summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-03-05 07:45:34 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-03-05 07:45:34 +0000
commitee0a5642ab9019f040132a2087872d87e3ddf026 (patch)
tree60614d661eb04699242798e5965b9c732dfd5bd5
parent9f03451a61e6d5541035462cd32c1f88eb68e9a5 (diff)
Added running_machine * parameter to the front of all read/write handlers.
Updated all call-through handlers appropriately. Renamed read8_handler to read8_machine_func, replicating this pattern throughout. Defined new set of memory handler functions which are similar but which pass a const device_config * in place of the running_machine *. These are called read8_device_func, etc. Added macros READ8_DEVICE_HANDLER() for specifying functions of this type. Note that some plumbing still needs to happen in memory.c before this will work. This check-in should remove the need for the global Machine and in turn "deprecat.h" for a lot of drivers, but that work has not been done. On the flip side, some new accesses to the global Machine were added in the emu/ files. These should be addressed over time, but are smaller in number than the references in the driver.
-rw-r--r--src/emu/cheat.c2
-rw-r--r--src/emu/cpu/arm7/arm7core.c7
-rw-r--r--src/emu/cpu/g65816/g65816.c2
-rw-r--r--src/emu/cpu/g65816/g65816cm.h2
-rw-r--r--src/emu/cpu/g65816/g65816op.h2
-rw-r--r--src/emu/cpu/i8051/i8051.c26
-rw-r--r--src/emu/cpu/m6502/m4510.c15
-rw-r--r--src/emu/cpu/m6502/m6502.c15
-rw-r--r--src/emu/cpu/m6502/m6509.c15
-rw-r--r--src/emu/cpu/m6502/m65ce02.c8
-rw-r--r--src/emu/cpu/m6502/ops02.h4
-rw-r--r--src/emu/cpu/m6800/m6800.c4
-rw-r--r--src/emu/cpu/mips/mdrc64.c2
-rw-r--r--src/emu/cpu/rsp/rsp.c8
-rw-r--r--src/emu/cpu/rsp/rsp.h8
-rw-r--r--src/emu/cpu/sh2/sh2.c12
-rw-r--r--src/emu/cpu/sh4/sh4.c12
-rw-r--r--src/emu/cpu/tms34010/tms34010.c6
-rw-r--r--src/emu/driver.h1
-rw-r--r--src/emu/inptport.c14
-rw-r--r--src/emu/inptport.h8
-rw-r--r--src/emu/machine/6522via.c55
-rw-r--r--src/emu/machine/6522via.h24
-rw-r--r--src/emu/machine/6532riot.c8
-rw-r--r--src/emu/machine/6532riot.h8
-rw-r--r--src/emu/machine/6821pia.c20
-rw-r--r--src/emu/machine/6821pia.h20
-rw-r--r--src/emu/machine/6840ptm.c8
-rw-r--r--src/emu/machine/6840ptm.h2
-rw-r--r--src/emu/machine/8042kbdc.c8
-rw-r--r--src/emu/machine/8237dma.c28
-rw-r--r--src/emu/machine/8255ppi.c55
-rw-r--r--src/emu/machine/8255ppi.h24
-rw-r--r--src/emu/machine/8257dma.c28
-rw-r--r--src/emu/machine/mc146818.c12
-rw-r--r--src/emu/machine/msm6242.c4
-rw-r--r--src/emu/machine/pci.c4
-rw-r--r--src/emu/machine/pic8259.c28
-rw-r--r--src/emu/machine/pit8253.c28
-rw-r--r--src/emu/machine/z80ctc.c6
-rw-r--r--src/emu/machine/z80ctc.h6
-rw-r--r--src/emu/machine/z80sio.c17
-rw-r--r--src/emu/machine/z80sio.h8
-rw-r--r--src/emu/memconv.h220
-rw-r--r--src/emu/memory.c281
-rw-r--r--src/emu/memory.h705
-rw-r--r--src/emu/sound/2151intf.c26
-rw-r--r--src/emu/sound/2151intf.h2
-rw-r--r--src/emu/sound/2203intf.c8
-rw-r--r--src/emu/sound/2203intf.h8
-rw-r--r--src/emu/sound/2413intf.c20
-rw-r--r--src/emu/sound/2608intf.h8
-rw-r--r--src/emu/sound/3812intf.c9
-rw-r--r--src/emu/sound/3812intf.h8
-rw-r--r--src/emu/sound/aica.c2
-rw-r--r--src/emu/sound/ay8910.c29
-rw-r--r--src/emu/sound/ay8910.h12
-rw-r--r--src/emu/sound/es5503.c5
-rw-r--r--src/emu/sound/es5503.h2
-rw-r--r--src/emu/sound/k053260.c8
-rw-r--r--src/emu/sound/namco.c2
-rw-r--r--src/emu/sound/pokey.c17
-rw-r--r--src/emu/sound/pokey.h8
-rw-r--r--src/emu/sound/scsp.c2
-rw-r--r--src/emu/sound/sp0256.c2
-rw-r--r--src/emu/sound/x1_010.c4
-rw-r--r--src/emu/sound/ym2151.c7
-rw-r--r--src/emu/sound/ym2151.h2
-rw-r--r--src/emu/sound/ymf271.c11
-rw-r--r--src/emu/sound/ymf271.h4
-rw-r--r--src/emu/sound/ymz280b.c11
-rw-r--r--src/emu/sound/ymz280b.h4
-rw-r--r--src/emu/video/tlc34076.c8
-rw-r--r--src/emu/video/tms34061.c12
-rw-r--r--src/emu/video/tms34061.h4
-rw-r--r--src/emu/video/tms9928a.c2
-rw-r--r--src/emu/video/v9938.c2
-rw-r--r--src/mame/audio/8080bw.c37
-rw-r--r--src/mame/audio/amiga.c2
-rw-r--r--src/mame/audio/asteroid.c14
-rw-r--r--src/mame/audio/atarijsa.c62
-rw-r--r--src/mame/audio/avalnche.c10
-rw-r--r--src/mame/audio/aztarac.c6
-rw-r--r--src/mame/audio/blockade.c2
-rw-r--r--src/mame/audio/bsktball.c8
-rw-r--r--src/mame/audio/cage.c6
-rw-r--r--src/mame/audio/canyon.c8
-rw-r--r--src/mame/audio/carnival.c4
-rw-r--r--src/mame/audio/cchasm.c52
-rw-r--r--src/mame/audio/circus.c14
-rw-r--r--src/mame/audio/crbaloon.c12
-rw-r--r--src/mame/audio/dcs.c10
-rw-r--r--src/mame/audio/dkong.c110
-rw-r--r--src/mame/audio/exidy.c4
-rw-r--r--src/mame/audio/firetrk.c18
-rw-r--r--src/mame/audio/gottlieb.c22
-rw-r--r--src/mame/audio/irem.c17
-rw-r--r--src/mame/audio/jaguar.c8
-rw-r--r--src/mame/audio/jedi.c11
-rw-r--r--src/mame/audio/leland.c42
-rw-r--r--src/mame/audio/llander.c10
-rw-r--r--src/mame/audio/m72.c4
-rw-r--r--src/mame/audio/mario.c78
-rw-r--r--src/mame/audio/mcr.c50
-rw-r--r--src/mame/audio/mcr.h4
-rw-r--r--src/mame/audio/mw8080bw.c126
-rw-r--r--src/mame/audio/namco54.c6
-rw-r--r--src/mame/audio/orbit.c12
-rw-r--r--src/mame/audio/phoenix.c10
-rw-r--r--src/mame/audio/poolshrk.c8
-rw-r--r--src/mame/audio/qix.c4
-rw-r--r--src/mame/audio/redalert.c32
-rw-r--r--src/mame/audio/redbaron.c2
-rw-r--r--src/mame/audio/rockola.c2
-rw-r--r--src/mame/audio/scramble.c10
-rw-r--r--src/mame/audio/seibu.c4
-rw-r--r--src/mame/audio/snes.c4
-rw-r--r--src/mame/audio/spiders.c14
-rw-r--r--src/mame/audio/starwars.c2
-rw-r--r--src/mame/audio/subs.c10
-rw-r--r--src/mame/audio/taitosnd.c12
-rw-r--r--src/mame/audio/toaplan2.c40
-rw-r--r--src/mame/audio/trackfld.c2
-rw-r--r--src/mame/audio/vicdual.c40
-rw-r--r--src/mame/audio/williams.c28
-rw-r--r--src/mame/drivers/40love.c8
-rw-r--r--src/mame/drivers/4enraya.c4
-rw-r--r--src/mame/drivers/8080bw.c2
-rw-r--r--src/mame/drivers/88games.c6
-rw-r--r--src/mame/drivers/acommand.c12
-rw-r--r--src/mame/drivers/actfancr.c4
-rw-r--r--src/mame/drivers/aerofgt.c14
-rw-r--r--src/mame/drivers/airbustr.c18
-rw-r--r--src/mame/drivers/alg.c2
-rw-r--r--src/mame/drivers/aliens.c6
-rw-r--r--src/mame/drivers/alpha68k.c10
-rw-r--r--src/mame/drivers/amidar.c8
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/amspdwy.c6
-rw-r--r--src/mame/drivers/aquarium.c12
-rw-r--r--src/mame/drivers/arcadecl.c4
-rw-r--r--src/mame/drivers/argus.c16
-rw-r--r--src/mame/drivers/armedf.c6
-rw-r--r--src/mame/drivers/ashnojoe.c4
-rw-r--r--src/mame/drivers/asterix.c8
-rw-r--r--src/mame/drivers/astinvad.c8
-rw-r--r--src/mame/drivers/astrocde.c12
-rw-r--r--src/mame/drivers/atarigt.c4
-rw-r--r--src/mame/drivers/atarisy1.c9
-rw-r--r--src/mame/drivers/atarisy2.c20
-rw-r--r--src/mame/drivers/attckufo.c4
-rw-r--r--src/mame/drivers/aztarac.c4
-rw-r--r--src/mame/drivers/backfire.c16
-rw-r--r--src/mame/drivers/badlands.c12
-rw-r--r--src/mame/drivers/bagman.c38
-rw-r--r--src/mame/drivers/battlera.c8
-rw-r--r--src/mame/drivers/bbusters.c10
-rw-r--r--src/mame/drivers/beathead.c6
-rw-r--r--src/mame/drivers/berzerk.c6
-rw-r--r--src/mame/drivers/bfm_sc2.c2
-rw-r--r--src/mame/drivers/bigevglf.c2
-rw-r--r--src/mame/drivers/bigfghtr.c8
-rw-r--r--src/mame/drivers/bionicc.c2
-rw-r--r--src/mame/drivers/bishi.c14
-rw-r--r--src/mame/drivers/bking.c4
-rw-r--r--src/mame/drivers/bladestl.c4
-rw-r--r--src/mame/drivers/blockade.c4
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/blockout.c4
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/bmcbowl.c10
-rw-r--r--src/mame/drivers/bogeyman.c8
-rw-r--r--src/mame/drivers/bottom9.c16
-rw-r--r--src/mame/drivers/brkthru.c4
-rw-r--r--src/mame/drivers/btime.c52
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/buggychl.c2
-rw-r--r--src/mame/drivers/bwing.c2
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/calomega.c8
-rw-r--r--src/mame/drivers/calorie.c4
-rw-r--r--src/mame/drivers/capbowl.c14
-rw-r--r--src/mame/drivers/cave.c18
-rw-r--r--src/mame/drivers/cbasebal.c12
-rw-r--r--src/mame/drivers/cbuster.c14
-rw-r--r--src/mame/drivers/cclimber.c4
-rw-r--r--src/mame/drivers/centiped.c8
-rw-r--r--src/mame/drivers/cham24.c6
-rw-r--r--src/mame/drivers/chinagat.c4
-rw-r--r--src/mame/drivers/cidelsa.c10
-rw-r--r--src/mame/drivers/cinemat.c2
-rw-r--r--src/mame/drivers/circusc.c4
-rw-r--r--src/mame/drivers/cliffhgr.c4
-rw-r--r--src/mame/drivers/cninja.c8
-rw-r--r--src/mame/drivers/cntsteer.c2
-rw-r--r--src/mame/drivers/combatsc.c2
-rw-r--r--src/mame/drivers/contra.c2
-rw-r--r--src/mame/drivers/coolpool.c4
-rw-r--r--src/mame/drivers/cop01.c6
-rw-r--r--src/mame/drivers/cosmic.c22
-rw-r--r--src/mame/drivers/cps1.c2
-rw-r--r--src/mame/drivers/cps3.c9
-rw-r--r--src/mame/drivers/crbaloon.c10
-rw-r--r--src/mame/drivers/crimfght.c4
-rw-r--r--src/mame/drivers/crospang.c2
-rw-r--r--src/mame/drivers/crshrace.c4
-rw-r--r--src/mame/drivers/cshooter.c5
-rw-r--r--src/mame/drivers/cubocd32.c28
-rw-r--r--src/mame/drivers/cvs.c56
-rw-r--r--src/mame/drivers/dambustr.c4
-rw-r--r--src/mame/drivers/darius.c16
-rw-r--r--src/mame/drivers/darkhors.c8
-rw-r--r--src/mame/drivers/darkseal.c14
-rw-r--r--src/mame/drivers/dassault.c4
-rw-r--r--src/mame/drivers/dblewing.c2
-rw-r--r--src/mame/drivers/dbz.c2
-rw-r--r--src/mame/drivers/dcheese.c14
-rw-r--r--src/mame/drivers/ddayjlc.c6
-rw-r--r--src/mame/drivers/ddenlovr.c30
-rw-r--r--src/mame/drivers/ddragon.c4
-rw-r--r--src/mame/drivers/ddragon3.c4
-rw-r--r--src/mame/drivers/dec0.c26
-rw-r--r--src/mame/drivers/dec8.c10
-rw-r--r--src/mame/drivers/deco156.c20
-rw-r--r--src/mame/drivers/deco32.c26
-rw-r--r--src/mame/drivers/deco_mlc.c6
-rw-r--r--src/mame/drivers/decocass.c16
-rw-r--r--src/mame/drivers/deniam.c8
-rw-r--r--src/mame/drivers/destroyr.c4
-rw-r--r--src/mame/drivers/dgpix.c6
-rw-r--r--src/mame/drivers/dietgo.c4
-rw-r--r--src/mame/drivers/discoboy.c4
-rw-r--r--src/mame/drivers/diverboy.c4
-rw-r--r--src/mame/drivers/djboy.c6
-rw-r--r--src/mame/drivers/djmain.c30
-rw-r--r--src/mame/drivers/dkong.c2
-rw-r--r--src/mame/drivers/dogfgt.c8
-rw-r--r--src/mame/drivers/dominob.c2
-rw-r--r--src/mame/drivers/dragrace.c38
-rw-r--r--src/mame/drivers/dreamwld.c8
-rw-r--r--src/mame/drivers/drgnmst.c8
-rw-r--r--src/mame/drivers/dribling.c10
-rw-r--r--src/mame/drivers/dynadice.c4
-rw-r--r--src/mame/drivers/dynax.c45
-rw-r--r--src/mame/drivers/egghunt.c4
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/esd16.c8
-rw-r--r--src/mame/drivers/espial.c6
-rw-r--r--src/mame/drivers/ettrivia.c18
-rw-r--r--src/mame/drivers/exerion.c2
-rw-r--r--src/mame/drivers/exidy.c2
-rw-r--r--src/mame/drivers/exidy440.c2
-rw-r--r--src/mame/drivers/exprraid.c4
-rw-r--r--src/mame/drivers/exterm.c14
-rw-r--r--src/mame/drivers/f-32.c12
-rw-r--r--src/mame/drivers/f1gp.c4
-rw-r--r--src/mame/drivers/fantland.c8
-rw-r--r--src/mame/drivers/fastlane.c10
-rw-r--r--src/mame/drivers/fcombat.c2
-rw-r--r--src/mame/drivers/findout.c6
-rw-r--r--src/mame/drivers/firebeat.c39
-rw-r--r--src/mame/drivers/firetrap.c4
-rw-r--r--src/mame/drivers/firetrk.c18
-rw-r--r--src/mame/drivers/flkatck.c8
-rw-r--r--src/mame/drivers/flower.c4
-rw-r--r--src/mame/drivers/flstory.c4
-rw-r--r--src/mame/drivers/foodf.c16
-rw-r--r--src/mame/drivers/frogger.c8
-rw-r--r--src/mame/drivers/fromanc2.c6
-rw-r--r--src/mame/drivers/funkybee.c4
-rw-r--r--src/mame/drivers/funybubl.c4
-rw-r--r--src/mame/drivers/fuukifg2.c4
-rw-r--r--src/mame/drivers/gaelco.c4
-rw-r--r--src/mame/drivers/gaelco3d.c37
-rw-r--r--src/mame/drivers/gaiden.c10
-rw-r--r--src/mame/drivers/galaga.c10
-rw-r--r--src/mame/drivers/galaxian.c8
-rw-r--r--src/mame/drivers/galivan.c14
-rw-r--r--src/mame/drivers/galpanic.c2
-rw-r--r--src/mame/drivers/galspnbl.c4
-rw-r--r--src/mame/drivers/gamecstl.c16
-rw-r--r--src/mame/drivers/gameplan.c6
-rw-r--r--src/mame/drivers/gaplus.c2
-rw-r--r--src/mame/drivers/gauntlet.c4
-rw-r--r--src/mame/drivers/gbusters.c2
-rw-r--r--src/mame/drivers/gcpinbal.c10
-rw-r--r--src/mame/drivers/genesis.c40
-rw-r--r--src/mame/drivers/getrivia.c8
-rw-r--r--src/mame/drivers/gijoe.c8
-rw-r--r--src/mame/drivers/gladiatr.c8
-rw-r--r--src/mame/drivers/goal92.c4
-rw-r--r--src/mame/drivers/gottlieb.c12
-rw-r--r--src/mame/drivers/gradius3.c18
-rw-r--r--src/mame/drivers/grchamp.c32
-rw-r--r--src/mame/drivers/groundfx.c8
-rw-r--r--src/mame/drivers/gstream.c8
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/gsword.c8
-rw-r--r--src/mame/drivers/gunbustr.c10
-rw-r--r--src/mame/drivers/hal21.c24
-rw-r--r--src/mame/drivers/halleys.c4
-rw-r--r--src/mame/drivers/hanaawas.c2
-rw-r--r--src/mame/drivers/hitme.c8
-rw-r--r--src/mame/drivers/homedata.c20
-rw-r--r--src/mame/drivers/homerun.c4
-rw-r--r--src/mame/drivers/hyprduel.c14
-rw-r--r--src/mame/drivers/igs_blit.c16
-rw-r--r--src/mame/drivers/inufuku.c6
-rw-r--r--src/mame/drivers/itech32.c20
-rw-r--r--src/mame/drivers/itech8.c31
-rw-r--r--src/mame/drivers/jack.c4
-rw-r--r--src/mame/drivers/jalmah.c38
-rw-r--r--src/mame/drivers/jcross.c8
-rw-r--r--src/mame/drivers/jedi.c8
-rw-r--r--src/mame/drivers/junofrst.c4
-rw-r--r--src/mame/drivers/kaneko16.c28
-rw-r--r--src/mame/drivers/karnov.c12
-rw-r--r--src/mame/drivers/kchamp.c4
-rw-r--r--src/mame/drivers/kickgoal.c40
-rw-r--r--src/mame/drivers/kingobox.c10
-rw-r--r--src/mame/drivers/kinst.c8
-rw-r--r--src/mame/drivers/kinstb.c4
-rw-r--r--src/mame/drivers/klax.c8
-rw-r--r--src/mame/drivers/koikoi.c4
-rw-r--r--src/mame/drivers/konamigq.c8
-rw-r--r--src/mame/drivers/konamigx.c12
-rw-r--r--src/mame/drivers/kopunch.c8
-rw-r--r--src/mame/drivers/ksayakyu.c2
-rw-r--r--src/mame/drivers/kyugo.c2
-rw-r--r--src/mame/drivers/ladyfrog.c2
-rw-r--r--src/mame/drivers/laserbat.c14
-rw-r--r--src/mame/drivers/lasso.c12
-rw-r--r--src/mame/drivers/lastduel.c2
-rw-r--r--src/mame/drivers/lazercmd.c10
-rw-r--r--src/mame/drivers/legionna.c150
-rw-r--r--src/mame/drivers/lemmings.c4
-rw-r--r--src/mame/drivers/lethal.c42
-rw-r--r--src/mame/drivers/lethalj.c8
-rw-r--r--src/mame/drivers/limenko.c2
-rw-r--r--src/mame/drivers/lkage.c2
-rw-r--r--src/mame/drivers/lockon.c2
-rw-r--r--src/mame/drivers/looping.c10
-rw-r--r--src/mame/drivers/lordgun.c14
-rw-r--r--src/mame/drivers/lwings.c6
-rw-r--r--src/mame/drivers/m107.c4
-rw-r--r--src/mame/drivers/m72.c4
-rw-r--r--src/mame/drivers/m79amb.c4
-rw-r--r--src/mame/drivers/m92.c4
-rw-r--r--src/mame/drivers/macrossp.c4
-rw-r--r--src/mame/drivers/madalien.c10
-rw-r--r--src/mame/drivers/madmotor.c12
-rw-r--r--src/mame/drivers/magicfly.c10
-rw-r--r--src/mame/drivers/mainevt.c4
-rw-r--r--src/mame/drivers/mainsnk.c2
-rw-r--r--src/mame/drivers/mappy.c8
-rw-r--r--src/mame/drivers/marvins.c8
-rw-r--r--src/mame/drivers/matmania.c8
-rw-r--r--src/mame/drivers/mayumi.c2
-rw-r--r--src/mame/drivers/mcatadv.c6
-rw-r--r--src/mame/drivers/mcr.c6
-rw-r--r--src/mame/drivers/mcr3.c27
-rw-r--r--src/mame/drivers/mcr68.c14
-rw-r--r--src/mame/drivers/mediagx.c22
-rw-r--r--src/mame/drivers/megadriv.c44
-rw-r--r--src/mame/drivers/megaplay.c4
-rw-r--r--src/mame/drivers/megasys1.c26
-rw-r--r--src/mame/drivers/meijinsn.c2
-rw-r--r--src/mame/drivers/mermaid.c8
-rw-r--r--src/mame/drivers/metro.c68
-rw-r--r--src/mame/drivers/mexico86.c2
-rw-r--r--src/mame/drivers/mhavoc.c10
-rw-r--r--src/mame/drivers/micro3d.c6
-rw-r--r--src/mame/drivers/midvunit.c8
-rw-r--r--src/mame/drivers/midzeus.c4
-rw-r--r--src/mame/drivers/mirax.c8
-rw-r--r--src/mame/drivers/missile.c4
-rw-r--r--src/mame/drivers/mitchell.c14
-rw-r--r--src/mame/drivers/model1.c20
-rw-r--r--src/mame/drivers/model2.c20
-rw-r--r--src/mame/drivers/model3.c10
-rw-r--r--src/mame/drivers/mogura.c4
-rw-r--r--src/mame/drivers/moo.c18
-rw-r--r--src/mame/drivers/mpu4.c14
-rw-r--r--src/mame/drivers/mquake.c4
-rw-r--r--src/mame/drivers/mrflea.c12
-rw-r--r--src/mame/drivers/mrjong.c2
-rw-r--r--src/mame/drivers/ms32.c8
-rw-r--r--src/mame/drivers/msisaac.c2
-rw-r--r--src/mame/drivers/mugsmash.c4
-rw-r--r--src/mame/drivers/multigam.c8
-rw-r--r--src/mame/drivers/munchmo.c4
-rw-r--r--src/mame/drivers/mw8080bw.c43
-rw-r--r--src/mame/drivers/mystston.c8
-rw-r--r--src/mame/drivers/mystwarr.c24
-rw-r--r--src/mame/drivers/namcona1.c20
-rw-r--r--src/mame/drivers/namcos11.c2
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/namcos86.c6
-rw-r--r--src/mame/drivers/naughtyb.c8
-rw-r--r--src/mame/drivers/nbmj8991.c6
-rw-r--r--src/mame/drivers/nbmj9195.c80
-rw-r--r--src/mame/drivers/nemesis.c14
-rw-r--r--src/mame/drivers/neogeo.c14
-rw-r--r--src/mame/drivers/ninjaw.c6
-rw-r--r--src/mame/drivers/niyanpai.c48
-rw-r--r--src/mame/drivers/nmg5.c4
-rw-r--r--src/mame/drivers/nmk16.c14
-rw-r--r--src/mame/drivers/nss.c4
-rw-r--r--src/mame/drivers/nycaptor.c2
-rw-r--r--src/mame/drivers/nyny.c30
-rw-r--r--src/mame/drivers/ojankohs.c4
-rw-r--r--src/mame/drivers/olibochu.c2
-rw-r--r--src/mame/drivers/omegrace.c8
-rw-r--r--src/mame/drivers/onetwo.c6
-rw-r--r--src/mame/drivers/orbit.c10
-rw-r--r--src/mame/drivers/othunder.c10
-rw-r--r--src/mame/drivers/overdriv.c22
-rw-r--r--src/mame/drivers/pacman.c8
-rw-r--r--src/mame/drivers/pandoras.c2
-rw-r--r--src/mame/drivers/parodius.c14
-rw-r--r--src/mame/drivers/pasha2.c12
-rw-r--r--src/mame/drivers/pass.c2
-rw-r--r--src/mame/drivers/pbaction.c4
-rw-r--r--src/mame/drivers/pcktgal.c4
-rw-r--r--src/mame/drivers/pgm.c6
-rw-r--r--src/mame/drivers/pipedrm.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pkscram.c6
-rw-r--r--src/mame/drivers/playch10.c6
-rw-r--r--src/mame/drivers/playmark.c9
-rw-r--r--src/mame/drivers/plygonet.c6
-rw-r--r--src/mame/drivers/pmpoker.c8
-rw-r--r--src/mame/drivers/pokechmp.c4
-rw-r--r--src/mame/drivers/polepos.c14
-rw-r--r--src/mame/drivers/policetr.c4
-rw-r--r--src/mame/drivers/poolshrk.c4
-rw-r--r--src/mame/drivers/popeye.c4
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/powerins.c2
-rw-r--r--src/mame/drivers/ppmast93.c6
-rw-r--r--src/mame/drivers/prehisle.c4
-rw-r--r--src/mame/drivers/psikyo.c8
-rw-r--r--src/mame/drivers/psikyo4.c14
-rw-r--r--src/mame/drivers/psikyosh.c14
-rw-r--r--src/mame/drivers/pturn.c4
-rw-r--r--src/mame/drivers/puckpkmn.c10
-rw-r--r--src/mame/drivers/punchout.c44
-rw-r--r--src/mame/drivers/pushman.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c45
-rw-r--r--src/mame/drivers/quantum.c8
-rw-r--r--src/mame/drivers/quasar.c12
-rw-r--r--src/mame/drivers/r2dtank.c28
-rw-r--r--src/mame/drivers/raiden.c2
-rw-r--r--src/mame/drivers/raiden2.c4
-rw-r--r--src/mame/drivers/rallyx.c6
-rw-r--r--src/mame/drivers/rampart.c8
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/realbrk.c38
-rw-r--r--src/mame/drivers/redalert.c2
-rw-r--r--src/mame/drivers/relief.c8
-rw-r--r--src/mame/drivers/renegade.c4
-rw-r--r--src/mame/drivers/retofinv.c4
-rw-r--r--src/mame/drivers/rmhaihai.c2
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rollerg.c6
-rw-r--r--src/mame/drivers/royalmah.c46
-rw-r--r--src/mame/drivers/rungun.c6
-rw-r--r--src/mame/drivers/safarir.c4
-rw-r--r--src/mame/drivers/sandscrp.c10
-rw-r--r--src/mame/drivers/sauro.c8
-rw-r--r--src/mame/drivers/sbowling.c6
-rw-r--r--src/mame/drivers/scobra.c38
-rw-r--r--src/mame/drivers/scotrsht.c4
-rw-r--r--src/mame/drivers/scramble.c16
-rw-r--r--src/mame/drivers/seattle.c32
-rw-r--r--src/mame/drivers/segac2.c16
-rw-r--r--src/mame/drivers/segae.c4
-rw-r--r--src/mame/drivers/segag80r.c18
-rw-r--r--src/mame/drivers/segag80v.c2
-rw-r--r--src/mame/drivers/segahang.c20
-rw-r--r--src/mame/drivers/segaorun.c36
-rw-r--r--src/mame/drivers/segas16a.c50
-rw-r--r--src/mame/drivers/segas16b.c111
-rw-r--r--src/mame/drivers/segas18.c22
-rw-r--r--src/mame/drivers/segas24.c22
-rw-r--r--src/mame/drivers/segas32.c26
-rw-r--r--src/mame/drivers/segaxbd.c8
-rw-r--r--src/mame/drivers/segaybd.c8
-rw-r--r--src/mame/drivers/seibuspi.c16
-rw-r--r--src/mame/drivers/seta.c25
-rw-r--r--src/mame/drivers/sf.c14
-rw-r--r--src/mame/drivers/sgladiat.c6
-rw-r--r--src/mame/drivers/shadfrce.c6
-rw-r--r--src/mame/drivers/shangha3.c4
-rw-r--r--src/mame/drivers/shangkid.c6
-rw-r--r--src/mame/drivers/shisen.c8
-rw-r--r--src/mame/drivers/shootout.c4
-rw-r--r--src/mame/drivers/shougi.c2
-rw-r--r--src/mame/drivers/shuuz.c4
-rw-r--r--src/mame/drivers/sidepckt.c4
-rw-r--r--src/mame/drivers/silkroad.c14
-rw-r--r--src/mame/drivers/simpl156.c12
-rw-r--r--src/mame/drivers/skydiver.c12
-rw-r--r--src/mame/drivers/slapfght.c4
-rw-r--r--src/mame/drivers/slapshot.c12
-rw-r--r--src/mame/drivers/sliver.c4
-rw-r--r--src/mame/drivers/snk.c68
-rw-r--r--src/mame/drivers/snk68.c4
-rw-r--r--src/mame/drivers/snowbros.c42
-rw-r--r--src/mame/drivers/solomon.c4
-rw-r--r--src/mame/drivers/spacefb.c6
-rw-r--r--src/mame/drivers/spbactn.c4
-rw-r--r--src/mame/drivers/spcforce.c6
-rw-r--r--src/mame/drivers/spdodgeb.c4
-rw-r--r--src/mame/drivers/speedspn.c4
-rw-r--r--src/mame/drivers/spiders.c8
-rw-r--r--src/mame/drivers/splash.c8
-rw-r--r--src/mame/drivers/sprint2.c14
-rw-r--r--src/mame/drivers/sprint4.c12
-rw-r--r--src/mame/drivers/spy.c2
-rw-r--r--src/mame/drivers/srmp6.c4
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/ssfindo.c2
-rw-r--r--src/mame/drivers/sshangha.c6
-rw-r--r--src/mame/drivers/ssingles.c4
-rw-r--r--src/mame/drivers/sslam.c52
-rw-r--r--src/mame/drivers/ssozumo.c4
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/st0016.c10
-rw-r--r--src/mame/drivers/stadhero.c12
-rw-r--r--src/mame/drivers/starfire.c24
-rw-r--r--src/mame/drivers/starwars.c6
-rw-r--r--src/mame/drivers/stv.c6
-rw-r--r--src/mame/drivers/suna16.c2
-rw-r--r--src/mame/drivers/suna8.c4
-rw-r--r--src/mame/drivers/supbtime.c8
-rw-r--r--src/mame/drivers/superchs.c12
-rw-r--r--src/mame/drivers/supertnk.c8
-rw-r--r--src/mame/drivers/suprloco.c4
-rw-r--r--src/mame/drivers/suprnova.c4
-rw-r--r--src/mame/drivers/suprslam.c4
-rw-r--r--src/mame/drivers/surpratk.c8
-rw-r--r--src/mame/drivers/system1.c12
-rw-r--r--src/mame/drivers/system16.c20
-rw-r--r--src/mame/drivers/system18.c8
-rw-r--r--src/mame/drivers/tagteam.c4
-rw-r--r--src/mame/drivers/tail2nos.c10
-rw-r--r--src/mame/drivers/taito_b.c22
-rw-r--r--src/mame/drivers/taito_f2.c94
-rw-r--r--src/mame/drivers/taito_f3.c2
-rw-r--r--src/mame/drivers/taito_h.c4
-rw-r--r--src/mame/drivers/taito_l.c32
-rw-r--r--src/mame/drivers/taito_z.c66
-rw-r--r--src/mame/drivers/taitosj.c4
-rw-r--r--src/mame/drivers/taitowlf.c16
-rw-r--r--src/mame/drivers/tank8.c28
-rw-r--r--src/mame/drivers/tankbust.c2
-rw-r--r--src/mame/drivers/taotaido.c4
-rw-r--r--src/mame/drivers/tatsumi.c4
-rw-r--r--src/mame/drivers/taxidrvr.c18
-rw-r--r--src/mame/drivers/tbowl.c4
-rw-r--r--src/mame/drivers/tecmo.c4
-rw-r--r--src/mame/drivers/tecmo16.c4
-rw-r--r--src/mame/drivers/tehkanwc.c6
-rw-r--r--src/mame/drivers/terracre.c4
-rw-r--r--src/mame/drivers/tetrisp2.c6
-rw-r--r--src/mame/drivers/thedeep.c4
-rw-r--r--src/mame/drivers/thief.c2
-rw-r--r--src/mame/drivers/thunderj.c2
-rw-r--r--src/mame/drivers/thunderx.c4
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tickee.c8
-rw-r--r--src/mame/drivers/tigeroad.c8
-rw-r--r--src/mame/drivers/tmnt.c92
-rw-r--r--src/mame/drivers/tnzs.c6
-rw-r--r--src/mame/drivers/toaplan2.c54
-rw-r--r--src/mame/drivers/toki.c4
-rw-r--r--src/mame/drivers/topspeed.c4
-rw-r--r--src/mame/drivers/toratora.c10
-rw-r--r--src/mame/drivers/toypop.c2
-rw-r--r--src/mame/drivers/triplhnt.c16
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvquest.c4
-rw-r--r--src/mame/drivers/tryout.c8
-rw-r--r--src/mame/drivers/tsamurai.c4
-rw-r--r--src/mame/drivers/tubep.c4
-rw-r--r--src/mame/drivers/tumbleb.c62
-rw-r--r--src/mame/drivers/tumblep.c12
-rw-r--r--src/mame/drivers/turbo.c2
-rw-r--r--src/mame/drivers/twin16.c2
-rw-r--r--src/mame/drivers/ultraman.c28
-rw-r--r--src/mame/drivers/ultratnk.c8
-rw-r--r--src/mame/drivers/ultrsprt.c16
-rw-r--r--src/mame/drivers/undrfire.c14
-rw-r--r--src/mame/drivers/unico.c28
-rw-r--r--src/mame/drivers/vamphalf.c20
-rw-r--r--src/mame/drivers/vaportra.c16
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/drivers/vegaeo.c16
-rw-r--r--src/mame/drivers/vegas.c26
-rw-r--r--src/mame/drivers/vendetta.c16
-rw-r--r--src/mame/drivers/vicdual.c104
-rw-r--r--src/mame/drivers/videopin.c20
-rw-r--r--src/mame/drivers/viper.c32
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/vsnes.c12
-rw-r--r--src/mame/drivers/wardner.c4
-rw-r--r--src/mame/drivers/warpwarp.c6
-rw-r--r--src/mame/drivers/warriorb.c6
-rw-r--r--src/mame/drivers/wc90.c4
-rw-r--r--src/mame/drivers/wc90b.c4
-rw-r--r--src/mame/drivers/wecleman.c28
-rw-r--r--src/mame/drivers/welltris.c4
-rw-r--r--src/mame/drivers/wgp.c6
-rw-r--r--src/mame/drivers/wilytowr.c8
-rw-r--r--src/mame/drivers/witch.c8
-rw-r--r--src/mame/drivers/wiz.c11
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c8
-rw-r--r--src/mame/drivers/xain.c8
-rw-r--r--src/mame/drivers/xexex.c12
-rw-r--r--src/mame/drivers/xmen.c12
-rw-r--r--src/mame/drivers/xtheball.c6
-rw-r--r--src/mame/drivers/yunsun16.c4
-rw-r--r--src/mame/drivers/yunsung8.c2
-rw-r--r--src/mame/drivers/zaccaria.c32
-rw-r--r--src/mame/drivers/zerozone.c4
-rw-r--r--src/mame/drivers/zn.c28
-rw-r--r--src/mame/drivers/zr107.c8
-rw-r--r--src/mame/includes/amiga.h2
-rw-r--r--src/mame/includes/crbaloon.h6
-rw-r--r--src/mame/includes/mw8080bw.h2
-rw-r--r--src/mame/includes/segas24.h4
-rw-r--r--src/mame/machine/ajax.c12
-rw-r--r--src/mame/machine/amiga.c18
-rw-r--r--src/mame/machine/arkanoid.c6
-rw-r--r--src/mame/machine/asic65.c2
-rw-r--r--src/mame/machine/asteroid.c4
-rw-r--r--src/mame/machine/atari.c10
-rw-r--r--src/mame/machine/atarifb.c50
-rw-r--r--src/mame/machine/atarigen.c18
-rw-r--r--src/mame/machine/bagman.c16
-rw-r--r--src/mame/machine/balsente.c8
-rw-r--r--src/mame/machine/beezer.c6
-rw-r--r--src/mame/machine/bsktball.c10
-rw-r--r--src/mame/machine/bublbobl.c2
-rw-r--r--src/mame/machine/copsnrob.c9
-rw-r--r--src/mame/machine/cubocd32.c3
-rw-r--r--src/mame/machine/daikaiju.c2
-rw-r--r--src/mame/machine/dc.c8
-rw-r--r--src/mame/machine/dec0.c24
-rw-r--r--src/mame/machine/decocass.c30
-rw-r--r--src/mame/machine/decoprot.c57
-rw-r--r--src/mame/machine/equites.c6
-rw-r--r--src/mame/machine/galaxian.c14
-rw-r--r--src/mame/machine/harddriv.c4
-rw-r--r--src/mame/machine/irobot.c4
-rw-r--r--src/mame/machine/kaneko16.c2
-rw-r--r--src/mame/machine/konamigx.c8
-rw-r--r--src/mame/machine/konppc.c12
-rw-r--r--src/mame/machine/leland.c36
-rw-r--r--src/mame/machine/lsasquad.c2
-rw-r--r--src/mame/machine/mcr.c30
-rw-r--r--src/mame/machine/mhavoc.c4
-rw-r--r--src/mame/machine/midwayic.c16
-rw-r--r--src/mame/machine/midwunit.c10
-rw-r--r--src/mame/machine/midyunit.c4
-rw-r--r--src/mame/machine/namcoio.c198
-rw-r--r--src/mame/machine/namcoio.h4
-rw-r--r--src/mame/machine/namcos1.c94
-rw-r--r--src/mame/machine/namcos2.c34
-rw-r--r--src/mame/machine/nb1413m3.c12
-rw-r--r--src/mame/machine/nitedrvr.c18
-rw-r--r--src/mame/machine/nmk004.c151
-rw-r--r--src/mame/machine/nmk112.c2
-rw-r--r--src/mame/machine/pcshare.c8
-rw-r--r--src/mame/machine/playch10.c20
-rw-r--r--src/mame/machine/qix.c22
-rw-r--r--src/mame/machine/scramble.c8
-rw-r--r--src/mame/machine/segaic16.c8
-rw-r--r--src/mame/machine/segaic16.h4
-rw-r--r--src/mame/machine/segas24.c18
-rw-r--r--src/mame/machine/simpsons.c4
-rw-r--r--src/mame/machine/slapfght.c4
-rw-r--r--src/mame/machine/snes.c26
-rw-r--r--src/mame/machine/stfight.c2
-rw-r--r--src/mame/machine/subs.c24
-rw-r--r--src/mame/machine/tait8741.c80
-rw-r--r--src/mame/machine/tait8741.h2
-rw-r--r--src/mame/machine/taitosj.c6
-rw-r--r--src/mame/machine/tatsumi.c4
-rw-r--r--src/mame/machine/ticket.c4
-rw-r--r--src/mame/machine/tnzs.c20
-rw-r--r--src/mame/machine/toaplan1.c6
-rw-r--r--src/mame/machine/vertigo.c2
-rw-r--r--src/mame/machine/vsnes.c21
-rw-r--r--src/mame/machine/williams.c44
-rw-r--r--src/mame/video/amiga.c10
-rw-r--r--src/mame/video/amspdwy.c2
-rw-r--r--src/mame/video/appoooh.c2
-rw-r--r--src/mame/video/armedf.c2
-rw-r--r--src/mame/video/astrocde.c2
-rw-r--r--src/mame/video/atari.c20
-rw-r--r--src/mame/video/atarisy1.c6
-rw-r--r--src/mame/video/atarisy2.c2
-rw-r--r--src/mame/video/avgdvg.c6
-rw-r--r--src/mame/video/balsente.c2
-rw-r--r--src/mame/video/bankp.c2
-rw-r--r--src/mame/video/beezer.c2
-rw-r--r--src/mame/video/bionicc.c4
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blockade.c2
-rw-r--r--src/mame/video/blstroid.c2
-rw-r--r--src/mame/video/bogeyman.c2
-rw-r--r--src/mame/video/btime.c12
-rw-r--r--src/mame/video/btoads.c4
-rw-r--r--src/mame/video/capbowl.c4
-rw-r--r--src/mame/video/centiped.c2
-rw-r--r--src/mame/video/cheekyms.c2
-rw-r--r--src/mame/video/cischeat.c47
-rw-r--r--src/mame/video/combatsc.c6
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/contra.c4
-rw-r--r--src/mame/video/cps1.c4
-rw-r--r--src/mame/video/crshrace.c4
-rw-r--r--src/mame/video/darkseal.c2
-rw-r--r--src/mame/video/dec0.c4
-rw-r--r--src/mame/video/decocass.c6
-rw-r--r--src/mame/video/dogfgt.c4
-rw-r--r--src/mame/video/dooyong.c12
-rw-r--r--src/mame/video/dynax.c10
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/eolith.c4
-rw-r--r--src/mame/video/exedexes.c2
-rw-r--r--src/mame/video/exidy440.c4
-rw-r--r--src/mame/video/flkatck.c2
-rw-r--r--src/mame/video/flstory.c4
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/galaxian.c8
-rw-r--r--src/mame/video/galivan.c4
-rw-r--r--src/mame/video/gameplan.c8
-rw-r--r--src/mame/video/genesis.c2
-rw-r--r--src/mame/video/ginganin.c2
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/gradius3.c4
-rw-r--r--src/mame/video/groundfx.c4
-rw-r--r--src/mame/video/gtia.c2
-rw-r--r--src/mame/video/hcastle.c4
-rw-r--r--src/mame/video/homedata.c18
-rw-r--r--src/mame/video/hyhoo.c6
-rw-r--r--src/mame/video/itech32.c10
-rw-r--r--src/mame/video/itech8.c12
-rw-r--r--src/mame/video/jack.c2
-rw-r--r--src/mame/video/jaguar.c8
-rw-r--r--src/mame/video/jedi.c4
-rw-r--r--src/mame/video/konamigx.c12
-rw-r--r--src/mame/video/konamiic.c98
-rw-r--r--src/mame/video/ladyfrog.c4
-rw-r--r--src/mame/video/lasso.c6
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/lazercmd.c4
-rw-r--r--src/mame/video/liberate.c8
-rw-r--r--src/mame/video/lwings.c2
-rw-r--r--src/mame/video/m62.c4
-rw-r--r--src/mame/video/m92.c4
-rw-r--r--src/mame/video/marvins.c2
-rw-r--r--src/mame/video/megasys1.c18
-rw-r--r--src/mame/video/midtunit.c2
-rw-r--r--src/mame/video/mitchell.c14
-rw-r--r--src/mame/video/mjkjidai.c2
-rw-r--r--src/mame/video/naughtyb.c10
-rw-r--r--src/mame/video/nbmj8688.c6
-rw-r--r--src/mame/video/neogeo.c2
-rw-r--r--src/mame/video/nitedrvr.c2
-rw-r--r--src/mame/video/nova2001.c6
-rw-r--r--src/mame/video/nycaptor.c4
-rw-r--r--src/mame/video/ojankohs.c12
-rw-r--r--src/mame/video/pastelg.c2
-rw-r--r--src/mame/video/phoenix.c6
-rw-r--r--src/mame/video/popeye.c4
-rw-r--r--src/mame/video/psikyosh.c2
-rw-r--r--src/mame/video/psx.c2
-rw-r--r--src/mame/video/psychic5.c14
-rw-r--r--src/mame/video/rockola.c2
-rw-r--r--src/mame/video/segag80r.c6
-rw-r--r--src/mame/video/segaic24.c12
-rw-r--r--src/mame/video/segas32.c12
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/simpsons.c4
-rw-r--r--src/mame/video/skydiver.c24
-rw-r--r--src/mame/video/skyfox.c2
-rw-r--r--src/mame/video/sprint4.c8
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/st0016.c4
-rw-r--r--src/mame/video/subs.c4
-rw-r--r--src/mame/video/superqix.c4
-rw-r--r--src/mame/video/suprnova.c2
-rw-r--r--src/mame/video/tagteam.c4
-rw-r--r--src/mame/video/taito_b.c6
-rw-r--r--src/mame/video/taitoic.c142
-rw-r--r--src/mame/video/taitosj.c2
-rw-r--r--src/mame/video/thepit.c4
-rw-r--r--src/mame/video/thief.c12
-rw-r--r--src/mame/video/tia.c86
-rw-r--r--src/mame/video/tia.h6
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/tmnt.c2
-rw-r--r--src/mame/video/toaplan1.c19
-rw-r--r--src/mame/video/toki.c4
-rw-r--r--src/mame/video/toobin.c2
-rw-r--r--src/mame/video/triplhnt.c4
-rw-r--r--src/mame/video/twin16.c2
-rw-r--r--src/mame/video/twincobr.c26
-rw-r--r--src/mame/video/ultratnk.c4
-rw-r--r--src/mame/video/undrfire.c2
-rw-r--r--src/mame/video/vdc.c16
-rw-r--r--src/mame/video/xmen.c4
-rw-r--r--src/mame/video/xxmissio.c2
-rw-r--r--src/mame/video/yiear.c2
-rw-r--r--src/mame/video/zac2650.c2
821 files changed, 5646 insertions, 5631 deletions
diff --git a/src/emu/cheat.c b/src/emu/cheat.c
index 32bd1b5da9b..c29e4123390 100644
--- a/src/emu/cheat.c
+++ b/src/emu/cheat.c
@@ -8922,7 +8922,7 @@ static void RestoreRegionBackup(SearchRegion * region)
static UINT8 DefaultEnableRegion(running_machine *machine, SearchRegion * region, SearchInfo * info)
{
- write8_handler handler = region->writeHandler->write.handler8;
+ write8_machine_func handler = region->writeHandler->write.handler8;
FPTR handlerAddress = (FPTR)handler;
switch(info->searchSpeed)
diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c
index 386c6834907..46ba193b092 100644
--- a/src/emu/cpu/arm7/arm7core.c
+++ b/src/emu/cpu/arm7/arm7core.c
@@ -78,6 +78,7 @@
*****************************************************************************/
#include <stdarg.h>
+#include "deprecat.h"
#define ARM7_DEBUG_CORE 0
@@ -674,7 +675,7 @@ static void HandleCoProcDO(UINT32 insn)
{
// This instruction simply instructs the co-processor to do something, no data is returned to ARM7 core
if (arm7_coproc_do_callback)
- arm7_coproc_do_callback(insn, 0, 0); // simply pass entire opcode to callback - since data format is actually dependent on co-proc implementation
+ arm7_coproc_do_callback(Machine, insn, 0, 0); // simply pass entire opcode to callback - since data format is actually dependent on co-proc implementation
else
LOG(("%08x: Co-Processor Data Operation executed, but no callback defined!\n", R15));
}
@@ -690,7 +691,7 @@ static void HandleCoProcRT(UINT32 insn)
{
if (arm7_coproc_rt_r_callback)
{
- UINT32 res = arm7_coproc_rt_r_callback(insn, 0); // RT Read handler must parse opcode & return appropriate result
+ UINT32 res = arm7_coproc_rt_r_callback(Machine, insn, 0); // RT Read handler must parse opcode & return appropriate result
SET_REGISTER((insn >> 12) & 0xf, res);
}
else
@@ -700,7 +701,7 @@ static void HandleCoProcRT(UINT32 insn)
else
{
if (arm7_coproc_rt_r_callback)
- arm7_coproc_rt_w_callback(insn, GET_REGISTER((insn >> 12) & 0xf), 0);
+ arm7_coproc_rt_w_callback(Machine, insn, GET_REGISTER((insn >> 12) & 0xf), 0);
else
LOG(("%08x: Co-Processor Register Transfer executed, but no RT Write callback defined!\n", R15));
}
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index 46a5673f3dc..18024f3c866 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -360,7 +360,7 @@ static void g65816_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + G65816_IRQ_STATE: g65816_set_reg(G65816_IRQ_STATE, info->i); break;
/* --- the following bits of info are set as pointers to data or functions --- */
- case CPUINFO_PTR_G65816_READVECTOR_CALLBACK: READ_VECTOR = (read8_handler) info->f; break;
+ case CPUINFO_PTR_G65816_READVECTOR_CALLBACK: READ_VECTOR = (read8_machine_func) info->f; break;
}
}
diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h
index d7248fb179e..2913b2e7080 100644
--- a/src/emu/cpu/g65816/g65816cm.h
+++ b/src/emu/cpu/g65816/g65816cm.h
@@ -87,7 +87,7 @@ typedef struct
uint ir; /* Instruction Register */
uint irq_delay; /* delay 1 instruction before checking irq */
int (*int_ack)(int); /* Interrupt Acknowledge */
- read8_handler read_vector; /* Read vector override */
+ read8_machine_func read_vector; /* Read vector override */
uint stopped; /* Sets how the CPU is stopped */
void (*const *opcodes)(void);
uint (*get_reg)(int regnum);
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h
index 28ce94667eb..173da329bd2 100644
--- a/src/emu/cpu/g65816/g65816op.h
+++ b/src/emu/cpu/g65816/g65816op.h
@@ -81,7 +81,7 @@ INLINE uint g65816i_read_8_direct(uint address)
INLINE uint g65816i_read_8_vector(uint address)
{
if (READ_VECTOR)
- return READ_VECTOR(address);
+ return READ_VECTOR(Machine, address);
else
return g65816i_read_8_normal(address);
}
diff --git a/src/emu/cpu/i8051/i8051.c b/src/emu/cpu/i8051/i8051.c
index f12fc83f37c..16eaad3f05f 100644
--- a/src/emu/cpu/i8051/i8051.c
+++ b/src/emu/cpu/i8051/i8051.c
@@ -208,32 +208,32 @@ static READ32_HANDLER((*hold_eram_iaddr_callback));
/***************************************************************
* Read/Write a byte from/to the Internal RAM
***************************************************************/
-#define IRAM_R(a) internal_ram_read(a)
-#define IRAM_W(a,v) internal_ram_write(a,v)
+#define IRAM_R(a) internal_ram_read(Machine,a)
+#define IRAM_W(a,v) internal_ram_write(Machine,a,v)
/***************************************************************
* Read/Write a byte from/to the Internal RAM indirectly (called from indirect addressing)
***************************************************************/
-#define IRAM_IR(a) internal_ram_iread(a)
-#define IRAM_IW(a,v) internal_ram_iwrite(a,v)
+#define IRAM_IR(a) internal_ram_iread(Machine,a)
+#define IRAM_IW(a,v) internal_ram_iwrite(Machine,a,v)
/***************************************************************
* Form an Address to Read/Write to External RAM indirectly (called from indirect addressing)
***************************************************************/
-#define ERAM_ADDR(a,m) external_ram_iaddr(a,m)
+#define ERAM_ADDR(a,m) external_ram_iaddr(Machine,a,m)
/***************************************************************
* Read/Write a byte from/to the SFR Registers
***************************************************************/
-#define SFR_R(a) sfr_read(a)
-#define SFR_W(a,v) sfr_write(a,v)
+#define SFR_R(a) sfr_read(Machine,a)
+#define SFR_W(a,v) sfr_write(Machine,a,v)
/***************************************************************
* Read/Write a bit from Bit Addressable Memory
***************************************************************/
-#define BIT_R(a) bit_address_r(a)
-#define BIT_W(a,v) bit_address_w(a,v)
+#define BIT_R(a) bit_address_r(Machine,a)
+#define BIT_W(a,v) bit_address_w(Machine,a,v)
/***************************************************************
* Input/Output a byte from given I/O port
***************************************************************/
#define IN(port) ((UINT8)io_read_byte(port))
-#define OUT(port,value) io_write_byte(port,value)
+#define OUT(port,value) io_write_byte(port,value)
/***************************************************************
* Access the 4 banks of R registers (R0...R7)
***************************************************************/
@@ -1785,14 +1785,14 @@ static WRITE8_HANDLER(internal_ram_write)
/* Different chip types handle differently, for speed, simply call the chip's handler */
static READ8_HANDLER(internal_ram_iread)
{
- return i8051.iram_iread(offset);
+ return i8051.iram_iread(Machine,offset);
}
/* Writes the contents of the Internal RAM memory (BUT CALLED FROM AN INDIRECT ADDRESSING MODE) */
/* Different chip types handle differently, for speed, simply call the chip's handler */
static WRITE8_HANDLER(internal_ram_iwrite)
{
- i8051.iram_iwrite(offset,data);
+ i8051.iram_iwrite(Machine,offset,data);
}
/*Generate an external ram address for read/writing using indirect addressing mode */
@@ -1804,7 +1804,7 @@ static WRITE8_HANDLER(internal_ram_iwrite)
static READ32_HANDLER(external_ram_iaddr)
{
if(i8051.eram_iaddr_callback)
- return i8051.eram_iaddr_callback(offset,mem_mask);
+ return i8051.eram_iaddr_callback(Machine,offset,mem_mask);
else
LOG(("i8051 #%d: external ram address requested (8 bit offset=%02x), but no callback available! at PC:%04x\n", cpu_getactivecpu(), offset, PC));
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index 9f8f0fc6c90..6384a9c1f0e 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -141,8 +141,8 @@ typedef struct {
UINT16 low, high;
UINT32 mem[8];
int (*irq_callback)(int irqline); /* IRQ callback */
- read8_handler rdmem_id; /* readmem callback for indexed instructions */
- write8_handler wrmem_id; /* writemem callback for indexed instructions */
+ read8_machine_func rdmem_id; /* readmem callback for indexed instructions */
+ write8_machine_func wrmem_id; /* writemem callback for indexed instructions */
UINT8 ddr;
UINT8 port;
@@ -173,10 +173,13 @@ INLINE int m4510_cpu_readop_arg(void)
#define M4510
#include "t65ce02.c"
+static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8(offset); }
+static WRITE8_HANDLER( default_wrmem_id ) { program_write_byte_8(offset, data); }
+
static void m4510_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
- m4510.rdmem_id = program_read_byte_8;
- m4510.wrmem_id = program_write_byte_8;
+ m4510.rdmem_id = default_rdmem_id;
+ m4510.wrmem_id = default_wrmem_id;
m4510.irq_callback = irqcallback;
}
@@ -412,8 +415,8 @@ static void m4510_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M4510_MEM7: m4510.mem[7] = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
- case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m4510.rdmem_id = (read8_handler) info->f; break;
- case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m4510.wrmem_id = (write8_handler) info->f; break;
+ case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m4510.rdmem_id = (read8_machine_func) info->f; break;
+ case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m4510.wrmem_id = (write8_machine_func) info->f; break;
case CPUINFO_PTR_M6510_PORTREAD: m4510.port_read = (UINT8 (*)(void)) info->f; break;
case CPUINFO_PTR_M6510_PORTWRITE: m4510.port_write = (void (*)(UINT8)) info->f; break;
}
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 71205b5e3a7..541586cdede 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -72,8 +72,8 @@ typedef struct
UINT8 irq_state;
UINT8 so_state;
int (*irq_callback)(int irqline); /* IRQ callback */
- read8_handler rdmem_id; /* readmem callback for indexed instructions */
- write8_handler wrmem_id; /* writemem callback for indexed instructions */
+ read8_machine_func rdmem_id; /* readmem callback for indexed instructions */
+ write8_machine_func wrmem_id; /* writemem callback for indexed instructions */
#if (HAS_M6510) || (HAS_M6510T) || (HAS_M8502) || (HAS_M7501)
UINT8 ddr;
@@ -89,6 +89,9 @@ static int m6502_ICount = 0;
static m6502_Regs m6502;
+static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8(offset); }
+static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8(offset, data); }
+
/***************************************************************
* include the opcode macros, functions and tables
***************************************************************/
@@ -130,8 +133,8 @@ static void m6502_common_init(int index, int clock, const void *config, int (*ir
m6502.irq_callback = irqcallback;
m6502.subtype = subtype;
m6502.insn = insn;
- m6502.rdmem_id = program_read_byte_8;
- m6502.wrmem_id = program_write_byte_8;
+ m6502.rdmem_id = default_rdmem_id;
+ m6502.wrmem_id = default_wdmem_id;
state_save_register_item(type, index, m6502.pc.w.l);
state_save_register_item(type, index, m6502.sp.w.l);
@@ -680,8 +683,8 @@ static void m6502_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M6502_ZP: m6502.zp.w.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
- case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m6502.rdmem_id = (read8_handler) info->f; break;
- case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m6502.wrmem_id = (write8_handler) info->f; break;
+ case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m6502.rdmem_id = (read8_machine_func) info->f; break;
+ case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m6502.wrmem_id = (write8_machine_func) info->f; break;
}
}
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 2a0b91c98c6..dbeed825a41 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -78,8 +78,8 @@ typedef struct {
UINT8 irq_state;
UINT8 so_state;
int (*irq_callback)(int irqline); /* IRQ callback */
- read8_handler rdmem_id; /* readmem callback for indexed instructions */
- write8_handler wrmem_id; /* readmem callback for indexed instructions */
+ read8_machine_func rdmem_id; /* readmem callback for indexed instructions */
+ write8_machine_func wrmem_id; /* readmem callback for indexed instructions */
} m6509_Regs;
static int m6502_ICount = 0;
@@ -119,10 +119,13 @@ static ADDRESS_MAP_START(m6509_mem, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE(0x00001, 0x00001) AM_MIRROR(0xF0000) AM_READWRITE(m6509_read_00001, m6509_write_00001)
ADDRESS_MAP_END
+static READ8_HANDLER( default_rdmem_id ) { return program_read_byte_8(offset); }
+static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8(offset, data); }
+
static void m6509_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
- m6509.rdmem_id = program_read_byte_8;
- m6509.wrmem_id = program_write_byte_8;
+ m6509.rdmem_id = default_rdmem_id;
+ m6509.wrmem_id = default_wdmem_id;
m6509.irq_callback = irqcallback;
}
@@ -304,8 +307,8 @@ static void m6509_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M6509_ZP: m6509.zp.w.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
- case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m6509.rdmem_id = (read8_handler) info->f; break;
- case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m6509.wrmem_id = (write8_handler) info->f; break;
+ case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m6509.rdmem_id = (read8_machine_func) info->f; break;
+ case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m6509.wrmem_id = (write8_machine_func) info->f; break;
}
}
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index 5aab6f54425..6b4114e338f 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -74,8 +74,8 @@ typedef struct {
UINT8 nmi_state;
UINT8 irq_state;
int (*irq_callback)(int irqline); /* IRQ callback */
- read8_handler rdmem_id; /* readmem callback for indexed instructions */
- write8_handler wrmem_id; /* writemem callback for indexed instructions */
+ read8_machine_func rdmem_id; /* readmem callback for indexed instructions */
+ write8_machine_func wrmem_id; /* writemem callback for indexed instructions */
} m65ce02_Regs;
@@ -260,8 +260,8 @@ static void m65ce02_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER + M65CE02_ZP: m65ce02.zp.b.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
- case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m65ce02.rdmem_id = (read8_handler) info->f; break;
- case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m65ce02.wrmem_id = (write8_handler) info->f; break;
+ case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: m65ce02.rdmem_id = (read8_machine_func) info->f; break;
+ case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m65ce02.wrmem_id = (write8_machine_func) info->f; break;
}
}
diff --git a/src/emu/cpu/m6502/ops02.h b/src/emu/cpu/m6502/ops02.h
index 65487ba67ae..336f6795fd0 100644
--- a/src/emu/cpu/m6502/ops02.h
+++ b/src/emu/cpu/m6502/ops02.h
@@ -63,8 +63,8 @@
#define PPC m6502.ppc.d
-#define RDMEM_ID m6502.rdmem_id
-#define WRMEM_ID m6502.wrmem_id
+#define RDMEM_ID(a) m6502.rdmem_id(Machine,a)
+#define WRMEM_ID(a,d) m6502.wrmem_id(Machine,a,d)
#define CHANGE_PC change_pc(PCD)
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index 5beb7e09b5f..7b6e8a8d1c5 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -1965,12 +1965,12 @@ static WRITE8_HANDLER( m6803_internal_registers_w );
READ8_HANDLER( hd63701_internal_registers_r )
{
- return m6803_internal_registers_r(offset);
+ return m6803_internal_registers_r(Machine, offset);
}
WRITE8_HANDLER( hd63701_internal_registers_w )
{
- m6803_internal_registers_w(offset,data);
+ m6803_internal_registers_w(Machine, offset,data);
}
#endif
diff --git a/src/emu/cpu/mips/mdrc64.c b/src/emu/cpu/mips/mdrc64.c
index 4ce9f6b97d4..0340e476e05 100644
--- a/src/emu/cpu/mips/mdrc64.c
+++ b/src/emu/cpu/mips/mdrc64.c
@@ -365,7 +365,7 @@ static const char *const x86regname[] = {"rax", "rcx", "rdx", "rbx", "rsp", "rbp
bounds callback for later
-------------------------------------------------*/
-INLINE void oob_request_callback(drc_core *drc, UINT8 condition, oob_callback_funcs callback, const compiler_state *compiler, const opcode_desc *desc, void *param)
+INLINE void oob_request_callback(drc_core *drc, UINT8 condition, oob_callback_func callback, const compiler_state *compiler, const opcode_desc *desc, void *param)
{
oob_handler *oob = &mips3.drcdata->ooblist[mips3.drcdata->oobcount++];
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 7d391527aee..9569c22ca9d 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -232,11 +232,11 @@ static UINT32 get_cop0_reg(int reg)
{
if (reg >= 0 && reg < 8)
{
- return (config->sp_reg_r)(reg, 0x00000000);
+ return (config->sp_reg_r)(Machine, reg, 0x00000000);
}
else if (reg >= 8 && reg < 16)
{
- return (config->dp_reg_r)(reg - 8, 0x00000000);
+ return (config->dp_reg_r)(Machine, reg - 8, 0x00000000);
}
else
{
@@ -248,11 +248,11 @@ static void set_cop0_reg(int reg, UINT32 data)
{
if (reg >= 0 && reg < 8)
{
- (config->sp_reg_w)(reg, data, 0x00000000);
+ (config->sp_reg_w)(Machine, reg, data, 0x00000000);
}
else if (reg >= 8 && reg < 16)
{
- (config->dp_reg_w)(reg - 8, data, 0x00000000);
+ (config->dp_reg_w)(Machine, reg - 8, data, 0x00000000);
}
else
{
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index f6f2360725c..22bee7d679f 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -3,10 +3,10 @@
struct _rsp_config
{
- read32_handler dp_reg_r;
- write32_handler dp_reg_w;
- read32_handler sp_reg_r;
- write32_handler sp_reg_w;
+ read32_machine_func dp_reg_r;
+ write32_machine_func dp_reg_w;
+ read32_machine_func sp_reg_r;
+ write32_machine_func sp_reg_w;
void (*sp_set_status)(UINT32 status);
};
typedef struct _rsp_config rsp_config;
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index ea43ba9a477..213c451928e 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -189,7 +189,7 @@ static TIMER_CALLBACK( sh2_timer_callback );
INLINE UINT8 RB(offs_t A)
{
if (A >= 0xe0000000)
- return sh2_internal_r((A & 0x1fc)>>2, ~(0xff << (((~A) & 3)*8))) >> (((~A) & 3)*8);
+ return sh2_internal_r(Machine, (A & 0x1fc)>>2, ~(0xff << (((~A) & 3)*8))) >> (((~A) & 3)*8);
if (A >= 0xc0000000)
return program_read_byte_32be(A);
@@ -203,7 +203,7 @@ INLINE UINT8 RB(offs_t A)
INLINE UINT16 RW(offs_t A)
{
if (A >= 0xe0000000)
- return sh2_internal_r((A & 0x1fc)>>2, ~(0xffff << (((~A) & 2)*8))) >> (((~A) & 2)*8);
+ return sh2_internal_r(Machine, (A & 0x1fc)>>2, ~(0xffff << (((~A) & 2)*8))) >> (((~A) & 2)*8);
if (A >= 0xc0000000)
return program_read_word_32be(A);
@@ -217,7 +217,7 @@ INLINE UINT16 RW(offs_t A)
INLINE UINT32 RL(offs_t A)
{
if (A >= 0xe0000000)
- return sh2_internal_r((A & 0x1fc)>>2, 0);
+ return sh2_internal_r(Machine, (A & 0x1fc)>>2, 0);
if (A >= 0xc0000000)
return program_read_dword_32be(A);
@@ -233,7 +233,7 @@ INLINE void WB(offs_t A, UINT8 V)
if (A >= 0xe0000000)
{
- sh2_internal_w((A & 0x1fc)>>2, V << (((~A) & 3)*8), ~(0xff << (((~A) & 3)*8)));
+ sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 3)*8), ~(0xff << (((~A) & 3)*8)));
return;
}
@@ -253,7 +253,7 @@ INLINE void WW(offs_t A, UINT16 V)
{
if (A >= 0xe0000000)
{
- sh2_internal_w((A & 0x1fc)>>2, V << (((~A) & 2)*8), ~(0xffff << (((~A) & 2)*8)));
+ sh2_internal_w(Machine, (A & 0x1fc)>>2, V << (((~A) & 2)*8), ~(0xffff << (((~A) & 2)*8)));
return;
}
@@ -273,7 +273,7 @@ INLINE void WL(offs_t A, UINT32 V)
{
if (A >= 0xe0000000)
{
- sh2_internal_w((A & 0x1fc)>>2, V, 0);
+ sh2_internal_w(Machine, (A & 0x1fc)>>2, V, 0);
return;
}
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index b9fff91a405..c7643809c7d 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -239,7 +239,7 @@ UINT32 abs;
INLINE UINT8 RB(offs_t A)
{
if (A >= 0xfe000000)
- return sh4_internal_r(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xff << ((A & 3)*8))) >> ((A & 3)*8);
+ return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xff << ((A & 3)*8))) >> ((A & 3)*8);
if (A >= 0xe0000000)
return program_read_byte_64le(A);
@@ -253,7 +253,7 @@ INLINE UINT8 RB(offs_t A)
INLINE UINT16 RW(offs_t A)
{
if (A >= 0xfe000000)
- return sh4_internal_r(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xffff << ((A & 2)*8))) >> ((A & 2)*8);
+ return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), ~(0xffff << ((A & 2)*8))) >> ((A & 2)*8);
if (A >= 0xe0000000)
return program_read_word_64le(A);
@@ -267,7 +267,7 @@ INLINE UINT16 RW(offs_t A)
INLINE UINT32 RL(offs_t A)
{
if (A >= 0xfe000000)
- return sh4_internal_r(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0);
+ return sh4_internal_r(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), 0);
if (A >= 0xe0000000)
return program_read_dword_64le(A);
@@ -283,7 +283,7 @@ INLINE void WB(offs_t A, UINT8 V)
if (A >= 0xfe000000)
{
- sh4_internal_w(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 3)*8), ~(0xff << ((A & 3)*8)));
+ sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 3)*8), ~(0xff << ((A & 3)*8)));
return;
}
@@ -303,7 +303,7 @@ INLINE void WW(offs_t A, UINT16 V)
{
if (A >= 0xfe000000)
{
- sh4_internal_w(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 2)*8), ~(0xffff << ((A & 2)*8)));
+ sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V << ((A & 2)*8), ~(0xffff << ((A & 2)*8)));
return;
}
@@ -323,7 +323,7 @@ INLINE void WL(offs_t A, UINT32 V)
{
if (A >= 0xfe000000)
{
- sh4_internal_w(((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V, 0);
+ sh4_internal_w(Machine, ((A & 0x0fc) >> 2) | ((A & 0x1fe0000) >> 11), V, 0);
return;
}
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 700cce3af00..5224e38aaab 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -692,7 +692,7 @@ static void tms34010_reset(void)
/* the first time we are run */
state.reset_deferred = state.config->halt_on_reset;
if (state.config->halt_on_reset)
- tms34010_io_register_w(REG_HSTCTLH, 0x8000, 0);
+ tms34010_io_register_w(Machine, REG_HSTCTLH, 0x8000, 0);
}
#if (HAS_TMS34020)
@@ -1653,8 +1653,8 @@ void tms34010_host_w(int cpunum, int reg, int data)
/* control register */
case TMS34010_HOST_CONTROL:
external_host_access = TRUE;
- tms34010_io_register_w(REG_HSTCTLH, data & 0xff00, 0);
- tms34010_io_register_w(REG_HSTCTLL, data & 0x00ff, 0);
+ tms34010_io_register_w(Machine, REG_HSTCTLH, data & 0xff00, 0);
+ tms34010_io_register_w(Machine, REG_HSTCTLL, data & 0x00ff, 0);
external_host_access = FALSE;
break;
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 77ec6661111..be19dbc8cc2 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -93,6 +93,7 @@ typedef UINT32 (*video_update_func)(running_machine *machine, int screen, bitmap
#include "cpuintrf.h"
#include "sndintrf.h"
+#include "devintrf.h"
#include "fileio.h"
#include "drawgfx.h"
#include "emupal.h"
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 1168997e8e8..4ad743e008f 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -274,7 +274,7 @@ static double totalspeed;
PORT HANDLER TABLES
***************************************************************************/
-static const read8_handler port_handler8[] =
+static const read8_machine_func port_handler8[] =
{
input_port_0_r, input_port_1_r, input_port_2_r, input_port_3_r,
input_port_4_r, input_port_5_r, input_port_6_r, input_port_7_r,
@@ -287,7 +287,7 @@ static const read8_handler port_handler8[] =
};
-static const read16_handler port_handler16[] =
+static const read16_machine_func port_handler16[] =
{
input_port_0_word_r, input_port_1_word_r, input_port_2_word_r, input_port_3_word_r,
input_port_4_word_r, input_port_5_word_r, input_port_6_word_r, input_port_7_word_r,
@@ -300,7 +300,7 @@ static const read16_handler port_handler16[] =
};
-static const read32_handler port_handler32[] =
+static const read32_machine_func port_handler32[] =
{
input_port_0_dword_r, input_port_1_dword_r, input_port_2_dword_r, input_port_3_dword_r,
input_port_4_dword_r, input_port_5_dword_r, input_port_6_dword_r, input_port_7_dword_r,
@@ -2575,28 +2575,28 @@ int port_tag_to_index(const char *tag)
}
-read8_handler port_tag_to_handler8(const char *tag)
+read8_machine_func port_tag_to_handler8(const char *tag)
{
int port = port_tag_to_index(tag);
return (port == -1) ? MRA8_NOP : port_handler8[port];
}
-read16_handler port_tag_to_handler16(const char *tag)
+read16_machine_func port_tag_to_handler16(const char *tag)
{
int port = port_tag_to_index(tag);
return (port == -1) ? MRA16_NOP : port_handler16[port];
}
-read32_handler port_tag_to_handler32(const char *tag)
+read32_machine_func port_tag_to_handler32(const char *tag)
{
int port = port_tag_to_index(tag);
return (port == -1) ? MRA32_NOP : port_handler32[port];
}
-read64_handler port_tag_to_handler64(const char *tag)
+read64_machine_func port_tag_to_handler64(const char *tag)
{
return MRA64_NOP;
}
diff --git a/src/emu/inptport.h b/src/emu/inptport.h
index eee620b8b15..2540b49b953 100644
--- a/src/emu/inptport.h
+++ b/src/emu/inptport.h
@@ -923,10 +923,10 @@ int port_type_is_analog_absolute(int type);
int port_type_in_use(int type);
int port_type_to_group(int type, int player);
int port_tag_to_index(const char *tag);
-read8_handler port_tag_to_handler8(const char *tag);
-read16_handler port_tag_to_handler16(const char *tag);
-read32_handler port_tag_to_handler32(const char *tag);
-read64_handler port_tag_to_handler64(const char *tag);
+read8_machine_func port_tag_to_handler8(const char *tag);
+read16_machine_func port_tag_to_handler16(const char *tag);
+read32_machine_func port_tag_to_handler32(const char *tag);
+read64_machine_func port_tag_to_handler64(const char *tag);
const char *input_port_name(const input_port_entry *in);
const input_seq *input_port_seq(input_port_entry *in, input_seq_type seqtype);
const input_seq *input_port_default_seq(int type, int player, input_seq_type seqtype);
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index e429b4cb0e5..2255c5b2260 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -23,6 +23,7 @@
*/
#include "driver.h"
+#include "deprecat.h"
#include "6522via.h"
//#define TRACE_VIA
@@ -250,14 +251,14 @@ static void via_shift(int which)
v->sr = (v->sr << 1) | v->out_cb2;
if (v->intf->out_cb2_func)
- v->intf->out_cb2_func(0, v->out_cb2);
+ v->intf->out_cb2_func(Machine, 0, v->out_cb2);
v->in_cb1=1;
if (v->intf->out_cb1_func)
{
/* this should be one cycle wide */
- v->intf->out_cb1_func(0, 0);
- v->intf->out_cb1_func(0, 1);
+ v->intf->out_cb1_func(Machine, 0, 0);
+ v->intf->out_cb1_func(Machine, 0, 1);
}
v->shift_counter = (v->shift_counter + 1) % 8;
@@ -276,7 +277,7 @@ static void via_shift(int which)
v->sr = (v->sr << 1) | v->out_cb2;
if (v->intf->out_cb2_func)
- v->intf->out_cb2_func(0, v->out_cb2);
+ v->intf->out_cb2_func(Machine, 0, v->out_cb2);
v->shift_counter = (v->shift_counter + 1) % 8;
@@ -289,7 +290,7 @@ static void via_shift(int which)
if (SI_EXT_CONTROL(v->acr))
{
if (v->intf->in_cb2_func)
- v->in_cb2 = v->intf->in_cb2_func(0);
+ v->in_cb2 = v->intf->in_cb2_func(Machine, 0);
v->sr = (v->sr << 1) | (v->in_cb2 & 1);
@@ -336,7 +337,7 @@ static TIMER_CALLBACK( via_t1_timeout )
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
- v->intf->out_b_func(0, write_data);
+ v->intf->out_b_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -402,7 +403,7 @@ int via_read(int which, int offset)
if (PB_LATCH_ENABLE(v->acr) == 0)
{
if (v->intf->in_b_func)
- v->in_b = v->intf->in_b_func(0);
+ v->in_b = v->intf->in_b_func(Machine, 0);
else
logerror("6522VIA chip %d: Port B is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
}
@@ -421,7 +422,7 @@ int via_read(int which, int offset)
if (PA_LATCH_ENABLE(v->acr) == 0)
{
if (v->intf->in_a_func)
- v->in_a = v->intf->in_a_func(0);
+ v->in_a = v->intf->in_a_func(Machine, 0);
else
logerror("6522VIA chip %d: Port A is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
}
@@ -442,7 +443,7 @@ int via_read(int which, int offset)
/* call the CA2 output function */
if (v->intf->out_ca2_func)
- v->intf->out_ca2_func(0, 0);
+ v->intf->out_ca2_func(Machine, 0, 0);
else
logerror("6522VIA chip %d: Port CA2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), 0);
}
@@ -455,7 +456,7 @@ int via_read(int which, int offset)
if (PA_LATCH_ENABLE(v->acr) == 0)
{
if (v->intf->in_a_func)
- v->in_a = v->intf->in_a_func(0);
+ v->in_a = v->intf->in_a_func(Machine, 0);
else
logerror("6522VIA chip %d: Port A is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
}
@@ -565,7 +566,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
- v->intf->out_b_func(0, write_data);
+ v->intf->out_b_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -583,7 +584,7 @@ void via_write(int which, int offset, int data)
/* call the CB2 output function */
if (v->intf->out_cb2_func)
- v->intf->out_cb2_func(0, 0);
+ v->intf->out_cb2_func(Machine, 0, 0);
else
logerror("6522VIA chip %d: Port CB2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), 0);
}
@@ -598,7 +599,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_a & v->ddr_a) | (v->ddr_a ^ 0xff);
if (v->intf->out_a_func)
- v->intf->out_a_func(0, write_data);
+ v->intf->out_a_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port A is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -612,8 +613,8 @@ void via_write(int which, int offset, int data)
/* call the CA2 output function */
if (v->intf->out_ca2_func)
{
- v->intf->out_ca2_func(0, 0);
- v->intf->out_ca2_func(0, 1);
+ v->intf->out_ca2_func(Machine, 0, 0);
+ v->intf->out_ca2_func(Machine, 0, 1);
}
else
logerror("6522VIA chip %d: Port CA2 is being pulsed but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
@@ -630,7 +631,7 @@ void via_write(int which, int offset, int data)
/* call the CA2 output function */
if (v->intf->out_ca2_func)
- v->intf->out_ca2_func(0, 0);
+ v->intf->out_ca2_func(Machine, 0, 0);
else
logerror("6522VIA chip %d: Port CA2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), 0);
}
@@ -646,7 +647,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_a & v->ddr_a) | (v->ddr_a ^ 0xff);
if (v->intf->out_a_func)
- v->intf->out_a_func(0, write_data);
+ v->intf->out_a_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port A is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -664,7 +665,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
- v->intf->out_b_func(0, write_data);
+ v->intf->out_b_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -682,7 +683,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_a & v->ddr_a) | (v->ddr_a ^ 0xff);
if (v->intf->out_a_func)
- v->intf->out_a_func(0, write_data);
+ v->intf->out_a_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port A is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -714,7 +715,7 @@ void via_write(int which, int offset, int data)
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
- v->intf->out_b_func(0, write_data);
+ v->intf->out_b_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -764,7 +765,7 @@ logerror("6522VIA chip %d: PCR = %02X. PC: %08X\n", which, data, safe_activecpu
{
v->out_ca2 = CA2_OUTPUT_LEVEL(data);
if (v->intf->out_ca2_func)
- v->intf->out_ca2_func(0, v->out_ca2);
+ v->intf->out_ca2_func(Machine, 0, v->out_ca2);
else
logerror("6522VIA chip %d: Port CA2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), v->out_ca2);
}
@@ -773,7 +774,7 @@ logerror("6522VIA chip %d: PCR = %02X. PC: %08X\n", which, data, safe_activecpu
{
v->out_cb2 = CB2_OUTPUT_LEVEL(data);
if (v->intf->out_cb2_func)
- v->intf->out_cb2_func(0, v->out_cb2);
+ v->intf->out_cb2_func(Machine, 0, v->out_cb2);
else
logerror("6522VIA chip %d: Port CB2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), v->out_cb2);
}
@@ -795,7 +796,7 @@ logerror("6522VIA chip %d: PCR = %02X. PC: %08X\n", which, data, safe_activecpu
UINT8 write_data = (v->out_b & v->ddr_b) | (v->ddr_b ^ 0xff);
if (v->intf->out_b_func)
- v->intf->out_b_func(0, write_data);
+ v->intf->out_b_func(Machine, 0, write_data);
else
logerror("6522VIA chip %d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -876,7 +877,7 @@ logerror("6522VIA chip %d: CA1 = %02X. PC: %08X\n", which, data, safe_activecpu
if (PA_LATCH_ENABLE(v->acr))
{
if (v->intf->in_a_func)
- v->in_a = v->intf->in_a_func(0);
+ v->in_a = v->intf->in_a_func(Machine, 0);
else
logerror("6522VIA chip %d: Port A is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
}
@@ -894,7 +895,7 @@ logerror("6522VIA chip %d: CA1 = %02X. PC: %08X\n", which, data, safe_activecpu
/* call the CA2 output function */
if (v->intf->out_ca2_func)
- v->intf->out_ca2_func(0, 1);
+ v->intf->out_ca2_func(Machine, 0, 1);
else
logerror("6522VIA chip %d: Port CA2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), 1);
}
@@ -963,7 +964,7 @@ void via_set_input_cb1(int which, int data)
if (PB_LATCH_ENABLE(v->acr))
{
if (v->intf->in_b_func)
- v->in_b = v->intf->in_b_func(0);
+ v->in_b = v->intf->in_b_func(Machine, 0);
else
logerror("6522VIA chip %d: Port B is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
}
@@ -983,7 +984,7 @@ void via_set_input_cb1(int which, int data)
/* call the CB2 output function */
if (v->intf->out_cb2_func)
- v->intf->out_cb2_func(0, 1);
+ v->intf->out_cb2_func(Machine, 0, 1);
else
logerror("6522VIA chip %d: Port CB2 is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), 1);
}
diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h
index f4e52b6db6c..20930d9f3c8 100644
--- a/src/emu/machine/6522via.h
+++ b/src/emu/machine/6522via.h
@@ -36,18 +36,18 @@
struct via6522_interface
{
- read8_handler in_a_func;
- read8_handler in_b_func;
- read8_handler in_ca1_func;
- read8_handler in_cb1_func;
- read8_handler in_ca2_func;
- read8_handler in_cb2_func;
- write8_handler out_a_func;
- write8_handler out_b_func;
- write8_handler out_ca1_func;
- write8_handler out_cb1_func;
- write8_handler out_ca2_func;
- write8_handler out_cb2_func;
+ read8_machine_func in_a_func;
+ read8_machine_func in_b_func;
+ read8_machine_func in_ca1_func;
+ read8_machine_func in_cb1_func;
+ read8_machine_func in_ca2_func;
+ read8_machine_func in_cb2_func;
+ write8_machine_func out_a_func;
+ write8_machine_func out_b_func;
+ write8_machine_func out_ca1_func;
+ write8_machine_func out_cb1_func;
+ write8_machine_func out_ca2_func;
+ write8_machine_func out_cb2_func;
void (*irq_func)(int state);
};
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 50331ecdfa8..37394a6d35c 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -124,7 +124,7 @@ void r6532_write(int which, offs_t offset, UINT8 data)
{
UINT8 write_data = ( r6532[which].ddr_a & r6532[which].out_a ) | ( ~r6532[which].ddr_a & 0xFF );
if (r6532[which].intf->out_a_func)
- r6532[which].intf->out_a_func(0, write_data);
+ r6532[which].intf->out_a_func(Machine, 0, write_data);
else
logerror("6532RIOT chip #%d: Port A is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
/* Check for PA7 change */
@@ -141,7 +141,7 @@ void r6532_write(int which, offs_t offset, UINT8 data)
{
UINT8 write_data = ( r6532[which].ddr_b & r6532[which].out_b ) | ( ~r6532[which].ddr_b & 0xFF );
if (r6532[which].intf->out_b_func)
- r6532[which].intf->out_b_func(0, write_data);
+ r6532[which].intf->out_b_func(Machine, 0, write_data);
else
logerror("6532RIOT chip #%d: Port B is being written to but has no handler. PC: %08X - %02X\n", which, safe_activecpu_get_pc(), write_data);
}
@@ -236,7 +236,7 @@ UINT8 r6532_read(int which, offs_t offset)
{
case 0:
if (r6532[which].intf->in_a_func)
- r6532[which].in_a = r6532[which].intf->in_a_func(0);
+ r6532[which].in_a = r6532[which].intf->in_a_func(Machine, 0);
else
logerror("6532RIOT chip #%d: Port A is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
val = ( r6532[which].ddr_a & r6532[which].out_a ) | ( ~r6532[which].ddr_a & r6532[which].in_a );
@@ -248,7 +248,7 @@ UINT8 r6532_read(int which, offs_t offset)
break;
case 2:
if (r6532[which].intf->in_b_func)
- r6532[which].in_b = r6532[which].intf->in_b_func(0);
+ r6532[which].in_b = r6532[which].intf->in_b_func(Machine, 0);
else
logerror("6532RIOT chip #%d: Port B is being read but has no handler. PC: %08X\n", which, safe_activecpu_get_pc());
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index 707263c5299..4dfee000fdd 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -11,10 +11,10 @@
struct riot6532_interface
{
- read8_handler in_a_func;
- read8_handler in_b_func;
- write8_handler out_a_func;
- write8_handler out_b_func;
+ read8_machine_func in_a_func;
+ read8_machine_func in_b_func;
+ write8_machine_func out_a_func;
+ write8_machine_func out_b_func;
void (*irq_func)(int state);
};
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index d5f17ef56c4..f52f2fec9d6 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -249,7 +249,7 @@ static UINT8 get_in_a_value(int which)
/* update the input */
if (p->intf->in_a_func)
- port_a_data = p->intf->in_a_func(0);
+ port_a_data = p->intf->in_a_func(Machine, 0);
else
{
if (p->in_a_pushed)
@@ -292,7 +292,7 @@ static UINT8 get_in_b_value(int which)
/* update the input */
if (p->intf->in_b_func)
- port_b_data = p->intf->in_b_func(0);
+ port_b_data = p->intf->in_b_func(Machine, 0);
else
{
if (p->in_b_pushed)
@@ -368,7 +368,7 @@ static void set_out_ca2(int which, int data)
/* send to output function */
if (p->intf->out_ca2_func)
- p->intf->out_ca2_func(0, p->out_ca2);
+ p->intf->out_ca2_func(Machine, 0, p->out_ca2);
else
{
if (p->out_ca2_needs_pulled)
@@ -393,7 +393,7 @@ static void set_out_cb2(int which, int data)
/* send to output function */
if (p->intf->out_cb2_func)
- p->intf->out_cb2_func(0, p->out_cb2);
+ p->intf->out_cb2_func(Machine, 0, p->out_cb2);
else
{
if (p->out_cb2_needs_pulled)
@@ -495,7 +495,7 @@ static UINT8 control_a_r(int which)
/* update CA1 & CA2 if callback exists, these in turn may update IRQ's */
if (p->intf->in_ca1_func)
- pia_set_input_ca1(which, p->intf->in_ca1_func(0));
+ pia_set_input_ca1(which, p->intf->in_ca1_func(Machine, 0));
else if (!p->logged_ca1_not_connected && (!p->in_ca1_pushed))
{
logerror("cpu #%d (PC=%08X): PIA #%d: Warning! No CA1 read handler. Assuming pin not connected\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which);
@@ -503,7 +503,7 @@ static UINT8 control_a_r(int which)
}
if (p->intf->in_ca2_func)
- pia_set_input_ca2(which, p->intf->in_ca2_func(0));
+ pia_set_input_ca2(which, p->intf->in_ca2_func(Machine, 0));
else if ( !p->logged_ca2_not_connected && C2_INPUT(p->ctl_a) && !p->in_ca2_pushed)
{
logerror("cpu #%d (PC=%08X): PIA #%d: Warning! No CA2 read handler. Assuming pin not connected\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which);
@@ -533,7 +533,7 @@ static UINT8 control_b_r(int which)
/* update CB1 & CB2 if callback exists, these in turn may update IRQ's */
if (p->intf->in_cb1_func)
- pia_set_input_cb1(which, p->intf->in_cb1_func(0));
+ pia_set_input_cb1(which, p->intf->in_cb1_func(Machine, 0));
else if (!p->logged_cb1_not_connected && !p->in_cb1_pushed)
{
logerror("cpu #%d (PC=%08X): PIA #%d: Error! no CB1 read handler. Three-state pin is undefined\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which);
@@ -541,7 +541,7 @@ static UINT8 control_b_r(int which)
}
if (p->intf->in_cb2_func)
- pia_set_input_cb2(which, p->intf->in_cb2_func(0));
+ pia_set_input_cb2(which, p->intf->in_cb2_func(Machine, 0));
else if (!p->logged_cb2_not_connected && C2_INPUT(p->ctl_b) && !p->in_cb2_pushed)
{
logerror("cpu #%d (PC=%08X): PIA #%d: Error! No CB2 read handler. Three-state pin is undefined\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which);
@@ -630,7 +630,7 @@ static void send_to_out_a_func(int which, const char* message)
LOG(("cpu #%d (PC=%08X): PIA #%d: %s = %02X\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which, message, data));
if (p->intf->out_a_func)
- p->intf->out_a_func(0, data);
+ p->intf->out_a_func(Machine, 0, data);
else
{
if (p->out_a_needs_pulled)
@@ -651,7 +651,7 @@ static void send_to_out_b_func(int which, const char* message)
LOG(("cpu #%d (PC=%08X): PIA #%d: %s = %02X\n", cpu_getactivecpu(), safe_activecpu_get_pc(), which, message, data));
if (p->intf->out_b_func)
- p->intf->out_b_func(0, data);
+ p->intf->out_b_func(Machine, 0, data);
else
{
if (p->out_b_needs_pulled)
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index 9930c5503e6..a912dd5d12c 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -30,16 +30,16 @@
typedef struct _pia6821_interface pia6821_interface;
struct _pia6821_interface
{
- read8_handler in_a_func;
- read8_handler in_b_func;
- read8_handler in_ca1_func;
- read8_handler in_cb1_func;
- read8_handler in_ca2_func;
- read8_handler in_cb2_func;
- write8_handler out_a_func;
- write8_handler out_b_func;
- write8_handler out_ca2_func;
- write8_handler out_cb2_func;
+ read8_machine_func in_a_func;
+ read8_machine_func in_b_func;
+ read8_machine_func in_ca1_func;
+ read8_machine_func in_cb1_func;
+ read8_machine_func in_ca2_func;
+ read8_machine_func in_cb2_func;
+ write8_machine_func out_a_func;
+ write8_machine_func out_b_func;
+ write8_machine_func out_ca2_func;
+ write8_machine_func out_cb2_func;
void (*irq_a_func)(int state);
void (*irq_b_func)(int state);
};
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index 5013d67bd2c..94c66b727a5 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -340,7 +340,7 @@ static void reload_count(int which, int idx)
if ((currptr->mode[idx] == 4)||(currptr->mode[idx] == 6))
{
currptr->output[idx] = 1;
- if ( currptr->intf->out_func[idx] ) currptr->intf->out_func[idx](0, currptr->output[idx]);
+ if ( currptr->intf->out_func[idx] ) currptr->intf->out_func[idx](Machine, 0, currptr->output[idx]);
}
/* set the timer */
@@ -549,7 +549,7 @@ void ptm6840_write (int which, int offset, int data)
{ // output cleared
if ( currptr->intf )
{
- if ( currptr->intf->out_func[idx] ) currptr->intf->out_func[idx](0, 0);
+ if ( currptr->intf->out_func[idx] ) currptr->intf->out_func[idx](Machine, 0, 0);
}
}
/* reset? */
@@ -644,7 +644,7 @@ static void ptm6840_timeout(int which, int idx)
{
p->output[idx] = p->output[idx]?0:1;
PLOG(("**ptm6840 %d t%d output %d **\n", which, idx+1, p->output[idx]));
- if ( p->intf->out_func[idx] ) p->intf->out_func[idx](0, p->output[idx]);
+ if ( p->intf->out_func[idx] ) p->intf->out_func[idx](Machine, 0, p->output[idx]);
}
if ((p->mode[idx] == 4)||(p->mode[idx] == 6))
{
@@ -652,7 +652,7 @@ static void ptm6840_timeout(int which, int idx)
{
p->output[idx] = 1;
PLOG(("**ptm6840 %d t%d output %d **\n", which, idx+1, p->output[idx]));
- if ( p->intf->out_func[idx] ) p->intf->out_func[idx](0, p->output[idx]);
+ if ( p->intf->out_func[idx] ) p->intf->out_func[idx](Machine, 0, p->output[idx]);
p->fired[idx]=1;//no changes in output until reinit
}
}
diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h
index f5a5e3ed757..f0df35364ce 100644
--- a/src/emu/machine/6840ptm.h
+++ b/src/emu/machine/6840ptm.h
@@ -18,7 +18,7 @@ struct _ptm6840_interface
int internal_clock;
int external_clock[3];
- write8_handler out_func[3]; // function to call when output[idx] changes
+ write8_machine_func out_func[3]; // function to call when output[idx] changes
void (*irq_func)(int state); // function called if IRQ line changes
};
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index fb6d7a61dfc..9c81a2e2850 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -598,26 +598,26 @@ WRITE8_HANDLER(kbdc8042_8_w)
READ32_HANDLER( kbdc8042_32le_r )
{
- return read32le_with_read8_handler(kbdc8042_8_r, offset, mem_mask);
+ return read32le_with_read8_handler(kbdc8042_8_r, machine, offset, mem_mask);
}
WRITE32_HANDLER( kbdc8042_32le_w )
{
- write32le_with_write8_handler(kbdc8042_8_w, offset, data, mem_mask);
+ write32le_with_write8_handler(kbdc8042_8_w, machine, offset, data, mem_mask);
}
READ64_HANDLER( kbdc8042_64be_r )
{
- return read64be_with_read8_handler(kbdc8042_8_r, offset, mem_mask);
+ return read64be_with_read8_handler(kbdc8042_8_r, machine, offset, mem_mask);
}
WRITE64_HANDLER( kbdc8042_64be_w )
{
- write64be_with_write8_handler(kbdc8042_8_w, offset, data, mem_mask);
+ write64be_with_write8_handler(kbdc8042_8_w, machine, offset, data, mem_mask);
}
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 0f1ab9fa1a0..5f273c68867 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -435,17 +435,17 @@ READ8_HANDLER( dma8237_1_r ) { return dma8237_read(1, offset); }
WRITE8_HANDLER( dma8237_0_w ) { dma8237_write(0, offset, data); }
WRITE8_HANDLER( dma8237_1_w ) { dma8237_write(1, offset, data); }
-READ16_HANDLER( dma8237_16le_0_r ) { return read16le_with_read8_handler(dma8237_0_r, offset, mem_mask); }
-READ16_HANDLER( dma8237_16le_1_r ) { return read16le_with_read8_handler(dma8237_1_r, offset, mem_mask); }
-WRITE16_HANDLER( dma8237_16le_0_w ) { write16le_with_write8_handler(dma8237_0_w, offset, data, mem_mask); }
-WRITE16_HANDLER( dma8237_16le_1_w ) { write16le_with_write8_handler(dma8237_1_w, offset, data, mem_mask); }
-
-READ32_HANDLER( dma8237_32le_0_r ) { return read32le_with_read8_handler(dma8237_0_r, offset, mem_mask); }
-READ32_HANDLER( dma8237_32le_1_r ) { return read32le_with_read8_handler(dma8237_1_r, offset, mem_mask); }
-WRITE32_HANDLER( dma8237_32le_0_w ) { write32le_with_write8_handler(dma8237_0_w, offset, data, mem_mask); }
-WRITE32_HANDLER( dma8237_32le_1_w ) { write32le_with_write8_handler(dma8237_1_w, offset, data, mem_mask); }
-
-READ64_HANDLER( dma8237_64be_0_r ) { return read64be_with_read8_handler(dma8237_0_r, offset, mem_mask); }
-READ64_HANDLER( dma8237_64be_1_r ) { return read64be_with_read8_handler(dma8237_1_r, offset, mem_mask); }
-WRITE64_HANDLER( dma8237_64be_0_w ) { write64be_with_write8_handler(dma8237_0_w, offset, data, mem_mask); }
-WRITE64_HANDLER( dma8237_64be_1_w ) { write64be_with_write8_handler(dma8237_1_w, offset, data, mem_mask); }
+READ16_HANDLER( dma8237_16le_0_r ) { return read16le_with_read8_handler(dma8237_0_r, machine, offset, mem_mask); }
+READ16_HANDLER( dma8237_16le_1_r ) { return read16le_with_read8_handler(dma8237_1_r, machine, offset, mem_mask); }
+WRITE16_HANDLER( dma8237_16le_0_w ) { write16le_with_write8_handler(dma8237_0_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( dma8237_16le_1_w ) { write16le_with_write8_handler(dma8237_1_w, machine, offset, data, mem_mask); }
+
+READ32_HANDLER( dma8237_32le_0_r ) { return read32le_with_read8_handler(dma8237_0_r, machine, offset, mem_mask); }
+READ32_HANDLER( dma8237_32le_1_r ) { return read32le_with_read8_handler(dma8237_1_r, machine, offset, mem_mask); }
+WRITE32_HANDLER( dma8237_32le_0_w ) { write32le_with_write8_handler(dma8237_0_w, machine, offset, data, mem_mask); }
+WRITE32_HANDLER( dma8237_32le_1_w ) { write32le_with_write8_handler(dma8237_1_w, machine, offset, data, mem_mask); }
+
+READ64_HANDLER( dma8237_64be_0_r ) { return read64be_with_read8_handler(dma8237_0_r, machine, offset, mem_mask); }
+READ64_HANDLER( dma8237_64be_1_r ) { return read64be_with_read8_handler(dma8237_1_r, machine, offset, mem_mask); }
+WRITE64_HANDLER( dma8237_64be_0_w ) { write64be_with_write8_handler(dma8237_0_w, machine, offset, data, mem_mask); }
+WRITE64_HANDLER( dma8237_64be_1_w ) { write64be_with_write8_handler(dma8237_1_w, machine, offset, data, mem_mask); }
diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c
index 592c9153239..6eb5bfedc37 100644
--- a/src/emu/machine/8255ppi.c
+++ b/src/emu/machine/8255ppi.c
@@ -91,6 +91,7 @@
*********************************************************************/
#include "driver.h"
+#include "deprecat.h"
#include "8255ppi.h"
#include "memconv.h"
@@ -99,8 +100,8 @@ static int num;
typedef struct
{
- read8_handler port_read[3];
- write8_handler port_write[3];
+ read8_machine_func port_read[3];
+ write8_machine_func port_write[3];
/* mode flags */
UINT8 groupA_mode;
@@ -142,7 +143,7 @@ void ppi8255_init( const ppi8255_interface *intfce )
ppi8255 *chip = &chips[i];
memset(chip, 0, sizeof(*chip));
-
+
chip->port_read[0] = intfce->portAread[i];
chip->port_read[1] = intfce->portBread[i];
chip->port_read[2] = intfce->portCread[i];
@@ -268,7 +269,7 @@ static UINT8 ppi8255_read_port(ppi8255 *chip, int port)
if (chip->in_mask[port])
{
if (chip->port_read[port])
- ppi8255_input(chip, port, chip->port_read[port](0));
+ ppi8255_input(chip, port, chip->port_read[port](Machine, 0));
result |= chip->read[port] & chip->in_mask[port];
}
@@ -328,7 +329,7 @@ static void ppi8255_write_port(ppi8255 *chip, int port)
chip->output[port] = write_data;
if (chip->port_write[port])
- chip->port_write[port](0, write_data);
+ chip->port_write[port](Machine, 0, write_data);
}
@@ -427,33 +428,33 @@ UINT8 ppi8255_peek( int which, offs_t offset )
#endif
-void ppi8255_set_portAread(int which, read8_handler portAread)
+void ppi8255_set_portAread(int which, read8_machine_func portAread)
{
chips[which].port_read[0] = portAread;
}
-void ppi8255_set_portBread(int which, read8_handler portBread)
+void ppi8255_set_portBread(int which, read8_machine_func portBread)
{
chips[which].port_read[1] = portBread;
}
-void ppi8255_set_portCread(int which, read8_handler portCread)
+void ppi8255_set_portCread(int which, read8_machine_func portCread)
{
chips[which].port_read[2] = portCread;
}
-void ppi8255_set_portAwrite(int which, write8_handler portAwrite)
+void ppi8255_set_portAwrite(int which, write8_machine_func portAwrite)
{
chips[which].port_write[0] = portAwrite;
}
-void ppi8255_set_portBwrite(int which, write8_handler portBwrite)
+void ppi8255_set_portBwrite(int which, write8_machine_func portBwrite)
{
chips[which].port_write[1] = portBwrite;
}
-void ppi8255_set_portCwrite(int which, write8_handler portCwrite)
+void ppi8255_set_portCwrite(int which, write8_machine_func portCwrite)
{
chips[which].port_write[2] = portCwrite;
}
@@ -571,19 +572,19 @@ WRITE8_HANDLER( ppi8255_5_w ) { ppi8255_w( 5, offset, data ); }
WRITE8_HANDLER( ppi8255_6_w ) { ppi8255_w( 6, offset, data ); }
WRITE8_HANDLER( ppi8255_7_w ) { ppi8255_w( 7, offset, data ); }
-READ16_HANDLER( ppi8255_16le_0_r ) { return read16le_with_read8_handler(ppi8255_0_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_1_r ) { return read16le_with_read8_handler(ppi8255_1_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_2_r ) { return read16le_with_read8_handler(ppi8255_2_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_3_r ) { return read16le_with_read8_handler(ppi8255_3_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_4_r ) { return read16le_with_read8_handler(ppi8255_4_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_5_r ) { return read16le_with_read8_handler(ppi8255_5_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_6_r ) { return read16le_with_read8_handler(ppi8255_6_r, offset, mem_mask); }
-READ16_HANDLER( ppi8255_16le_7_r ) { return read16le_with_read8_handler(ppi8255_7_r, offset, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_0_w ) { write16le_with_write8_handler(ppi8255_0_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_1_w ) { write16le_with_write8_handler(ppi8255_1_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_2_w ) { write16le_with_write8_handler(ppi8255_2_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_3_w ) { write16le_with_write8_handler(ppi8255_3_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_4_w ) { write16le_with_write8_handler(ppi8255_4_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_5_w ) { write16le_with_write8_handler(ppi8255_5_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_6_w ) { write16le_with_write8_handler(ppi8255_6_w, offset, data, mem_mask); }
-WRITE16_HANDLER( ppi8255_16le_7_w ) { write16le_with_write8_handler(ppi8255_7_w, offset, data, mem_mask); }
+READ16_HANDLER( ppi8255_16le_0_r ) { return read16le_with_read8_handler(ppi8255_0_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_1_r ) { return read16le_with_read8_handler(ppi8255_1_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_2_r ) { return read16le_with_read8_handler(ppi8255_2_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_3_r ) { return read16le_with_read8_handler(ppi8255_3_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_4_r ) { return read16le_with_read8_handler(ppi8255_4_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_5_r ) { return read16le_with_read8_handler(ppi8255_5_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_6_r ) { return read16le_with_read8_handler(ppi8255_6_r, machine, offset, mem_mask); }
+READ16_HANDLER( ppi8255_16le_7_r ) { return read16le_with_read8_handler(ppi8255_7_r, machine, offset, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_0_w ) { write16le_with_write8_handler(ppi8255_0_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_1_w ) { write16le_with_write8_handler(ppi8255_1_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_2_w ) { write16le_with_write8_handler(ppi8255_2_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_3_w ) { write16le_with_write8_handler(ppi8255_3_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_4_w ) { write16le_with_write8_handler(ppi8255_4_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_5_w ) { write16le_with_write8_handler(ppi8255_5_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_6_w ) { write16le_with_write8_handler(ppi8255_6_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( ppi8255_16le_7_w ) { write16le_with_write8_handler(ppi8255_7_w, machine, offset, data, mem_mask); }
diff --git a/src/emu/machine/8255ppi.h b/src/emu/machine/8255ppi.h
index f735fbc32d8..9a5eb65d0f0 100644
--- a/src/emu/machine/8255ppi.h
+++ b/src/emu/machine/8255ppi.h
@@ -14,12 +14,12 @@
typedef struct
{
int num; /* number of PPIs to emulate */
- read8_handler portAread[MAX_8255];
- read8_handler portBread[MAX_8255];
- read8_handler portCread[MAX_8255];
- write8_handler portAwrite[MAX_8255];
- write8_handler portBwrite[MAX_8255];
- write8_handler portCwrite[MAX_8255];
+ read8_machine_func portAread[MAX_8255];
+ read8_machine_func portBread[MAX_8255];
+ read8_machine_func portCread[MAX_8255];
+ write8_machine_func portAwrite[MAX_8255];
+ write8_machine_func portBwrite[MAX_8255];
+ write8_machine_func portCwrite[MAX_8255];
} ppi8255_interface;
@@ -30,13 +30,13 @@ void ppi8255_init( const ppi8255_interface *intfce);
UINT8 ppi8255_r ( int which, offs_t offset );
void ppi8255_w( int which, offs_t offset, UINT8 data );
-void ppi8255_set_portAread( int which, read8_handler portAread);
-void ppi8255_set_portBread( int which, read8_handler portBread);
-void ppi8255_set_portCread( int which, read8_handler portCread);
+void ppi8255_set_portAread( int which, read8_machine_func portAread);
+void ppi8255_set_portBread( int which, read8_machine_func portBread);
+void ppi8255_set_portCread( int which, read8_machine_func portCread);
-void ppi8255_set_portAwrite( int which, write8_handler portAwrite);
-void ppi8255_set_portBwrite( int which, write8_handler portBwrite);
-void ppi8255_set_portCwrite( int which, write8_handler portCwrite);
+void ppi8255_set_portAwrite( int which, write8_machine_func portAwrite);
+void ppi8255_set_portBwrite( int which, write8_machine_func portBwrite);
+void ppi8255_set_portCwrite( int which, write8_machine_func portCwrite);
void ppi8255_set_portA( int which, UINT8 data );
void ppi8255_set_portB( int which, UINT8 data );
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 953c7c742fc..911cb472214 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -363,17 +363,17 @@ READ8_HANDLER( dma8257_1_r ) { return dma8257_read(1, offset); }
WRITE8_HANDLER( dma8257_0_w ) { dma8257_write(0, offset, data); }
WRITE8_HANDLER( dma8257_1_w ) { dma8257_write(1, offset, data); }
-READ16_HANDLER( dma8257_16le_0_r ) { return read16le_with_read8_handler(dma8257_0_r, offset, mem_mask); }
-READ16_HANDLER( dma8257_16le_1_r ) { return read16le_with_read8_handler(dma8257_1_r, offset, mem_mask); }
-WRITE16_HANDLER( dma8257_16le_0_w ) { write16le_with_write8_handler(dma8257_0_w, offset, data, mem_mask); }
-WRITE16_HANDLER( dma8257_16le_1_w ) { write16le_with_write8_handler(dma8257_1_w, offset, data, mem_mask); }
-
-READ32_HANDLER( dma8257_32le_0_r ) { return read32le_with_read8_handler(dma8257_0_r, offset, mem_mask); }
-READ32_HANDLER( dma8257_32le_1_r ) { return read32le_with_read8_handler(dma8257_1_r, offset, mem_mask); }
-WRITE32_HANDLER( dma8257_32le_0_w ) { write32le_with_write8_handler(dma8257_0_w, offset, data, mem_mask); }
-WRITE32_HANDLER( dma8257_32le_1_w ) { write32le_with_write8_handler(dma8257_1_w, offset, data, mem_mask); }
-
-READ64_HANDLER( dma8257_64be_0_r ) { return read64be_with_read8_handler(dma8257_0_r, offset, mem_mask); }
-READ64_HANDLER( dma8257_64be_1_r ) { return read64be_with_read8_handler(dma8257_1_r, offset, mem_mask); }
-WRITE64_HANDLER( dma8257_64be_0_w ) { write64be_with_write8_handler(dma8257_0_w, offset, data, mem_mask); }
-WRITE64_HANDLER( dma8257_64be_1_w ) { write64be_with_write8_handler(dma8257_1_w, offset, data, mem_mask); }
+READ16_HANDLER( dma8257_16le_0_r ) { return read16le_with_read8_handler(dma8257_0_r, machine, offset, mem_mask); }
+READ16_HANDLER( dma8257_16le_1_r ) { return read16le_with_read8_handler(dma8257_1_r, machine, offset, mem_mask); }
+WRITE16_HANDLER( dma8257_16le_0_w ) { write16le_with_write8_handler(dma8257_0_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER( dma8257_16le_1_w ) { write16le_with_write8_handler(dma8257_1_w, machine, offset, data, mem_mask); }
+
+READ32_HANDLER( dma8257_32le_0_r ) { return read32le_with_read8_handler(dma8257_0_r, machine, offset, mem_mask); }
+READ32_HANDLER( dma8257_32le_1_r ) { return read32le_with_read8_handler(dma8257_1_r, machine, offset, mem_mask); }
+WRITE32_HANDLER( dma8257_32le_0_w ) { write32le_with_write8_handler(dma8257_0_w, machine, offset, data, mem_mask); }
+WRITE32_HANDLER( dma8257_32le_1_w ) { write32le_with_write8_handler(dma8257_1_w, machine, offset, data, mem_mask); }
+
+READ64_HANDLER( dma8257_64be_0_r ) { return read64be_with_read8_handler(dma8257_0_r, machine, offset, mem_mask); }
+READ64_HANDLER( dma8257_64be_1_r ) { return read64be_with_read8_handler(dma8257_1_r, machine, offset, mem_mask); }
+WRITE64_HANDLER( dma8257_64be_0_w ) { write64be_with_write8_handler(dma8257_0_w, machine, offset, data, mem_mask); }
+WRITE64_HANDLER( dma8257_64be_1_w ) { write64be_with_write8_handler(dma8257_1_w, machine, offset, data, mem_mask); }
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index ea02981c57b..ce3b0996c25 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -364,30 +364,30 @@ WRITE8_HANDLER(mc146818_port_w)
READ16_HANDLER(mc146818_port16le_r)
{
- return read16le_with_read8_handler(mc146818_port_r, offset, mem_mask);
+ return read16le_with_read8_handler(mc146818_port_r, machine, offset, mem_mask);
}
WRITE16_HANDLER(mc146818_port16le_w)
{
- write16le_with_write8_handler(mc146818_port_w, offset, data, mem_mask);
+ write16le_with_write8_handler(mc146818_port_w, machine, offset, data, mem_mask);
}
READ32_HANDLER(mc146818_port32le_r)
{
- return read32le_with_read8_handler(mc146818_port_r, offset, mem_mask);
+ return read32le_with_read8_handler(mc146818_port_r, machine, offset, mem_mask);
}
WRITE32_HANDLER(mc146818_port32le_w)
{
- write32le_with_write8_handler(mc146818_port_w, offset, data, mem_mask);
+ write32le_with_write8_handler(mc146818_port_w, machine, offset, data, mem_mask);
}
READ64_HANDLER(mc146818_port64be_r)
{
- return read64be_with_read8_handler(mc146818_port_r, offset, mem_mask);
+ return read64be_with_read8_handler(mc146818_port_r, machine, offset, mem_mask);
}
WRITE64_HANDLER(mc146818_port64be_w)
{
- write64be_with_write8_handler(mc146818_port_w, offset, data, mem_mask);
+ write64be_with_write8_handler(mc146818_port_w, machine, offset, data, mem_mask);
}
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index 02287290ab3..b6c73665f8e 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -130,11 +130,11 @@ WRITE8_HANDLER( msm6242_w )
READ16_HANDLER( msm6242_lsb_r )
{
- return msm6242_r(offset);
+ return msm6242_r(machine, offset);
}
WRITE16_HANDLER( msm6242_lsb_w )
{
if (ACCESSING_LSB)
- msm6242_w(offset,data);
+ msm6242_w(machine, offset, data);
}
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index 454bf8949e6..1b8e57aebe5 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -193,5 +193,5 @@ WRITE32_HANDLER(pci_32le_w)
-READ64_HANDLER(pci_64be_r) { return read64be_with_32le_handler(pci_32le_r, offset, mem_mask); }
-WRITE64_HANDLER(pci_64be_w) { write64be_with_32le_handler(pci_32le_w, offset, data, mem_mask); }
+READ64_HANDLER(pci_64be_r) { return read64be_with_32le_handler(pci_32le_r, machine, offset, mem_mask); }
+WRITE64_HANDLER(pci_64be_w) { write64be_with_32le_handler(pci_32le_w, machine, offset, data, mem_mask); }
diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c
index f11ad5406ba..671b63b1fba 100644
--- a/src/emu/machine/pic8259.c
+++ b/src/emu/machine/pic8259.c
@@ -381,17 +381,17 @@ READ8_HANDLER ( pic8259_1_r ) { return pic8259_read(1, offset); }
WRITE8_HANDLER ( pic8259_0_w ) { pic8259_write(0, offset, data); }
WRITE8_HANDLER ( pic8259_1_w ) { pic8259_write(1, offset, data); }
-READ16_HANDLER ( pic8259_16le_0_r ) { return read16le_with_read8_handler(pic8259_0_r, offset, mem_mask); }
-READ16_HANDLER ( pic8259_16le_1_r ) { return read16le_with_read8_handler(pic8259_1_r, offset, mem_mask); }
-WRITE16_HANDLER ( pic8259_16le_0_w ) { write16le_with_write8_handler(pic8259_0_w, offset, data, mem_mask); }
-WRITE16_HANDLER ( pic8259_16le_1_w ) { write16le_with_write8_handler(pic8259_1_w, offset, data, mem_mask); }
-
-READ32_HANDLER ( pic8259_32le_0_r ) { return read32le_with_read8_handler(pic8259_0_r, offset, mem_mask); }
-READ32_HANDLER ( pic8259_32le_1_r ) { return read32le_with_read8_handler(pic8259_1_r, offset, mem_mask); }
-WRITE32_HANDLER ( pic8259_32le_0_w ) { write32le_with_write8_handler(pic8259_0_w, offset, data, mem_mask); }
-WRITE32_HANDLER ( pic8259_32le_1_w ) { write32le_with_write8_handler(pic8259_1_w, offset, data, mem_mask); }
-
-READ64_HANDLER ( pic8259_64be_0_r ) { return read64be_with_read8_handler(pic8259_0_r, offset, mem_mask); }
-READ64_HANDLER ( pic8259_64be_1_r ) { return read64be_with_read8_handler(pic8259_1_r, offset, mem_mask); }
-WRITE64_HANDLER ( pic8259_64be_0_w ) { write64be_with_write8_handler(pic8259_0_w, offset, data, mem_mask); }
-WRITE64_HANDLER ( pic8259_64be_1_w ) { write64be_with_write8_handler(pic8259_1_w, offset, data, mem_mask); }
+READ16_HANDLER ( pic8259_16le_0_r ) { return read16le_with_read8_handler(pic8259_0_r, machine, offset, mem_mask); }
+READ16_HANDLER ( pic8259_16le_1_r ) { return read16le_with_read8_handler(pic8259_1_r, machine, offset, mem_mask); }
+WRITE16_HANDLER ( pic8259_16le_0_w ) { write16le_with_write8_handler(pic8259_0_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER ( pic8259_16le_1_w ) { write16le_with_write8_handler(pic8259_1_w, machine, offset, data, mem_mask); }
+
+READ32_HANDLER ( pic8259_32le_0_r ) { return read32le_with_read8_handler(pic8259_0_r, machine, offset, mem_mask); }
+READ32_HANDLER ( pic8259_32le_1_r ) { return read32le_with_read8_handler(pic8259_1_r, machine, offset, mem_mask); }
+WRITE32_HANDLER ( pic8259_32le_0_w ) { write32le_with_write8_handler(pic8259_0_w, machine, offset, data, mem_mask); }
+WRITE32_HANDLER ( pic8259_32le_1_w ) { write32le_with_write8_handler(pic8259_1_w, machine, offset, data, mem_mask); }
+
+READ64_HANDLER ( pic8259_64be_0_r ) { return read64be_with_read8_handler(pic8259_0_r, machine, offset, mem_mask); }
+READ64_HANDLER ( pic8259_64be_1_r ) { return read64be_with_read8_handler(pic8259_1_r, machine, offset, mem_mask); }
+WRITE64_HANDLER ( pic8259_64be_0_w ) { write64be_with_write8_handler(pic8259_0_w, machine, offset, data, mem_mask); }
+WRITE64_HANDLER ( pic8259_64be_1_w ) { write64be_with_write8_handler(pic8259_1_w, machine, offset, data, mem_mask); }
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index 817071294ff..adbe32981df 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -1188,20 +1188,20 @@ READ16_HANDLER ( pit8253_1_lsb_r ) { return pit8253_read(1, offset); }
WRITE16_HANDLER ( pit8253_0_lsb_w ) { if (ACCESSING_LSB) pit8253_write(0, offset, data); }
WRITE16_HANDLER ( pit8253_1_lsb_w ) { if (ACCESSING_LSB) pit8253_write(1, offset, data); }
-READ16_HANDLER ( pit8253_16le_0_r ) { return read16le_with_read8_handler(pit8253_0_r, offset, mem_mask); }
-READ16_HANDLER ( pit8253_16le_1_r ) { return read16le_with_read8_handler(pit8253_1_r, offset, mem_mask); }
-WRITE16_HANDLER ( pit8253_16le_0_w ) { write16le_with_write8_handler(pit8253_0_w, offset, data, mem_mask); }
-WRITE16_HANDLER ( pit8253_16le_1_w ) { write16le_with_write8_handler(pit8253_1_w, offset, data, mem_mask); }
-
-READ32_HANDLER ( pit8253_32le_0_r ) { return read32le_with_read8_handler(pit8253_0_r, offset, mem_mask); }
-READ32_HANDLER ( pit8253_32le_1_r ) { return read32le_with_read8_handler(pit8253_1_r, offset, mem_mask); }
-WRITE32_HANDLER ( pit8253_32le_0_w ) { write32le_with_write8_handler(pit8253_0_w, offset, data, mem_mask); }
-WRITE32_HANDLER ( pit8253_32le_1_w ) { write32le_with_write8_handler(pit8253_1_w, offset, data, mem_mask); }
-
-READ64_HANDLER ( pit8253_64be_0_r ) { return read64be_with_read8_handler(pit8253_0_r, offset, mem_mask); }
-READ64_HANDLER ( pit8253_64be_1_r ) { return read64be_with_read8_handler(pit8253_1_r, offset, mem_mask); }
-WRITE64_HANDLER ( pit8253_64be_0_w ) { write64be_with_write8_handler(pit8253_0_w, offset, data, mem_mask); }
-WRITE64_HANDLER ( pit8253_64be_1_w ) { write64be_with_write8_handler(pit8253_1_w, offset, data, mem_mask); }
+READ16_HANDLER ( pit8253_16le_0_r ) { return read16le_with_read8_handler(pit8253_0_r, machine, offset, mem_mask); }
+READ16_HANDLER ( pit8253_16le_1_r ) { return read16le_with_read8_handler(pit8253_1_r, machine, offset, mem_mask); }
+WRITE16_HANDLER ( pit8253_16le_0_w ) { write16le_with_write8_handler(pit8253_0_w, machine, offset, data, mem_mask); }
+WRITE16_HANDLER ( pit8253_16le_1_w ) { write16le_with_write8_handler(pit8253_1_w, machine, offset, data, mem_mask); }
+
+READ32_HANDLER ( pit8253_32le_0_r ) { return read32le_with_read8_handler(pit8253_0_r, machine, offset, mem_mask); }
+READ32_HANDLER ( pit8253_32le_1_r ) { return read32le_with_read8_handler(pit8253_1_r, machine, offset, mem_mask); }
+WRITE32_HANDLER ( pit8253_32le_0_w ) { write32le_with_write8_handler(pit8253_0_w, machine, offset, data, mem_mask); }
+WRITE32_HANDLER ( pit8253_32le_1_w ) { write32le_with_write8_handler(pit8253_1_w, machine, offset, data, mem_mask); }
+
+READ64_HANDLER ( pit8253_64be_0_r ) { return read64be_with_read8_handler(pit8253_0_r, machine, offset, mem_mask); }
+READ64_HANDLER ( pit8253_64be_1_r ) { return read64be_with_read8_handler(pit8253_1_r, machine, offset, mem_mask); }
+WRITE64_HANDLER ( pit8253_64be_0_w ) { write64be_with_write8_handler(pit8253_0_w, machine, offset, data, mem_mask); }
+WRITE64_HANDLER ( pit8253_64be_1_w ) { write64be_with_write8_handler(pit8253_1_w, machine, offset, data, mem_mask); }
WRITE8_HANDLER ( pit8253_0_gate_w ) { pit8253_gate_write(0, offset, data); }
WRITE8_HANDLER ( pit8253_1_gate_w ) { pit8253_gate_write(1, offset, data); }
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index 80420f46fe3..1063c5536a7 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -81,7 +81,7 @@ struct _z80ctc
attotime period16; /* 16/system clock */
attotime period256; /* 256/system clock */
void (*intr)(int which); /* interrupt callback */
- write8_handler zc[4]; /* zero crossing callbacks */
+ write8_machine_func zc[4]; /* zero crossing callbacks */
UINT8 notimer; /* no timer masks */
UINT16 mode[4]; /* current mode */
UINT16 tconst[4]; /* time constant */
@@ -132,8 +132,8 @@ static TIMER_CALLBACK( timercallback )
/* generate the clock pulse */
if (ctc->zc[ch])
{
- (*ctc->zc[ch])(0,1);
- (*ctc->zc[ch])(0,0);
+ (*ctc->zc[ch])(machine,0,1);
+ (*ctc->zc[ch])(machine,0,0);
}
/* reset the down counter */
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index d8b94d0282c..d8fc57c0ae5 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -29,9 +29,9 @@ typedef struct
int baseclock; /* timer clock */
int notimer; /* timer disablers */
void (*intr)(int which); /* callback when change interrupt status */
- write8_handler zc0; /* ZC/TO0 callback */
- write8_handler zc1; /* ZC/TO1 callback */
- write8_handler zc2; /* ZC/TO2 callback */
+ write8_machine_func zc0; /* ZC/TO0 callback */
+ write8_machine_func zc1; /* ZC/TO1 callback */
+ write8_machine_func zc2; /* ZC/TO2 callback */
} z80ctc_interface;
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index c364db27812..bc05a1c646c 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -8,6 +8,7 @@
***************************************************************************/
#include "driver.h"
+#include "deprecat.h"
#include "z80sio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -180,10 +181,10 @@ struct _z80sio
UINT8 int_state[8]; /* interrupt states */
void (*irq_cb)(int state);
- write8_handler dtr_changed_cb;
- write8_handler rts_changed_cb;
- write8_handler break_changed_cb;
- write8_handler transmit_cb;
+ write8_machine_func dtr_changed_cb;
+ write8_machine_func rts_changed_cb;
+ write8_machine_func break_changed_cb;
+ write8_machine_func transmit_cb;
int (*receive_poll_cb)(int which);
};
@@ -418,11 +419,11 @@ void z80sio_c_w(int which, int ch, UINT8 data)
/* SIO write register 5 */
case 5:
if (((old ^ data) & SIO_WR5_DTR) && sio->dtr_changed_cb)
- (*sio->dtr_changed_cb)(ch, (data & SIO_WR5_DTR) != 0);
+ (*sio->dtr_changed_cb)(Machine, ch, (data & SIO_WR5_DTR) != 0);
if (((old ^ data) & SIO_WR5_SEND_BREAK) && sio->break_changed_cb)
- (*sio->break_changed_cb)(ch, (data & SIO_WR5_SEND_BREAK) != 0);
+ (*sio->break_changed_cb)(Machine, ch, (data & SIO_WR5_SEND_BREAK) != 0);
if (((old ^ data) & SIO_WR5_RTS) && sio->rts_changed_cb)
- (*sio->rts_changed_cb)(ch, (data & SIO_WR5_RTS) != 0);
+ (*sio->rts_changed_cb)(Machine, ch, (data & SIO_WR5_RTS) != 0);
break;
}
}
@@ -641,7 +642,7 @@ static TIMER_CALLBACK( serial_callback )
/* actually transmit the character */
if (sio->transmit_cb != NULL)
- (*sio->transmit_cb)(ch, chan->outbuf);
+ (*sio->transmit_cb)(machine, ch, chan->outbuf);
/* update the status register */
chan->status[0] |= SIO_RR0_TX_BUFFER_EMPTY;
diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h
index 2b791439c31..14cb0d6c718 100644
--- a/src/emu/machine/z80sio.h
+++ b/src/emu/machine/z80sio.h
@@ -24,10 +24,10 @@ struct _z80sio_interface
{
int baseclock;
void (*irq_cb)(int state);
- write8_handler dtr_changed_cb;
- write8_handler rts_changed_cb;
- write8_handler break_changed_cb;
- write8_handler transmit_cb;
+ write8_machine_func dtr_changed_cb;
+ write8_machine_func rts_changed_cb;
+ write8_machine_func break_changed_cb;
+ write8_machine_func transmit_cb;
int (*receive_poll_cb)(int which);
};
diff --git a/src/emu/memconv.h b/src/emu/memconv.h
index 421b182a651..54c169680ea 100644
--- a/src/emu/memconv.h
+++ b/src/emu/memconv.h
@@ -85,23 +85,23 @@
*
*************************************/
-INLINE UINT16 read16be_with_read8_handler(read8_handler handler, offs_t offset, UINT16 mem_mask)
+INLINE UINT16 read16be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if ((mem_mask & 0xff00) != 0xff00)
- result |= ((UINT16)(*handler)(offset * 2 + 0)) << 8;
+ result |= ((UINT16)(*handler)(param, offset * 2 + 0)) << 8;
if ((mem_mask & 0x00ff) != 0x00ff)
- result |= ((UINT16)(*handler)(offset * 2 + 1)) << 0;
+ result |= ((UINT16)(*handler)(param, offset * 2 + 1)) << 0;
return result;
}
-INLINE void write16be_with_write8_handler(write8_handler handler, offs_t offset, UINT16 data, UINT16 mem_mask)
+INLINE void write16be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if ((mem_mask & 0xff00) != 0xff00)
- (*handler)(offset * 2 + 0, data >> 8);
+ (*handler)(param, offset * 2 + 0, data >> 8);
if ((mem_mask & 0x00ff) != 0x00ff)
- (*handler)(offset * 2 + 1, data >> 0);
+ (*handler)(param, offset * 2 + 1, data >> 0);
}
@@ -111,23 +111,23 @@ INLINE void write16be_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT16 read16le_with_read8_handler(read8_handler handler, offs_t offset, UINT16 mem_mask)
+INLINE UINT16 read16le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if ((mem_mask & 0x00ff) != 0x00ff)
- result |= ((UINT16) (*handler)(offset * 2 + 0)) << 0;
+ result |= ((UINT16) (*handler)(param, offset * 2 + 0)) << 0;
if ((mem_mask & 0xff00) != 0xff00)
- result |= ((UINT16) (*handler)(offset * 2 + 1)) << 8;
+ result |= ((UINT16) (*handler)(param, offset * 2 + 1)) << 8;
return result;
}
-INLINE void write16le_with_write8_handler(write8_handler handler, offs_t offset, UINT16 data, UINT16 mem_mask)
+INLINE void write16le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if ((mem_mask & 0x00ff) != 0x00ff)
- (*handler)(offset * 2 + 0, data >> 0);
+ (*handler)(param, offset * 2 + 0, data >> 0);
if ((mem_mask & 0xff00) != 0xff00)
- (*handler)(offset * 2 + 1, data >> 8);
+ (*handler)(param, offset * 2 + 1, data >> 8);
}
@@ -137,23 +137,23 @@ INLINE void write16le_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32be_with_read8_handler(read8_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= read16be_with_read8_handler(handler, offset * 2 + 0, mem_mask >> 16) << 16;
+ result |= read16be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 16) << 16;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= read16be_with_read8_handler(handler, offset * 2 + 1, mem_mask) << 0;
+ result |= read16be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
-INLINE void write32be_with_write8_handler(write8_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0xffff0000) != 0xffff0000)
- write16be_with_write8_handler(handler, offset * 2 + 0, data >> 16, mem_mask >> 16);
+ write16be_with_write8_handler(handler, param, offset * 2 + 0, data >> 16, mem_mask >> 16);
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- write16be_with_write8_handler(handler, offset * 2 + 1, data, mem_mask);
+ write16be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@@ -163,23 +163,23 @@ INLINE void write32be_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32le_with_read8_handler(read8_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= read16le_with_read8_handler(handler, offset * 2 + 0, mem_mask) << 0;
+ result |= read16le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask) << 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= read16le_with_read8_handler(handler, offset * 2 + 1, mem_mask >> 16) << 16;
+ result |= read16le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
-INLINE void write32le_with_write8_handler(write8_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- write16le_with_write8_handler(handler, offset * 2 + 0, data, mem_mask);
+ write16le_with_write8_handler(handler, param, offset * 2 + 0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- write16le_with_write8_handler(handler, offset * 2 + 1, data >> 16, mem_mask >> 16);
+ write16le_with_write8_handler(handler, param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@@ -189,23 +189,23 @@ INLINE void write32le_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32be_with_16be_handler(read16_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= (*handler)(offset * 2 + 0, mem_mask >> 16) << 16;
+ result |= (*handler)(param, offset * 2 + 0, mem_mask >> 16) << 16;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= (*handler)(offset * 2 + 1, mem_mask) << 0;
+ result |= (*handler)(param, offset * 2 + 1, mem_mask) << 0;
return result;
}
-INLINE void write32be_with_16be_handler(write16_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0xffff0000) != 0xffff0000)
- (*handler)(offset * 2 + 0, data >> 16, mem_mask >> 16);
+ (*handler)(param, offset * 2 + 0, data >> 16, mem_mask >> 16);
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- (*handler)(offset * 2 + 1, data, mem_mask);
+ (*handler)(param, offset * 2 + 1, data, mem_mask);
}
@@ -215,23 +215,23 @@ INLINE void write32be_with_16be_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32le_with_16le_handler(read16_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= (*handler)(offset * 2 + 0, mem_mask) << 0;
+ result |= (*handler)(param, offset * 2 + 0, mem_mask) << 0;
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= (*handler)(offset * 2 + 1, mem_mask >> 16) << 16;
+ result |= (*handler)(param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
-INLINE void write32le_with_16le_handler(write16_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- (*handler)(offset * 2 + 0, data, mem_mask);
+ (*handler)(param, offset * 2 + 0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- (*handler)(offset * 2 + 1, data >> 16, mem_mask >> 16);
+ (*handler)(param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@@ -241,20 +241,20 @@ INLINE void write32le_with_16le_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32be_with_16le_handler(read16_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
mem_mask = FLIPENDIAN_INT32(mem_mask);
- result = read32le_with_16le_handler(handler, offset, mem_mask);
+ result = read32le_with_16le_handler(handler, param, offset, mem_mask);
return FLIPENDIAN_INT32(result);
}
-INLINE void write32be_with_16le_handler(write16_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
data = FLIPENDIAN_INT32(data);
mem_mask = FLIPENDIAN_INT32(mem_mask);
- write32le_with_16le_handler(handler, offset, data, mem_mask);
+ write32le_with_16le_handler(handler, param, offset, data, mem_mask);
}
@@ -264,20 +264,20 @@ INLINE void write32be_with_16le_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read32le_with_16be_handler(read16_handler handler, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
mem_mask = FLIPENDIAN_INT32(mem_mask);
- result = read32be_with_16be_handler(handler, offset, mem_mask);
+ result = read32be_with_16be_handler(handler, param, offset, mem_mask);
return FLIPENDIAN_INT32(result);
}
-INLINE void write32le_with_16be_handler(write16_handler handler, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
data = FLIPENDIAN_INT32(data);
mem_mask = FLIPENDIAN_INT32(mem_mask);
- write32be_with_16be_handler(handler, offset, data, mem_mask);
+ write32be_with_16be_handler(handler, param, offset, data, mem_mask);
}
@@ -287,23 +287,23 @@ INLINE void write32le_with_16be_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64be_with_read8_handler(read8_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32be_with_read8_handler(handler, offset * 2 + 0, mem_mask >> 32) << 32;
+ result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32be_with_read8_handler(handler, offset * 2 + 1, mem_mask) << 0;
+ result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
-INLINE void write64be_with_write8_handler(write8_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32be_with_write8_handler(handler, offset * 2 + 0, data >> 32, mem_mask >> 32);
+ write32be_with_write8_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32be_with_write8_handler(handler, offset * 2 + 1, data, mem_mask);
+ write32be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@@ -313,23 +313,23 @@ INLINE void write64be_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64le_with_read8_handler(read8_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32le_with_read8_handler(handler, offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32le_with_read8_handler(handler, offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
-INLINE void write64le_with_write8_handler(write8_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32le_with_write8_handler(handler, offset * 2 + 0, data >> 0, mem_mask >> 0);
+ write32le_with_write8_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32le_with_write8_handler(handler, offset * 2 + 1, data >> 32, mem_mask >> 32);
+ write32le_with_write8_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -339,23 +339,23 @@ INLINE void write64le_with_write8_handler(write8_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read64be_with_16be_handler(read16_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32be_with_16be_handler(handler, offset * 2 + 0, mem_mask >> 32) << 32;
+ result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32be_with_16be_handler(handler, offset * 2 + 1, mem_mask >> 0) << 0;
+ result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
-INLINE void write64be_with_16be_handler(write16_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32be_with_16be_handler(handler, offset * 2 + 0, data >> 32, mem_mask >> 32);
+ write32be_with_16be_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32be_with_16be_handler(handler, offset * 2 + 1, data >> 0, mem_mask >> 0);
+ write32be_with_16be_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -365,23 +365,23 @@ INLINE void write64be_with_16be_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read64le_with_16le_handler(read16_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32le_with_16le_handler(handler, offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32le_with_16le_handler(handler, offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
-INLINE void write64le_with_16le_handler(write16_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32le_with_16le_handler(handler, offset * 2 + 0, data >> 0, mem_mask >> 0);
+ write32le_with_16le_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32le_with_16le_handler(handler, offset * 2 + 1, data >> 32, mem_mask >> 32);
+ write32le_with_16le_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -391,23 +391,23 @@ INLINE void write64le_with_16le_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read64be_with_16le_handler(read16_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64be_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32be_with_16le_handler(handler, offset * 2 + 0, mem_mask >> 32) << 32;
+ result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32be_with_16le_handler(handler, offset * 2 + 1, mem_mask >> 0) << 0;
+ result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
-INLINE void write64be_with_16le_handler(write16_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32be_with_16le_handler(handler, offset * 2 + 0, data >> 32, mem_mask >> 32);
+ write32be_with_16le_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32be_with_16le_handler(handler, offset * 2 + 1, data >> 0, mem_mask >> 0);
+ write32be_with_16le_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -417,23 +417,23 @@ INLINE void write64be_with_16le_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT32 read64le_with_16be_handler(read16_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64le_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)read32le_with_16be_handler(handler, offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)read32le_with_16be_handler(handler, offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
-INLINE void write64le_with_16be_handler(write16_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- write32le_with_16be_handler(handler, offset * 2 + 0, data >> 0, mem_mask >> 0);
+ write32le_with_16be_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- write32le_with_16be_handler(handler, offset * 2 + 1, data >> 32, mem_mask >> 32);
+ write32le_with_16be_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -443,23 +443,23 @@ INLINE void write64le_with_16be_handler(write16_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64be_with_32be_handler(read32_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_32be_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)(*handler)(offset * 2 + 0, mem_mask >> 32) << 32;
+ result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 32) << 32;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)(*handler)(offset * 2 + 1, mem_mask >> 0) << 0;
+ result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
-INLINE void write64be_with_32be_handler(write32_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_32be_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- (*handler)(offset * 2 + 0, data >> 32, mem_mask >> 32);
+ (*handler)(param, offset * 2 + 0, data >> 32, mem_mask >> 32);
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- (*handler)(offset * 2 + 1, data >> 0, mem_mask >> 0);
+ (*handler)(param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -469,23 +469,23 @@ INLINE void write64be_with_32be_handler(write32_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64le_with_32le_handler(read32_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_32le_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- result |= (UINT64)(*handler)(offset * 2 + 0, mem_mask >> 0) << 0;
+ result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 0) << 0;
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- result |= (UINT64)(*handler)(offset * 2 + 1, mem_mask >> 32) << 32;
+ result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
-INLINE void write64le_with_32le_handler(write32_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_32le_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
- (*handler)(offset * 2 + 0, data >> 0, mem_mask >> 0);
+ (*handler)(param, offset * 2 + 0, data >> 0, mem_mask >> 0);
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
- (*handler)(offset * 2 + 1, data >> 32, mem_mask >> 32);
+ (*handler)(param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -495,20 +495,20 @@ INLINE void write64le_with_32le_handler(write32_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64be_with_32le_handler(read32_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_32le_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
- result = read64le_with_32le_handler(handler, offset, mem_mask);
+ result = read64le_with_32le_handler(handler, param, offset, mem_mask);
return FLIPENDIAN_INT64(result);
}
-INLINE void write64be_with_32le_handler(write32_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_32le_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
- write64le_with_32le_handler(handler, offset, data, mem_mask);
+ write64le_with_32le_handler(handler, param, offset, data, mem_mask);
}
@@ -518,20 +518,20 @@ INLINE void write64be_with_32le_handler(write32_handler handler, offs_t offset,
*
*************************************/
-INLINE UINT64 read64le_with_32be_handler(read32_handler handler, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_32be_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
- result = read64be_with_32be_handler(handler, offset, mem_mask);
+ result = read64be_with_32be_handler(handler, param, offset, mem_mask);
return FLIPENDIAN_INT64(result);
}
-INLINE void write64le_with_32be_handler(write32_handler handler, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_32be_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
- write64be_with_32be_handler(handler, offset, data, mem_mask);
+ write64be_with_32be_handler(handler, param, offset, data, mem_mask);
}
@@ -542,31 +542,31 @@ INLINE void write64le_with_32be_handler(write32_handler handler, offs_t offset,
**************************************************************************/
-#define READ_TEMPLATE(bits, name, handler, func) \
-READ##bits##_HANDLER( name##_r ) \
-{ \
- return func(handler, offset, mem_mask); \
+#define READ_TEMPLATE(bits, name, handler, func) \
+READ##bits##_HANDLER( name##_r ) \
+{ \
+ return func(handler, param, offset, mem_mask); \
}
#define READ_TEMPLATE_COND(bits, name, handler, func, cond) \
READ##bits##_HANDLER( name##_r ) \
{ \
if (cond) \
- return func(handler, offset, mem_mask); \
+ return func(handler, param, offset, mem_mask); \
return 0; \
}
-#define WRITE_TEMPLATE(bits, name, handler, func) \
-WRITE##bits##_HANDLER( name##_w ) \
-{ \
- func(handler, offset, data, mem_mask); \
+#define WRITE_TEMPLATE(bits, name, handler, func) \
+WRITE##bits##_HANDLER( name##_w ) \
+{ \
+ func(handler, param, offset, data, mem_mask); \
}
#define WRITE_TEMPLATE_COND(bits, name, handler, func, cond) \
WRITE##bits##_HANDLER( name##_w ) \
{ \
if (cond) \
- return func(handler, offset, data, mem_mask); \
+ return func(handler, param, offset, data, mem_mask); \
}
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 90391af3b5d..713c8dab63d 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -206,6 +206,7 @@ struct _handler_data
offs_t offset; /* base offset for handler */
offs_t top; /* maximum offset for handler */
offs_t mask; /* mask against the final address */
+ void * object; /* object associated with the handler */
const char * name; /* name of the handler */
};
@@ -247,7 +248,7 @@ struct _addrspace_data
typedef struct _cpu_data cpu_data;
struct _cpu_data
{
- opbase_handler opbase; /* opcode base handler */
+ opbase_handler_func opbase; /* opcode base handler */
void * op_ram; /* dynamic RAM base pointer */
void * op_rom; /* dynamic ROM base pointer */
@@ -283,7 +284,7 @@ static int memory_block_count = 0; /* number of memory_block[] entries us
static int cur_context; /* current CPU context */
-static opbase_handler opbasefunc; /* opcode base override */
+static opbase_handler_func opbasefunc; /* opcode base override */
static int debugger_access; /* treat accesses as coming from the debugger */
static int log_unmap[ADDRESS_SPACES]; /* log unmapped memory accesses */
@@ -381,10 +382,10 @@ static void init_cpudata(void);
static void init_addrspace(UINT8 cpunum, UINT8 spacenum);
static void preflight_memory(void);
static void populate_memory(void);
-static void install_mem_handler_private(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, const char *handler_name);
-static void install_mem_handler(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, const char *handler_name);
+static void install_mem_handler_private(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, void *object, const char *handler_name);
+static void install_mem_handler(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, void *object, const char *handler_name);
static genf *assign_dynamic_bank(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mirror, int isfixed, int ismasked);
-static UINT8 get_handler_index(handler_data *table, genf *handler, const char *handler_name, offs_t start, offs_t end, offs_t mask);
+static UINT8 get_handler_index(handler_data *table, void *object, genf *handler, const char *handler_name, offs_t start, offs_t end, offs_t mask);
static void populate_table_range(addrspace_data *space, int iswrite, offs_t start, offs_t stop, UINT8 handler);
static void populate_table_match(addrspace_data *space, int iswrite, offs_t matchval, offs_t matchmask, UINT8 handler);
static UINT8 allocate_subtable(table_data *tabledata);
@@ -568,9 +569,9 @@ const address_map *memory_get_map(int cpunum, int spacenum)
memory base
-------------------------------------------------*/
-opbase_handler memory_set_opbase_handler(int cpunum, opbase_handler function)
+opbase_handler_func memory_set_opbase_handler(int cpunum, opbase_handler_func function)
{
- opbase_handler old = cpudata[cpunum].opbase;
+ opbase_handler_func old = cpudata[cpunum].opbase;
cpudata[cpunum].opbase = function;
if (cpunum == cpu_getactivecpu())
opbasefunc = function;
@@ -592,7 +593,7 @@ void memory_set_opbase(offs_t pc)
/* allow overrides */
if (opbasefunc != NULL)
{
- pc = (*opbasefunc)(pc);
+ pc = (*opbasefunc)(Machine, pc);
if (pc == ~0)
return;
}
@@ -751,7 +752,7 @@ void *memory_get_op_ptr(int cpunum, offs_t offset, int arg)
UINT8 saved_opcode_entry = opcode_entry;
/* query the handler */
- offs_t new_offset = (*cpudata[cpunum].opbase)(offset);
+ offs_t new_offset = (*cpudata[cpunum].opbase)(Machine, offset);
/* if it returns ~0, we use whatever data the handler set */
if (new_offset == ~0)
@@ -954,39 +955,39 @@ void *_memory_install_read_handler(int cpunum, int spacenum, offs_t start, offs_
addrspace_data *space = &cpudata[cpunum].space[spacenum];
if (handler >= STATIC_COUNT)
fatalerror("fatal: can only use static banks with memory_install_read_handler()");
- install_mem_handler(space, 0, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)handler, 0, handler_name);
+ install_mem_handler(space, 0, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT8 *_memory_install_read8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_handler handler, const char *handler_name)
+UINT8 *_memory_install_read8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 8, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 8, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT16 *_memory_install_read16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_handler handler, const char *handler_name)
+UINT16 *_memory_install_read16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 16, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 16, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT32 *_memory_install_read32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_handler handler, const char *handler_name)
+UINT32 *_memory_install_read32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 32, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 32, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT64 *_memory_install_read64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_handler handler, const char *handler_name)
+UINT64 *_memory_install_read64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 64, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 64, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
@@ -1002,39 +1003,39 @@ void *_memory_install_write_handler(int cpunum, int spacenum, offs_t start, offs
addrspace_data *space = &cpudata[cpunum].space[spacenum];
if (handler >= STATIC_COUNT)
fatalerror("fatal: can only use static banks with memory_install_write_handler()");
- install_mem_handler(space, 1, space->dbits, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, space->dbits, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, start));
}
-UINT8 *_memory_install_write8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write8_handler handler, const char *handler_name)
+UINT8 *_memory_install_write8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write8_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 8, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 8, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, start));
}
-UINT16 *_memory_install_write16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write16_handler handler, const char *handler_name)
+UINT16 *_memory_install_write16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write16_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 16, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 16, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, start));
}
-UINT32 *_memory_install_write32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write32_handler handler, const char *handler_name)
+UINT32 *_memory_install_write32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write32_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 32, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 32, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, start));
}
-UINT64 *_memory_install_write64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write64_handler handler, const char *handler_name)
+UINT64 *_memory_install_write64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write64_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 64, 0, start, end, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 64, 0, start, end, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, start));
}
@@ -1050,44 +1051,44 @@ void *_memory_install_readwrite_handler(int cpunum, int spacenum, offs_t start,
addrspace_data *space = &cpudata[cpunum].space[spacenum];
if (rhandler >= STATIC_COUNT || whandler >= STATIC_COUNT)
fatalerror("fatal: can only use static banks with memory_install_readwrite_handler()");
- install_mem_handler(space, 0, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)rhandler, 0, rhandler_name);
- install_mem_handler(space, 1, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)whandler, 0, whandler_name);
+ install_mem_handler(space, 0, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)rhandler, 0, Machine, rhandler_name);
+ install_mem_handler(space, 1, space->dbits, 0, start, end, mask, mirror, (genf *)(FPTR)whandler, 0, Machine, whandler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT8 *_memory_install_readwrite8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_handler rhandler, write8_handler whandler, const char *rhandler_name, const char *whandler_name)
+UINT8 *_memory_install_readwrite8_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_machine_func rhandler, write8_machine_func whandler, const char *rhandler_name, const char *whandler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 8, 0, start, end, mask, mirror, (genf *)rhandler, 0, rhandler_name);
- install_mem_handler(space, 1, 8, 0, start, end, mask, mirror, (genf *)whandler, 0, whandler_name);
+ install_mem_handler(space, 0, 8, 0, start, end, mask, mirror, (genf *)rhandler, 0, Machine, rhandler_name);
+ install_mem_handler(space, 1, 8, 0, start, end, mask, mirror, (genf *)whandler, 0, Machine, whandler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT16 *_memory_install_readwrite16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_handler rhandler, write16_handler whandler, const char *rhandler_name, const char *whandler_name)
+UINT16 *_memory_install_readwrite16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_machine_func rhandler, write16_machine_func whandler, const char *rhandler_name, const char *whandler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 16, 0, start, end, mask, mirror, (genf *)rhandler, 0, rhandler_name);
- install_mem_handler(space, 1, 16, 0, start, end, mask, mirror, (genf *)whandler, 0, whandler_name);
+ install_mem_handler(space, 0, 16, 0, start, end, mask, mirror, (genf *)rhandler, 0, Machine, rhandler_name);
+ install_mem_handler(space, 1, 16, 0, start, end, mask, mirror, (genf *)whandler, 0, Machine, whandler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT32 *_memory_install_readwrite32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_handler rhandler, write32_handler whandler, const char *rhandler_name, const char *whandler_name)
+UINT32 *_memory_install_readwrite32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_machine_func rhandler, write32_machine_func whandler, const char *rhandler_name, const char *whandler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 32, 0, start, end, mask, mirror, (genf *)rhandler, 0, rhandler_name);
- install_mem_handler(space, 1, 32, 0, start, end, mask, mirror, (genf *)whandler, 0, whandler_name);
+ install_mem_handler(space, 0, 32, 0, start, end, mask, mirror, (genf *)rhandler, 0, Machine, rhandler_name);
+ install_mem_handler(space, 1, 32, 0, start, end, mask, mirror, (genf *)whandler, 0, Machine, whandler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
-UINT64 *_memory_install_readwrite64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_handler rhandler, write64_handler whandler, const char *rhandler_name, const char *whandler_name)
+UINT64 *_memory_install_readwrite64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_machine_func rhandler, write64_machine_func whandler, const char *rhandler_name, const char *whandler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 64, 0, start, end, mask, mirror, (genf *)rhandler, 0, rhandler_name);
- install_mem_handler(space, 1, 64, 0, start, end, mask, mirror, (genf *)whandler, 0, whandler_name);
+ install_mem_handler(space, 0, 64, 0, start, end, mask, mirror, (genf *)rhandler, 0, Machine, rhandler_name);
+ install_mem_handler(space, 1, 64, 0, start, end, mask, mirror, (genf *)whandler, 0, Machine, whandler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, start));
}
@@ -1104,39 +1105,39 @@ void *_memory_install_read_matchmask_handler(int cpunum, int spacenum, offs_t ma
addrspace_data *space = &cpudata[cpunum].space[spacenum];
if (handler >= STATIC_COUNT)
fatalerror("fatal: can only use static banks with memory_install_read_matchmask_handler()");
- install_mem_handler(space, 0, space->dbits, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, space->dbits, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, matchval));
}
-UINT8 *_memory_install_read8_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read8_handler handler, const char *handler_name)
+UINT8 *_memory_install_read8_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read8_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 8, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 8, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, matchval));
}
-UINT16 *_memory_install_read16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read16_handler handler, const char *handler_name)
+UINT16 *_memory_install_read16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read16_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 16, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 16, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, matchval));
}
-UINT32 *_memory_install_read32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read32_handler handler, const char *handler_name)
+UINT32 *_memory_install_read32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read32_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 32, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 32, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, matchval));
}
-UINT64 *_memory_install_read64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read64_handler handler, const char *handler_name)
+UINT64 *_memory_install_read64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read64_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 0, 64, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 0, 64, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 0, SPACE_SHIFT(space, matchval));
}
@@ -1153,39 +1154,39 @@ void *_memory_install_write_matchmask_handler(int cpunum, int spacenum, offs_t m
addrspace_data *space = &cpudata[cpunum].space[spacenum];
if (handler >= STATIC_COUNT)
fatalerror("fatal: can only use static banks with memory_install_write_matchmask_handler()");
- install_mem_handler(space, 1, space->dbits, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, space->dbits, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, matchval));
}
-UINT8 *_memory_install_write8_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write8_handler handler, const char *handler_name)
+UINT8 *_memory_install_write8_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write8_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 8, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 8, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, matchval));
}
-UINT16 *_memory_install_write16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write16_handler handler, const char *handler_name)
+UINT16 *_memory_install_write16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write16_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 16, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 16, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, matchval));
}
-UINT32 *_memory_install_write32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write32_handler handler, const char *handler_name)
+UINT32 *_memory_install_write32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write32_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 32, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 32, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, matchval));
}
-UINT64 *_memory_install_write64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write64_handler handler, const char *handler_name)
+UINT64 *_memory_install_write64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write64_machine_func handler, const char *handler_name)
{
addrspace_data *space = &cpudata[cpunum].space[spacenum];
- install_mem_handler(space, 1, 64, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, handler_name);
+ install_mem_handler(space, 1, 64, 1, matchval, maskval, mask, mirror, (genf *)handler, 0, Machine, handler_name);
mem_dump();
return memory_find_base(cpunum, spacenum, 1, SPACE_SHIFT(space, matchval));
}
@@ -1505,10 +1506,19 @@ static void populate_memory(void)
{
int ismatchmask = ((map->flags & AM_FLAGS_MATCH_MASK) != 0);
int isfixed = (map->memory != NULL) || (map->share != 0);
+
if (map->read.handler != NULL)
- install_mem_handler_private(space, 0, space->dbits, ismatchmask, map->start, map->end, map->mask, map->mirror, map->read.handler, isfixed, map->read_name);
+ {
+ void *object = Machine;
+ if (map->read_devtype != NULL) object = (void *)device_list_find_by_tag(Machine->config->devicelist, map->read_devtype, map->read_devtag);
+ install_mem_handler_private(space, 0, space->dbits, ismatchmask, map->start, map->end, map->mask, map->mirror, map->read.handler, isfixed, object, map->read_name);
+ }
if (map->write.handler != NULL)
- install_mem_handler_private(space, 1, space->dbits, ismatchmask, map->start, map->end, map->mask, map->mirror, map->write.handler, isfixed, map->write_name);
+ {
+ void *object = Machine;
+ if (map->write_devtype != NULL) object = (void *)device_list_find_by_tag(Machine->config->devicelist, map->write_devtype, map->write_devtag);
+ install_mem_handler_private(space, 1, space->dbits, ismatchmask, map->start, map->end, map->mask, map->mirror, map->write.handler, isfixed, object, map->write_name);
+ }
}
}
}
@@ -1522,7 +1532,7 @@ static void populate_memory(void)
banks to dynamically assigned banks
-------------------------------------------------*/
-static void install_mem_handler_private(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, const char *handler_name)
+static void install_mem_handler_private(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, void *object, const char *handler_name)
{
/* translate ROM to RAM/UNMAP here */
if (HANDLER_IS_ROM(handler))
@@ -1547,7 +1557,7 @@ static void install_mem_handler_private(addrspace_data *space, int iswrite, int
}
/* then do a normal installation */
- install_mem_handler(space, iswrite, databits, ismatchmask, start, end, mask, mirror, handler, isfixed, handler_name);
+ install_mem_handler(space, iswrite, databits, ismatchmask, start, end, mask, mirror, handler, isfixed, object, handler_name);
}
@@ -1556,7 +1566,7 @@ static void install_mem_handler_private(addrspace_data *space, int iswrite, int
memory operations
-------------------------------------------------*/
-static void install_mem_handler(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, const char *handler_name)
+static void install_mem_handler(addrspace_data *space, int iswrite, int databits, int ismatchmask, offs_t start, offs_t end, offs_t mask, offs_t mirror, genf *handler, int isfixed, void *object, const char *handler_name)
{
offs_t lmirrorbit[LEVEL2_BITS], lmirrorbits, hmirrorbit[32 - LEVEL2_BITS], hmirrorbits, lmirrorcount, hmirrorcount;
table_data *tabledata = iswrite ? &space->write : &space->read;
@@ -1621,7 +1631,7 @@ static void install_mem_handler(addrspace_data *space, int iswrite, int databits
hmirrorbit[hmirrorbits++] = 1 << i;
/* get the final handler index */
- idx = get_handler_index(tabledata->handlers, handler, handler_name, start, end, mask);
+ idx = get_handler_index(tabledata->handlers, object, handler, handler_name, start, end, mask);
/* loop over mirrors in the level 2 table */
for (hmirrorcount = 0; hmirrorcount < (1 << hmirrorbits); hmirrorcount++)
@@ -1715,7 +1725,7 @@ static genf *assign_dynamic_bank(int cpunum, int spacenum, offs_t start, offs_t
handler, or allocates a new one as necessary
-------------------------------------------------*/
-static UINT8 get_handler_index(handler_data *table, genf *handler, const char *handler_name, offs_t start, offs_t end, offs_t mask)
+static UINT8 get_handler_index(handler_data *table, void *object, genf *handler, const char *handler_name, offs_t start, offs_t end, offs_t mask)
{
int i;
@@ -1731,6 +1741,7 @@ static UINT8 get_handler_index(handler_data *table, genf *handler, const char *h
table[i].top = end;
table[i].mask = mask;
table[i].name = handler_name;
+ table[i].object = object;
}
return i;
}
@@ -1745,9 +1756,10 @@ static UINT8 get_handler_index(handler_data *table, genf *handler, const char *h
table[i].top = end;
table[i].mask = mask;
table[i].name = handler_name;
+ table[i].object = object;
return i;
}
- if (table[i].handler.generic == handler && table[i].offset == start && table[i].mask == mask)
+ if (table[i].handler.generic == handler && table[i].offset == start && table[i].mask == mask && table[i].object == object)
return i;
}
return 0;
@@ -2449,12 +2461,13 @@ static void *memory_find_base(int cpunum, int spacenum, int readwrite, offs_t of
PERFORM_LOOKUP - common lookup procedure
-------------------------------------------------*/
-#define PERFORM_LOOKUP(lookup,space,extraand) \
+#define PERFORM_LOOKUP(lookup,handlers,spacenum,extraand) \
/* perform lookup */ \
- address &= space.addrmask & extraand; \
- entry = space.lookup[LEVEL1_INDEX(address)]; \
+ address &= active_address_space[spacenum].addrmask & extraand; \
+ entry = active_address_space[spacenum].lookup[LEVEL1_INDEX(address)]; \
if (entry >= SUBTABLE_BASE) \
- entry = space.lookup[LEVEL2_INDEX(entry,address)]; \
+ entry = active_address_space[spacenum].lookup[LEVEL2_INDEX(entry,address)]; \
+ handler = &active_address_space[spacenum].handlers[entry]; \
/*-------------------------------------------------
@@ -2465,32 +2478,34 @@ static void *memory_find_base(int cpunum, int spacenum, int readwrite, offs_t of
UINT8 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~0); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~0); \
DEBUG_HOOK_READ(spacenum, 1, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler8)(address));\
+ MEMREADEND((*handler->handler.read.handler8)(handler->object, address)); \
} \
#define READBYTE(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
UINT8 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~0); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~0); \
DEBUG_HOOK_READ(spacenum, 1, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(bank_ptr[entry][xormacro(address)]); \
\
@@ -2498,7 +2513,7 @@ UINT8 name(offs_t original_address) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handlertype)(address >> (ignorebits), ~((masktype)0xff << shift)) >> shift);\
+ MEMREADEND((*handler->handler.read.handlertype)(handler->object, address >> (ignorebits), ~((masktype)0xff << shift)) >> shift);\
} \
} \
@@ -2519,32 +2534,34 @@ UINT8 name(offs_t original_address) \
UINT16 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~1); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~1); \
DEBUG_HOOK_READ(spacenum, 2, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT16 *)&bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler16)(address >> 1,0));\
+ MEMREADEND((*handler->handler.read.handler16)(handler->object, address >> 1, 0));\
} \
#define READWORD(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
UINT16 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~1); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~1); \
DEBUG_HOOK_READ(spacenum, 2, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT16 *)&bank_ptr[entry][xormacro(address)]); \
\
@@ -2552,7 +2569,7 @@ UINT16 name(offs_t original_address) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handlertype)(address >> (ignorebits), ~((masktype)0xffff << shift)) >> shift);\
+ MEMREADEND((*handler->handler.read.handlertype)(handler->object, address >> (ignorebits), ~((masktype)0xffff << shift)) >> shift);\
} \
} \
@@ -2571,51 +2588,54 @@ UINT16 name(offs_t original_address) \
UINT32 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~3); \
DEBUG_HOOK_READ(spacenum, 4, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT32 *)&bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler32)(address >> 2,0));\
+ MEMREADEND((*handler->handler.read.handler32)(handler->object, address >> 2, 0));\
} \
#define READMASKED32(name,spacenum) \
UINT32 name(offs_t original_address, UINT32 mem_mask) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~3); \
DEBUG_HOOK_READ(spacenum, 4, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT32 *)&bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler32)(address >> 2, mem_mask));\
+ MEMREADEND((*handler->handler.read.handler32)(handler->object, address >> 2, mem_mask));\
} \
#define READDWORD(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
UINT32 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~3); \
DEBUG_HOOK_READ(spacenum, 4, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT32 *)&bank_ptr[entry][xormacro(address)]); \
\
@@ -2623,7 +2643,7 @@ UINT32 name(offs_t original_address) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handlertype)(address >> (ignorebits), ~((masktype)0xffffffff << shift)) >> shift);\
+ MEMREADEND((*handler->handler.read.handlertype)(handler->object, address >> (ignorebits), ~((masktype)0xffffffff << shift)) >> shift);\
} \
} \
@@ -2640,38 +2660,40 @@ UINT32 name(offs_t original_address) \
UINT64 name(offs_t original_address) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~7); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~7); \
DEBUG_HOOK_READ(spacenum, 8, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT64 *)&bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler64)(address >> 3,0));\
+ MEMREADEND((*handler->handler.read.handler64)(handler->object, address >> 3, 0));\
} \
#define READMASKED64(name,spacenum) \
UINT64 name(offs_t original_address, UINT64 mem_mask) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMREADSTART(); \
- PERFORM_LOOKUP(readlookup,active_address_space[spacenum],~7); \
+ PERFORM_LOOKUP(readlookup,readhandlers,spacenum,~7); \
DEBUG_HOOK_READ(spacenum, 8, address); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].readhandlers[entry].offset) & active_address_space[spacenum].readhandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMREADEND(*(UINT64 *)&bank_ptr[entry][address]); \
\
/* fall back to the handler */ \
else \
- MEMREADEND((*active_address_space[spacenum].readhandlers[entry].handler.read.handler64)(address >> 3, mem_mask));\
+ MEMREADEND((*handler->handler.read.handler64)(handler->object, address >> 3, mem_mask));\
} \
@@ -2683,32 +2705,34 @@ UINT64 name(offs_t original_address, UINT64 mem_mask) \
void name(offs_t original_address, UINT8 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~0); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~0); \
DEBUG_HOOK_WRITE(spacenum, 1, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(bank_ptr[entry][address] = data); \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler8)(address, data));\
+ MEMWRITEEND((*handler->handler.write.handler8)(handler->object, address, data));\
} \
#define WRITEBYTE(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
void name(offs_t original_address, UINT8 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~0); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~0); \
DEBUG_HOOK_WRITE(spacenum, 1, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(bank_ptr[entry][xormacro(address)] = data); \
\
@@ -2716,7 +2740,7 @@ void name(offs_t original_address, UINT8 data) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handlertype)(address >> (ignorebits), (masktype)data << shift, ~((masktype)0xff << shift)));\
+ MEMWRITEEND((*handler->handler.write.handlertype)(handler->object, address >> (ignorebits), (masktype)data << shift, ~((masktype)0xff << shift)));\
} \
} \
@@ -2737,32 +2761,34 @@ void name(offs_t original_address, UINT8 data) \
void name(offs_t original_address, UINT16 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~1); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~1); \
DEBUG_HOOK_WRITE(spacenum, 2, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(*(UINT16 *)&bank_ptr[entry][address] = data); \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler16)(address >> 1, data, 0));\
+ MEMWRITEEND((*handler->handler.write.handler16)(handler->object, address >> 1, data, 0));\
} \
#define WRITEWORD(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
void name(offs_t original_address, UINT16 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~1); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~1); \
DEBUG_HOOK_WRITE(spacenum, 2, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(*(UINT16 *)&bank_ptr[entry][xormacro(address)] = data); \
\
@@ -2770,7 +2796,7 @@ void name(offs_t original_address, UINT16 data) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handlertype)(address >> (ignorebits), (masktype)data << shift, ~((masktype)0xffff << shift)));\
+ MEMWRITEEND((*handler->handler.write.handlertype)(handler->object, address >> (ignorebits), (masktype)data << shift, ~((masktype)0xffff << shift)));\
} \
} \
@@ -2789,32 +2815,34 @@ void name(offs_t original_address, UINT16 data) \
void name(offs_t original_address, UINT32 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~3); \
DEBUG_HOOK_WRITE(spacenum, 4, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(*(UINT32 *)&bank_ptr[entry][address] = data); \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler32)(address >> 2, data, 0));\
+ MEMWRITEEND((*handler->handler.write.handler32)(handler->object, address >> 2, data, 0));\
} \
#define WRITEMASKED32(name,spacenum) \
void name(offs_t original_address, UINT32 data, UINT32 mem_mask) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~3); \
DEBUG_HOOK_WRITE(spacenum, 4, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
{ \
UINT32 *dest = (UINT32 *)&bank_ptr[entry][address]; \
@@ -2823,20 +2851,21 @@ void name(offs_t original_address, UINT32 data, UINT32 mem_mask) \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler32)(address >> 2, data, mem_mask));\
+ MEMWRITEEND((*handler->handler.write.handler32)(handler->object, address >> 2, data, mem_mask));\
} \
#define WRITEDWORD(name,spacenum,xormacro,handlertype,ignorebits,shiftbytes,masktype) \
void name(offs_t original_address, UINT32 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~3); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~3); \
DEBUG_HOOK_WRITE(spacenum, 4, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(*(UINT32 *)&bank_ptr[entry][xormacro(address)] = data); \
\
@@ -2844,7 +2873,7 @@ void name(offs_t original_address, UINT32 data) \
else \
{ \
int shift = 8 * (shiftbytes); \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handlertype)(address >> (ignorebits), (masktype)data << shift, ~((masktype)0xffffffff << shift)));\
+ MEMWRITEEND((*handler->handler.write.handlertype)(handler->object, address >> (ignorebits), (masktype)data << shift, ~((masktype)0xffffffff << shift)));\
} \
} \
@@ -2861,32 +2890,34 @@ void name(offs_t original_address, UINT32 data) \
void name(offs_t original_address, UINT64 data) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~7); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~7); \
DEBUG_HOOK_WRITE(spacenum, 8, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
MEMWRITEEND(*(UINT64 *)&bank_ptr[entry][address] = data); \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler64)(address >> 3, data, 0));\
+ MEMWRITEEND((*handler->handler.write.handler64)(handler->object, address >> 3, data, 0));\
} \
#define WRITEMASKED64(name,spacenum) \
void name(offs_t original_address, UINT64 data, UINT64 mem_mask) \
{ \
offs_t address = original_address; \
+ const handler_data *handler; \
UINT32 entry; \
MEMWRITESTART(); \
- PERFORM_LOOKUP(writelookup,active_address_space[spacenum],~7); \
+ PERFORM_LOOKUP(writelookup,writehandlers,spacenum,~7); \
DEBUG_HOOK_WRITE(spacenum, 8, address, data); \
\
/* handle banks inline */ \
- address = (address - active_address_space[spacenum].writehandlers[entry].offset) & active_address_space[spacenum].writehandlers[entry].mask;\
+ address = (address - handler->offset) & handler->mask; \
if (entry < STATIC_RAM) \
{ \
UINT64 *dest = (UINT64 *)&bank_ptr[entry][address]; \
@@ -2895,7 +2926,7 @@ void name(offs_t original_address, UINT64 data, UINT64 mem_mask) \
\
/* fall back to the handler */ \
else \
- MEMWRITEEND((*active_address_space[spacenum].writehandlers[entry].handler.write.handler64)(address >> 3, data, mem_mask));\
+ MEMWRITEEND((*handler->handler.write.handler64)(handler->object, address >> 3, data, mem_mask));\
} \
diff --git a/src/emu/memory.h b/src/emu/memory.h
index bc42619a454..23b06508aec 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -15,6 +15,7 @@
#define __MEMORY_H__
#include "mamecore.h"
+#include "devintrf.h"
@@ -26,15 +27,25 @@
typedef UINT32 offs_t;
/* ----- typedefs for the various common data access handlers ----- */
-typedef UINT8 (*read8_handler) (ATTR_UNUSED offs_t offset);
-typedef void (*write8_handler) (ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data);
-typedef UINT16 (*read16_handler) (ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask);
-typedef void (*write16_handler)(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask);
-typedef UINT32 (*read32_handler) (ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask);
-typedef void (*write32_handler)(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask);
-typedef UINT64 (*read64_handler) (ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask);
-typedef void (*write64_handler)(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask);
-typedef offs_t (*opbase_handler) (ATTR_UNUSED offs_t address);
+typedef UINT8 (*read8_machine_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset);
+typedef void (*write8_machine_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data);
+typedef UINT16 (*read16_machine_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask);
+typedef void (*write16_machine_func)(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask);
+typedef UINT32 (*read32_machine_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask);
+typedef void (*write32_machine_func)(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask);
+typedef UINT64 (*read64_machine_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask);
+typedef void (*write64_machine_func)(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask);
+
+typedef UINT8 (*read8_device_func) (ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset);
+typedef void (*write8_device_func) (ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data);
+typedef UINT16 (*read16_device_func) (ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask);
+typedef void (*write16_device_func)(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask);
+typedef UINT32 (*read32_device_func) (ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask);
+typedef void (*write32_device_func)(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask);
+typedef UINT64 (*read64_device_func) (ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask);
+typedef void (*write64_device_func)(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask);
+
+typedef offs_t (*opbase_handler_func) (ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t address);
/* ----- this struct contains pointers to the live read/write routines ----- */
typedef struct _data_accessors data_accessors;
@@ -58,15 +69,25 @@ struct _data_accessors
***************************************************************************/
/* ----- macros for declaring the various common data access handlers ----- */
-#define READ8_HANDLER(name) UINT8 name(ATTR_UNUSED offs_t offset)
-#define WRITE8_HANDLER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data)
-#define READ16_HANDLER(name) UINT16 name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask)
-#define WRITE16_HANDLER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask)
-#define READ32_HANDLER(name) UINT32 name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask)
-#define WRITE32_HANDLER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask)
-#define READ64_HANDLER(name) UINT64 name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask)
-#define WRITE64_HANDLER(name) void name(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask)
-#define OPBASE_HANDLER(name) offs_t name(ATTR_UNUSED offs_t address)
+#define READ8_HANDLER(name) UINT8 name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset)
+#define WRITE8_HANDLER(name) void name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data)
+#define READ16_HANDLER(name) UINT16 name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask)
+#define WRITE16_HANDLER(name) void name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask)
+#define READ32_HANDLER(name) UINT32 name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask)
+#define WRITE32_HANDLER(name) void name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask)
+#define READ64_HANDLER(name) UINT64 name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask)
+#define WRITE64_HANDLER(name) void name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask)
+
+#define READ8_DEVICE_HANDLER(name) UINT8 name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset)
+#define WRITE8_DEVICE_HANDLER(name) void name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data)
+#define READ16_DEVICE_HANDLER(name) UINT16 name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask)
+#define WRITE16_DEVICE_HANDLER(name) void name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask)
+#define READ32_DEVICE_HANDLER(name) UINT32 name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask)
+#define WRITE32_DEVICE_HANDLER(name) void name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask)
+#define READ64_DEVICE_HANDLER(name) UINT64 name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask)
+#define WRITE64_DEVICE_HANDLER(name) void name(ATTR_UNUSED device_config *device, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask)
+
+#define OPBASE_HANDLER(name) offs_t name(ATTR_UNUSED running_machine *machine, ATTR_UNUSED offs_t address)
/* ----- macros for accessing bytes and words within larger chunks ----- */
#ifdef LSB_FIRST
@@ -199,308 +220,308 @@ enum
***************************************************************************/
/* 8-bit reads */
-#define MRA8_BANK1 ((read8_handler)STATIC_BANK1)
-#define MRA8_BANK2 ((read8_handler)STATIC_BANK2)
-#define MRA8_BANK3 ((read8_handler)STATIC_BANK3)
-#define MRA8_BANK4 ((read8_handler)STATIC_BANK4)
-#define MRA8_BANK5 ((read8_handler)STATIC_BANK5)
-#define MRA8_BANK6 ((read8_handler)STATIC_BANK6)
-#define MRA8_BANK7 ((read8_handler)STATIC_BANK7)
-#define MRA8_BANK8 ((read8_handler)STATIC_BANK8)
-#define MRA8_BANK9 ((read8_handler)STATIC_BANK9)
-#define MRA8_BANK10 ((read8_handler)STATIC_BANK10)
-#define MRA8_BANK11 ((read8_handler)STATIC_BANK11)
-#define MRA8_BANK12 ((read8_handler)STATIC_BANK12)
-#define MRA8_BANK13 ((read8_handler)STATIC_BANK13)
-#define MRA8_BANK14 ((read8_handler)STATIC_BANK14)
-#define MRA8_BANK15 ((read8_handler)STATIC_BANK15)
-#define MRA8_BANK16 ((read8_handler)STATIC_BANK16)
-#define MRA8_BANK17 ((read8_handler)STATIC_BANK17)
-#define MRA8_BANK18 ((read8_handler)STATIC_BANK18)
-#define MRA8_BANK19 ((read8_handler)STATIC_BANK19)
-#define MRA8_BANK20 ((read8_handler)STATIC_BANK20)
-#define MRA8_BANK21 ((read8_handler)STATIC_BANK21)
-#define MRA8_BANK22 ((read8_handler)STATIC_BANK22)
-#define MRA8_BANK23 ((read8_handler)STATIC_BANK23)
-#define MRA8_BANK24 ((read8_handler)STATIC_BANK24)
-#define MRA8_BANK25 ((read8_handler)STATIC_BANK25)
-#define MRA8_BANK26 ((read8_handler)STATIC_BANK26)
-#define MRA8_BANK27 ((read8_handler)STATIC_BANK27)
-#define MRA8_BANK28 ((read8_handler)STATIC_BANK28)
-#define MRA8_BANK29 ((read8_handler)STATIC_BANK29)
-#define MRA8_BANK30 ((read8_handler)STATIC_BANK30)
-#define MRA8_BANK31 ((read8_handler)STATIC_BANK31)
-#define MRA8_BANK32 ((read8_handler)STATIC_BANK32)
-#define MRA8_RAM ((read8_handler)STATIC_RAM)
-#define MRA8_ROM ((read8_handler)STATIC_ROM)
-#define MRA8_NOP ((read8_handler)STATIC_NOP)
-#define MRA8_UNMAP ((read8_handler)STATIC_UNMAP)
+#define MRA8_BANK1 ((read8_machine_func)STATIC_BANK1)
+#define MRA8_BANK2 ((read8_machine_func)STATIC_BANK2)
+#define MRA8_BANK3 ((read8_machine_func)STATIC_BANK3)
+#define MRA8_BANK4 ((read8_machine_func)STATIC_BANK4)
+#define MRA8_BANK5 ((read8_machine_func)STATIC_BANK5)
+#define MRA8_BANK6 ((read8_machine_func)STATIC_BANK6)
+#define MRA8_BANK7 ((read8_machine_func)STATIC_BANK7)
+#define MRA8_BANK8 ((read8_machine_func)STATIC_BANK8)
+#define MRA8_BANK9 ((read8_machine_func)STATIC_BANK9)
+#define MRA8_BANK10 ((read8_machine_func)STATIC_BANK10)
+#define MRA8_BANK11 ((read8_machine_func)STATIC_BANK11)
+#define MRA8_BANK12 ((read8_machine_func)STATIC_BANK12)
+#define MRA8_BANK13 ((read8_machine_func)STATIC_BANK13)
+#define MRA8_BANK14 ((read8_machine_func)STATIC_BANK14)
+#define MRA8_BANK15 ((read8_machine_func)STATIC_BANK15)
+#define MRA8_BANK16 ((read8_machine_func)STATIC_BANK16)
+#define MRA8_BANK17 ((read8_machine_func)STATIC_BANK17)
+#define MRA8_BANK18 ((read8_machine_func)STATIC_BANK18)
+#define MRA8_BANK19 ((read8_machine_func)STATIC_BANK19)
+#define MRA8_BANK20 ((read8_machine_func)STATIC_BANK20)
+#define MRA8_BANK21 ((read8_machine_func)STATIC_BANK21)
+#define MRA8_BANK22 ((read8_machine_func)STATIC_BANK22)
+#define MRA8_BANK23 ((read8_machine_func)STATIC_BANK23)
+#define MRA8_BANK24 ((read8_machine_func)STATIC_BANK24)
+#define MRA8_BANK25 ((read8_machine_func)STATIC_BANK25)
+#define MRA8_BANK26 ((read8_machine_func)STATIC_BANK26)
+#define MRA8_BANK27 ((read8_machine_func)STATIC_BANK27)
+#define MRA8_BANK28 ((read8_machine_func)STATIC_BANK28)
+#define MRA8_BANK29 ((read8_machine_func)STATIC_BANK29)
+#define MRA8_BANK30 ((read8_machine_func)STATIC_BANK30)
+#define MRA8_BANK31 ((read8_machine_func)STATIC_BANK31)
+#define MRA8_BANK32 ((read8_machine_func)STATIC_BANK32)
+#define MRA8_RAM ((read8_machine_func)STATIC_RAM)
+#define MRA8_ROM ((read8_machine_func)STATIC_ROM)
+#define MRA8_NOP ((read8_machine_func)STATIC_NOP)
+#define MRA8_UNMAP ((read8_machine_func)STATIC_UNMAP)
/* 8-bit writes */
-#define MWA8_BANK1 ((write8_handler)STATIC_BANK1)
-#define MWA8_BANK2 ((write8_handler)STATIC_BANK2)
-#define MWA8_BANK3 ((write8_handler)STATIC_BANK3)
-#define MWA8_BANK4 ((write8_handler)STATIC_BANK4)
-#define MWA8_BANK5 ((write8_handler)STATIC_BANK5)
-#define MWA8_BANK6 ((write8_handler)STATIC_BANK6)
-#define MWA8_BANK7 ((write8_handler)STATIC_BANK7)
-#define MWA8_BANK8 ((write8_handler)STATIC_BANK8)
-#define MWA8_BANK9 ((write8_handler)STATIC_BANK9)
-#define MWA8_BANK10 ((write8_handler)STATIC_BANK10)
-#define MWA8_BANK11 ((write8_handler)STATIC_BANK11)
-#define MWA8_BANK12 ((write8_handler)STATIC_BANK12)
-#define MWA8_BANK13 ((write8_handler)STATIC_BANK13)
-#define MWA8_BANK14 ((write8_handler)STATIC_BANK14)
-#define MWA8_BANK15 ((write8_handler)STATIC_BANK15)
-#define MWA8_BANK16 ((write8_handler)STATIC_BANK16)
-#define MWA8_BANK17 ((write8_handler)STATIC_BANK17)
-#define MWA8_BANK18 ((write8_handler)STATIC_BANK18)
-#define MWA8_BANK19 ((write8_handler)STATIC_BANK19)
-#define MWA8_BANK20 ((write8_handler)STATIC_BANK20)
-#define MWA8_BANK21 ((write8_handler)STATIC_BANK21)
-#define MWA8_BANK22 ((write8_handler)STATIC_BANK22)
-#define MWA8_BANK23 ((write8_handler)STATIC_BANK23)
-#define MWA8_BANK24 ((write8_handler)STATIC_BANK24)
-#define MWA8_BANK25 ((write8_handler)STATIC_BANK25)
-#define MWA8_BANK26 ((write8_handler)STATIC_BANK26)
-#define MWA8_BANK27 ((write8_handler)STATIC_BANK27)
-#define MWA8_BANK28 ((write8_handler)STATIC_BANK28)
-#define MWA8_BANK29 ((write8_handler)STATIC_BANK29)
-#define MWA8_BANK30 ((write8_handler)STATIC_BANK30)
-#define MWA8_BANK31 ((write8_handler)STATIC_BANK31)
-#define MWA8_BANK32 ((write8_handler)STATIC_BANK32)
-#define MWA8_RAM ((write8_handler)STATIC_RAM)
-#define MWA8_ROM ((write8_handler)STATIC_ROM)
-#define MWA8_NOP ((write8_handler)STATIC_NOP)
-#define MWA8_UNMAP ((write8_handler)STATIC_UNMAP)
+#define MWA8_BANK1 ((write8_machine_func)STATIC_BANK1)
+#define MWA8_BANK2 ((write8_machine_func)STATIC_BANK2)
+#define MWA8_BANK3 ((write8_machine_func)STATIC_BANK3)
+#define MWA8_BANK4 ((write8_machine_func)STATIC_BANK4)
+#define MWA8_BANK5 ((write8_machine_func)STATIC_BANK5)
+#define MWA8_BANK6 ((write8_machine_func)STATIC_BANK6)
+#define MWA8_BANK7 ((write8_machine_func)STATIC_BANK7)
+#define MWA8_BANK8 ((write8_machine_func)STATIC_BANK8)
+#define MWA8_BANK9 ((write8_machine_func)STATIC_BANK9)
+#define MWA8_BANK10 ((write8_machine_func)STATIC_BANK10)
+#define MWA8_BANK11 ((write8_machine_func)STATIC_BANK11)
+#define MWA8_BANK12 ((write8_machine_func)STATIC_BANK12)
+#define MWA8_BANK13 ((write8_machine_func)STATIC_BANK13)
+#define MWA8_BANK14 ((write8_machine_func)STATIC_BANK14)
+#define MWA8_BANK15 ((write8_machine_func)STATIC_BANK15)
+#define MWA8_BANK16 ((write8_machine_func)STATIC_BANK16)
+#define MWA8_BANK17 ((write8_machine_func)STATIC_BANK17)
+#define MWA8_BANK18 ((write8_machine_func)STATIC_BANK18)
+#define MWA8_BANK19 ((write8_machine_func)STATIC_BANK19)
+#define MWA8_BANK20 ((write8_machine_func)STATIC_BANK20)
+#define MWA8_BANK21 ((write8_machine_func)STATIC_BANK21)
+#define MWA8_BANK22 ((write8_machine_func)STATIC_BANK22)
+#define MWA8_BANK23 ((write8_machine_func)STATIC_BANK23)
+#define MWA8_BANK24 ((write8_machine_func)STATIC_BANK24)
+#define MWA8_BANK25 ((write8_machine_func)STATIC_BANK25)
+#define MWA8_BANK26 ((write8_machine_func)STATIC_BANK26)
+#define MWA8_BANK27 ((write8_machine_func)STATIC_BANK27)
+#define MWA8_BANK28 ((write8_machine_func)STATIC_BANK28)
+#define MWA8_BANK29 ((write8_machine_func)STATIC_BANK29)
+#define MWA8_BANK30 ((write8_machine_func)STATIC_BANK30)
+#define MWA8_BANK31 ((write8_machine_func)STATIC_BANK31)
+#define MWA8_BANK32 ((write8_machine_func)STATIC_BANK32)
+#define MWA8_RAM ((write8_machine_func)STATIC_RAM)
+#define MWA8_ROM ((write8_machine_func)STATIC_ROM)
+#define MWA8_NOP ((write8_machine_func)STATIC_NOP)
+#define MWA8_UNMAP ((write8_machine_func)STATIC_UNMAP)
/* 16-bit reads */
-#define MRA16_BANK1 ((read16_handler)STATIC_BANK1)
-#define MRA16_BANK2 ((read16_handler)STATIC_BANK2)
-#define MRA16_BANK3 ((read16_handler)STATIC_BANK3)
-#define MRA16_BANK4 ((read16_handler)STATIC_BANK4)
-#define MRA16_BANK5 ((read16_handler)STATIC_BANK5)
-#define MRA16_BANK6 ((read16_handler)STATIC_BANK6)
-#define MRA16_BANK7 ((read16_handler)STATIC_BANK7)
-#define MRA16_BANK8 ((read16_handler)STATIC_BANK8)
-#define MRA16_BANK9 ((read16_handler)STATIC_BANK9)
-#define MRA16_BANK10 ((read16_handler)STATIC_BANK10)
-#define MRA16_BANK11 ((read16_handler)STATIC_BANK11)
-#define MRA16_BANK12 ((read16_handler)STATIC_BANK12)
-#define MRA16_BANK13 ((read16_handler)STATIC_BANK13)
-#define MRA16_BANK14 ((read16_handler)STATIC_BANK14)
-#define MRA16_BANK15 ((read16_handler)STATIC_BANK15)
-#define MRA16_BANK16 ((read16_handler)STATIC_BANK16)
-#define MRA16_BANK17 ((read16_handler)STATIC_BANK17)
-#define MRA16_BANK18 ((read16_handler)STATIC_BANK18)
-#define MRA16_BANK19 ((read16_handler)STATIC_BANK19)
-#define MRA16_BANK20 ((read16_handler)STATIC_BANK20)
-#define MRA16_BANK21 ((read16_handler)STATIC_BANK21)
-#define MRA16_BANK22 ((read16_handler)STATIC_BANK22)
-#define MRA16_BANK23 ((read16_handler)STATIC_BANK23)
-#define MRA16_BANK24 ((read16_handler)STATIC_BANK24)
-#define MRA16_BANK25 ((read16_handler)STATIC_BANK25)
-#define MRA16_BANK26 ((read16_handler)STATIC_BANK26)
-#define MRA16_BANK27 ((read16_handler)STATIC_BANK27)
-#define MRA16_BANK28 ((read16_handler)STATIC_BANK28)
-#define MRA16_BANK29 ((read16_handler)STATIC_BANK29)
-#define MRA16_BANK30 ((read16_handler)STATIC_BANK30)
-#define MRA16_BANK31 ((read16_handler)STATIC_BANK31)
-#define MRA16_BANK32 ((read16_handler)STATIC_BANK32)
-#define MRA16_RAM ((read16_handler)STATIC_RAM)
-#define MRA16_ROM ((read16_handler)STATIC_ROM)
-#define MRA16_NOP ((read16_handler)STATIC_NOP)
-#define MRA16_UNMAP ((read16_handler)STATIC_UNMAP)
+#define MRA16_BANK1 ((read16_machine_func)STATIC_BANK1)
+#define MRA16_BANK2 ((read16_machine_func)STATIC_BANK2)
+#define MRA16_BANK3 ((read16_machine_func)STATIC_BANK3)
+#define MRA16_BANK4 ((read16_machine_func)STATIC_BANK4)
+#define MRA16_BANK5 ((read16_machine_func)STATIC_BANK5)
+#define MRA16_BANK6 ((read16_machine_func)STATIC_BANK6)
+#define MRA16_BANK7 ((read16_machine_func)STATIC_BANK7)
+#define MRA16_BANK8 ((read16_machine_func)STATIC_BANK8)
+#define MRA16_BANK9 ((read16_machine_func)STATIC_BANK9)
+#define MRA16_BANK10 ((read16_machine_func)STATIC_BANK10)
+#define MRA16_BANK11 ((read16_machine_func)STATIC_BANK11)
+#define MRA16_BANK12 ((read16_machine_func)STATIC_BANK12)
+#define MRA16_BANK13 ((read16_machine_func)STATIC_BANK13)
+#define MRA16_BANK14 ((read16_machine_func)STATIC_BANK14)
+#define MRA16_BANK15 ((read16_machine_func)STATIC_BANK15)
+#define MRA16_BANK16 ((read16_machine_func)STATIC_BANK16)
+#define MRA16_BANK17 ((read16_machine_func)STATIC_BANK17)
+#define MRA16_BANK18 ((read16_machine_func)STATIC_BANK18)
+#define MRA16_BANK19 ((read16_machine_func)STATIC_BANK19)
+#define MRA16_BANK20 ((read16_machine_func)STATIC_BANK20)
+#define MRA16_BANK21 ((read16_machine_func)STATIC_BANK21)
+#define MRA16_BANK22 ((read16_machine_func)STATIC_BANK22)
+#define MRA16_BANK23 ((read16_machine_func)STATIC_BANK23)
+#define MRA16_BANK24 ((read16_machine_func)STATIC_BANK24)
+#define MRA16_BANK25 ((read16_machine_func)STATIC_BANK25)
+#define MRA16_BANK26 ((read16_machine_func)STATIC_BANK26)
+#define MRA16_BANK27 ((read16_machine_func)STATIC_BANK27)
+#define MRA16_BANK28 ((read16_machine_func)STATIC_BANK28)
+#define MRA16_BANK29 ((read16_machine_func)STATIC_BANK29)
+#define MRA16_BANK30 ((read16_machine_func)STATIC_BANK30)
+#define MRA16_BANK31 ((read16_machine_func)STATIC_BANK31)
+#define MRA16_BANK32 ((read16_machine_func)STATIC_BANK32)
+#define MRA16_RAM ((read16_machine_func)STATIC_RAM)
+#define MRA16_ROM ((read16_machine_func)STATIC_ROM)
+#define MRA16_NOP ((read16_machine_func)STATIC_NOP)
+#define MRA16_UNMAP ((read16_machine_func)STATIC_UNMAP)
/* 16-bit writes */
-#define MWA16_BANK1 ((write16_handler)STATIC_BANK1)
-#define MWA16_BANK2 ((write16_handler)STATIC_BANK2)
-#define MWA16_BANK3 ((write16_handler)STATIC_BANK3)
-#define MWA16_BANK4 ((write16_handler)STATIC_BANK4)
-#define MWA16_BANK5 ((write16_handler)STATIC_BANK5)
-#define MWA16_BANK6 ((write16_handler)STATIC_BANK6)
-#define MWA16_BANK7 ((write16_handler)STATIC_BANK7)
-#define MWA16_BANK8 ((write16_handler)STATIC_BANK8)
-#define MWA16_BANK9 ((write16_handler)STATIC_BANK9)
-#define MWA16_BANK10 ((write16_handler)STATIC_BANK10)
-#define MWA16_BANK11 ((write16_handler)STATIC_BANK11)
-#define MWA16_BANK12 ((write16_handler)STATIC_BANK12)
-#define MWA16_BANK13 ((write16_handler)STATIC_BANK13)
-#define MWA16_BANK14 ((write16_handler)STATIC_BANK14)
-#define MWA16_BANK15 ((write16_handler)STATIC_BANK15)
-#define MWA16_BANK16 ((write16_handler)STATIC_BANK16)
-#define MWA16_BANK17 ((write16_handler)STATIC_BANK17)
-#define MWA16_BANK18 ((write16_handler)STATIC_BANK18)
-#define MWA16_BANK19 ((write16_handler)STATIC_BANK19)
-#define MWA16_BANK20 ((write16_handler)STATIC_BANK20)
-#define MWA16_BANK21 ((write16_handler)STATIC_BANK21)
-#define MWA16_BANK22 ((write16_handler)STATIC_BANK22)
-#define MWA16_BANK23 ((write16_handler)STATIC_BANK23)
-#define MWA16_BANK24 ((write16_handler)STATIC_BANK24)
-#define MWA16_BANK25 ((write16_handler)STATIC_BANK25)
-#define MWA16_BANK26 ((write16_handler)STATIC_BANK26)
-#define MWA16_BANK27 ((write16_handler)STATIC_BANK27)
-#define MWA16_BANK28 ((write16_handler)STATIC_BANK28)
-#define MWA16_BANK29 ((write16_handler)STATIC_BANK29)
-#define MWA16_BANK30 ((write16_handler)STATIC_BANK30)
-#define MWA16_BANK31 ((write16_handler)STATIC_BANK31)
-#define MWA16_BANK32 ((write16_handler)STATIC_BANK32)
-#define MWA16_RAM ((write16_handler)STATIC_RAM)
-#define MWA16_ROM ((write16_handler)STATIC_ROM)
-#define MWA16_NOP ((write16_handler)STATIC_NOP)
-#define MWA16_UNMAP ((write16_handler)STATIC_UNMAP)
+#define MWA16_BANK1 ((write16_machine_func)STATIC_BANK1)
+#define MWA16_BANK2 ((write16_machine_func)STATIC_BANK2)
+#define MWA16_BANK3 ((write16_machine_func)STATIC_BANK3)
+#define MWA16_BANK4 ((write16_machine_func)STATIC_BANK4)
+#define MWA16_BANK5 ((write16_machine_func)STATIC_BANK5)
+#define MWA16_BANK6 ((write16_machine_func)STATIC_BANK6)
+#define MWA16_BANK7 ((write16_machine_func)STATIC_BANK7)
+#define MWA16_BANK8 ((write16_machine_func)STATIC_BANK8)
+#define MWA16_BANK9 ((write16_machine_func)STATIC_BANK9)
+#define MWA16_BANK10 ((write16_machine_func)STATIC_BANK10)
+#define MWA16_BANK11 ((write16_machine_func)STATIC_BANK11)
+#define MWA16_BANK12 ((write16_machine_func)STATIC_BANK12)
+#define MWA16_BANK13 ((write16_machine_func)STATIC_BANK13)
+#define MWA16_BANK14 ((write16_machine_func)STATIC_BANK14)
+#define MWA16_BANK15 ((write16_machine_func)STATIC_BANK15)
+#define MWA16_BANK16 ((write16_machine_func)STATIC_BANK16)
+#define MWA16_BANK17 ((write16_machine_func)STATIC_BANK17)
+#define MWA16_BANK18 ((write16_machine_func)STATIC_BANK18)
+#define MWA16_BANK19 ((write16_machine_func)STATIC_BANK19)
+#define MWA16_BANK20 ((write16_machine_func)STATIC_BANK20)
+#define MWA16_BANK21 ((write16_machine_func)STATIC_BANK21)
+#define MWA16_BANK22 ((write16_machine_func)STATIC_BANK22)
+#define MWA16_BANK23 ((write16_machine_func)STATIC_BANK23)
+#define MWA16_BANK24 ((write16_machine_func)STATIC_BANK24)
+#define MWA16_BANK25 ((write16_machine_func)STATIC_BANK25)
+#define MWA16_BANK26 ((write16_machine_func)STATIC_BANK26)
+#define MWA16_BANK27 ((write16_machine_func)STATIC_BANK27)
+#define MWA16_BANK28 ((write16_machine_func)STATIC_BANK28)
+#define MWA16_BANK29 ((write16_machine_func)STATIC_BANK29)
+#define MWA16_BANK30 ((write16_machine_func)STATIC_BANK30)
+#define MWA16_BANK31 ((write16_machine_func)STATIC_BANK31)
+#define MWA16_BANK32 ((write16_machine_func)STATIC_BANK32)
+#define MWA16_RAM ((write16_machine_func)STATIC_RAM)
+#define MWA16_ROM ((write16_machine_func)STATIC_ROM)
+#define MWA16_NOP ((write16_machine_func)STATIC_NOP)
+#define MWA16_UNMAP ((write16_machine_func)STATIC_UNMAP)
/* 32-bit reads */
-#define MRA32_BANK1 ((read32_handler)STATIC_BANK1)
-#define MRA32_BANK2 ((read32_handler)STATIC_BANK2)
-#define MRA32_BANK3 ((read32_handler)STATIC_BANK3)
-#define MRA32_BANK4 ((read32_handler)STATIC_BANK4)
-#define MRA32_BANK5 ((read32_handler)STATIC_BANK5)
-#define MRA32_BANK6 ((read32_handler)STATIC_BANK6)
-#define MRA32_BANK7 ((read32_handler)STATIC_BANK7)
-#define MRA32_BANK8 ((read32_handler)STATIC_BANK8)
-#define MRA32_BANK9 ((read32_handler)STATIC_BANK9)
-#define MRA32_BANK10 ((read32_handler)STATIC_BANK10)
-#define MRA32_BANK11 ((read32_handler)STATIC_BANK11)
-#define MRA32_BANK12 ((read32_handler)STATIC_BANK12)
-#define MRA32_BANK13 ((read32_handler)STATIC_BANK13)
-#define MRA32_BANK14 ((read32_handler)STATIC_BANK14)
-#define MRA32_BANK15 ((read32_handler)STATIC_BANK15)
-#define MRA32_BANK16 ((read32_handler)STATIC_BANK16)
-#define MRA32_BANK17 ((read32_handler)STATIC_BANK17)
-#define MRA32_BANK18 ((read32_handler)STATIC_BANK18)
-#define MRA32_BANK19 ((read32_handler)STATIC_BANK19)
-#define MRA32_BANK20 ((read32_handler)STATIC_BANK20)
-#define MRA32_BANK21 ((read32_handler)STATIC_BANK21)
-#define MRA32_BANK22 ((read32_handler)STATIC_BANK22)
-#define MRA32_BANK23 ((read32_handler)STATIC_BANK23)
-#define MRA32_BANK24 ((read32_handler)STATIC_BANK24)
-#define MRA32_BANK25 ((read32_handler)STATIC_BANK25)
-#define MRA32_BANK26 ((read32_handler)STATIC_BANK26)
-#define MRA32_BANK27 ((read32_handler)STATIC_BANK27)
-#define MRA32_BANK28 ((read32_handler)STATIC_BANK28)
-#define MRA32_BANK29 ((read32_handler)STATIC_BANK29)
-#define MRA32_BANK30 ((read32_handler)STATIC_BANK30)
-#define MRA32_BANK31 ((read32_handler)STATIC_BANK31)
-#define MRA32_BANK32 ((read32_handler)STATIC_BANK32)
-#define MRA32_RAM ((read32_handler)STATIC_RAM)
-#define MRA32_ROM ((read32_handler)STATIC_ROM)
-#define MRA32_NOP ((read32_handler)STATIC_NOP)
-#define MRA32_UNMAP ((read32_handler)STATIC_UNMAP)
+#define MRA32_BANK1 ((read32_machine_func)STATIC_BANK1)
+#define MRA32_BANK2 ((read32_machine_func)STATIC_BANK2)
+#define MRA32_BANK3 ((read32_machine_func)STATIC_BANK3)
+#define MRA32_BANK4 ((read32_machine_func)STATIC_BANK4)
+#define MRA32_BANK5 ((read32_machine_func)STATIC_BANK5)
+#define MRA32_BANK6 ((read32_machine_func)STATIC_BANK6)
+#define MRA32_BANK7 ((read32_machine_func)STATIC_BANK7)
+#define MRA32_BANK8 ((read32_machine_func)STATIC_BANK8)
+#define MRA32_BANK9 ((read32_machine_func)STATIC_BANK9)
+#define MRA32_BANK10 ((read32_machine_func)STATIC_BANK10)
+#define MRA32_BANK11 ((read32_machine_func)STATIC_BANK11)
+#define MRA32_BANK12 ((read32_machine_func)STATIC_BANK12)
+#define MRA32_BANK13 ((read32_machine_func)STATIC_BANK13)
+#define MRA32_BANK14 ((read32_machine_func)STATIC_BANK14)
+#define MRA32_BANK15 ((read32_machine_func)STATIC_BANK15)
+#define MRA32_BANK16 ((read32_machine_func)STATIC_BANK16)
+#define MRA32_BANK17 ((read32_machine_func)STATIC_BANK17)
+#define MRA32_BANK18 ((read32_machine_func)STATIC_BANK18)
+#define MRA32_BANK19 ((read32_machine_func)STATIC_BANK19)
+#define MRA32_BANK20 ((read32_machine_func)STATIC_BANK20)
+#define MRA32_BANK21 ((read32_machine_func)STATIC_BANK21)
+#define MRA32_BANK22 ((read32_machine_func)STATIC_BANK22)
+#define MRA32_BANK23 ((read32_machine_func)STATIC_BANK23)
+#define MRA32_BANK24 ((read32_machine_func)STATIC_BANK24)
+#define MRA32_BANK25 ((read32_machine_func)STATIC_BANK25)
+#define MRA32_BANK26 ((read32_machine_func)STATIC_BANK26)
+#define MRA32_BANK27 ((read32_machine_func)STATIC_BANK27)
+#define MRA32_BANK28 ((read32_machine_func)STATIC_BANK28)
+#define MRA32_BANK29 ((read32_machine_func)STATIC_BANK29)
+#define MRA32_BANK30 ((read32_machine_func)STATIC_BANK30)
+#define MRA32_BANK31 ((read32_machine_func)STATIC_BANK31)
+#define MRA32_BANK32 ((read32_machine_func)STATIC_BANK32)
+#define MRA32_RAM ((read32_machine_func)STATIC_RAM)
+#define MRA32_ROM ((read32_machine_func)STATIC_ROM)
+#define MRA32_NOP ((read32_machine_func)STATIC_NOP)
+#define MRA32_UNMAP ((read32_machine_func)STATIC_UNMAP)
/* 32-bit writes */
-#define MWA32_BANK1 ((write32_handler)STATIC_BANK1)
-#define MWA32_BANK2 ((write32_handler)STATIC_BANK2)
-#define MWA32_BANK3 ((write32_handler)STATIC_BANK3)
-#define MWA32_BANK4 ((write32_handler)STATIC_BANK4)
-#define MWA32_BANK5 ((write32_handler)STATIC_BANK5)
-#define MWA32_BANK6 ((write32_handler)STATIC_BANK6)
-#define MWA32_BANK7 ((write32_handler)STATIC_BANK7)
-#define MWA32_BANK8 ((write32_handler)STATIC_BANK8)
-#define MWA32_BANK9 ((write32_handler)STATIC_BANK9)
-#define MWA32_BANK10 ((write32_handler)STATIC_BANK10)
-#define MWA32_BANK11 ((write32_handler)STATIC_BANK11)
-#define MWA32_BANK12 ((write32_handler)STATIC_BANK12)
-#define MWA32_BANK13 ((write32_handler)STATIC_BANK13)
-#define MWA32_BANK14 ((write32_handler)STATIC_BANK14)
-#define MWA32_BANK15 ((write32_handler)STATIC_BANK15)
-#define MWA32_BANK16 ((write32_handler)STATIC_BANK16)
-#define MWA32_BANK17 ((write32_handler)STATIC_BANK17)
-#define MWA32_BANK18 ((write32_handler)STATIC_BANK18)
-#define MWA32_BANK19 ((write32_handler)STATIC_BANK19)
-#define MWA32_BANK20 ((write32_handler)STATIC_BANK20)
-#define MWA32_BANK21 ((write32_handler)STATIC_BANK21)
-#define MWA32_BANK22 ((write32_handler)STATIC_BANK22)
-#define MWA32_BANK23 ((write32_handler)STATIC_BANK23)
-#define MWA32_BANK24 ((write32_handler)STATIC_BANK24)
-#define MWA32_BANK25 ((write32_handler)STATIC_BANK25)
-#define MWA32_BANK26 ((write32_handler)STATIC_BANK26)
-#define MWA32_BANK27 ((write32_handler)STATIC_BANK27)
-#define MWA32_BANK28 ((write32_handler)STATIC_BANK28)
-#define MWA32_BANK29 ((write32_handler)STATIC_BANK29)
-#define MWA32_BANK30 ((write32_handler)STATIC_BANK30)
-#define MWA32_BANK31 ((write32_handler)STATIC_BANK31)
-#define MWA32_BANK32 ((write32_handler)STATIC_BANK32)
-#define MWA32_RAM ((write32_handler)STATIC_RAM)
-#define MWA32_ROM ((write32_handler)STATIC_ROM)
-#define MWA32_NOP ((write32_handler)STATIC_NOP)
-#define MWA32_UNMAP ((write32_handler)STATIC_UNMAP)
+#define MWA32_BANK1 ((write32_machine_func)STATIC_BANK1)
+#define MWA32_BANK2 ((write32_machine_func)STATIC_BANK2)
+#define MWA32_BANK3 ((write32_machine_func)STATIC_BANK3)
+#define MWA32_BANK4 ((write32_machine_func)STATIC_BANK4)
+#define MWA32_BANK5 ((write32_machine_func)STATIC_BANK5)
+#define MWA32_BANK6 ((write32_machine_func)STATIC_BANK6)
+#define MWA32_BANK7 ((write32_machine_func)STATIC_BANK7)
+#define MWA32_BANK8 ((write32_machine_func)STATIC_BANK8)
+#define MWA32_BANK9 ((write32_machine_func)STATIC_BANK9)
+#define MWA32_BANK10 ((write32_machine_func)STATIC_BANK10)
+#define MWA32_BANK11 ((write32_machine_func)STATIC_BANK11)
+#define MWA32_BANK12 ((write32_machine_func)STATIC_BANK12)
+#define MWA32_BANK13 ((write32_machine_func)STATIC_BANK13)
+#define MWA32_BANK14 ((write32_machine_func)STATIC_BANK14)
+#define MWA32_BANK15 ((write32_machine_func)STATIC_BANK15)
+#define MWA32_BANK16 ((write32_machine_func)STATIC_BANK16)
+#define MWA32_BANK17 ((write32_machine_func)STATIC_BANK17)
+#define MWA32_BANK18 ((write32_machine_func)STATIC_BANK18)
+#define MWA32_BANK19 ((write32_machine_func)STATIC_BANK19)
+#define MWA32_BANK20 ((write32_machine_func)STATIC_BANK20)
+#define MWA32_BANK21 ((write32_machine_func)STATIC_BANK21)
+#define MWA32_BANK22 ((write32_machine_func)STATIC_BANK22)
+#define MWA32_BANK23 ((write32_machine_func)STATIC_BANK23)
+#define MWA32_BANK24 ((write32_machine_func)STATIC_BANK24)
+#define MWA32_BANK25 ((write32_machine_func)STATIC_BANK25)
+#define MWA32_BANK26 ((write32_machine_func)STATIC_BANK26)
+#define MWA32_BANK27 ((write32_machine_func)STATIC_BANK27)
+#define MWA32_BANK28 ((write32_machine_func)STATIC_BANK28)
+#define MWA32_BANK29 ((write32_machine_func)STATIC_BANK29)
+#define MWA32_BANK30 ((write32_machine_func)STATIC_BANK30)
+#define MWA32_BANK31 ((write32_machine_func)STATIC_BANK31)
+#define MWA32_BANK32 ((write32_machine_func)STATIC_BANK32)
+#define MWA32_RAM ((write32_machine_func)STATIC_RAM)
+#define MWA32_ROM ((write32_machine_func)STATIC_ROM)
+#define MWA32_NOP ((write32_machine_func)STATIC_NOP)
+#define MWA32_UNMAP ((write32_machine_func)STATIC_UNMAP)
/* 64-bit reads */
-#define MRA64_BANK1 ((read64_handler)STATIC_BANK1)
-#define MRA64_BANK2 ((read64_handler)STATIC_BANK2)
-#define MRA64_BANK3 ((read64_handler)STATIC_BANK3)
-#define MRA64_BANK4 ((read64_handler)STATIC_BANK4)
-#define MRA64_BANK5 ((read64_handler)STATIC_BANK5)
-#define MRA64_BANK6 ((read64_handler)STATIC_BANK6)
-#define MRA64_BANK7 ((read64_handler)STATIC_BANK7)
-#define MRA64_BANK8 ((read64_handler)STATIC_BANK8)
-#define MRA64_BANK9 ((read64_handler)STATIC_BANK9)
-#define MRA64_BANK10 ((read64_handler)STATIC_BANK10)
-#define MRA64_BANK11 ((read64_handler)STATIC_BANK11)
-#define MRA64_BANK12 ((read64_handler)STATIC_BANK12)
-#define MRA64_BANK13 ((read64_handler)STATIC_BANK13)
-#define MRA64_BANK14 ((read64_handler)STATIC_BANK14)
-#define MRA64_BANK15 ((read64_handler)STATIC_BANK15)
-#define MRA64_BANK16 ((read64_handler)STATIC_BANK16)
-#define MRA64_BANK17 ((read64_handler)STATIC_BANK17)
-#define MRA64_BANK18 ((read64_handler)STATIC_BANK18)
-#define MRA64_BANK19 ((read64_handler)STATIC_BANK19)
-#define MRA64_BANK20 ((read64_handler)STATIC_BANK20)
-#define MRA64_BANK21 ((read64_handler)STATIC_BANK21)
-#define MRA64_BANK22 ((read64_handler)STATIC_BANK22)
-#define MRA64_BANK23 ((read64_handler)STATIC_BANK23)
-#define MRA64_BANK24 ((read64_handler)STATIC_BANK24)
-#define MRA64_BANK25 ((read64_handler)STATIC_BANK25)
-#define MRA64_BANK26 ((read64_handler)STATIC_BANK26)
-#define MRA64_BANK27 ((read64_handler)STATIC_BANK27)
-#define MRA64_BANK28 ((read64_handler)STATIC_BANK28)
-#define MRA64_BANK29 ((read64_handler)STATIC_BANK29)
-#define MRA64_BANK30 ((read64_handler)STATIC_BANK30)
-#define MRA64_BANK31 ((read64_handler)STATIC_BANK31)
-#define MRA64_BANK32 ((read64_handler)STATIC_BANK32)
-#define MRA64_RAM ((read64_handler)STATIC_RAM)
-#define MRA64_ROM ((read64_handler)STATIC_ROM)
-#define MRA64_NOP ((read64_handler)STATIC_NOP)
-#define MRA64_UNMAP ((read64_handler)STATIC_UNMAP)
+#define MRA64_BANK1 ((read64_machine_func)STATIC_BANK1)
+#define MRA64_BANK2 ((read64_machine_func)STATIC_BANK2)
+#define MRA64_BANK3 ((read64_machine_func)STATIC_BANK3)
+#define MRA64_BANK4 ((read64_machine_func)STATIC_BANK4)
+#define MRA64_BANK5 ((read64_machine_func)STATIC_BANK5)
+#define MRA64_BANK6 ((read64_machine_func)STATIC_BANK6)
+#define MRA64_BANK7 ((read64_machine_func)STATIC_BANK7)
+#define MRA64_BANK8 ((read64_machine_func)STATIC_BANK8)
+#define MRA64_BANK9 ((read64_machine_func)STATIC_BANK9)
+#define MRA64_BANK10 ((read64_machine_func)STATIC_BANK10)
+#define MRA64_BANK11 ((read64_machine_func)STATIC_BANK11)
+#define MRA64_BANK12 ((read64_machine_func)STATIC_BANK12)
+#define MRA64_BANK13 ((read64_machine_func)STATIC_BANK13)
+#define MRA64_BANK14 ((read64_machine_func)STATIC_BANK14)
+#define MRA64_BANK15 ((read64_machine_func)STATIC_BANK15)
+#define MRA64_BANK16 ((read64_machine_func)STATIC_BANK16)
+#define MRA64_BANK17 ((read64_machine_func)STATIC_BANK17)
+#define MRA64_BANK18 ((read64_machine_func)STATIC_BANK18)
+#define MRA64_BANK19 ((read64_machine_func)STATIC_BANK19)
+#define MRA64_BANK20 ((read64_machine_func)STATIC_BANK20)
+#define MRA64_BANK21 ((read64_machine_func)STATIC_BANK21)
+#define MRA64_BANK22 ((read64_machine_func)STATIC_BANK22)
+#define MRA64_BANK23 ((read64_machine_func)STATIC_BANK23)
+#define MRA64_BANK24 ((read64_machine_func)STATIC_BANK24)
+#define MRA64_BANK25 ((read64_machine_func)STATIC_BANK25)
+#define MRA64_BANK26 ((read64_machine_func)STATIC_BANK26)
+#define MRA64_BANK27 ((read64_machine_func)STATIC_BANK27)
+#define MRA64_BANK28 ((read64_machine_func)STATIC_BANK28)
+#define MRA64_BANK29 ((read64_machine_func)STATIC_BANK29)
+#define MRA64_BANK30 ((read64_machine_func)STATIC_BANK30)
+#define MRA64_BANK31 ((read64_machine_func)STATIC_BANK31)
+#define MRA64_BANK32 ((read64_machine_func)STATIC_BANK32)
+#define MRA64_RAM ((read64_machine_func)STATIC_RAM)
+#define MRA64_ROM ((read64_machine_func)STATIC_ROM)
+#define MRA64_NOP ((read64_machine_func)STATIC_NOP)
+#define MRA64_UNMAP ((read64_machine_func)STATIC_UNMAP)
/* 64-bit writes */
-#define MWA64_BANK1 ((write64_handler)STATIC_BANK1)
-#define MWA64_BANK2 ((write64_handler)STATIC_BANK2)
-#define MWA64_BANK3 ((write64_handler)STATIC_BANK3)
-#define MWA64_BANK4 ((write64_handler)STATIC_BANK4)
-#define MWA64_BANK5 ((write64_handler)STATIC_BANK5)
-#define MWA64_BANK6 ((write64_handler)STATIC_BANK6)
-#define MWA64_BANK7 ((write64_handler)STATIC_BANK7)
-#define MWA64_BANK8 ((write64_handler)STATIC_BANK8)
-#define MWA64_BANK9 ((write64_handler)STATIC_BANK9)
-#define MWA64_BANK10 ((write64_handler)STATIC_BANK10)
-#define MWA64_BANK11 ((write64_handler)STATIC_BANK11)
-#define MWA64_BANK12 ((write64_handler)STATIC_BANK12)
-#define MWA64_BANK13 ((write64_handler)STATIC_BANK13)
-#define MWA64_BANK14 ((write64_handler)STATIC_BANK14)
-#define MWA64_BANK15 ((write64_handler)STATIC_BANK15)
-#define MWA64_BANK16 ((write64_handler)STATIC_BANK16)
-#define MWA64_BANK17 ((write64_handler)STATIC_BANK17)
-#define MWA64_BANK18 ((write64_handler)STATIC_BANK18)
-#define MWA64_BANK19 ((write64_handler)STATIC_BANK19)
-#define MWA64_BANK20 ((write64_handler)STATIC_BANK20)
-#define MWA64_BANK21 ((write64_handler)STATIC_BANK21)
-#define MWA64_BANK22 ((write64_handler)STATIC_BANK22)
-#define MWA64_BANK23 ((write64_handler)STATIC_BANK23)
-#define MWA64_BANK24 ((write64_handler)STATIC_BANK24)
-#define MWA64_BANK25 ((write64_handler)STATIC_BANK25)
-#define MWA64_BANK26 ((write64_handler)STATIC_BANK26)
-#define MWA64_BANK27 ((write64_handler)STATIC_BANK27)
-#define MWA64_BANK28 ((write64_handler)STATIC_BANK28)
-#define MWA64_BANK29 ((write64_handler)STATIC_BANK29)
-#define MWA64_BANK30 ((write64_handler)STATIC_BANK30)
-#define MWA64_BANK31 ((write64_handler)STATIC_BANK31)
-#define MWA64_BANK32 ((write64_handler)STATIC_BANK32)
-#define MWA64_RAM ((write64_handler)STATIC_RAM)
-#define MWA64_ROM ((write64_handler)STATIC_ROM)
-#define MWA64_NOP ((write64_handler)STATIC_NOP)
-#define MWA64_UNMAP ((write64_handler)STATIC_UNMAP)
+#define MWA64_BANK1 ((write64_machine_func)STATIC_BANK1)
+#define MWA64_BANK2 ((write64_machine_func)STATIC_BANK2)
+#define MWA64_BANK3 ((write64_machine_func)STATIC_BANK3)
+#define MWA64_BANK4 ((write64_machine_func)STATIC_BANK4)
+#define MWA64_BANK5 ((write64_machine_func)STATIC_BANK5)
+#define MWA64_BANK6 ((write64_machine_func)STATIC_BANK6)
+#define MWA64_BANK7 ((write64_machine_func)STATIC_BANK7)
+#define MWA64_BANK8 ((write64_machine_func)STATIC_BANK8)
+#define MWA64_BANK9 ((write64_machine_func)STATIC_BANK9)
+#define MWA64_BANK10 ((write64_machine_func)STATIC_BANK10)
+#define MWA64_BANK11 ((write64_machine_func)STATIC_BANK11)
+#define MWA64_BANK12 ((write64_machine_func)STATIC_BANK12)
+#define MWA64_BANK13 ((write64_machine_func)STATIC_BANK13)
+#define MWA64_BANK14 ((write64_machine_func)STATIC_BANK14)
+#define MWA64_BANK15 ((write64_machine_func)STATIC_BANK15)
+#define MWA64_BANK16 ((write64_machine_func)STATIC_BANK16)
+#define MWA64_BANK17 ((write64_machine_func)STATIC_BANK17)
+#define MWA64_BANK18 ((write64_machine_func)STATIC_BANK18)
+#define MWA64_BANK19 ((write64_machine_func)STATIC_BANK19)
+#define MWA64_BANK20 ((write64_machine_func)STATIC_BANK20)
+#define MWA64_BANK21 ((write64_machine_func)STATIC_BANK21)
+#define MWA64_BANK22 ((write64_machine_func)STATIC_BANK22)
+#define MWA64_BANK23 ((write64_machine_func)STATIC_BANK23)
+#define MWA64_BANK24 ((write64_machine_func)STATIC_BANK24)
+#define MWA64_BANK25 ((write64_machine_func)STATIC_BANK25)
+#define MWA64_BANK26 ((write64_machine_func)STATIC_BANK26)
+#define MWA64_BANK27 ((write64_machine_func)STATIC_BANK27)
+#define MWA64_BANK28 ((write64_machine_func)STATIC_BANK28)
+#define MWA64_BANK29 ((write64_machine_func)STATIC_BANK29)
+#define MWA64_BANK30 ((write64_machine_func)STATIC_BANK30)
+#define MWA64_BANK31 ((write64_machine_func)STATIC_BANK31)
+#define MWA64_BANK32 ((write64_machine_func)STATIC_BANK32)
+#define MWA64_RAM ((write64_machine_func)STATIC_RAM)
+#define MWA64_ROM ((write64_machine_func)STATIC_ROM)
+#define MWA64_NOP ((write64_machine_func)STATIC_NOP)
+#define MWA64_UNMAP ((write64_machine_func)STATIC_UNMAP)
@@ -524,22 +545,22 @@ typedef struct _handler_data handler_data;
typedef union _read_handlers read_handlers;
union _read_handlers
{
- genf * handler;
- read8_handler handler8;
- read16_handler handler16;
- read32_handler handler32;
- read64_handler handler64;
+ genf * handler;
+ read8_machine_func handler8;
+ read16_machine_func handler16;
+ read32_machine_func handler32;
+ read64_machine_func handler64;
};
/* ----- a union of all the different write handler types ----- */
typedef union _write_handlers write_handlers;
union _write_handlers
{
- genf * handler;
- write8_handler handler8;
- write16_handler handler16;
- write32_handler handler32;
- write64_handler handler64;
+ genf * handler;
+ write8_machine_func handler8;
+ write16_machine_func handler16;
+ write32_machine_func handler32;
+ write64_machine_func handler64;
};
/* ----- a generic address map type ----- */
@@ -552,8 +573,12 @@ struct _address_map
offs_t mask; /* mask bits */
read_handlers read; /* read handler callback */
const char * read_name; /* read handler callback name */
+ device_type read_devtype; /* read device type for device references */
+ const char * read_devtag; /* read tag for the relevant device */
write_handlers write; /* write handler callback */
const char * write_name; /* write handler callback name */
+ device_type write_devtype; /* read device type for device references */
+ const char * write_devtag; /* read tag for the relevant device */
void * memory; /* pointer to memory backing this entry */
UINT32 share; /* index of a shared memory block */
void ** base; /* receives pointer to memory (optional) */
@@ -593,9 +618,9 @@ address_map *construct_map_##_name(address_map *map) \
#define ADDRESS_MAP_START(_name,_space,_bits) \
address_map *construct_map_##_name(address_map *map) \
{ \
- extern read##_bits##_handler port_tag_to_handler##_bits(const char *); \
- typedef read##_bits##_handler _rh_t; \
- typedef write##_bits##_handler _wh_t; \
+ extern read##_bits##_machine_func port_tag_to_handler##_bits(const char *); \
+ typedef read##_bits##_machine_func _rh_t; \
+ typedef write##_bits##_machine_func _wh_t; \
_rh_t read; \
_wh_t write; \
_rh_t (*port_tag_to_handler)(const char *) = port_tag_to_handler##_bits; \
@@ -919,7 +944,7 @@ void memory_set_context(int activecpu);
const address_map *memory_get_map(int cpunum, int spacenum);
/* ----- opcode base control ---- */
-opbase_handler memory_set_opbase_handler(int cpunum, opbase_handler function);
+opbase_handler_func memory_set_opbase_handler(int cpunum, opbase_handler_func function);
void memory_set_opbase(offs_t offset);
/* ----- separate opcode/data encryption helper ---- */
@@ -944,31 +969,31 @@ int memory_get_log_unmap(int spacenum);
/* ----- dynamic address space mapping ----- */
void * _memory_install_read_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, FPTR handler, const char *handler_name);
-UINT8 * _memory_install_read8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_handler handler, const char *handler_name);
-UINT16 * _memory_install_read16_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_handler handler, const char *handler_name);
-UINT32 * _memory_install_read32_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_handler handler, const char *handler_name);
-UINT64 * _memory_install_read64_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_handler handler, const char *handler_name);
+UINT8 * _memory_install_read8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_machine_func handler, const char *handler_name);
+UINT16 * _memory_install_read16_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_machine_func handler, const char *handler_name);
+UINT32 * _memory_install_read32_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_machine_func handler, const char *handler_name);
+UINT64 * _memory_install_read64_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_machine_func handler, const char *handler_name);
void * _memory_install_write_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, FPTR handler, const char *handler_name);
-UINT8 * _memory_install_write8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write8_handler handler, const char *handler_name);
-UINT16 * _memory_install_write16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write16_handler handler, const char *handler_name);
-UINT32 * _memory_install_write32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write32_handler handler, const char *handler_name);
-UINT64 * _memory_install_write64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write64_handler handler, const char *handler_name);
+UINT8 * _memory_install_write8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write8_machine_func handler, const char *handler_name);
+UINT16 * _memory_install_write16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write16_machine_func handler, const char *handler_name);
+UINT32 * _memory_install_write32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write32_machine_func handler, const char *handler_name);
+UINT64 * _memory_install_write64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, write64_machine_func handler, const char *handler_name);
void * _memory_install_readwrite_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, FPTR rhandler, FPTR whandler, const char *rhandler_name, const char *whandler_name);
-UINT8 * _memory_install_readwrite8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_handler rhandler, write8_handler whandler, const char *rhandler_name, const char *whandler_name);
-UINT16 * _memory_install_readwrite16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_handler rhandler, write16_handler whandler, const char *rhandler_name, const char *whandler_name);
-UINT32 * _memory_install_readwrite32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_handler rhandler, write32_handler whandler, const char *rhandler_name, const char *whandler_name);
-UINT64 * _memory_install_readwrite64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_handler rhandler, write64_handler whandler, const char *rhandler_name, const char *whandler_name);
+UINT8 * _memory_install_readwrite8_handler (int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_machine_func rhandler, write8_machine_func whandler, const char *rhandler_name, const char *whandler_name);
+UINT16 * _memory_install_readwrite16_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_machine_func rhandler, write16_machine_func whandler, const char *rhandler_name, const char *whandler_name);
+UINT32 * _memory_install_readwrite32_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read32_machine_func rhandler, write32_machine_func whandler, const char *rhandler_name, const char *whandler_name);
+UINT64 * _memory_install_readwrite64_handler(int cpunum, int spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read64_machine_func rhandler, write64_machine_func whandler, const char *rhandler_name, const char *whandler_name);
void * _memory_install_read_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, FPTR handler, const char *handler_name);
-UINT8 * _memory_install_read8_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read8_handler handler, const char *handler_name);
-UINT16 * _memory_install_read16_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read16_handler handler, const char *handler_name);
-UINT32 * _memory_install_read32_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read32_handler handler, const char *handler_name);
-UINT64 * _memory_install_read64_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read64_handler handler, const char *handler_name);
+UINT8 * _memory_install_read8_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read8_machine_func handler, const char *handler_name);
+UINT16 * _memory_install_read16_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read16_machine_func handler, const char *handler_name);
+UINT32 * _memory_install_read32_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read32_machine_func handler, const char *handler_name);
+UINT64 * _memory_install_read64_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, read64_machine_func handler, const char *handler_name);
void * _memory_install_write_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, FPTR handler, const char *handler_name);
-UINT8 * _memory_install_write8_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write8_handler handler, const char *handler_name);
-UINT16 * _memory_install_write16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write16_handler handler, const char *handler_name);
-UINT32 * _memory_install_write32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write32_handler handler, const char *handler_name);
-UINT64 * _memory_install_write64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write64_handler handler, const char *handler_name);
+UINT8 * _memory_install_write8_matchmask_handler (int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write8_machine_func handler, const char *handler_name);
+UINT16 * _memory_install_write16_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write16_machine_func handler, const char *handler_name);
+UINT32 * _memory_install_write32_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write32_machine_func handler, const char *handler_name);
+UINT64 * _memory_install_write64_matchmask_handler(int cpunum, int spacenum, offs_t matchval, offs_t maskval, offs_t mask, offs_t mirror, write64_machine_func handler, const char *handler_name);
/* ----- memory debugging ----- */
void memory_dump(FILE *file);
diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index e37c6778530..491c3f160e1 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -135,69 +135,69 @@ WRITE8_HANDLER( YM2151_data_port_2_w )
WRITE8_HANDLER( YM2151_word_0_w )
{
if (offset)
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
else
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
}
WRITE8_HANDLER( YM2151_word_1_w )
{
if (offset)
- YM2151_data_port_1_w(0,data);
+ YM2151_data_port_1_w(machine,0,data);
else
- YM2151_register_port_1_w(0,data);
+ YM2151_register_port_1_w(machine,0,data);
}
READ16_HANDLER( YM2151_status_port_0_lsb_r )
{
- return YM2151_status_port_0_r(0);
+ return YM2151_status_port_0_r(machine,0);
}
READ16_HANDLER( YM2151_status_port_1_lsb_r )
{
- return YM2151_status_port_1_r(0);
+ return YM2151_status_port_1_r(machine,0);
}
READ16_HANDLER( YM2151_status_port_2_lsb_r )
{
- return YM2151_status_port_2_r(0);
+ return YM2151_status_port_2_r(machine,0);
}
WRITE16_HANDLER( YM2151_register_port_0_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_register_port_0_w(0, data & 0xff);
+ YM2151_register_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_1_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_register_port_1_w(0, data & 0xff);
+ YM2151_register_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_2_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_register_port_2_w(0, data & 0xff);
+ YM2151_register_port_2_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_0_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_data_port_0_w(0, data & 0xff);
+ YM2151_data_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_1_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_data_port_1_w(0, data & 0xff);
+ YM2151_data_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_2_lsb_w )
{
if (ACCESSING_LSB)
- YM2151_data_port_2_w(0, data & 0xff);
+ YM2151_data_port_2_w(machine, 0, data & 0xff);
}
diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h
index 17140c818d7..6312a296c48 100644
--- a/src/emu/sound/2151intf.h
+++ b/src/emu/sound/2151intf.h
@@ -4,7 +4,7 @@
struct YM2151interface
{
void (*irqhandler)(int irq);
- write8_handler portwritehandler;
+ write8_machine_func portwritehandler;
};
READ8_HANDLER( YM2151_status_port_0_r );
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index fd98c52bbb8..2fc007cd620 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -296,17 +296,17 @@ WRITE16_HANDLER( YM2203_write_port_4_lsb_w )
WRITE8_HANDLER( YM2203_word_0_w )
{
if (offset)
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
else
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
}
WRITE8_HANDLER( YM2203_word_1_w )
{
if (offset)
- YM2203_write_port_1_w(0,data);
+ YM2203_write_port_1_w(machine,0,data);
else
- YM2203_control_port_1_w(0,data);
+ YM2203_control_port_1_w(machine,0,data);
}
diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h
index 2de7e324011..6890451136a 100644
--- a/src/emu/sound/2203intf.h
+++ b/src/emu/sound/2203intf.h
@@ -5,10 +5,10 @@
struct YM2203interface
{
- read8_handler portAread;
- read8_handler portBread;
- write8_handler portAwrite;
- write8_handler portBwrite;
+ read8_machine_func portAread;
+ read8_machine_func portBread;
+ write8_machine_func portAwrite;
+ write8_machine_func portBwrite;
void (*handler)(int irq);
};
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index e862af4ee67..d3aea5c2ba3 100644
--- a/src/emu/sound/2413intf.c
+++ b/src/emu/sound/2413intf.c
@@ -139,16 +139,16 @@ WRITE8_HANDLER( YM2413_data_port_1_w ) { struct ym2413_info *info = sndti_token(
WRITE8_HANDLER( YM2413_data_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); YM2413Write (info->chip, 1, data); } /* 3rd chip */
WRITE8_HANDLER( YM2413_data_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); YM2413Write (info->chip, 1, data); } /* 4th chip */
-WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_0_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_register_port_0_w(offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_1_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_2_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_3_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_0_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_data_port_0_w(offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_1_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_2_w(offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_3_w(offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_register_port_3_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_MSB) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_LSB) YM2413_data_port_3_w(machine,offset,data & 0xff); }
/**************************************************************************
diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h
index c829f47998c..9a406c65cd9 100644
--- a/src/emu/sound/2608intf.h
+++ b/src/emu/sound/2608intf.h
@@ -5,10 +5,10 @@
struct YM2608interface
{
- read8_handler portAread;
- read8_handler portBread;
- write8_handler portAwrite;
- write8_handler portBwrite;
+ read8_machine_func portAread;
+ read8_machine_func portBread;
+ write8_machine_func portAwrite;
+ write8_machine_func portBwrite;
void ( *handler )( int irq ); /* IRQ handler for the YM2608 */
int pcmrom; /* Delta-T memory region ram/rom */
};
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index 1eb46246bd3..8e49a1b0967 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -17,6 +17,7 @@
*
******************************************************************************/
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "cpuintrf.h"
#include "3812intf.h"
@@ -403,7 +404,7 @@ static unsigned char Y8950PortHandler_r(void *param)
{
struct y8950_info *info = param;
if (info->intf->portread)
- return info->intf->portread(info->index);
+ return info->intf->portread(Machine,info->index);
return 0;
}
@@ -411,14 +412,14 @@ static void Y8950PortHandler_w(void *param,unsigned char data)
{
struct y8950_info *info = param;
if (info->intf->portwrite)
- info->intf->portwrite(info->index,data);
+ info->intf->portwrite(Machine,info->index,data);
}
static unsigned char Y8950KeyboardHandler_r(void *param)
{
struct y8950_info *info = param;
if (info->intf->keyboardread)
- return info->intf->keyboardread(info->index);
+ return info->intf->keyboardread(Machine,info->index);
return 0;
}
@@ -426,7 +427,7 @@ static void Y8950KeyboardHandler_w(void *param,unsigned char data)
{
struct y8950_info *info = param;
if (info->intf->keyboardwrite)
- info->intf->keyboardwrite(info->index,data);
+ info->intf->keyboardwrite(Machine,info->index,data);
}
static void y8950_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h
index f1692859ab3..5c7c337cff0 100644
--- a/src/emu/sound/3812intf.h
+++ b/src/emu/sound/3812intf.h
@@ -15,10 +15,10 @@ struct Y8950interface
int rom_region; /* delta-T ADPCM ROM/RAM region */
- read8_handler keyboardread;
- write8_handler keyboardwrite;
- read8_handler portread;
- write8_handler portwrite;
+ read8_machine_func keyboardread;
+ write8_machine_func keyboardwrite;
+ read8_machine_func portread;
+ write8_machine_func portwrite;
};
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index b71a4e6b85c..dd3e76d85a4 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -735,7 +735,7 @@ static void AICA_UpdateReg(struct _AICA *AICA, int reg)
break;
case 0x8:
case 0x9:
- AICA_MidiIn(0, AICA->udata.data[0x8/2]&0xff, 0);
+ AICA_MidiIn(Machine, 0, AICA->udata.data[0x8/2]&0xff, 0);
break;
case 0x12:
case 0x13:
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 39203cec47d..f81580018f1 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -11,6 +11,7 @@
***************************************************************************/
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "cpuintrf.h"
#include "ay8910.h"
@@ -26,10 +27,10 @@ struct AY8910
int streams;
int ready;
sound_stream *Channel;
- read8_handler PortAread;
- read8_handler PortBread;
- write8_handler PortAwrite;
- write8_handler PortBwrite;
+ read8_machine_func PortAread;
+ read8_machine_func PortBread;
+ write8_machine_func PortAwrite;
+ write8_machine_func PortBwrite;
INT32 register_latch;
UINT8 Regs[16];
INT32 lastEnable;
@@ -124,7 +125,7 @@ static void _AYWriteReg(struct AY8910 *PSG, int r, int v)
{
/* write out 0xff if port set to input */
if (PSG->PortAwrite)
- (*PSG->PortAwrite)(0, (PSG->Regs[AY_ENABLE] & 0x40) ? PSG->Regs[AY_PORTA] : 0xff);
+ (*PSG->PortAwrite)(Machine, 0, (PSG->Regs[AY_ENABLE] & 0x40) ? PSG->Regs[AY_PORTA] : 0xff);
}
if ((PSG->lastEnable == -1) ||
@@ -132,7 +133,7 @@ static void _AYWriteReg(struct AY8910 *PSG, int r, int v)
{
/* write out 0xff if port set to input */
if (PSG->PortBwrite)
- (*PSG->PortBwrite)(0, (PSG->Regs[AY_ENABLE] & 0x80) ? PSG->Regs[AY_PORTB] : 0xff);
+ (*PSG->PortBwrite)(Machine, 0, (PSG->Regs[AY_ENABLE] & 0x80) ? PSG->Regs[AY_PORTB] : 0xff);
}
PSG->lastEnable = PSG->Regs[AY_ENABLE];
@@ -212,7 +213,7 @@ static void _AYWriteReg(struct AY8910 *PSG, int r, int v)
if (PSG->Regs[AY_ENABLE] & 0x40)
{
if (PSG->PortAwrite)
- (*PSG->PortAwrite)(0, PSG->Regs[AY_PORTA]);
+ (*PSG->PortAwrite)(Machine, 0, PSG->Regs[AY_PORTA]);
else
logerror("warning - write %02x to 8910 #%d Port A\n",PSG->Regs[AY_PORTA],PSG->index);
}
@@ -225,7 +226,7 @@ static void _AYWriteReg(struct AY8910 *PSG, int r, int v)
if (PSG->Regs[AY_ENABLE] & 0x80)
{
if (PSG->PortBwrite)
- (*PSG->PortBwrite)(0, PSG->Regs[AY_PORTB]);
+ (*PSG->PortBwrite)(Machine, 0, PSG->Regs[AY_PORTB]);
else
logerror("warning - write %02x to 8910 #%d Port B\n",PSG->Regs[AY_PORTB],PSG->index);
}
@@ -613,8 +614,8 @@ static void build_mixer_table(struct AY8910 *PSG)
static void AY8910_init(struct AY8910 *PSG, int streams,
int clock,int sample_rate,
- read8_handler portAread,read8_handler portBread,
- write8_handler portAwrite,write8_handler portBwrite)
+ read8_machine_func portAread,read8_machine_func portBread,
+ write8_machine_func portAwrite,write8_machine_func portBwrite)
{
PSG->PortAread = portAread;
PSG->PortBread = portBread;
@@ -673,8 +674,8 @@ static void AY8910_statesave(struct AY8910 *PSG, int sndindex)
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, int streams,
- read8_handler portAread, read8_handler portBread,
- write8_handler portAwrite, write8_handler portBwrite)
+ read8_machine_func portAread, read8_machine_func portBread,
+ write8_machine_func portAwrite, write8_machine_func portBwrite)
{
struct AY8910 *info;
@@ -765,13 +766,13 @@ int ay8910_read_ym(void *chip)
even if the port is set as output, we still need to return the external
data. Some games, like kidniki, need this to work.
*/
- if (PSG->PortAread) PSG->Regs[AY_PORTA] = (*PSG->PortAread)(0);
+ if (PSG->PortAread) PSG->Regs[AY_PORTA] = (*PSG->PortAread)(Machine, 0);
else logerror("PC %04x: warning - read 8910 #%d Port A\n",activecpu_get_pc(),PSG->index);
break;
case AY_PORTB:
if ((PSG->Regs[AY_ENABLE] & 0x80) != 0)
logerror("warning: read from 8910 #%d Port B set as output\n",PSG->index);
- if (PSG->PortBread) PSG->Regs[AY_PORTB] = (*PSG->PortBread)(0);
+ if (PSG->PortBread) PSG->Regs[AY_PORTB] = (*PSG->PortBread)(Machine, 0);
else logerror("PC %04x: warning - read 8910 #%d Port B\n",activecpu_get_pc(),PSG->index);
break;
}
diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h
index e6b9fec4985..8bdc756829c 100644
--- a/src/emu/sound/ay8910.h
+++ b/src/emu/sound/ay8910.h
@@ -18,10 +18,10 @@ YMZ294: 0 I/O port
struct AY8910interface
{
- read8_handler portAread;
- read8_handler portBread;
- write8_handler portAwrite;
- write8_handler portBwrite;
+ read8_machine_func portAread;
+ read8_machine_func portBread;
+ write8_machine_func portAwrite;
+ write8_machine_func portBwrite;
};
void AY8910_set_volume(int chip,int channel,int volume);
@@ -78,8 +78,8 @@ WRITE16_HANDLER( AY8910_write_port_4_msb_w );
/*********** An interface for SSG of YM2203 ***********/
void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, int streams,
- read8_handler portAread, read8_handler portBread,
- write8_handler portAwrite, write8_handler portBwrite);
+ read8_machine_func portAread, read8_machine_func portBread,
+ write8_machine_func portAwrite, write8_machine_func portBwrite);
void ay8910_stop_ym(void *chip);
void ay8910_reset_ym(void *chip);
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index b180af85c67..d645ba8f429 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -35,6 +35,7 @@
#include <math.h>
#include "sndintrf.h"
+#include "deprecat.h"
#include "cpuintrf.h"
#include "es5503.h"
#include "streams.h"
@@ -69,7 +70,7 @@ typedef struct
void (*irq_callback)(int); // IRQ callback
- read8_handler adc_read; // callback for the 5503's built-in analog to digital converter
+ read8_machine_func adc_read; // callback for the 5503's built-in analog to digital converter
INT8 oscsenabled; // # of oscillators enabled
@@ -376,7 +377,7 @@ READ8_HANDLER(ES5503_reg_0_r)
case 0xe2: // A/D converter
if (chip->adc_read)
{
- return chip->adc_read(0);
+ return chip->adc_read(Machine, 0);
}
break;
}
diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h
index 262cc35200e..c8ce1866e5c 100644
--- a/src/emu/sound/es5503.h
+++ b/src/emu/sound/es5503.h
@@ -4,7 +4,7 @@
struct ES5503interface
{
void (*irq_callback)(int state);
- read8_handler adc_read;
+ read8_machine_func adc_read;
UINT8 *wave_memory;
};
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index bdb966abd57..fff2bbc8835 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -429,23 +429,23 @@ WRITE8_HANDLER( K053260_1_w )
WRITE16_HANDLER( K053260_0_lsb_w )
{
if (ACCESSING_LSB)
- K053260_0_w (offset, data & 0xff);
+ K053260_0_w (machine, offset, data & 0xff);
}
READ16_HANDLER( K053260_0_lsb_r )
{
- return K053260_0_r(offset);
+ return K053260_0_r(machine, offset);
}
WRITE16_HANDLER( K053260_1_lsb_w )
{
if (ACCESSING_LSB)
- K053260_1_w (offset, data & 0xff);
+ K053260_1_w (machine, offset, data & 0xff);
}
READ16_HANDLER( K053260_1_lsb_r )
{
- return K053260_1_r(offset);
+ return K053260_1_r(machine, offset);
}
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index 831ad810dc5..de56302d717 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -771,7 +771,7 @@ WRITE8_HANDLER( namcos1_cus30_w )
}
}
else if (offset < 0x140)
- namcos1_sound_w(offset - 0x100,data);
+ namcos1_sound_w(machine, offset - 0x100,data);
else
namco_wavedata[offset] = data;
}
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index c04bb203a51..42ec75e9c13 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -50,6 +50,7 @@
*****************************************************************************/
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "cpuintrf.h"
#include "pokey.h"
@@ -180,10 +181,10 @@ struct POKEYregisters
int timer_param[3]; /* computed parameters for these timers */
emu_timer *rtimer; /* timer for calculating the random offset */
emu_timer *ptimer[8]; /* pot timers */
- read8_handler pot_r[8];
- read8_handler allpot_r;
- read8_handler serin_r;
- write8_handler serout_w;
+ read8_machine_func pot_r[8];
+ read8_machine_func allpot_r;
+ read8_machine_func serin_r;
+ write8_machine_func serout_w;
void (*interrupt_cb)(int mask);
UINT8 AUDF[4]; /* AUDFx (D200, D202, D204, D206) */
UINT8 AUDC[4]; /* AUDCx (D201, D203, D205, D207) */
@@ -809,7 +810,7 @@ static void pokey_potgo(struct POKEYregisters *p)
p->POTx[pot] = 0xff;
if( p->pot_r[pot] )
{
- int r = (*p->pot_r[pot])(pot);
+ int r = (*p->pot_r[pot])(Machine, pot);
LOG(("POKEY #%d pot_r(%d) returned $%02x\n", p->index, pot, r));
if( r != -1 )
@@ -878,7 +879,7 @@ static int pokey_register_r(int chip, int offs)
}
else if( p->allpot_r )
{
- data = (*p->allpot_r)(offs);
+ data = (*p->allpot_r)(Machine, offs);
LOG(("POKEY #%d ALLPOT callback $%02x\n", chip, data));
}
else
@@ -931,7 +932,7 @@ static int pokey_register_r(int chip, int offs)
case SERIN_C:
if( p->serin_r )
- p->SERIN = (*p->serin_r)(offs);
+ p->SERIN = (*p->serin_r)(Machine, offs);
data = p->SERIN;
LOG(("POKEY #%d SERIN $%02x\n", chip, data));
break;
@@ -1178,7 +1179,7 @@ static void pokey_register_w(int chip, int offs, int data)
case SEROUT_C:
LOG(("POKEY #%d SEROUT $%02x\n", chip, data));
if (p->serout_w)
- (*p->serout_w)(offs, data);
+ (*p->serout_w)(Machine, offs, data);
p->SKSTAT |= SK_SEROUT;
/*
* These are arbitrary values, tested with some custom boot
diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h
index 222e7ac07ba..dae733274b4 100644
--- a/src/emu/sound/pokey.h
+++ b/src/emu/sound/pokey.h
@@ -67,10 +67,10 @@
*****************************************************************************/
struct POKEYinterface {
- read8_handler pot_r[8];
- read8_handler allpot_r;
- read8_handler serin_r;
- write8_handler serout_w;
+ read8_machine_func pot_r[8];
+ read8_machine_func allpot_r;
+ read8_machine_func serin_r;
+ write8_machine_func serout_w;
void (*interrupt_cb)(int mask);
};
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 78f99061ef3..6edc98a8fa5 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -712,7 +712,7 @@ static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
break;
case 0x6:
case 0x7:
- SCSP_MidiIn(0, SCSP->udata.data[0x6/2]&0xff, 0);
+ SCSP_MidiIn(Machine, 0, SCSP->udata.data[0x6/2]&0xff, 0);
break;
case 0x12:
case 0x13:
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index e88afa2823e..7a5db020111 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -1300,7 +1300,7 @@ WRITE16_HANDLER( spb640_w )
if( offset == 0 )
{
- sp0256_ALD_w( 0, data & 0xff );
+ sp0256_ALD_w( machine, 0, data & 0xff );
return;
}
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 7f01bb60d1f..43e7afb0385 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -270,7 +270,7 @@ READ16_HANDLER( seta_sound_word_r )
UINT16 ret;
ret = info->HI_WORD_BUF[offset]<<8;
- ret += (seta_sound_r( offset )&0xff);
+ ret += (seta_sound_r( machine, offset )&0xff);
LOG_REGISTER_READ(( "Read X1-010 PC:%06X Offset:%04X Data:%04X\n", activecpu_get_pc(), offset, ret ));
return ret;
}
@@ -279,7 +279,7 @@ WRITE16_HANDLER( seta_sound_word_w )
{
struct x1_010_info *info = sndti_token(SOUND_X1_010, 0);
info->HI_WORD_BUF[offset] = (data>>8)&0xff;
- seta_sound_w( offset, data&0xff );
+ seta_sound_w( machine, offset, data&0xff );
LOG_REGISTER_WRITE(( "Write X1-010 PC:%06X Offset:%04X Data:%04X\n", activecpu_get_pc(), offset, data ));
}
diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c
index b660e7e8dff..19418a9d28a 100644
--- a/src/emu/sound/ym2151.c
+++ b/src/emu/sound/ym2151.c
@@ -7,6 +7,7 @@
#include <math.h>
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "ym2151.h"
@@ -165,7 +166,7 @@ typedef struct
UINT32 noise_tab[32]; /* 17bit Noise Generator periods */
void (*irqhandler)(int irq); /* IRQ function handler */
- write8_handler porthandler; /* port write function handler */
+ write8_machine_func porthandler; /* port write function handler */
unsigned int clock; /* chip clock in Hz (passed from 2151intf.c) */
unsigned int sampfreq; /* sampling frequency in Hz (passed from 2151intf.c) */
@@ -1195,7 +1196,7 @@ void YM2151WriteReg(void *_chip, int r, int v)
case 0x1b: /* CT2, CT1, LFO waveform */
chip->ct = v >> 6;
chip->lfo_wsel = v & 3;
- if (chip->porthandler) (*chip->porthandler)(0 , chip->ct );
+ if (chip->porthandler) (*chip->porthandler)(Machine, 0 , chip->ct );
break;
default:
@@ -2497,7 +2498,7 @@ void YM2151SetIrqHandler(void *chip, void(*handler)(int irq))
PSG->irqhandler = handler;
}
-void YM2151SetPortWriteHandler(void *chip, write8_handler handler)
+void YM2151SetPortWriteHandler(void *chip, write8_machine_func handler)
{
YM2151 *PSG = chip;
PSG->porthandler = handler;
diff --git a/src/emu/sound/ym2151.h b/src/emu/sound/ym2151.h
index a3dd23b6a0e..c74149a9968 100644
--- a/src/emu/sound/ym2151.h
+++ b/src/emu/sound/ym2151.h
@@ -79,7 +79,7 @@ int YM2151ReadStatus(void *chip);
void YM2151SetIrqHandler(void *chip, void (*handler)(int irq));
/* set port write handler on YM2151 chip number 'n'*/
-void YM2151SetPortWriteHandler(void *chip, write8_handler handler);
+void YM2151SetPortWriteHandler(void *chip, write8_machine_func handler);
/* refresh chip when load state */
void YM2151Postload(void *chip);
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index bbb2b04b8c6..87a3d2ff23a 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -14,6 +14,7 @@
#include <math.h>
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "ymf271.h"
@@ -107,8 +108,8 @@ typedef struct
UINT8 ext_read;
const UINT8 *rom;
- read8_handler ext_mem_read;
- write8_handler ext_mem_write;
+ read8_machine_func ext_mem_read;
+ write8_machine_func ext_mem_write;
void (*irq_callback)(int);
int index;
@@ -1375,7 +1376,7 @@ static TIMER_CALLBACK( ymf271_timer_b_tick )
static UINT8 ymf271_read_ext_memory(YMF271Chip *chip, UINT32 address)
{
if( chip->ext_mem_read ) {
- return chip->ext_mem_read(address);
+ return chip->ext_mem_read(Machine,address);
} else {
if( address < 0x800000)
return chip->rom[address];
@@ -1386,7 +1387,7 @@ static UINT8 ymf271_read_ext_memory(YMF271Chip *chip, UINT32 address)
static void ymf271_write_ext_memory(YMF271Chip *chip, UINT32 address, UINT8 data)
{
if( chip->ext_mem_write ) {
- chip->ext_mem_write(address, data);
+ chip->ext_mem_write(Machine, address, data);
}
}
@@ -1725,7 +1726,7 @@ static void init_state(YMF271Chip *chip)
state_save_register_item("ymf271", chip->index, chip->ext_read);
}
-static void ymf271_init(YMF271Chip *chip, UINT8 *rom, void (*cb)(int), read8_handler ext_read, write8_handler ext_write)
+static void ymf271_init(YMF271Chip *chip, UINT8 *rom, void (*cb)(int), read8_machine_func ext_read, write8_machine_func ext_write)
{
chip->timA = timer_alloc(ymf271_timer_a_tick, chip);
chip->timB = timer_alloc(ymf271_timer_b_tick, chip);
diff --git a/src/emu/sound/ymf271.h b/src/emu/sound/ymf271.h
index c9375573dc6..9811fdc126a 100644
--- a/src/emu/sound/ymf271.h
+++ b/src/emu/sound/ymf271.h
@@ -4,8 +4,8 @@
struct YMF271interface
{
int region; /* memory region of sample ROMs */
- read8_handler ext_read; /* external memory read */
- write8_handler ext_write; /* external memory write */
+ read8_machine_func ext_read; /* external memory read */
+ write8_machine_func ext_write; /* external memory write */
void (*irq_callback)(int state); /* irq callback */
};
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 9b16725d7ad..48a4f7c9b78 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -24,6 +24,7 @@
#include <math.h>
#include "sndintrf.h"
+#include "deprecat.h"
#include "streams.h"
#include "ymz280b.h"
@@ -91,8 +92,8 @@ struct YMZ280BChip
void (*irq_callback)(int); /* IRQ callback */
struct YMZ280BVoice voice[8]; /* the 8 voices */
UINT32 rom_readback_addr; /* where the CPU can read the ROM */
- read8_handler ext_ram_read; /* external RAM read handler */
- write8_handler ext_ram_write; /* external RAM write handler */
+ read8_machine_func ext_ram_read; /* external RAM read handler */
+ write8_machine_func ext_ram_write; /* external RAM write handler */
#if MAKE_WAVS
void * wavresample; /* resampled waveform */
@@ -864,7 +865,7 @@ static void write_to_register(struct YMZ280BChip *chip, int data)
case 0x87: /* RAM write */
if (chip->ext_ram_write)
- chip->ext_ram_write(chip->rom_readback_addr, data);
+ chip->ext_ram_write(Machine, chip->rom_readback_addr, data);
else
logerror("YMZ280B attempted RAM write to %X\n", chip->rom_readback_addr);
break;
@@ -1074,7 +1075,7 @@ READ8_HANDLER( YMZ280B_data_0_r )
{
UINT8 data;
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
- data = chip->ext_ram_read(chip->rom_readback_addr - 1);
+ data = chip->ext_ram_read(machine, chip->rom_readback_addr - 1);
chip->rom_readback_addr++;
return data;
}
@@ -1083,7 +1084,7 @@ READ8_HANDLER( YMZ280B_data_1_r )
{
UINT8 data;
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
- data = chip->ext_ram_read(chip->rom_readback_addr - 1);
+ data = chip->ext_ram_read(machine, chip->rom_readback_addr - 1);
chip->rom_readback_addr++;
return data;
}
diff --git a/src/emu/sound/ymz280b.h b/src/emu/sound/ymz280b.h
index b32a908cad0..18f6fe1fc04 100644
--- a/src/emu/sound/ymz280b.h
+++ b/src/emu/sound/ymz280b.h
@@ -12,8 +12,8 @@ struct YMZ280Binterface
{
int region; /* memory region where the sample ROM lives */
void (*irq_callback)(int state); /* irq callback */
- read8_handler ext_read; /* external RAM read */
- write8_handler ext_write; /* external RAM write */
+ read8_machine_func ext_read; /* external RAM read */
+ write8_machine_func ext_write; /* external RAM write */
};
READ8_HANDLER ( YMZ280B_status_0_r );
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index 6b5e52807fe..68f236c4bf4 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -244,23 +244,23 @@ WRITE8_HANDLER( tlc34076_w )
READ16_HANDLER( tlc34076_lsb_r )
{
- return tlc34076_r(offset);
+ return tlc34076_r(machine, offset);
}
WRITE16_HANDLER( tlc34076_lsb_w )
{
if (ACCESSING_LSB)
- tlc34076_w(offset, data);
+ tlc34076_w(machine, offset, data);
}
READ16_HANDLER( tlc34076_msb_r )
{
- return tlc34076_r(offset) << 8;
+ return tlc34076_r(machine, offset) << 8;
}
WRITE16_HANDLER( tlc34076_msb_w )
{
if (ACCESSING_MSB)
- tlc34076_w(offset, data >> 8);
+ tlc34076_w(machine, offset, data >> 8);
}
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index 8bc299474aa..6f188b2a553 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -395,7 +395,7 @@ static READ8_HANDLER( xypixel_r )
*
*************************************/
-void tms34061_w(int col, int row, int func, UINT8 data)
+void tms34061_w(running_machine *machine, int col, int row, int func, UINT8 data)
{
offs_t offs;
@@ -405,12 +405,12 @@ void tms34061_w(int col, int row, int func, UINT8 data)
/* both 0 and 2 map to register access */
case 0:
case 2:
- register_w(col, data);
+ register_w(machine, col, data);
break;
/* function 1 maps to XY access; col is the address adjustment */
case 1:
- xypixel_w(col, data);
+ xypixel_w(machine, col, data);
break;
/* function 3 maps to direct access */
@@ -454,7 +454,7 @@ void tms34061_w(int col, int row, int func, UINT8 data)
}
-UINT8 tms34061_r(int col, int row, int func)
+UINT8 tms34061_r(running_machine *machine, int col, int row, int func)
{
int result = 0;
offs_t offs;
@@ -465,12 +465,12 @@ UINT8 tms34061_r(int col, int row, int func)
/* both 0 and 2 map to register access */
case 0:
case 2:
- result = register_r(col);
+ result = register_r(machine, col);
break;
/* function 1 maps to XY access; col is the address adjustment */
case 1:
- result = xypixel_r(col);
+ result = xypixel_r(machine, col);
break;
/* funtion 3 maps to direct access */
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index d20f3ce26e5..df4bf418905 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -59,8 +59,8 @@ struct tms34061_display
void tms34061_start(running_machine *machine, const struct tms34061_interface *interface);
/* reads/writes to the 34061 */
-UINT8 tms34061_r(int col, int row, int func);
-void tms34061_w(int col, int row, int func, UINT8 data);
+UINT8 tms34061_r(running_machine *machine, int col, int row, int func);
+void tms34061_w(running_machine *machine, int col, int row, int func, UINT8 data);
/* latch settings */
READ8_HANDLER( tms34061_latch_r );
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index 9fb143ddbd3..6a73c613e8f 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -292,7 +292,7 @@ WRITE8_HANDLER (TMS9928A_register_w) {
tms.Addr = ((UINT16)data << 8 | tms.FirstByte) & (tms.vramsize - 1);
if ( !(data & 0x40) ) {
/* read ahead */
- TMS9928A_vram_r (0);
+ TMS9928A_vram_r (machine,0);
}
}
tms.latch = 0;
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index ea97917f81e..76e1524cd63 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -386,7 +386,7 @@ WRITE8_HANDLER (v9938_command_w)
{
vdp.address_latch =
(((UINT16)data << 8) | vdp.cmd_write) & 0x3fff;
- if ( !(data & 0x40) ) v9938_vram_r (0); /* read ahead! */
+ if ( !(data & 0x40) ) v9938_vram_r (machine,0); /* read ahead! */
}
vdp.cmd_write_first = 0;
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index d534a5263f3..bdcad86fff7 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -160,7 +160,7 @@ WRITE8_HANDLER( lrescue_sh_port_2_w )
WRITE8_HANDLER( cosmo_sh_port_2_w )
{
/* inverted flip screen bit */
- invadpt2_sh_port_2_w(offset, data ^ 0x20);
+ invadpt2_sh_port_2_w(machine, offset, data ^ 0x20);
}
@@ -277,7 +277,7 @@ WRITE8_HANDLER( indianbt_sh_port_2_w )
WRITE8_HANDLER( indianbt_sh_port_3_w )
{
- discrete_sound_w(INDIANBT_MUSIC_DATA, data);
+ discrete_sound_w(machine, INDIANBT_MUSIC_DATA, data);
}
@@ -595,46 +595,47 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( polaris_sh_port_1_w )
{
- discrete_sound_w(POLARIS_MUSIC_DATA, data);
+ discrete_sound_w(machine, POLARIS_MUSIC_DATA, data);
}
WRITE8_HANDLER( polaris_sh_port_2_w )
{
/* 0x01 - SX0 - Shot */
- discrete_sound_w(POLARIS_SX0_EN, data & 0x01);
+ discrete_sound_w(machine, POLARIS_SX0_EN, data & 0x01);
/* 0x02 - SX1 - Ship Hit (Sub) */
- discrete_sound_w(POLARIS_SX1_EN, data & 0x02);
+ discrete_sound_w(machine, POLARIS_SX1_EN, data & 0x02);
/* 0x04 - SX2 - Ship */
- discrete_sound_w(POLARIS_SX2_EN, data & 0x04);
+ discrete_sound_w(machine, POLARIS_SX2_EN, data & 0x04);
/* 0x08 - SX3 - Explosion */
- discrete_sound_w(POLARIS_SX3_EN, data & 0x08);
+ discrete_sound_w(machine, POLARIS_SX3_EN, data & 0x08);
/* 0x10 - SX4 */
/* 0x20 - SX5 - Sound Enable */
- discrete_sound_w(POLARIS_SX5_EN, data & 0x20);
+ discrete_sound_w(machine, POLARIS_SX5_EN, data & 0x20);
}
WRITE8_HANDLER( polaris_sh_port_3_w )
{
+
coin_lockout_global_w(data & 0x04); /* SX8 */
c8080bw_flip_screen_w(data & 0x20); /* SX11 */
/* 0x01 - SX6 - Plane Down */
- discrete_sound_w(POLARIS_SX6_EN, data & 0x01);
+ discrete_sound_w(machine, POLARIS_SX6_EN, data & 0x01);
/* 0x02 - SX7 - Plane Up */
- discrete_sound_w(POLARIS_SX7_EN, data & 0x02);
+ discrete_sound_w(machine, POLARIS_SX7_EN, data & 0x02);
/* 0x08 - SX9 - Hit */
- discrete_sound_w(POLARIS_SX9_EN, data & 0x08);
+ discrete_sound_w(machine, POLARIS_SX9_EN, data & 0x08);
/* 0x10 - SX10 - Hit */
- discrete_sound_w(POLARIS_SX10_EN, data & 0x10);
+ discrete_sound_w(machine, POLARIS_SX10_EN, data & 0x10);
}
@@ -783,8 +784,8 @@ WRITE8_HANDLER( schaser_sh_port_1_w )
bit 4 - Effect Sound C (SX4)
bit 5 - Explosion (SX5) */
- discrete_sound_w(SCHASER_DOT_EN, data & 0x01);
- discrete_sound_w(SCHASER_DOT_SEL, data & 0x02);
+ discrete_sound_w(machine, SCHASER_DOT_EN, data & 0x01);
+ discrete_sound_w(machine, SCHASER_DOT_SEL, data & 0x02);
/* The effect is a variable rate 555 timer. A diode/resistor array is used to
* select the frequency. Because of the diode voltage drop, we can not use the
@@ -844,9 +845,9 @@ WRITE8_HANDLER( schaser_sh_port_2_w )
bit 4 - Field Control B (SX10)
bit 5 - Flip Screen */
- discrete_sound_w(SCHASER_MUSIC_BIT, data & 0x01);
+ discrete_sound_w(machine, SCHASER_MUSIC_BIT, data & 0x01);
- discrete_sound_w(SCHASER_SND_EN, data & 0x02);
+ discrete_sound_w(machine, SCHASER_SND_EN, data & 0x02);
sound_global_enable(data & 0x02);
coin_lockout_global_w(data & 0x04);
@@ -892,8 +893,8 @@ MACHINE_RESET( schaser )
{
schaser_effect_555_is_low = 0;
timer_adjust_oneshot(schaser_effect_555_timer, attotime_never, 0);
- schaser_sh_port_1_w(0, 0);
- schaser_sh_port_2_w(0, 0);
+ schaser_sh_port_1_w(machine, 0, 0);
+ schaser_sh_port_2_w(machine, 0, 0);
schaser_effect_555_time_remain = attotime_zero;
MACHINE_RESET_CALL(mw8080bw);
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index daf155fd3a6..40d9b08c190 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -83,7 +83,7 @@ static amiga_audio *audio_state;
static TIMER_CALLBACK( signal_irq )
{
- amiga_custom_w(REG_INTREQ, 0x8000 | (0x80 << param), 0);
+ amiga_custom_w(machine, REG_INTREQ, 0x8000 | (0x80 << param), 0);
}
diff --git a/src/mame/audio/asteroid.c b/src/mame/audio/asteroid.c
index 1497e888d9e..9192c527777 100644
--- a/src/mame/audio/asteroid.c
+++ b/src/mame/audio/asteroid.c
@@ -280,7 +280,7 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( asteroid_explode_w )
{
- discrete_sound_w(ASTEROID_EXPLODE_DATA,(data&0x3c)>>2); // Volume
+ discrete_sound_w(machine,ASTEROID_EXPLODE_DATA,(data&0x3c)>>2); // Volume
/* We will modify the pitch data to send the divider value. */
switch ((data&0xc0))
{
@@ -297,27 +297,27 @@ WRITE8_HANDLER( asteroid_explode_w )
data = 5;
break;
}
- discrete_sound_w(ASTEROID_EXPLODE_PITCH, data);
+ discrete_sound_w(machine,ASTEROID_EXPLODE_PITCH, data);
}
WRITE8_HANDLER( asteroid_thump_w )
{
- discrete_sound_w(ASTEROID_THUMP_EN, data & 0x10);
- discrete_sound_w(ASTEROID_THUMP_DATA, data & 0x0f);
+ discrete_sound_w(machine, ASTEROID_THUMP_EN, data & 0x10);
+ discrete_sound_w(machine, ASTEROID_THUMP_DATA, data & 0x0f);
}
WRITE8_HANDLER( asteroid_sounds_w )
{
- discrete_sound_w(ASTEROID_SAUCER_SND_EN + offset, data & 0x80);
+ discrete_sound_w(machine, ASTEROID_SAUCER_SND_EN + offset, data & 0x80);
}
WRITE8_HANDLER( astdelux_sounds_w )
{
/* Only ever activates the thrusters in Astdelux */
- discrete_sound_w(ASTEROID_THRUST_EN, data & 0x80);
+ discrete_sound_w(machine, ASTEROID_THRUST_EN, data & 0x80);
}
WRITE8_HANDLER( asteroid_noise_reset_w )
{
- discrete_sound_w(ASTEROID_NOISE_RESET, 0);
+ discrete_sound_w(machine, ASTEROID_NOISE_RESET, 0);
}
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 292eda85ae8..19cdbba3ffb 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -208,7 +208,7 @@ static READ8_HANDLER( jsa1_io_r )
break;
case 0x002: /* /RDP */
- result = atarigen_6502_sound_r(offset);
+ result = atarigen_6502_sound_r(machine, offset);
break;
case 0x004: /* /RDIO */
@@ -230,7 +230,7 @@ static READ8_HANDLER( jsa1_io_r )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /VOICE */
@@ -256,7 +256,7 @@ static WRITE8_HANDLER( jsa1_io_w )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /VOICE */
@@ -264,7 +264,7 @@ static WRITE8_HANDLER( jsa1_io_w )
break;
case 0x202: /* /WRP */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
break;
case 0x204: /* WRIO */
@@ -284,7 +284,7 @@ static WRITE8_HANDLER( jsa1_io_w )
int count;
if (((data ^ last_ctl) & 0x02) && (data & 0x02))
- tms5220_data_w(0, speech_data);
+ tms5220_data_w(machine, 0, speech_data);
count = 5 | ((data >> 2) & 2);
tms5220_set_frequency(JSA_MASTER_CLOCK*2 / (16 - count));
}
@@ -308,7 +308,7 @@ static WRITE8_HANDLER( jsa1_io_w )
tms5220_volume = ((data >> 6) & 3) * 100 / 3;
pokey_volume = ((data >> 4) & 3) * 100 / 3;
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
}
}
@@ -329,13 +329,13 @@ static READ8_HANDLER( jsa2_io_r )
{
case 0x000: /* /RDV */
if (has_oki6295)
- result = OKIM6295_status_0_r(offset);
+ result = OKIM6295_status_0_r(machine, offset);
else
logerror("atarijsa: Unknown read at %04X\n", offset & 0x206);
break;
case 0x002: /* /RDP */
- result = atarigen_6502_sound_r(offset);
+ result = atarigen_6502_sound_r(machine, offset);
break;
case 0x004: /* /RDIO */
@@ -356,7 +356,7 @@ static READ8_HANDLER( jsa2_io_r )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
@@ -382,18 +382,18 @@ static WRITE8_HANDLER( jsa2_io_w )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
if (has_oki6295)
- OKIM6295_data_0_w(offset, data);
+ OKIM6295_data_0_w(machine, offset, data);
else
logerror("atarijsa: Unknown write (%02X) at %04X\n", data & 0xff, offset & 0x206);
break;
case 0x202: /* /WRP */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
break;
case 0x204: /* /WRIO */
@@ -429,7 +429,7 @@ static WRITE8_HANDLER( jsa2_io_w )
*/
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
oki6295_volume = 50 + (data & 1) * 50;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
}
}
@@ -450,11 +450,11 @@ static READ8_HANDLER( jsa3_io_r )
{
case 0x000: /* /RDV */
if (has_oki6295)
- result = OKIM6295_status_0_r(offset);
+ result = OKIM6295_status_0_r(machine, offset);
break;
case 0x002: /* /RDP */
- result = atarigen_6502_sound_r(offset);
+ result = atarigen_6502_sound_r(machine, offset);
break;
case 0x004: /* /RDIO */
@@ -475,7 +475,7 @@ static READ8_HANDLER( jsa3_io_r )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
@@ -496,7 +496,7 @@ static WRITE8_HANDLER( jsa3_io_w )
{
case 0x000: /* /RDV */
overall_volume = data * 100 / 127;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
case 0x002: /* /RDP */
@@ -505,16 +505,16 @@ static WRITE8_HANDLER( jsa3_io_w )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
if (has_oki6295)
- OKIM6295_data_0_w(offset, data);
+ OKIM6295_data_0_w(machine, offset, data);
break;
case 0x202: /* /WRP */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
break;
case 0x204: /* /WRIO */
@@ -561,7 +561,7 @@ static WRITE8_HANDLER( jsa3_io_w )
/* update the volumes */
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
oki6295_volume = 50 + (data & 1) * 50;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
}
}
@@ -584,14 +584,14 @@ static READ8_HANDLER( jsa3s_io_r )
if (has_oki6295)
{
if (offset & 1)
- result = OKIM6295_status_1_r(offset);
+ result = OKIM6295_status_1_r(machine, offset);
else
- result = OKIM6295_status_0_r(offset);
+ result = OKIM6295_status_0_r(machine, offset);
}
break;
case 0x002: /* /RDP */
- result = atarigen_6502_sound_r(offset);
+ result = atarigen_6502_sound_r(machine, offset);
break;
case 0x004: /* /RDIO */
@@ -612,7 +612,7 @@ static READ8_HANDLER( jsa3s_io_r )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
@@ -633,7 +633,7 @@ static WRITE8_HANDLER( jsa3s_io_w )
{
case 0x000: /* /RDV */
overall_volume = data * 100 / 127;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
case 0x002: /* /RDP */
@@ -642,21 +642,21 @@ static WRITE8_HANDLER( jsa3s_io_w )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /WRV */
if (has_oki6295)
{
if (offset & 1)
- OKIM6295_data_1_w(offset, data);
+ OKIM6295_data_1_w(machine, offset, data);
else
- OKIM6295_data_0_w(offset, data);
+ OKIM6295_data_0_w(machine, offset, data);
}
break;
case 0x202: /* /WRP */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
break;
case 0x204: /* /WRIO */
@@ -704,7 +704,7 @@ static WRITE8_HANDLER( jsa3s_io_w )
/* update the volumes */
ym2151_volume = ((data >> 1) & 7) * 100 / 7;
oki6295_volume = 50 + (data & 1) * 50;
- update_all_volumes(Machine);
+ update_all_volumes(machine);
break;
}
}
diff --git a/src/mame/audio/avalnche.c b/src/mame/audio/avalnche.c
index bc1f1b13fe6..c2487ef9bde 100644
--- a/src/mame/audio/avalnche.c
+++ b/src/mame/audio/avalnche.c
@@ -23,13 +23,13 @@
WRITE8_HANDLER( avalnche_noise_amplitude_w )
{
- discrete_sound_w(AVALNCHE_SOUNDLVL_DATA, data & 0x3f);
+ discrete_sound_w(machine, AVALNCHE_SOUNDLVL_DATA, data & 0x3f);
}
WRITE8_HANDLER( avalnche_attract_enable_w )
{
- discrete_sound_w(AVALNCHE_ATTRACT_EN, data & 0x01);
+ discrete_sound_w(machine, AVALNCHE_ATTRACT_EN, data & 0x01);
}
@@ -40,16 +40,16 @@ WRITE8_HANDLER( avalnche_audio_w )
switch (offset & 0x07)
{
case 0x00: /* AUD0 */
- discrete_sound_w(AVALNCHE_AUD0_EN, bit);
+ discrete_sound_w(machine, AVALNCHE_AUD0_EN, bit);
break;
case 0x01: /* AUD1 */
- discrete_sound_w(AVALNCHE_AUD1_EN, bit);
+ discrete_sound_w(machine, AVALNCHE_AUD1_EN, bit);
break;
case 0x02: /* AUD2 */
default:
- discrete_sound_w(AVALNCHE_AUD2_EN, bit);
+ discrete_sound_w(machine, AVALNCHE_AUD2_EN, bit);
break;
}
}
diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c
index e909ceb39ac..31e6f74bf24 100644
--- a/src/mame/audio/aztarac.c
+++ b/src/mame/audio/aztarac.c
@@ -21,10 +21,10 @@ WRITE16_HANDLER( aztarac_sound_w )
if (ACCESSING_LSB)
{
data &= 0xff;
- soundlatch_w(offset, data);
+ soundlatch_w(machine, offset, data);
sound_status ^= 0x21;
if (sound_status & 0x20)
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
}
@@ -32,7 +32,7 @@ READ8_HANDLER( aztarac_snd_command_r )
{
sound_status |= 0x01;
sound_status &= ~0x20;
- return soundlatch_r(offset);
+ return soundlatch_r(machine,offset);
}
READ8_HANDLER( aztarac_snd_status_r )
diff --git a/src/mame/audio/blockade.c b/src/mame/audio/blockade.c
index 5bf24e12bb8..2fbba8077a4 100644
--- a/src/mame/audio/blockade.c
+++ b/src/mame/audio/blockade.c
@@ -36,7 +36,7 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( blockade_sound_freq_w )
{
- discrete_sound_w(BLOCKADE_NOTE_DATA, data);
+ discrete_sound_w(machine,BLOCKADE_NOTE_DATA, data);
return;
}
diff --git a/src/mame/audio/bsktball.c b/src/mame/audio/bsktball.c
index 57e0029559f..e8721faf658 100644
--- a/src/mame/audio/bsktball.c
+++ b/src/mame/audio/bsktball.c
@@ -12,18 +12,18 @@ Sound handlers
***************************************************************************/
WRITE8_HANDLER( bsktball_bounce_w )
{
- discrete_sound_w(BSKTBALL_CROWD_DATA, data & 0x0f); // Crowd
- discrete_sound_w(BSKTBALL_BOUNCE_EN, data & 0x10); // Bounce
+ discrete_sound_w(machine, BSKTBALL_CROWD_DATA, data & 0x0f); // Crowd
+ discrete_sound_w(machine, BSKTBALL_BOUNCE_EN, data & 0x10); // Bounce
}
WRITE8_HANDLER( bsktball_note_w )
{
- discrete_sound_w(BSKTBALL_NOTE_DATA, data); // Note
+ discrete_sound_w(machine, BSKTBALL_NOTE_DATA, data); // Note
}
WRITE8_HANDLER( bsktball_noise_reset_w )
{
- discrete_sound_w(BSKTBALL_NOISE_EN, offset & 0x01);
+ discrete_sound_w(machine, BSKTBALL_NOISE_EN, offset & 0x01);
}
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 3b4be364a73..a529be33149 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -483,7 +483,7 @@ static WRITE32_HANDLER( cage_to_main_w )
{
if (LOG_COMM)
logerror("%06X:Data from CAGE = %04X\n", activecpu_get_pc(), data);
- soundlatch_word_w(0, data, mem_mask);
+ soundlatch_word_w(machine, 0, data, mem_mask);
cage_to_cpu_ready = 1;
update_control_lines();
}
@@ -503,10 +503,10 @@ static READ32_HANDLER( cage_io_status_r )
UINT16 main_from_cage_r(void)
{
if (LOG_COMM)
- logerror("%06X:main read data = %04X\n", activecpu_get_pc(), soundlatch_word_r(0, 0));
+ logerror("%06X:main read data = %04X\n", activecpu_get_pc(), soundlatch_word_r(Machine, 0, 0));
cage_to_cpu_ready = 0;
update_control_lines();
- return soundlatch_word_r(0, 0);
+ return soundlatch_word_r(Machine, 0, 0);
}
diff --git a/src/mame/audio/canyon.c b/src/mame/audio/canyon.c
index f4c183523d9..14087be0d32 100644
--- a/src/mame/audio/canyon.c
+++ b/src/mame/audio/canyon.c
@@ -16,25 +16,25 @@
WRITE8_HANDLER( canyon_motor_w )
{
- discrete_sound_w(CANYON_MOTOR1_DATA + (offset & 0x01), data & 0x0f);
+ discrete_sound_w(machine, CANYON_MOTOR1_DATA + (offset & 0x01), data & 0x0f);
}
WRITE8_HANDLER( canyon_explode_w )
{
- discrete_sound_w(CANYON_EXPLODE_DATA, data >> 4);
+ discrete_sound_w(machine, CANYON_EXPLODE_DATA, data >> 4);
}
WRITE8_HANDLER( canyon_attract_w )
{
- discrete_sound_w(CANYON_ATTRACT1_EN + (offset & 0x01), offset & 0x02);
+ discrete_sound_w(machine, CANYON_ATTRACT1_EN + (offset & 0x01), offset & 0x02);
}
WRITE8_HANDLER( canyon_whistle_w )
{
- discrete_sound_w(CANYON_WHISTLE1_EN + (offset & 0x01), offset & 0x02);
+ discrete_sound_w(machine, CANYON_WHISTLE1_EN + (offset & 0x01), offset & 0x02);
}
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index 66dbe55aa54..c7c50ef49e1 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -274,11 +274,11 @@ static WRITE8_HANDLER( carnival_music_port_2_w )
break;
case PSG_BC_WRITE:
- AY8910_write_port_0_w( 0, psgData );
+ AY8910_write_port_0_w( machine, 0, psgData );
break;
case PSG_BC_LATCH_ADDRESS:
- AY8910_control_port_0_w( 0, psgData );
+ AY8910_control_port_0_w( machine, 0, psgData );
break;
}
}
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index 194fc077f58..c78ab25685a 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -22,23 +22,23 @@ READ8_HANDLER( cchasm_snd_io_r )
switch (offset & 0x61 )
{
case 0x00:
- coin = (input_port_3_r (offset) >> 4) & 0x7;
+ coin = (input_port_3_r (machine, offset) >> 4) & 0x7;
if (coin != 0x7) coin |= 0x8;
return sound_flags | coin;
case 0x01:
- return AY8910_read_port_0_r (offset);
+ return AY8910_read_port_0_r (machine, offset);
case 0x21:
- return AY8910_read_port_1_r (offset);
+ return AY8910_read_port_1_r (machine, offset);
case 0x40:
- return soundlatch_r (offset);
+ return soundlatch_r (machine, offset);
case 0x41:
sound_flags &= ~0x80;
- z80ctc_0_trg2_w (0, 0);
- return soundlatch2_r (offset);
+ z80ctc_0_trg2_w (machine, 0, 0);
+ return soundlatch2_r (machine, offset);
default:
logerror("Read from unmapped internal IO device at 0x%x\n", offset + 0x6000);
return 0;
@@ -50,33 +50,33 @@ WRITE8_HANDLER( cchasm_snd_io_w )
switch (offset & 0x61 )
{
case 0x00:
- AY8910_control_port_0_w (offset, data);
+ AY8910_control_port_0_w (machine, offset, data);
break;
case 0x01:
- AY8910_write_port_0_w (offset, data);
+ AY8910_write_port_0_w (machine, offset, data);
break;
case 0x20:
- AY8910_control_port_1_w (offset, data);
+ AY8910_control_port_1_w (machine, offset, data);
break;
case 0x21:
- AY8910_write_port_1_w (offset, data);
+ AY8910_write_port_1_w (machine, offset, data);
break;
case 0x40:
- soundlatch3_w (offset, data);
+ soundlatch3_w (machine, offset, data);
break;
case 0x41:
sound_flags |= 0x40;
- soundlatch4_w (offset, data);
- cpunum_set_input_line(Machine, 0, 1, HOLD_LINE);
+ soundlatch4_w (machine, offset, data);
+ cpunum_set_input_line(machine, 0, 1, HOLD_LINE);
break;
case 0x61:
- z80ctc_0_trg0_w (0, 0);
+ z80ctc_0_trg0_w (machine, 0, 0);
break;
default:
@@ -94,13 +94,13 @@ WRITE16_HANDLER( cchasm_io_w )
switch (offset & 0xf)
{
case 0:
- soundlatch_w (offset, data);
+ soundlatch_w (machine, offset, data);
break;
case 1:
sound_flags |= 0x80;
- soundlatch2_w (offset, data);
- z80ctc_0_trg2_w (0, 1);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch2_w (machine, offset, data);
+ z80ctc_0_trg2_w (machine, 0, 1);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
break;
case 2:
led = data;
@@ -114,16 +114,16 @@ READ16_HANDLER( cchasm_io_r )
switch (offset & 0xf)
{
case 0x0:
- return soundlatch3_r (offset) << 8;
+ return soundlatch3_r (machine, offset) << 8;
case 0x1:
sound_flags &= ~0x40;
- return soundlatch4_r (offset) << 8;
+ return soundlatch4_r (machine,offset) << 8;
case 0x2:
- return (sound_flags| (input_port_3_r (offset) & 0x07) | 0x08) << 8;
+ return (sound_flags| (input_port_3_r (machine, offset) & 0x07) | 0x08) << 8;
case 0x5:
- return input_port_2_r (offset) << 8;
+ return input_port_2_r (machine, offset) << 8;
case 0x8:
- return input_port_1_r (offset) << 8;
+ return input_port_1_r (machine, offset) << 8;
default:
return 0xff << 8;
}
@@ -139,7 +139,6 @@ static void ctc_interrupt (int state)
static WRITE8_HANDLER( ctc_timer_1_w )
{
-
if (data) /* rising edge */
{
output[0] ^= 0x7f;
@@ -150,7 +149,6 @@ static WRITE8_HANDLER( ctc_timer_1_w )
static WRITE8_HANDLER( ctc_timer_2_w )
{
-
if (data) /* rising edge */
{
output[1] ^= 0x7f;
@@ -171,8 +169,8 @@ static z80ctc_interface ctc_intf =
static TIMER_CALLBACK( cchasm_sh_update )
{
- if ((input_port_3_r (0) & 0x70) != 0x70)
- z80ctc_0_trg0_w (0, 1);
+ if ((input_port_3_r (machine, 0) & 0x70) != 0x70)
+ z80ctc_0_trg0_w (machine, 0, 1);
}
SOUND_START( cchasm )
diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c
index d4d878f8c7c..d32d3ed1e8c 100644
--- a/src/mame/audio/circus.c
+++ b/src/mame/audio/circus.c
@@ -185,11 +185,11 @@ WRITE8_HANDLER( circus_clown_z_w )
switch ((data & 0x70) >> 4)
{
case 0 : /* All Off */
- discrete_sound_w(CIRCUS_MUSIC_BIT, 0);
+ discrete_sound_w(machine, CIRCUS_MUSIC_BIT, 0);
break;
case 1 : /* Music */
- discrete_sound_w(CIRCUS_MUSIC_BIT, 1);
+ discrete_sound_w(machine, CIRCUS_MUSIC_BIT, 1);
break;
case 2 : /* Circus = Pop; Rip Cord = Splash */
@@ -218,7 +218,7 @@ WRITE8_HANDLER( circus_clown_z_w )
break;
case 2: /* robotbwl */
- discrete_sound_w(ROBOTBWL_MUSIC_BIT, data & 0x08); /* Footsteps */
+ discrete_sound_w(machine, ROBOTBWL_MUSIC_BIT, data & 0x08); /* Footsteps */
if (data & 0x40) /* Hit */
sample_start (0, 0, 0);
@@ -243,11 +243,11 @@ WRITE8_HANDLER( circus_clown_z_w )
switch ((data & 0x70) >> 4)
{
case 0 : /* All Off */
- discrete_sound_w(CRASH_MUSIC_BIT, 0);
+ discrete_sound_w(machine, CRASH_MUSIC_BIT, 0);
break;
case 1 : /* Music */
- discrete_sound_w(CRASH_MUSIC_BIT, 1);
+ discrete_sound_w(machine, CRASH_MUSIC_BIT, 1);
break;
case 2 : /* Crash */
@@ -255,14 +255,14 @@ WRITE8_HANDLER( circus_clown_z_w )
break;
case 3 : /* Normal Video and Beep */
- discrete_sound_w(CRASH_BEEPER_EN, 0);
+ discrete_sound_w(machine, CRASH_BEEPER_EN, 0);
break;
case 4 : /* Skid */
break;
case 5 : /* Invert Video and Beep */
- discrete_sound_w(CRASH_BEEPER_EN, 0);
+ discrete_sound_w(machine, CRASH_BEEPER_EN, 0);
break;
case 6 : /* Hi Motor */
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index 33bda448bb8..8b9d54a91d7 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -30,15 +30,15 @@
-void crbaloon_audio_set_music_freq(UINT8 freq)
+void crbaloon_audio_set_music_freq(running_machine *machine, UINT8 freq)
{
- discrete_sound_w(CRBALOON_MUSIC_DATA, freq);
+ discrete_sound_w(machine, CRBALOON_MUSIC_DATA, freq);
}
-void crbaloon_audio_set_music_enable(int enabled)
+void crbaloon_audio_set_music_enable(running_machine *machine, int enabled)
{
- discrete_sound_w(CRBALOON_MUSIC_EN, enabled);
+ discrete_sound_w(machine, CRBALOON_MUSIC_EN, enabled);
}
@@ -64,9 +64,9 @@ void crbaloon_audio_set_appear_enable(int enabled)
}
-void crbaloon_audio_set_laugh_enable(int enabled)
+void crbaloon_audio_set_laugh_enable(running_machine *machine, int enabled)
{
- discrete_sound_w(CRBALOON_LAUGH_EN, enabled);
+ discrete_sound_w(machine, CRBALOON_LAUGH_EN, enabled);
}
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index 3fcdbcedab9..2adbe7cfbaf 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -1572,7 +1572,7 @@ static WRITE16_HANDLER( input_latch_ack_w )
static READ16_HANDLER( input_latch_r )
{
if (dcs.auto_ack)
- input_latch_ack_w(0,0,0);
+ input_latch_ack_w(machine,0,0,0);
if (LOG_DCS_IO)
logerror("%08X:input_latch_r(%04X)\n", activecpu_get_pc(), dcs.input_data);
return dcs.input_data;
@@ -2080,7 +2080,7 @@ static TIMER_CALLBACK( s1_ack_callback2 )
timer_set(ATTOTIME_IN_USEC(1), NULL, param, s1_ack_callback2);
return;
}
- output_latch_w(0, 0x000a, 0);
+ output_latch_w(machine, 0, 0x000a, 0);
}
@@ -2092,7 +2092,7 @@ static TIMER_CALLBACK( s1_ack_callback1 )
timer_set(ATTOTIME_IN_USEC(1), NULL, param, s1_ack_callback1);
return;
}
- output_latch_w(0, param, 0);
+ output_latch_w(machine, 0, param, 0);
/* chain to the next word we need to write back */
timer_set(ATTOTIME_IN_USEC(1), NULL, 0, s1_ack_callback2);
@@ -2230,8 +2230,8 @@ static TIMER_CALLBACK( s2_ack_callback )
timer_set(ATTOTIME_IN_USEC(1), NULL, param, s2_ack_callback);
return;
}
- output_latch_w(0, param, 0);
- output_control_w(0, (dcs.output_control & ~0xff00) | 0x0300, 0);
+ output_latch_w(machine, 0, param, 0);
+ output_control_w(machine, 0, (dcs.output_control & ~0xff00) | 0x0300, 0);
}
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 0c1225b154e..2e6b35d95d9 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -36,16 +36,16 @@
/* Needed for dkongjr ... FIXME */
//#define I8035_T_R(N) ((portT >> (N)) & 1)
-#define I8035_T_R(N) ((soundlatch2_r(0) >> (N)) & 1)
-#define I8035_T_W_AL(N,D) do { state->portT = ACTIVELOW_PORT_BIT(state->portT,N,D); soundlatch2_w(0, state->portT); } while (0)
+#define I8035_T_R(M,N) ((soundlatch2_r(machine,0) >> (N)) & 1)
+#define I8035_T_W_AL(M,N,D) do { state->portT = ACTIVELOW_PORT_BIT(state->portT,N,D); soundlatch2_w(machine, 0, state->portT); } while (0)
-#define I8035_P1_R() (soundlatch3_r(0))
-#define I8035_P2_R() (soundlatch4_r(0))
-#define I8035_P1_W(D) soundlatch3_w(0,D)
-#define I8035_P2_W(D) soundlatch4_w(0,D)
+#define I8035_P1_R(M) (soundlatch3_r(M,0))
+#define I8035_P2_R(M) (soundlatch4_r(M,0))
+#define I8035_P1_W(M,D) soundlatch3_w(M,0,D)
+#define I8035_P2_W(M,D) soundlatch4_w(M,0,D)
-#define I8035_P1_W_AL(B,D) I8035_P1_W(ACTIVELOW_PORT_BIT(I8035_P1_R(),B,(D)))
-#define I8035_P2_W_AL(B,D) I8035_P2_W(ACTIVELOW_PORT_BIT(I8035_P2_R(),B,(D)))
+#define I8035_P1_W_AL(M,B,D) I8035_P1_W(M,ACTIVELOW_PORT_BIT(I8035_P1_R(M),B,(D)))
+#define I8035_P2_W_AL(M,B,D) I8035_P2_W(M,ACTIVELOW_PORT_BIT(I8035_P2_R(M),B,(D)))
/****************************************************************
@@ -895,17 +895,17 @@ static SOUND_RESET( dkong )
state->page = 0x47;
state->portT = 0;
- I8035_T_W_AL(0,0);
- I8035_T_W_AL(1,0);
- I8035_P1_W(0xFF);
- I8035_P2_W(0xFF);
- soundlatch_w(0,0x0F);
+ I8035_T_W_AL(machine,0,0);
+ I8035_T_W_AL(machine,1,0);
+ I8035_P1_W(machine,0xFF);
+ I8035_P2_W(machine,0xFF);
+ soundlatch_w(machine,0,0x0F);
}
static SOUND_RESET( dkongjr )
{
SOUND_RESET_CALL(dkong);
- soundlatch_w(0,0x00);
+ soundlatch_w(machine,0,0x00);
}
/****************************************************************
@@ -1004,8 +1004,8 @@ static WRITE8_HANDLER( M58817_command_w )
{
logerror("PA Write %x\n", data);
- tms5110_CTL_w(0, data & 0x0f);
- tms5110_PDC_w(0, (data>>4) & 0x01);
+ tms5110_CTL_w(machine, 0, data & 0x0f);
+ tms5110_PDC_w(machine, 0, (data>>4) & 0x01);
// FIXME 0x20 is CS
}
@@ -1017,22 +1017,22 @@ static WRITE8_HANDLER( M58817_command_w )
static READ8_HANDLER( dkong_sh_p1_r )
{
- return I8035_P1_R();
+ return I8035_P1_R(machine);
}
static READ8_HANDLER( dkong_sh_p2_r )
{
- return I8035_P2_R();
+ return I8035_P2_R(machine);
}
static READ8_HANDLER( dkong_sh_t0_r )
{
- return I8035_T_R(0);
+ return I8035_T_R(machine,0);
}
static READ8_HANDLER( dkong_sh_t1_r )
{
- return I8035_T_R(1);
+ return I8035_T_R(machine,1);
}
static WRITE8_HANDLER( dkong_voice_w )
@@ -1053,12 +1053,12 @@ static READ8_HANDLER( dkong_voice_status_r )
static READ8_HANDLER( dkong_sh_tune_r )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
UINT8 *SND = memory_region(REGION_CPU2);
if ( state->page & 0x40 )
{
- return (soundlatch_r(0) & 0x0F) | (dkong_voice_status_r(0)<<4);
+ return (soundlatch_r(machine,0) & 0x0F) | (dkong_voice_status_r(machine,0)<<4);
}
else
{
@@ -1069,12 +1069,12 @@ static READ8_HANDLER( dkong_sh_tune_r )
static READ8_HANDLER( dkongjr_sh_tune_r )
{
- return soundlatch_r(0) & 0x01F;
+ return soundlatch_r(machine,0) & 0x01F;
}
static WRITE8_HANDLER( dkong_sh_p1_w )
{
- discrete_sound_w(DS_DAC,data);
+ discrete_sound_w(machine,DS_DAC,data);
}
@@ -1082,13 +1082,13 @@ static READ8_HANDLER( radarsc1_sh_p1_r )
{
int r;
- r = (I8035_P1_R() & 0x80) | (tms5110_status_r(0)<<6);
+ r = (I8035_P1_R(machine) & 0x80) | (tms5110_status_r(machine,0)<<6);
return r;
}
static WRITE8_HANDLER( dkong_sh_p2_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
/* If P2.Bit7 -> is apparently an external signal decay or other output control
* If P2.Bit6 -> activates the external compressed sample ROM (not radarsc1)
@@ -1098,10 +1098,10 @@ static WRITE8_HANDLER( dkong_sh_p2_w )
*/
state->mcustatus = ((~data & 0x10) >> 4);
- radarsc1_ansn_w(0, (data & 0x20) >> 5);
+ radarsc1_ansn_w(machine, 0, (data & 0x20) >> 5);
state->page = (data & 0x47);
- discrete_sound_w(DS_DAC_DISCHARGE, (data & 0x80) ? 0 : 1 );
+ discrete_sound_w(machine,DS_DAC_DISCHARGE, (data & 0x80) ? 0 : 1 );
}
@@ -1113,18 +1113,18 @@ static WRITE8_HANDLER( dkong_sh_p2_w )
WRITE8_HANDLER( dkongjr_sh_test6_w )
{
- I8035_P2_W_AL(6,data & 1);
+ I8035_P2_W_AL(machine,6,data & 1);
}
WRITE8_HANDLER( dkongjr_sh_tuneselect_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
}
READ8_HANDLER( dkong_audio_status_r )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
return state->mcustatus;
}
@@ -1132,45 +1132,45 @@ READ8_HANDLER( dkong_audio_status_r )
WRITE8_HANDLER( dkong_audio_irq_w )
{
if (data)
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE);
else
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
}
WRITE8_HANDLER( dkong_snd_disc_w )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
switch (offset)
{
case 0:
- discrete_sound_w(DS_SOUND0_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND0_INP,data & 1);
break;
case 1:
- discrete_sound_w(DS_SOUND1_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND1_INP,data & 1);
break;
case 2:
- discrete_sound_w(DS_SOUND2_INP,data & 1);
- radarscp_snd02_w(0, data & 1);
+ discrete_sound_w(machine,DS_SOUND2_INP,data & 1);
+ radarscp_snd02_w(machine, 0, data & 1);
break;
case 3:
if (state->hardware_type == HARDWARE_TRS01)
//SOUND3 ==> PA7
- I8035_P1_W_AL(7,data & 1);
+ I8035_P1_W_AL(machine,7,data & 1);
else
- I8035_P2_W_AL(5,data & 1);
+ I8035_P2_W_AL(machine,5,data & 1);
break;
case 4:
- I8035_T_W_AL(1, data & 1);
+ I8035_T_W_AL(machine, 1, data & 1);
break;
case 5:
- I8035_T_W_AL(0, data & 1);
+ I8035_T_W_AL(machine, 0, data & 1);
break;
case 6:
- discrete_sound_w(DS_SOUND6_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND6_INP,data & 1);
break;
case 7:
- discrete_sound_w(DS_SOUND7_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND7_INP,data & 1);
break;
}
return;
@@ -1178,38 +1178,38 @@ WRITE8_HANDLER( dkong_snd_disc_w )
WRITE8_HANDLER( dkong_sh_tuneselect_w )
{
- soundlatch_w(offset,data ^ 0x0f);
+ soundlatch_w(machine,offset,data ^ 0x0f);
}
WRITE8_HANDLER( dkongjr_snd_w1 )
{
- dkong_state *state = Machine->driver_data;
+ dkong_state *state = machine->driver_data;
switch (offset)
{
case 0: /* climb */
- discrete_sound_w(DS_SOUND0_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND0_INP,data & 1);
break;
case 1: /* jump */
- discrete_sound_w(DS_SOUND1_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND1_INP,data & 1);
break;
case 2: /* land */
- discrete_sound_w(DS_SOUND2_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND2_INP,data & 1);
break;
case 3: /* Port 3 write ==> PB 5 */
- I8035_P2_W_AL(5,data & 1);
+ I8035_P2_W_AL(machine,5,data & 1);
break;
case 4: /* Port 4 write */
- I8035_T_W_AL(1, data & 1);
+ I8035_T_W_AL(machine,1, data & 1);
break;
case 5: /* Port 5 write */
- I8035_T_W_AL(0, data & 1);
+ I8035_T_W_AL(machine,0, data & 1);
break;
case 6: /* Port 6 write ==> PB 4 */
- I8035_P2_W_AL(4,data & 1);
+ I8035_P2_W_AL(machine,4,data & 1);
break;
case 7: /* walk */
- discrete_sound_w(DS_SOUND7_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND7_INP,data & 1);
break;
}
}
@@ -1219,7 +1219,7 @@ WRITE8_HANDLER( dkongjr_snd_w2 )
switch (offset)
{
case 0: /* S9 - drop */
- discrete_sound_w(DS_SOUND9_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND9_INP,data & 1);
break;
}
}
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index f041a05e409..c4158e7a582 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -460,13 +460,13 @@ static WRITE8_HANDLER( exidy_shriot_w )
{
if (!(data & 0x01) && (riot_portb_data & 0x01))
{
- riot_porta_data = tms5220_status_r(0);
+ riot_porta_data = tms5220_status_r(machine, 0);
logerror("(%f)%04X:TMS5220 status read = %02X\n", attotime_to_double(timer_get_time()), activecpu_get_previouspc(), riot_porta_data);
}
if (!(data & 0x02) && (riot_portb_data & 0x02))
{
logerror("(%f)%04X:TMS5220 data write = %02X\n", attotime_to_double(timer_get_time()), activecpu_get_previouspc(), riot_porta_data);
- tms5220_data_w(0, riot_porta_data);
+ tms5220_data_w(machine, 0, riot_porta_data);
}
}
riot_portb_data = (riot_portb_data & ~riot_portb_ddr) | (data & riot_portb_ddr);
diff --git a/src/mame/audio/firetrk.c b/src/mame/audio/firetrk.c
index 290f57477fe..40ba64dc893 100644
--- a/src/mame/audio/firetrk.c
+++ b/src/mame/audio/firetrk.c
@@ -15,56 +15,56 @@ WRITE8_HANDLER( firetrk_skid_reset_w )
firetrk_skid[1] = 0;
// also SUPERBUG_SKID_EN
- discrete_sound_w(FIRETRUCK_SKID_EN, 1);
+ discrete_sound_w(machine, FIRETRUCK_SKID_EN, 1);
}
WRITE8_HANDLER( montecar_skid_reset_w )
{
- discrete_sound_w(MONTECAR_SKID_EN, 1);
+ discrete_sound_w(machine, MONTECAR_SKID_EN, 1);
}
WRITE8_HANDLER( firetrk_crash_snd_w )
{
// also SUPERBUG_CRASH_DATA and MONTECAR_CRASH_DATA
- discrete_sound_w(FIRETRUCK_CRASH_DATA, data >> 4);
+ discrete_sound_w(machine, FIRETRUCK_CRASH_DATA, data >> 4);
}
WRITE8_HANDLER( firetrk_skid_snd_w )
{
// also SUPERBUG_SKID_EN and MONTECAR_SKID_EN
- discrete_sound_w(FIRETRUCK_SKID_EN, 0);
+ discrete_sound_w(machine, FIRETRUCK_SKID_EN, 0);
}
WRITE8_HANDLER( firetrk_motor_snd_w )
{
// also MONTECAR_DRONE_MOTOR_DATA
- discrete_sound_w(FIRETRUCK_SIREN_DATA, data >> 4);
+ discrete_sound_w(machine, FIRETRUCK_SIREN_DATA, data >> 4);
// also MONTECAR_MOTOR_DATA
- discrete_sound_w(FIRETRUCK_MOTOR_DATA, data & 0x0f);
+ discrete_sound_w(machine, FIRETRUCK_MOTOR_DATA, data & 0x0f);
}
WRITE8_HANDLER( superbug_motor_snd_w )
{
- discrete_sound_w(SUPERBUG_SPEED_DATA, data & 0x0f);
+ discrete_sound_w(machine, SUPERBUG_SPEED_DATA, data & 0x0f);
}
WRITE8_HANDLER( firetrk_xtndply_w )
{
- discrete_sound_w(FIRETRUCK_XTNDPLY_EN, data);
+ discrete_sound_w(machine, FIRETRUCK_XTNDPLY_EN, data);
}
WRITE8_HANDLER( superbug_asr_w )
{
popmessage("ASR");
- discrete_sound_w(SUPERBUG_ASR_EN, 1); /* ASR */
+ discrete_sound_w(machine, SUPERBUG_ASR_EN, 1); /* ASR */
}
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 622df627e53..381226f4ddc 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -76,19 +76,19 @@ WRITE8_HANDLER( gottlieb_sh_w )
}
}
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
switch (cpu_gettotalcpu())
{
case 2:
/* Revision 1 sound board */
- cpunum_set_input_line(Machine, 1,M6502_IRQ_LINE,HOLD_LINE);
+ cpunum_set_input_line(machine, 1,M6502_IRQ_LINE,HOLD_LINE);
break;
case 3:
case 4:
/* Revision 2 & 3 sound board */
- cpunum_set_input_line(Machine, cpu_gettotalcpu()-1,M6502_IRQ_LINE,HOLD_LINE);
- cpunum_set_input_line(Machine, cpu_gettotalcpu()-2,M6502_IRQ_LINE,HOLD_LINE);
+ cpunum_set_input_line(machine, cpu_gettotalcpu()-1,M6502_IRQ_LINE,HOLD_LINE);
+ cpunum_set_input_line(machine, cpu_gettotalcpu()-2,M6502_IRQ_LINE,HOLD_LINE);
break;
}
}
@@ -175,7 +175,7 @@ READ8_HANDLER( gottlieb_riot_r )
{
switch (offset) {
case 0: /* port A */
- return soundlatch_r(0) ^ 0xff; /* invert command */
+ return soundlatch_r(machine,0) ^ 0xff; /* invert command */
case 2: /* port B */
return 0x40; /* say that PB6 is 1 (test SW1 not pressed) */
case 5: /* interrupt register */
@@ -253,7 +253,7 @@ WRITE8_HANDLER( stooges_sound_control_w )
{
static int last;
- common_sound_control_w(offset, data);
+ common_sound_control_w(machine, offset, data);
/* bit 2 goes to 8913 BDIR pin */
if ((last & 0x04) == 0x04 && (data & 0x04) == 0x00)
@@ -263,17 +263,17 @@ WRITE8_HANDLER( stooges_sound_control_w )
{
/* bit 4 goes to the 8913 BC1 pin */
if (data & 0x10)
- AY8910_control_port_0_w(0,psg_latch);
+ AY8910_control_port_0_w(machine,0,psg_latch);
else
- AY8910_write_port_0_w(0,psg_latch);
+ AY8910_write_port_0_w(machine,0,psg_latch);
}
else
{
/* bit 4 goes to the 8913 BC1 pin */
if (data & 0x10)
- AY8910_control_port_1_w(0,psg_latch);
+ AY8910_control_port_1_w(machine,0,psg_latch);
else
- AY8910_write_port_1_w(0,psg_latch);
+ AY8910_write_port_1_w(machine,0,psg_latch);
}
}
@@ -282,7 +282,7 @@ WRITE8_HANDLER( stooges_sound_control_w )
/* bit 6 = speech chip DATA PRESENT pin; high then low to make the chip read data */
if ((last & 0x40) == 0x40 && (data & 0x40) == 0x00)
{
- sp0250_w(0,sp0250_latch);
+ sp0250_w(machine,0,sp0250_latch);
}
/* bit 7 goes to the speech chip RESET pin */
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 98ca987dc4b..8cd40a3d64a 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -38,9 +38,9 @@ static SOUND_START( irem_audio )
WRITE8_HANDLER( irem_sound_cmd_w )
{
if ((data & 0x80) == 0)
- soundlatch_w(0, data & 0x7f);
+ soundlatch_w(machine, 0, data & 0x7f);
else
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE);
}
@@ -59,6 +59,7 @@ static WRITE8_HANDLER( m6803_port1_w )
static WRITE8_HANDLER( m6803_port2_w )
{
+
/* write latch */
if ((port2 & 0x01) && !(data & 0x01))
{
@@ -67,17 +68,17 @@ static WRITE8_HANDLER( m6803_port2_w )
{
/* PSG 0 or 1? */
if (port2 & 0x08)
- AY8910_control_port_0_w(0,port1);
+ AY8910_control_port_0_w(machine, 0, port1);
if (port2 & 0x10)
- AY8910_control_port_1_w(0,port1);
+ AY8910_control_port_1_w(machine, 0, port1);
}
else
{
/* PSG 0 or 1? */
if (port2 & 0x08)
- AY8910_write_port_0_w(0,port1);
+ AY8910_write_port_0_w(machine, 0, port1);
if (port2 & 0x10)
- AY8910_write_port_1_w(0,port1);
+ AY8910_write_port_1_w(machine, 0, port1);
}
}
port2 = data;
@@ -95,9 +96,9 @@ static READ8_HANDLER( m6803_port1_r )
{
/* PSG 0 or 1? */
if (port2 & 0x08)
- return AY8910_read_port_0_r(0);
+ return AY8910_read_port_0_r(machine, 0);
if (port2 & 0x10)
- return AY8910_read_port_1_r(0);
+ return AY8910_read_port_1_r(machine, 0);
return 0xff;
}
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index afa819d4e3e..938b778f145 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -144,6 +144,7 @@
#include "driver.h"
#include "deprecat.h"
+#include "memconv.h"
#include "includes/jaguar.h"
#include "cpu/jaguar/jaguar.h"
#include "sound/dac.h"
@@ -340,16 +341,13 @@ WRITE16_HANDLER( jaguar_jerry_regs_w )
READ32_HANDLER( jaguar_jerry_regs32_r )
{
- return (jaguar_jerry_regs_r(offset * 2, 0) << 16) | jaguar_jerry_regs_r(offset * 2 + 1, 0);
+ return read32be_with_16be_handler(jaguar_jerry_regs_r, machine, offset, mem_mask);
}
WRITE32_HANDLER( jaguar_jerry_regs32_w )
{
- if (ACCESSING_MSW32)
- jaguar_jerry_regs_w(offset * 2, data >> 16, mem_mask >> 16);
- if (ACCESSING_LSW32)
- jaguar_jerry_regs_w(offset * 2 + 1, data, mem_mask);
+ write32be_with_16be_handler(jaguar_jerry_regs_w, machine, offset, data, mem_mask);
}
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index b653c8f49f3..d5e7a9d1cef 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -95,7 +95,7 @@ WRITE8_HANDLER( jedi_audio_latch_w )
static READ8_HANDLER( audio_latch_r )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
*state->audio_comm_stat &= ~0x80;
return state->audio_latch;
@@ -105,7 +105,6 @@ static READ8_HANDLER( audio_latch_r )
CUSTOM_INPUT( jedi_audio_comm_stat_r )
{
jedi_state *state = machine->driver_data;
-
return *state->audio_comm_stat >> 6;
}
@@ -119,7 +118,7 @@ CUSTOM_INPUT( jedi_audio_comm_stat_r )
READ8_HANDLER( jedi_audio_ack_latch_r )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
*state->audio_comm_stat &= ~0x40;
return state->audio_ack_latch;
@@ -128,7 +127,7 @@ READ8_HANDLER( jedi_audio_ack_latch_r )
static WRITE8_HANDLER( audio_ack_latch_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
state->audio_ack_latch = data;
*state->audio_comm_stat |= 0x40;
@@ -144,11 +143,11 @@ static WRITE8_HANDLER( audio_ack_latch_w )
static WRITE8_HANDLER( speech_strobe_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
int new_speech_strobe_state = (~offset >> 8) & 1;
if ((new_speech_strobe_state != state->speech_strobe_state) && new_speech_strobe_state)
- tms5220_data_w(0, *state->speech_data);
+ tms5220_data_w(machine, 0, *state->speech_data);
state->speech_strobe_state = new_speech_strobe_state;
}
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index f1636a30641..1fcbe5b392c 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -1270,9 +1270,9 @@ static WRITE16_HANDLER( i80186_internal_port_w )
/* handle partials */
if (!ACCESSING_MSB)
- data = (i80186_internal_port_r(offset, 0) & 0xff00) | (data & 0x00ff);
+ data = (i80186_internal_port_r(machine, offset, 0) & 0xff00) | (data & 0x00ff);
else if (!ACCESSING_LSB)
- data = (i80186_internal_port_r(offset, 0) & 0x00ff) | (data & 0xff00);
+ data = (i80186_internal_port_r(machine, offset, 0) & 0x00ff) | (data & 0xff00);
switch (offset)
{
@@ -1931,13 +1931,13 @@ static WRITE16_HANDLER( ataxx_dac_control )
case 0x01:
case 0x02:
if (ACCESSING_LSB)
- dac_w(offset, data, 0xff00);
+ dac_w(machine, offset, data, 0xff00);
return;
case 0x03:
- dac_w(0, ((data << 13) & 0xe000) | ((data << 10) & 0x1c00) | ((data << 7) & 0x0300), 0x00ff);
- dac_w(2, ((data << 10) & 0xe000) | ((data << 7) & 0x1c00) | ((data << 4) & 0x0300), 0x00ff);
- dac_w(4, ((data << 8) & 0xc000) | ((data << 6) & 0x3000) | ((data << 4) & 0x0c00) | ((data << 2) & 0x0300), 0x00ff);
+ dac_w(machine, 0, ((data << 13) & 0xe000) | ((data << 10) & 0x1c00) | ((data << 7) & 0x0300), 0x00ff);
+ dac_w(machine, 2, ((data << 10) & 0xe000) | ((data << 7) & 0x1c00) | ((data << 4) & 0x0300), 0x00ff);
+ dac_w(machine, 4, ((data << 8) & 0xc000) | ((data << 6) & 0x3000) | ((data << 4) & 0x0c00) | ((data << 2) & 0x0300), 0x00ff);
return;
}
@@ -1972,7 +1972,7 @@ static WRITE16_HANDLER( ataxx_dac_control )
return;
case 0x21:
- dac_w(offset - 0x21 + 7, data, mem_mask);
+ dac_w(machine, offset - 0x21 + 7, data, mem_mask);
return;
}
}
@@ -2007,20 +2007,20 @@ static READ16_HANDLER( peripheral_r )
return ((clock_active << 1) & 0x7e);
case 1:
- return main_to_sound_comm_r(offset, mem_mask);
+ return main_to_sound_comm_r(machine, offset, mem_mask);
case 2:
- return pit8254_r(offset, mem_mask);
+ return pit8254_r(machine, offset, mem_mask);
case 3:
if (!has_ym2151)
- return pit8254_r(offset | 0x40, mem_mask);
+ return pit8254_r(machine, offset | 0x40, mem_mask);
else
- return YM2151_status_port_0_lsb_r(offset, mem_mask);
+ return YM2151_status_port_0_lsb_r(machine, offset, mem_mask);
case 4:
if (is_redline)
- return pit8254_r(offset | 0x80, mem_mask);
+ return pit8254_r(machine, offset | 0x80, mem_mask);
else
logerror("%05X:Unexpected peripheral read %d/%02X\n", activecpu_get_pc(), select, offset*2);
break;
@@ -2041,31 +2041,31 @@ static WRITE16_HANDLER( peripheral_w )
switch (select)
{
case 1:
- sound_to_main_comm_w(offset, data, mem_mask);
+ sound_to_main_comm_w(machine, offset, data, mem_mask);
break;
case 2:
- pit8254_w(offset, data, mem_mask);
+ pit8254_w(machine, offset, data, mem_mask);
break;
case 3:
if (!has_ym2151)
- pit8254_w(offset | 0x40, data, mem_mask);
+ pit8254_w(machine, offset | 0x40, data, mem_mask);
else if (offset == 0)
- YM2151_register_port_0_lsb_w(offset, data, mem_mask);
+ YM2151_register_port_0_lsb_w(machine, offset, data, mem_mask);
else if (offset == 1)
- YM2151_data_port_0_lsb_w(offset, data, mem_mask);
+ YM2151_data_port_0_lsb_w(machine, offset, data, mem_mask);
break;
case 4:
if (is_redline)
- pit8254_w(offset | 0x80, data, mem_mask);
+ pit8254_w(machine, offset | 0x80, data, mem_mask);
else
- dac_10bit_w(offset, data, mem_mask);
+ dac_10bit_w(machine, offset, data, mem_mask);
break;
case 5: /* Ataxx/WSF/Indy Heat only */
- ataxx_dac_control(offset, data, mem_mask);
+ ataxx_dac_control(machine, offset, data, mem_mask);
break;
default:
@@ -2089,7 +2089,7 @@ WRITE8_HANDLER( ataxx_80186_control_w )
((data & 0x02) << 5) |
((data & 0x04) << 3) |
((data & 0x08) << 1);
- leland_80186_control_w(offset, modified);
+ leland_80186_control_w(machine, offset, modified);
}
diff --git a/src/mame/audio/llander.c b/src/mame/audio/llander.c
index 1b1ac59a166..75a51631534 100644
--- a/src/mame/audio/llander.c
+++ b/src/mame/audio/llander.c
@@ -82,14 +82,14 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( llander_snd_reset_w )
{
/* Resets the LFSR that is used for the white noise generator */
- discrete_sound_w(LLANDER_NOISE_RESET, 0); /* Reset */
+ discrete_sound_w(machine, LLANDER_NOISE_RESET, 0); /* Reset */
}
WRITE8_HANDLER( llander_sounds_w )
{
- discrete_sound_w(LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */
- discrete_sound_w(LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */
- discrete_sound_w(LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */
- discrete_sound_w(LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */
+ discrete_sound_w(machine, LLANDER_THRUST_DATA, data & 0x07); /* Thrust volume */
+ discrete_sound_w(machine, LLANDER_TONE3K_EN, data & 0x10); /* Tone 3KHz enable */
+ discrete_sound_w(machine, LLANDER_TONE6K_EN, data & 0x20); /* Tone 6KHz enable */
+ discrete_sound_w(machine, LLANDER_EXPLOD_EN, data & 0x08); /* Explosion */
}
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 8442aea7019..5b994213b5e 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -125,14 +125,14 @@ WRITE16_HANDLER( m72_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, Z80_ASSERT,setvector_callback);
}
}
WRITE8_HANDLER( m72_sound_command_byte_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, Z80_ASSERT,setvector_callback);
}
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 90ac0a43c14..60ecceb44c1 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -18,16 +18,16 @@
#define ACTIVELOW_PORT_BIT(P,A,D) ((P & (~(1 << A))) | ((D ^ 1) << A))
#define ACTIVEHIGH_PORT_BIT(P,A,D) ((P & (~(1 << A))) | (D << A))
-#define I8035_T_R(N) ((soundlatch2_r(0) >> (N)) & 1)
-#define I8035_T_W_AH(N,D) do { state->portT = ACTIVEHIGH_PORT_BIT(state->portT,N,D); soundlatch2_w(0, state->portT); } while (0)
+#define I8035_T_R(M,N) ((soundlatch2_r(M,0) >> (N)) & 1)
+#define I8035_T_W_AH(M,N,D) do { state->portT = ACTIVEHIGH_PORT_BIT(state->portT,N,D); soundlatch2_w(M, 0, state->portT); } while (0)
-#define I8035_P1_R() (soundlatch3_r(0))
-#define I8035_P2_R() (soundlatch4_r(0))
-#define I8035_P1_W(D) soundlatch3_w(0,D)
-#define I8035_P2_W(D) soundlatch4_w(0,D)
+#define I8035_P1_R(M) (soundlatch3_r(M,0))
+#define I8035_P2_R(M) (soundlatch4_r(M,0))
+#define I8035_P1_W(M,D) soundlatch3_w(M,0,D)
+#define I8035_P2_W(M,D) soundlatch4_w(M,0,D)
-#define I8035_P1_W_AH(B,D) I8035_P1_W(ACTIVEHIGH_PORT_BIT(I8035_P1_R(),B,(D)))
-#define I8035_P2_W_AH(B,D) I8035_P2_W(ACTIVEHIGH_PORT_BIT(I8035_P2_R(),B,(D)))
+#define I8035_P1_W_AH(M,B,D) I8035_P1_W(M,ACTIVEHIGH_PORT_BIT(I8035_P1_R(M),B,(D)))
+#define I8035_P2_W_AH(M,B,D) I8035_P2_W(M,ACTIVEHIGH_PORT_BIT(I8035_P2_R(M),B,(D)))
/****************************************************************
*
@@ -251,12 +251,12 @@ static SOUND_RESET( mario )
{
mario_state *state = machine->driver_data;
- soundlatch_clear_w(0,0);
- soundlatch2_clear_w(0,0);
- soundlatch3_clear_w(0,0);
- soundlatch4_clear_w(0,0);
- I8035_P1_W(0x00); /* Input port */
- I8035_P2_W(0xff); /* Port is in high impedance state after reset */
+ soundlatch_clear_w(machine,0,0);
+ soundlatch2_clear_w(machine,0,0);
+ soundlatch3_clear_w(machine,0,0);
+ soundlatch4_clear_w(machine,0,0);
+ I8035_P1_W(machine,0x00); /* Input port */
+ I8035_P2_W(machine,0xff); /* Port is in high impedance state after reset */
state->last = 0;
}
@@ -269,22 +269,22 @@ static SOUND_RESET( mario )
static READ8_HANDLER( mario_sh_p1_r )
{
- return I8035_P1_R();
+ return I8035_P1_R(machine);
}
static READ8_HANDLER( mario_sh_p2_r )
{
- return I8035_P2_R() & 0xEF; /* Bit 4 connected to GND! */
+ return I8035_P2_R(machine) & 0xEF; /* Bit 4 connected to GND! */
}
static READ8_HANDLER( mario_sh_t0_r )
{
- return I8035_T_R(0);
+ return I8035_T_R(machine,0);
}
static READ8_HANDLER( mario_sh_t1_r )
{
- return I8035_T_R(1);
+ return I8035_T_R(machine,1);
}
static READ8_HANDLER( mario_sh_ea_r )
@@ -292,7 +292,7 @@ static READ8_HANDLER( mario_sh_ea_r )
#if USE_8039
return 1;
#else
- int p2 = (I8035_P2_R() >> 5) & 1;
+ int p2 = (I8035_P2_R(machine) >> 5) & 1;
return p2 ^ 1;
#endif
}
@@ -301,27 +301,27 @@ static READ8_HANDLER( mario_sh_tune_r )
{
UINT8 *SND = memory_region(REGION_CPU2);
UINT16 mask = memory_region_length(REGION_CPU2)-1;
- UINT8 p2 = I8035_P2_R();
+ UINT8 p2 = I8035_P2_R(machine);
if ((p2 >> 7) & 1)
- return soundlatch_r(offset);
+ return soundlatch_r(machine,offset);
else
return (SND[(0x1000 + (p2 & 0x0f)*256+offset) & mask]);
}
static WRITE8_HANDLER( mario_sh_sound_w )
{
- discrete_sound_w(DS_DAC,data);
+ discrete_sound_w(machine,DS_DAC,data);
}
static WRITE8_HANDLER( mario_sh_p1_w )
{
- I8035_P1_W(data);
+ I8035_P1_W(machine,data);
}
static WRITE8_HANDLER( mario_sh_p2_w )
{
- I8035_P2_W(data);
+ I8035_P2_W(machine,data);
}
/****************************************************************
@@ -332,12 +332,12 @@ static WRITE8_HANDLER( mario_sh_p2_w )
WRITE8_HANDLER( masao_sh_irqtrigger_w )
{
- mario_state *state = Machine->driver_data;
+ mario_state *state = machine->driver_data;
if (state->last == 1 && data == 0)
{
/* setting bit 0 high then low triggers IRQ on the sound CPU */
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
state->last = data;
@@ -345,54 +345,54 @@ WRITE8_HANDLER( masao_sh_irqtrigger_w )
WRITE8_HANDLER( mario_sh_tuneselect_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
}
/* Mario running sample */
WRITE8_HANDLER( mario_sh1_w )
{
- discrete_sound_w(DS_SOUND0_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND0_INP,data & 1);
}
/* Luigi running sample */
WRITE8_HANDLER( mario_sh2_w )
{
- discrete_sound_w(DS_SOUND1_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND1_INP,data & 1);
}
/* Misc samples */
WRITE8_HANDLER( mario_sh3_w )
{
- mario_state *state = Machine->driver_data;
+ mario_state *state = machine->driver_data;
switch (offset)
{
case 0: /* death */
if (data)
- cpunum_set_input_line(Machine, 1,0,ASSERT_LINE);
+ cpunum_set_input_line(machine, 1,0,ASSERT_LINE);
else
- cpunum_set_input_line(Machine, 1,0,CLEAR_LINE);
+ cpunum_set_input_line(machine, 1,0,CLEAR_LINE);
break;
case 1: /* get coin */
- I8035_T_W_AH(0,data & 1);
+ I8035_T_W_AH(machine,0,data & 1);
break;
case 2: /* ice */
- I8035_T_W_AH(1,data & 1);
+ I8035_T_W_AH(machine,1,data & 1);
break;
case 3: /* crab */
- I8035_P1_W_AH(0,data & 1);
+ I8035_P1_W_AH(machine,0,data & 1);
break;
case 4: /* turtle */
- I8035_P1_W_AH(1,data & 1);
+ I8035_P1_W_AH(machine,1,data & 1);
break;
case 5: /* fly */
- I8035_P1_W_AH(2,data & 1);
+ I8035_P1_W_AH(machine,2,data & 1);
break;
case 6: /* coin */
- I8035_P1_W_AH(3,data & 1);
+ I8035_P1_W_AH(machine,3,data & 1);
break;
case 7: /* skid */
- discrete_sound_w(DS_SOUND7_INP,data & 1);
+ discrete_sound_w(machine,DS_SOUND7_INP,data & 1);
break;
}
}
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 9ff38b486cf..ce6a4944287 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -63,8 +63,8 @@ static UINT8 ssio_duty_cycle[2][3];
static UINT8 ssio_ayvolume_lookup[16];
static UINT8 ssio_custom_input_mask[5];
static UINT8 ssio_custom_output_mask[2];
-static read8_handler ssio_custom_input[5];
-static write8_handler ssio_custom_output[2];
+static read8_machine_func ssio_custom_input[5];
+static write8_machine_func ssio_custom_output[2];
/* Chip Squeak Deluxe-specific globals */
static UINT8 csdeluxe_sound_cpu;
@@ -417,7 +417,7 @@ READ8_HANDLER( ssio_input_port_r )
UINT8 result = readinputportbytag_safe(port[offset], 0xff);
if (ssio_custom_input[offset])
result = (result & ~ssio_custom_input_mask[offset]) |
- ((*ssio_custom_input[offset])(offset) & ssio_custom_input_mask[offset]);
+ ((*ssio_custom_input[offset])(machine, offset) & ssio_custom_input_mask[offset]);
return result;
}
@@ -425,18 +425,18 @@ WRITE8_HANDLER( ssio_output_port_w )
{
int which = offset >> 2;
if (which == 0)
- mcr_control_port_w(offset, data);
+ mcr_control_port_w(machine, offset, data);
if (ssio_custom_output[which])
- (*ssio_custom_output[which])(offset, data & ssio_custom_output_mask[which]);
+ (*ssio_custom_output[which])(machine, offset, data & ssio_custom_output_mask[which]);
}
-void ssio_set_custom_input(int which, int mask, read8_handler handler)
+void ssio_set_custom_input(int which, int mask, read8_machine_func handler)
{
ssio_custom_input[which] = handler;
ssio_custom_input_mask[which] = mask;
}
-void ssio_set_custom_output(int which, int mask, write8_handler handler)
+void ssio_set_custom_output(int which, int mask, write8_machine_func handler)
{
ssio_custom_output[which/4] = handler;
ssio_custom_output_mask[which/4] = mask;
@@ -535,8 +535,8 @@ static void csdeluxe_irq(int state)
static TIMER_CALLBACK( csdeluxe_delayed_data_w )
{
- pia_0_portb_w(0, param & 0x0f);
- pia_0_ca1_w(0, ~param & 0x10);
+ pia_0_portb_w(machine, 0, param & 0x0f);
+ pia_0_ca1_w(machine, 0, ~param & 0x10);
/* oftentimes games will write one nibble at a time; the sync on this is very */
/* important, so we boost the interleave briefly while this happens */
@@ -550,17 +550,17 @@ static READ16_HANDLER( csdeluxe_pia_r )
/* using the MOVEP instruction outputs the same value on the high and */
/* low bytes. */
if (ACCESSING_MSB)
- return pia_0_alt_r(offset) << 8;
+ return pia_0_alt_r(machine, offset) << 8;
else
- return pia_0_alt_r(offset);
+ return pia_0_alt_r(machine, offset);
}
static WRITE16_HANDLER( csdeluxe_pia_w )
{
if (ACCESSING_MSB)
- pia_0_alt_w(offset, data >> 8);
+ pia_0_alt_w(machine, offset, data >> 8);
else
- pia_0_alt_w(offset, data);
+ pia_0_alt_w(machine, offset, data);
}
@@ -657,8 +657,8 @@ static void soundsgood_irq(int state)
static TIMER_CALLBACK( soundsgood_delayed_data_w )
{
- pia_1_portb_w(0, (param >> 1) & 0x0f);
- pia_1_ca1_w(0, ~param & 0x01);
+ pia_1_portb_w(machine, 0, (param >> 1) & 0x0f);
+ pia_1_ca1_w(machine, 0, ~param & 0x01);
/* oftentimes games will write one nibble at a time; the sync on this is very */
/* important, so we boost the interleave briefly while this happens */
@@ -750,8 +750,8 @@ static void turbocs_irq(int state)
static TIMER_CALLBACK( turbocs_delayed_data_w )
{
- pia_0_portb_w(0, (param >> 1) & 0x0f);
- pia_0_ca1_w(0, ~param & 0x01);
+ pia_0_portb_w(machine, 0, (param >> 1) & 0x0f);
+ pia_0_ca1_w(machine, 0, ~param & 0x01);
/* oftentimes games will write one nibble at a time; the sync on this is very */
/* important, so we boost the interleave briefly while this happens */
@@ -853,21 +853,21 @@ static WRITE8_HANDLER( squawkntalk_portb2_w )
/* write strobe -- pass the current command to the TMS5200 */
if (((data ^ squawkntalk_tms_strobes) & 0x02) && !(data & 0x02))
{
- tms5220_data_w(offset, squawkntalk_tms_command);
+ tms5220_data_w(machine, offset, squawkntalk_tms_command);
/* DoT expects the ready line to transition on a command/write here, so we oblige */
- pia_1_ca2_w(0, 1);
- pia_1_ca2_w(0, 0);
+ pia_1_ca2_w(machine, 0, 1);
+ pia_1_ca2_w(machine, 0, 0);
}
/* read strobe -- read the current status from the TMS5200 */
else if (((data ^ squawkntalk_tms_strobes) & 0x01) && !(data & 0x01))
{
- pia_1_porta_w(0, tms5220_status_r(offset));
+ pia_1_porta_w(machine, 0, tms5220_status_r(machine, offset));
/* DoT expects the ready line to transition on a command/write here, so we oblige */
- pia_1_ca2_w(0, 1);
- pia_1_ca2_w(0, 0);
+ pia_1_ca2_w(machine, 0, 1);
+ pia_1_ca2_w(machine, 0, 0);
}
/* remember the state */
@@ -883,8 +883,8 @@ static void squawkntalk_irq(int state)
static TIMER_CALLBACK( squawkntalk_delayed_data_w )
{
- pia_0_porta_w(0, ~param & 0x0f);
- pia_0_cb1_w(0, ~param & 0x10);
+ pia_0_porta_w(machine, 0, ~param & 0x0f);
+ pia_0_cb1_w(machine, 0, ~param & 0x10);
}
diff --git a/src/mame/audio/mcr.h b/src/mame/audio/mcr.h
index aa125067e73..d365260825b 100644
--- a/src/mame/audio/mcr.h
+++ b/src/mame/audio/mcr.h
@@ -20,8 +20,8 @@ READ8_HANDLER( ssio_status_r );
READ8_HANDLER( ssio_input_port_r );
WRITE8_HANDLER( ssio_output_port_w );
void ssio_reset_w(int state);
-void ssio_set_custom_input(int which, int mask, read8_handler handler);
-void ssio_set_custom_output(int which, int mask, write8_handler handler);
+void ssio_set_custom_input(int which, int mask, read8_machine_func handler);
+void ssio_set_custom_output(int which, int mask, write8_machine_func handler);
WRITE8_HANDLER( csdeluxe_data_w );
READ8_HANDLER( csdeluxe_status_r );
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index ced288fedac..de73fe38f5f 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -66,9 +66,9 @@ static SOUND_START( samples )
WRITE8_HANDLER( midway_tone_generator_lo_w )
{
- discrete_sound_w(MIDWAY_TONE_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, MIDWAY_TONE_EN, (data >> 0) & 0x01);
- discrete_sound_w(MIDWAY_TONE_DATA_L, (data >> 1) & 0x1f);
+ discrete_sound_w(machine, MIDWAY_TONE_DATA_L, (data >> 1) & 0x1f);
/* D6 and D7 are not connected */
}
@@ -76,7 +76,7 @@ WRITE8_HANDLER( midway_tone_generator_lo_w )
WRITE8_HANDLER( midway_tone_generator_hi_w )
{
- discrete_sound_w(MIDWAY_TONE_DATA_H, data & 0x3f);
+ discrete_sound_w(machine, MIDWAY_TONE_DATA_H, data & 0x3f);
/* D6 and D7 are not connected */
}
@@ -311,11 +311,11 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( tornbase_audio_w )
{
- discrete_sound_w(TORNBASE_TONE_240_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, TORNBASE_TONE_240_EN, (data >> 0) & 0x01);
- discrete_sound_w(TORNBASE_TONE_960_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, TORNBASE_TONE_960_EN, (data >> 1) & 0x01);
- discrete_sound_w(TORNBASE_TONE_120_EN, (data >> 2) & 0x01);
+ discrete_sound_w(machine, TORNBASE_TONE_120_EN, (data >> 2) & 0x01);
/* if (data & 0x08) enable SIREN sound */
@@ -567,22 +567,22 @@ MACHINE_DRIVER_START( maze_audio )
MACHINE_DRIVER_END
-void maze_write_discrete(UINT8 maze_tone_timing_state)
+void maze_write_discrete(running_machine *machine, UINT8 maze_tone_timing_state)
{
/* controls need to be active low */
int controls = ~readinputport(0) & 0xff;
- discrete_sound_w(MAZE_TONE_TIMING, maze_tone_timing_state);
- discrete_sound_w(MAZE_P1_DATA, controls & 0x0f);
- discrete_sound_w(MAZE_P2_DATA, (controls >> 4) & 0x0f);
- discrete_sound_w(MAZE_JOYSTICK_IN_USE, controls != 0xff);
+ discrete_sound_w(machine, MAZE_TONE_TIMING, maze_tone_timing_state);
+ discrete_sound_w(machine, MAZE_P1_DATA, controls & 0x0f);
+ discrete_sound_w(machine, MAZE_P2_DATA, (controls >> 4) & 0x0f);
+ discrete_sound_w(machine, MAZE_JOYSTICK_IN_USE, controls != 0xff);
/* The coin line is connected directly to the discrete circuit. */
/* We can't really do that, so updating it with the tone timing is close enough. */
/* A better option might be to update it at vblank or set a timer to do it. */
/* The only noticeable difference doing it here, is that the controls don't */
/* imediately start making tones if pressed right after the coin is inserted. */
- discrete_sound_w(MAZE_COIN, (~readinputport(1) >> 3) & 0x01);
+ discrete_sound_w(machine, MAZE_COIN, (~readinputport(1) >> 3) & 0x01);
}
@@ -809,15 +809,15 @@ WRITE8_HANDLER( boothill_audio_w )
coin_counter_w(0, (data >> 2) & 0x01);
- discrete_sound_w(BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01);
+ discrete_sound_w(machine, BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01);
- discrete_sound_w(BOOTHILL_LEFT_SHOT_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, BOOTHILL_LEFT_SHOT_EN, (data >> 4) & 0x01);
- discrete_sound_w(BOOTHILL_RIGHT_SHOT_EN, (data >> 5) & 0x01);
+ discrete_sound_w(machine, BOOTHILL_RIGHT_SHOT_EN, (data >> 5) & 0x01);
- discrete_sound_w(BOOTHILL_LEFT_HIT_EN, (data >> 6) & 0x01);
+ discrete_sound_w(machine, BOOTHILL_LEFT_HIT_EN, (data >> 6) & 0x01);
- discrete_sound_w(BOOTHILL_RIGHT_HIT_EN, (data >> 7) & 0x01);
+ discrete_sound_w(machine, BOOTHILL_RIGHT_HIT_EN, (data >> 7) & 0x01);
}
@@ -1041,16 +1041,16 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( checkmat_audio_w )
{
- discrete_sound_w(CHECKMAT_TONE_EN, data & 0x01);
+ discrete_sound_w(machine, CHECKMAT_TONE_EN, data & 0x01);
- discrete_sound_w(CHECKMAT_BOOM_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, CHECKMAT_BOOM_EN, (data >> 1) & 0x01);
coin_counter_w(0, (data >> 2) & 0x01);
sound_global_enable((data >> 3) & 0x01);
- discrete_sound_w(CHECKMAT_TONE_DATA_45, (data >> 4) & 0x03);
- discrete_sound_w(CHECKMAT_TONE_DATA_67, (data >> 6) & 0x03);
+ discrete_sound_w(machine, CHECKMAT_TONE_DATA_45, (data >> 4) & 0x03);
+ discrete_sound_w(machine, CHECKMAT_TONE_DATA_67, (data >> 6) & 0x03);
}
@@ -1284,23 +1284,23 @@ WRITE8_HANDLER( desertgu_audio_1_w )
coin_counter_w(0, (data >> 2) & 0x01);
- discrete_sound_w(DESERTGU_GAME_ON_EN, (data >> 3) & 0x01);
+ discrete_sound_w(machine, DESERTGU_GAME_ON_EN, (data >> 3) & 0x01);
- discrete_sound_w(DESERTGU_RIFLE_SHOT_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, DESERTGU_RIFLE_SHOT_EN, (data >> 4) & 0x01);
- discrete_sound_w(DESERTGU_BOTTLE_HIT_EN, (data >> 5) & 0x01);
+ discrete_sound_w(machine, DESERTGU_BOTTLE_HIT_EN, (data >> 5) & 0x01);
- discrete_sound_w(DESERTGU_ROAD_RUNNER_HIT_EN, (data >> 6) & 0x01);
+ discrete_sound_w(machine, DESERTGU_ROAD_RUNNER_HIT_EN, (data >> 6) & 0x01);
- discrete_sound_w(DESERTGU_CREATURE_HIT_EN, (data >> 7) & 0x01);
+ discrete_sound_w(machine, DESERTGU_CREATURE_HIT_EN, (data >> 7) & 0x01);
}
WRITE8_HANDLER( desertgu_audio_2_w )
{
- discrete_sound_w(DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01);
- discrete_sound_w(DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01);
output_set_value("KICKER", (data >> 2) & 0x01);
@@ -1574,15 +1574,15 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( dplay_audio_w )
{
- discrete_sound_w(DPLAY_TONE_ON_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, DPLAY_TONE_ON_EN, (data >> 0) & 0x01);
- discrete_sound_w(DPLAY_CHEER_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, DPLAY_CHEER_EN, (data >> 1) & 0x01);
- discrete_sound_w(DPLAY_SIREN_EN, (data >> 2) & 0x01);
+ discrete_sound_w(machine, DPLAY_SIREN_EN, (data >> 2) & 0x01);
- discrete_sound_w(DPLAY_WHISTLE_EN, (data >> 3) & 0x01);
+ discrete_sound_w(machine, DPLAY_WHISTLE_EN, (data >> 3) & 0x01);
- discrete_sound_w(DPLAY_GAME_ON_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, DPLAY_GAME_ON_EN, (data >> 4) & 0x01);
coin_counter_w(0, (data >> 5) & 0x01);
@@ -2028,15 +2028,15 @@ WRITE8_HANDLER( clowns_audio_2_w )
{
UINT8 rising_bits = data & ~port_2_last;
- discrete_sound_w(CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, CLOWNS_POP_BOTTOM_EN, (data >> 0) & 0x01);
- discrete_sound_w(CLOWNS_POP_MIDDLE_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, CLOWNS_POP_MIDDLE_EN, (data >> 1) & 0x01);
- discrete_sound_w(CLOWNS_POP_TOP_EN, (data >> 2) & 0x01);
+ discrete_sound_w(machine, CLOWNS_POP_TOP_EN, (data >> 2) & 0x01);
sound_global_enable((data >> 3) & 0x01);
- discrete_sound_w(CLOWNS_SPRINGBOARD_HIT_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, CLOWNS_SPRINGBOARD_HIT_EN, (data >> 4) & 0x01);
if (rising_bits & 0x20) sample_start_n(0, 0, 0, 0); /* springboard miss */
@@ -2705,7 +2705,7 @@ WRITE8_HANDLER( spcenctr_audio_1_w )
/* D1 is marked as 'OPTIONAL SWITCH VIDEO FOR COCKTAIL',
but it is never set by the software */
- discrete_sound_w(SPCENCTR_CRASH_EN, (data >> 2) & 0x01);
+ discrete_sound_w(machine, SPCENCTR_CRASH_EN, (data >> 2) & 0x01);
/* D3-D7 are not connected */
}
@@ -2715,9 +2715,9 @@ WRITE8_HANDLER( spcenctr_audio_2_w )
{
/* set WIND SOUND FREQ(data & 0x0f) 0, if no wind */
- discrete_sound_w(SPCENCTR_EXPLOSION_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, SPCENCTR_EXPLOSION_EN, (data >> 4) & 0x01);
- discrete_sound_w(SPCENCTR_PLAYER_SHOT_EN, (data >> 5) & 0x01);
+ discrete_sound_w(machine, SPCENCTR_PLAYER_SHOT_EN, (data >> 5) & 0x01);
/* D6 and D7 are not connected */
@@ -2729,13 +2729,13 @@ WRITE8_HANDLER( spcenctr_audio_3_w )
{
/* if (data & 0x01) enable SCREECH (hit the sides) sound */
- discrete_sound_w(SPCENCTR_ENEMY_SHIP_SHOT_EN, (data >> 1) & 0x01);
+ discrete_sound_w(machine, SPCENCTR_ENEMY_SHIP_SHOT_EN, (data >> 1) & 0x01);
spcenctr_set_strobe_state((data >> 2) & 0x01);
output_set_value("LAMP", (data >> 3) & 0x01);
- discrete_sound_w(SPCENCTR_BONUS_EN, (data >> 4) & 0x01);
+ discrete_sound_w(machine, SPCENCTR_BONUS_EN, (data >> 4) & 0x01);
SN76477_enable_w(0, (data >> 5) & 0x01); /* saucer sound */
@@ -2912,7 +2912,7 @@ WRITE8_HANDLER( bowler_audio_1_w )
sound_global_enable((data >> 2) & 0x01);
- discrete_sound_w(BOWLER_FOWL_EN, (data >> 3) & 0x01);
+ discrete_sound_w(machine, BOWLER_FOWL_EN, (data >> 3) & 0x01);
/* D4 - appears to be a screen flip, but it's
shown unconnected on the schematics for both the
@@ -3642,10 +3642,10 @@ WRITE8_HANDLER( invaders_audio_1_w )
{
SN76477_enable_w(0, (~data >> 0) & 0x01); /* saucer sound */
- discrete_sound_w(INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02);
- discrete_sound_w(INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04);
- discrete_sound_w(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08);
- discrete_sound_w(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10);
sound_global_enable(data & 0x20);
@@ -3655,8 +3655,8 @@ WRITE8_HANDLER( invaders_audio_1_w )
WRITE8_HANDLER( invaders_audio_2_w )
{
- discrete_sound_w(INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f);
- discrete_sound_w(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10);
/* the flip screen line is only connected on the cocktail PCB */
if (invaders_is_cabinet_cocktail())
@@ -3792,11 +3792,11 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( blueshrk_audio_w )
{
- discrete_sound_w(BLUESHRK_GAME_ON_EN, (data >> 0) & 0x01);
+ discrete_sound_w(machine, BLUESHRK_GAME_ON_EN, (data >> 0) & 0x01);
/* discrete_sound_w(BLUESHRK_SHOT_EN, (data >> 1) & 0x01); */
- discrete_sound_w(BLUESHRK_HIT_EN, (data >> 2) & 0x01);
+ discrete_sound_w(machine, BLUESHRK_HIT_EN, (data >> 2) & 0x01);
/* discrete_sound_w(BLUESHRK_SHARK_EN, (data >> 3) & 0x01); */
@@ -4022,10 +4022,10 @@ WRITE8_HANDLER( invad2ct_audio_1_w )
{
SN76477_enable_w(0, (~data >> 0) & 0x01); /* saucer sound */
- discrete_sound_w(INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02);
- discrete_sound_w(INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04);
- discrete_sound_w(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08);
- discrete_sound_w(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_EXPLOSION_EN, 1), data & 0x04);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 1), data & 0x08);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 1), data & 0x10);
sound_global_enable(data & 0x20);
@@ -4035,8 +4035,8 @@ WRITE8_HANDLER( invad2ct_audio_1_w )
WRITE8_HANDLER( invad2ct_audio_2_w )
{
- discrete_sound_w(INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f);
- discrete_sound_w(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10);
/* D5-D7 are not connected */
}
@@ -4046,10 +4046,10 @@ WRITE8_HANDLER( invad2ct_audio_3_w )
{
SN76477_enable_w(1, (~data >> 0) & 0x01); /* saucer sound */
- discrete_sound_w(INVADERS_NODE(INVADERS_MISSILE_EN, 2), data & 0x02);
- discrete_sound_w(INVADERS_NODE(INVADERS_EXPLOSION_EN, 2), data & 0x04);
- discrete_sound_w(INVADERS_NODE(INVADERS_INVADER_HIT_EN, 2), data & 0x08);
- discrete_sound_w(INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 2), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_MISSILE_EN, 2), data & 0x02);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_EXPLOSION_EN, 2), data & 0x04);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_INVADER_HIT_EN, 2), data & 0x08);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_BONUS_MISSLE_BASE_EN, 2), data & 0x10);
/* D5-D7 are not connected */
}
@@ -4057,8 +4057,8 @@ WRITE8_HANDLER( invad2ct_audio_3_w )
WRITE8_HANDLER( invad2ct_audio_4_w )
{
- discrete_sound_w(INVADERS_NODE(INVADERS_FLEET_DATA, 2), data & 0x0f);
- discrete_sound_w(INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 2), data & 0x10);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_FLEET_DATA, 2), data & 0x0f);
+ discrete_sound_w(machine, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 2), data & 0x10);
/* D5-D7 are not connected */
}
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index 5c746fcdb1b..9048182c4cd 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -76,16 +76,16 @@ static WRITE8_HANDLER( namco_54xx_O_w )
{
UINT8 out = (data & 0x0f);
if (data & 0x10)
- discrete_sound_w(NAMCO_54XX_1_DATA, out);
+ discrete_sound_w(machine, NAMCO_54XX_1_DATA, out);
else
- discrete_sound_w(NAMCO_54XX_0_DATA, out);
+ discrete_sound_w(machine, NAMCO_54XX_0_DATA, out);
}
static WRITE8_HANDLER( namco_54xx_R1_w )
{
UINT8 out = (data & 0x0f);
- discrete_sound_w(NAMCO_54XX_2_DATA, out);
+ discrete_sound_w(machine, NAMCO_54XX_2_DATA, out);
}
diff --git a/src/mame/audio/orbit.c b/src/mame/audio/orbit.c
index 5ac7de6acd8..be551cf2fae 100644
--- a/src/mame/audio/orbit.c
+++ b/src/mame/audio/orbit.c
@@ -15,24 +15,24 @@
WRITE8_HANDLER( orbit_note_w )
{
- discrete_sound_w(ORBIT_NOTE_FREQ, (~data) & 0xff);
+ discrete_sound_w(machine, ORBIT_NOTE_FREQ, (~data) & 0xff);
}
WRITE8_HANDLER( orbit_note_amp_w )
{
- discrete_sound_w(ORBIT_ANOTE1_AMP, data & 0x0f);
- discrete_sound_w(ORBIT_ANOTE2_AMP, data >> 4);
+ discrete_sound_w(machine, ORBIT_ANOTE1_AMP, data & 0x0f);
+ discrete_sound_w(machine, ORBIT_ANOTE2_AMP, data >> 4);
}
WRITE8_HANDLER( orbit_noise_amp_w )
{
- discrete_sound_w(ORBIT_NOISE1_AMP, data & 0x0f);
- discrete_sound_w(ORBIT_NOISE2_AMP, data >> 4);
+ discrete_sound_w(machine, ORBIT_NOISE1_AMP, data & 0x0f);
+ discrete_sound_w(machine, ORBIT_NOISE2_AMP, data >> 4);
}
WRITE8_HANDLER( orbit_noise_rst_w )
{
- discrete_sound_w(ORBIT_NOISE_EN, 0);
+ discrete_sound_w(machine, ORBIT_NOISE_EN, 0);
}
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index 4f9ebdb8e1b..3125fd14924 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -387,8 +387,8 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( phoenix_sound_control_a_w )
{
- discrete_sound_w(PHOENIX_EFFECT_2_DATA, data & 0x0f);
- discrete_sound_w(PHOENIX_EFFECT_2_FREQ, (data & 0x30) >> 4);
+ discrete_sound_w(machine, PHOENIX_EFFECT_2_DATA, data & 0x0f);
+ discrete_sound_w(machine, PHOENIX_EFFECT_2_FREQ, (data & 0x30) >> 4);
// discrete_sound_w(PHOENIX_EFFECT_3_EN , data & 0x40);
// discrete_sound_w(PHOENIX_EFFECT_4_EN , data & 0x80);
@@ -418,9 +418,9 @@ SOUND_START( phoenix)
WRITE8_HANDLER( phoenix_sound_control_b_w )
{
- discrete_sound_w(PHOENIX_EFFECT_1_DATA, data & 0x0f);
- discrete_sound_w(PHOENIX_EFFECT_1_FILT, data & 0x20);
- discrete_sound_w(PHOENIX_EFFECT_1_FREQ, data & 0x10);
+ discrete_sound_w(machine, PHOENIX_EFFECT_1_DATA, data & 0x0f);
+ discrete_sound_w(machine, PHOENIX_EFFECT_1_FILT, data & 0x20);
+ discrete_sound_w(machine, PHOENIX_EFFECT_1_FREQ, data & 0x10);
/* update the tune that the MM6221AA is playing */
mm6221aa_tune_w(0, data >> 6);
diff --git a/src/mame/audio/poolshrk.c b/src/mame/audio/poolshrk.c
index 36a6afa197b..b6ca498f81a 100644
--- a/src/mame/audio/poolshrk.c
+++ b/src/mame/audio/poolshrk.c
@@ -158,20 +158,20 @@ DISCRETE_SOUND_END
WRITE8_HANDLER( poolshrk_scratch_sound_w )
{
- discrete_sound_w(POOLSHRK_SCRATCH_SND, offset & 1);
+ discrete_sound_w(machine, POOLSHRK_SCRATCH_SND, offset & 1);
}
WRITE8_HANDLER( poolshrk_score_sound_w )
{
- discrete_sound_w(POOLSHRK_SCORE_EN, 1); /* this will trigger the sound code for 1 sample */
+ discrete_sound_w(machine, POOLSHRK_SCORE_EN, 1); /* this will trigger the sound code for 1 sample */
}
WRITE8_HANDLER( poolshrk_click_sound_w )
{
- discrete_sound_w(POOLSHRK_CLICK_EN, 1); /* this will trigger the sound code for 1 sample */
+ discrete_sound_w(machine, POOLSHRK_CLICK_EN, 1); /* this will trigger the sound code for 1 sample */
}
WRITE8_HANDLER( poolshrk_bump_sound_w )
{
- discrete_sound_w(POOLSHRK_BUMP_EN, offset & 1);
+ discrete_sound_w(machine, POOLSHRK_BUMP_EN, offset & 1);
}
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 203ac958ebf..7073f8b75bd 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -22,12 +22,12 @@ Audio handlers
WRITE8_HANDLER( qix_dac_w )
{
- discrete_sound_w(QIX_DAC_DATA, data);
+ discrete_sound_w(machine, QIX_DAC_DATA, data);
}
WRITE8_HANDLER( qix_vol_w )
{
- discrete_sound_w(QIX_VOL_DATA, data);
+ discrete_sound_w(machine, QIX_VOL_DATA, data);
}
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index f5a4ba71428..efc1712ea75 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -77,12 +77,12 @@ static WRITE8_HANDLER( redalert_analog_w )
WRITE8_HANDLER( redalert_audio_command_w )
{
/* the byte is connected to port A of the AY8910 */
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
/* D7 is also connected to the NMI input of the CPU -
the NMI is actually toggled by a 74121 */
if ((data & 0x80) == 0x00)
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -97,18 +97,18 @@ static WRITE8_HANDLER( redalert_AY8910_w )
/* BC1=1, BDIR=0 : read from PSG */
case 0x01:
- ay8910_latch_1 = AY8910_read_port_0_r(0);
+ ay8910_latch_1 = AY8910_read_port_0_r(machine, 0);
break;
/* BC1=0, BDIR=1 : write to PSG */
case 0x02:
- AY8910_write_port_0_w(0, ay8910_latch_2);
+ AY8910_write_port_0_w(machine, 0, ay8910_latch_2);
break;
/* BC1=1, BDIR=1 : latch address */
default:
case 0x03:
- AY8910_control_port_0_w(0, ay8910_latch_2);
+ AY8910_control_port_0_w(machine, 0, ay8910_latch_2);
break;
}
}
@@ -159,9 +159,8 @@ static SOUND_START( redalert_audio )
WRITE8_HANDLER( redalert_voice_command_w )
{
- soundlatch2_w(0, (data & 0x78) >> 3);
-
- cpunum_set_input_line(Machine, 2, I8085_RST75_LINE, (~data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
+ soundlatch2_w(machine, 0, (data & 0x78) >> 3);
+ cpunum_set_input_line(machine, 2, I8085_RST75_LINE, (~data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
}
@@ -248,9 +247,8 @@ MACHINE_DRIVER_END
WRITE8_HANDLER( demoneye_audio_command_w )
{
/* the byte is connected to port A of the AY8910 */
- soundlatch_w(0, data);
-
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -272,28 +270,28 @@ static WRITE8_HANDLER( demoneye_ay8910_data_w )
{
case 0x00:
if (ay8910_latch_1 & 0x10)
- AY8910_write_port_0_w(0, data);
+ AY8910_write_port_0_w(machine, 0, data);
if (ay8910_latch_1 & 0x20)
- AY8910_write_port_1_w(0, data);
+ AY8910_write_port_1_w(machine, 0, data);
break;
case 0x01:
if (ay8910_latch_1 & 0x10)
- ay8910_latch_2 = AY8910_read_port_0_r(0);
+ ay8910_latch_2 = AY8910_read_port_0_r(machine, 0);
if (ay8910_latch_1 & 0x20)
- ay8910_latch_2 = AY8910_read_port_1_r(0);
+ ay8910_latch_2 = AY8910_read_port_1_r(machine, 0);
break;
case 0x03:
if (ay8910_latch_1 & 0x10)
- AY8910_control_port_0_w(0, data);
+ AY8910_control_port_0_w(machine, 0, data);
if (ay8910_latch_1 & 0x20)
- AY8910_control_port_1_w(0, data);
+ AY8910_control_port_1_w(machine, 0, data);
break;
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 5df88d0ad15..234b7b77c7a 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -59,7 +59,7 @@ WRITE8_HANDLER( redbaron_sounds_w )
WRITE8_HANDLER( redbaron_pokey_w )
{
if( latch & 0x20 )
- pokey1_w (offset, data);
+ pokey1_w(machine, offset, data);
}
static void redbaron_sound_update(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int length)
diff --git a/src/mame/audio/rockola.c b/src/mame/audio/rockola.c
index d0aed2200b7..4bfbbd23750 100644
--- a/src/mame/audio/rockola.c
+++ b/src/mame/audio/rockola.c
@@ -715,7 +715,7 @@ WRITE8_HANDLER( fantasy_sound_w )
tone_channels[2].base = 0x1000 + ((data & 0x70) << 4);
tone_channels[2].mask = 0xff;
- rockola_flipscreen_w(0, data);
+ rockola_flipscreen_w(machine, 0, data);
break;
}
}
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 188e0449810..67134d9ef33 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -157,13 +157,13 @@ static void sfx_sh_7474_callback(void)
WRITE8_HANDLER( hotshock_sh_irqtrigger_w )
{
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE);
}
READ8_HANDLER( hotshock_soundlatch_r )
{
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
+ return soundlatch_r(machine,0);
}
static void filter_w(int chip, int channel, int data)
@@ -323,8 +323,8 @@ static TIMER_CALLBACK( ad2083_step )
if (ctrl & 0x40)
speech_rom_address = 0;
- tms5110_CTL_w(0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
- tms5110_PDC_w(0, ctrl & 0x02 ? 0 : 1);
+ tms5110_CTL_w(machine, 0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
+ tms5110_PDC_w(machine, 0, ctrl & 0x02 ? 0 : 1);
if (!(ctrl & 0x80))
timer_set(ATTOTIME_IN_HZ(AD2083_TMS5110_CLOCK / 2),NULL,1,ad2083_step);
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index f4f4870c835..f5316220b06 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -459,12 +459,12 @@ WRITE16_HANDLER( seibu_main_word_w )
READ8_HANDLER( seibu_main_v30_r )
{
- return seibu_main_word_r(offset/2,0) >> (8 * (offset & 1));
+ return seibu_main_word_r(machine,offset/2,0) >> (8 * (offset & 1));
}
WRITE8_HANDLER( seibu_main_v30_w )
{
- seibu_main_word_w(offset/2,data << (8 * (offset & 1)),0xff00 >> (8 * (offset & 1)));
+ seibu_main_word_w(machine,offset/2,data << (8 * (offset & 1)),0xff00 >> (8 * (offset & 1)));
}
WRITE16_HANDLER( seibu_main_mustb_w )
diff --git a/src/mame/audio/snes.c b/src/mame/audio/snes.c
index 60c90362dfa..f8c9b34caa9 100644
--- a/src/mame/audio/snes.c
+++ b/src/mame/audio/snes.c
@@ -1228,7 +1228,7 @@ READ8_HANDLER( spc_io_r )
case 0x2: /* Register address */
return spc_ram[0xf2];
case 0x3: /* Register data */
- return snes_dsp_io_r( spc_ram[0xf2] );
+ return snes_dsp_io_r( machine, spc_ram[0xf2] );
case 0x4: /* Port 0 */
case 0x5: /* Port 1 */
case 0x6: /* Port 2 */
@@ -1303,7 +1303,7 @@ WRITE8_HANDLER( spc_io_w )
case 0x2: /* Register address */
break;
case 0x3: /* Register data */
- snes_dsp_io_w( spc_ram[0xf2], data );
+ snes_dsp_io_w( machine, spc_ram[0xf2], data );
break;
case 0x4: /* Port 0 */
case 0x5: /* Port 1 */
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index 15a5ec1a548..e972fc61090 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -179,22 +179,22 @@ WRITE8_HANDLER( spiders_audio_command_w )
WRITE8_HANDLER( spiders_audio_a_w )
{
- discrete_sound_w(SPIDER_WEB_SOUND_MOD_DATA, 1 + (data & 4) * 8 + (data & 2) * 4 + (data & 1) * 2);
+ discrete_sound_w(machine, SPIDER_WEB_SOUND_MOD_DATA, 1 + (data & 4) * 8 + (data & 2) * 4 + (data & 1) * 2);
}
WRITE8_HANDLER( spiders_audio_b_w )
{
- discrete_sound_w(SPIDERS_WEB_SOUND_DATA, data);
+ discrete_sound_w(machine, SPIDERS_WEB_SOUND_DATA, data);
}
WRITE8_HANDLER( spiders_audio_ctrl_w )
{
- discrete_sound_w(SPIDERS_FIRE_EN, data & 0x10 ? 1 : 0);
- discrete_sound_w(SPIDERS_EXP_EN, data & 0x08 ? 1 : 0);
- discrete_sound_w(SPIDERS_SUPER_WEB_EXPL_EN, data & 0x04 ? 1 : 0);
- discrete_sound_w(SPIDERS_SUPER_WEB_EN, data & 0x02 ? 1 : 0);
- discrete_sound_w(SPIDERS_X_EN, data & 0x01 ? 1 : 0);
+ discrete_sound_w(machine, SPIDERS_FIRE_EN, data & 0x10 ? 1 : 0);
+ discrete_sound_w(machine, SPIDERS_EXP_EN, data & 0x08 ? 1 : 0);
+ discrete_sound_w(machine, SPIDERS_SUPER_WEB_EXPL_EN, data & 0x04 ? 1 : 0);
+ discrete_sound_w(machine, SPIDERS_SUPER_WEB_EN, data & 0x02 ? 1 : 0);
+ discrete_sound_w(machine, SPIDERS_X_EN, data & 0x01 ? 1 : 0);
}
diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c
index 4158e6c6d38..2c659080874 100644
--- a/src/mame/audio/starwars.c
+++ b/src/mame/audio/starwars.c
@@ -119,7 +119,7 @@ WRITE8_HANDLER( starwars_m6532_w )
{
port_A = (port_A&(~port_A_ddr))|(data&port_A_ddr);
if ((port_A&0x01)==0)
- tms5220_data_w(0,port_B);
+ tms5220_data_w(machine,0,port_B);
}
else
port_A = (port_A&(~port_A_ddr))|(data&port_A_ddr);
diff --git a/src/mame/audio/subs.c b/src/mame/audio/subs.c
index ee3786aa427..bcf79e6cbf6 100644
--- a/src/mame/audio/subs.c
+++ b/src/mame/audio/subs.c
@@ -14,28 +14,28 @@ sub sound functions
WRITE8_HANDLER( subs_sonar1_w )
{
- discrete_sound_w(SUBS_SONAR1_EN, offset & 0x01);
+ discrete_sound_w(machine, SUBS_SONAR1_EN, offset & 0x01);
}
WRITE8_HANDLER( subs_sonar2_w )
{
- discrete_sound_w(SUBS_SONAR2_EN, offset & 0x01);
+ discrete_sound_w(machine, SUBS_SONAR2_EN, offset & 0x01);
}
WRITE8_HANDLER( subs_crash_w )
{
- discrete_sound_w(SUBS_CRASH_EN, offset & 0x01);
+ discrete_sound_w(machine, SUBS_CRASH_EN, offset & 0x01);
}
WRITE8_HANDLER( subs_explode_w )
{
- discrete_sound_w(SUBS_EXPLODE_EN, offset & 0x01);
+ discrete_sound_w(machine, SUBS_EXPLODE_EN, offset & 0x01);
}
WRITE8_HANDLER( subs_noise_reset_w )
{
/* Pulse noise reset */
- discrete_sound_w(SUBS_NOISE_RESET, 0);
+ discrete_sound_w(machine, SUBS_NOISE_RESET, 0);
}
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 77b32a4807f..82b0bbdeca3 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -266,31 +266,31 @@ READ8_HANDLER( taitosound_slave_comm_r )
WRITE16_HANDLER( taitosound_port16_lsb_w )
{
if (ACCESSING_LSB)
- taitosound_port_w(0,data & 0xff);
+ taitosound_port_w(machine,0,data & 0xff);
}
WRITE16_HANDLER( taitosound_comm16_lsb_w )
{
if (ACCESSING_LSB)
- taitosound_comm_w(0,data & 0xff);
+ taitosound_comm_w(machine,0,data & 0xff);
}
READ16_HANDLER( taitosound_comm16_lsb_r )
{
- return taitosound_comm_r(0);
+ return taitosound_comm_r(machine,0);
}
WRITE16_HANDLER( taitosound_port16_msb_w )
{
if (ACCESSING_MSB)
- taitosound_port_w(0,data >> 8);
+ taitosound_port_w(machine,0,data >> 8);
}
WRITE16_HANDLER( taitosound_comm16_msb_w )
{
if (ACCESSING_MSB)
- taitosound_comm_w(0,data >> 8);
+ taitosound_comm_w(machine,0,data >> 8);
}
READ16_HANDLER( taitosound_comm16_msb_r )
{
- return taitosound_comm_r(0) << 8;
+ return taitosound_comm_r(machine,0) << 8;
}
diff --git a/src/mame/audio/toaplan2.c b/src/mame/audio/toaplan2.c
index 7574fac0624..387f1ed3338 100644
--- a/src/mame/audio/toaplan2.c
+++ b/src/mame/audio/toaplan2.c
@@ -70,77 +70,77 @@ static const UINT8 fixeight_cmd_snd[128] =
/*78*/ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-static void play_oki_sound(int game_sound, int data)
+static void play_oki_sound(running_machine *machine, int game_sound, int data)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
logerror("Playing sample %02x from command %02x\n",game_sound,data);
if (game_sound != 0)
{
if ((status & 0x01) == 0) {
- OKIM6295_data_0_w(0,(0x80 | game_sound));
- OKIM6295_data_0_w(0,0x11);
+ OKIM6295_data_0_w(machine,0,(0x80 | game_sound));
+ OKIM6295_data_0_w(machine,0,0x11);
}
else if ((status & 0x02) == 0) {
- OKIM6295_data_0_w(0,(0x80 | game_sound));
- OKIM6295_data_0_w(0,0x21);
+ OKIM6295_data_0_w(machine,0,(0x80 | game_sound));
+ OKIM6295_data_0_w(machine,0,0x21);
}
else if ((status & 0x04) == 0) {
- OKIM6295_data_0_w(0,(0x80 | game_sound));
- OKIM6295_data_0_w(0,0x41);
+ OKIM6295_data_0_w(machine,0,(0x80 | game_sound));
+ OKIM6295_data_0_w(machine,0,0x41);
}
else if ((status & 0x08) == 0) {
- OKIM6295_data_0_w(0,(0x80 | game_sound));
- OKIM6295_data_0_w(0,0x81);
+ OKIM6295_data_0_w(machine,0,(0x80 | game_sound));
+ OKIM6295_data_0_w(machine,0,0x81);
}
}
}
-void dogyuun_okisnd_w(int data)
+void dogyuun_okisnd_w(running_machine *machine, int data)
{
/* Need a board to determine the sound commands */
// popmessage("Writing %04x to Sound CPU",data);
}
-void kbash_okisnd_w(int data)
+void kbash_okisnd_w(running_machine *machine, int data)
{
// popmessage("Writing %04x to Sound CPU",data);
if (data == 0)
{
- OKIM6295_data_0_w(0,0x78); /* Stop playing effects */
+ OKIM6295_data_0_w(machine,0,0x78); /* Stop playing effects */
}
else if ((data > 0) && (data < 128))
{
- play_oki_sound(kbash_cmd_snd[data], data);
+ play_oki_sound(machine, kbash_cmd_snd[data], data);
}
}
-void fixeight_okisnd_w(int data)
+void fixeight_okisnd_w(running_machine *machine, int data)
{
// popmessage("Writing %04x to Sound CPU",data);
if (data == 0)
{
- OKIM6295_data_0_w(0,0x78); /* Stop playing effects */
+ OKIM6295_data_0_w(machine,0,0x78); /* Stop playing effects */
}
else if ((data > 0) && (data < 128))
{
- play_oki_sound(fixeight_cmd_snd[data], data);
+ play_oki_sound(machine, fixeight_cmd_snd[data], data);
}
}
-void batsugun_okisnd_w(int data)
+void batsugun_okisnd_w(running_machine *machine, int data)
{
// popmessage("Writing %04x to Sound CPU",data);
if (data == 0)
{
- OKIM6295_data_0_w(0,0x78); /* Stop playing effects */
+ OKIM6295_data_0_w(machine,0,0x78); /* Stop playing effects */
}
else if ((data > 0) && (data < 64))
{
- play_oki_sound(batsugun_cmd_snd[data], data);
+ play_oki_sound(machine, batsugun_cmd_snd[data], data);
}
}
diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c
index 9c7b7a86892..70ae9a2ba22 100644
--- a/src/mame/audio/trackfld.c
+++ b/src/mame/audio/trackfld.c
@@ -105,7 +105,7 @@ WRITE8_HANDLER( konami_SN76496_latch_w )
WRITE8_HANDLER( konami_SN76496_0_w )
{
- SN76496_0_w(offset, SN76496_latch);
+ SN76496_0_w(machine, offset, SN76496_latch);
}
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index a58d176385a..cd92a5fa87c 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -150,12 +150,12 @@ WRITE8_HANDLER( frogs_audio_w )
int new_croak = data & 0x08;
int new_buzzz = data & 0x10;
-// discrete_sound_w(FROGS_HOP_EN, data & 0x01);
-// discrete_sound_w(FROGS_JUMP_EN, data & 0x02);
- discrete_sound_w(FROGS_TONGUE_EN, data & 0x04);
-// discrete_sound_w(FROGS_CAPTURE_EN, data & 0x08);
-// discrete_sound_w(FROGS_FLY_EN, data & 0x10);
-// discrete_sound_w(FROGS_SPLASH_EN, data & 0x80);
+// discrete_sound_w(machine, FROGS_HOP_EN, data & 0x01);
+// discrete_sound_w(machine, FROGS_JUMP_EN, data & 0x02);
+ discrete_sound_w(machine, FROGS_TONGUE_EN, data & 0x04);
+// discrete_sound_w(machine, FROGS_CAPTURE_EN, data & 0x08);
+// discrete_sound_w(machine, FROGS_FLY_EN, data & 0x10);
+// discrete_sound_w(machine, FROGS_SPLASH_EN, data & 0x80);
if (data & 0x01)
sample_start (3, 3, 0); // Hop
@@ -447,13 +447,13 @@ WRITE8_HANDLER( headon_audio_w )
{
if (!sndti_exists(SOUND_DISCRETE, 0))
return;
- discrete_sound_w(HEADON_HISPEED_PC_EN, data & 0x01);
- discrete_sound_w(HEADON_SCREECH1_EN, data & 0x02);
- discrete_sound_w(HEADON_CRASH_EN, data & 0x04);
- discrete_sound_w(HEADON_HISPEED_CC_EN, data & 0x08);
- discrete_sound_w(HEADON_SCREECH2_EN, data & 0x10);
- discrete_sound_w(HEADON_BONUS_EN, data & 0x20);
- discrete_sound_w(HEADON_CAR_ON_EN, data & 0x40);
+ discrete_sound_w(machine, HEADON_HISPEED_PC_EN, data & 0x01);
+ discrete_sound_w(machine, HEADON_SCREECH1_EN, data & 0x02);
+ discrete_sound_w(machine, HEADON_CRASH_EN, data & 0x04);
+ discrete_sound_w(machine, HEADON_HISPEED_CC_EN, data & 0x08);
+ discrete_sound_w(machine, HEADON_SCREECH2_EN, data & 0x10);
+ discrete_sound_w(machine, HEADON_BONUS_EN, data & 0x20);
+ discrete_sound_w(machine, HEADON_CAR_ON_EN, data & 0x40);
}
@@ -461,13 +461,13 @@ WRITE8_HANDLER( invho2_audio_w )
{
if (!sndti_exists(SOUND_DISCRETE, 0))
return;
- discrete_sound_w(HEADON_HISPEED_PC_EN, data & 0x10);
- discrete_sound_w(HEADON_SCREECH1_EN, data & 0x08);
- discrete_sound_w(HEADON_CRASH_EN, data & 0x80);
- discrete_sound_w(HEADON_HISPEED_CC_EN, data & 0x40);
- discrete_sound_w(HEADON_SCREECH2_EN, data & 0x04);
- discrete_sound_w(HEADON_BONUS_EN, data & 0x02);
- discrete_sound_w(HEADON_CAR_ON_EN, data & 0x20);
+ discrete_sound_w(machine, HEADON_HISPEED_PC_EN, data & 0x10);
+ discrete_sound_w(machine, HEADON_SCREECH1_EN, data & 0x08);
+ discrete_sound_w(machine, HEADON_CRASH_EN, data & 0x80);
+ discrete_sound_w(machine, HEADON_HISPEED_CC_EN, data & 0x40);
+ discrete_sound_w(machine, HEADON_SCREECH2_EN, data & 0x04);
+ discrete_sound_w(machine, HEADON_BONUS_EN, data & 0x02);
+ discrete_sound_w(machine, HEADON_CAR_ON_EN, data & 0x20);
}
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 2d81c922e56..ce29d122bbe 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -487,7 +487,7 @@ void williams_cvsd_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- cvsd_bank_select_w(0, 0);
+ cvsd_bank_select_w(Machine, 0, 0);
init_audio_state(Machine);
cpunum_set_input_line(Machine, sound_cpunum, INPUT_LINE_RESET, ASSERT_LINE);
}
@@ -516,23 +516,23 @@ static WRITE8_HANDLER( narc_slave_bank_select_w )
static READ8_HANDLER( narc_command_r )
{
- cpunum_set_input_line(Machine, sound_cpunum, M6809_IRQ_LINE, CLEAR_LINE);
+ cpunum_set_input_line(machine, sound_cpunum, M6809_IRQ_LINE, CLEAR_LINE);
williams_sound_int_state = 0;
- return soundlatch_r(0);
+ return soundlatch_r(machine, 0);
}
static WRITE8_HANDLER( narc_command2_w )
{
- soundlatch2_w(0, data & 0xff);
- cpunum_set_input_line(Machine, soundalt_cpunum, M6809_FIRQ_LINE, ASSERT_LINE);
+ soundlatch2_w(machine, 0, data & 0xff);
+ cpunum_set_input_line(machine, soundalt_cpunum, M6809_FIRQ_LINE, ASSERT_LINE);
}
static READ8_HANDLER( narc_command2_r )
{
- cpunum_set_input_line(Machine, soundalt_cpunum, M6809_FIRQ_LINE, CLEAR_LINE);
- return soundlatch2_r(0);
+ cpunum_set_input_line(machine, soundalt_cpunum, M6809_FIRQ_LINE, CLEAR_LINE);
+ return soundlatch2_r(machine, 0);
}
@@ -577,7 +577,7 @@ static WRITE8_HANDLER( narc_slave_sync_w )
void williams_narc_data_w(int data)
{
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(Machine, 0, data & 0xff);
cpunum_set_input_line(Machine, sound_cpunum, INPUT_LINE_NMI, (data & 0x100) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x200))
{
@@ -592,8 +592,8 @@ void williams_narc_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- narc_master_bank_select_w(0, 0);
- narc_slave_bank_select_w(0, 0);
+ narc_master_bank_select_w(Machine, 0, 0);
+ narc_slave_bank_select_w(Machine, 0, 0);
init_audio_state(Machine);
cpunum_set_input_line(Machine, sound_cpunum, INPUT_LINE_RESET, ASSERT_LINE);
cpunum_set_input_line(Machine, soundalt_cpunum, INPUT_LINE_RESET, ASSERT_LINE);
@@ -638,12 +638,12 @@ static TIMER_CALLBACK( clear_irq_state )
static READ8_HANDLER( adpcm_command_r )
{
- cpunum_set_input_line(Machine, sound_cpunum, M6809_IRQ_LINE, CLEAR_LINE);
+ cpunum_set_input_line(machine, sound_cpunum, M6809_IRQ_LINE, CLEAR_LINE);
/* don't clear the external IRQ state for a short while; this allows the
self-tests to pass */
timer_set(ATTOTIME_IN_USEC(10), NULL, 0, clear_irq_state);
- return soundlatch_r(0);
+ return soundlatch_r(machine, 0);
}
@@ -661,7 +661,7 @@ static WRITE8_HANDLER( adpcm_talkback_w )
void williams_adpcm_data_w(int data)
{
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(Machine, 0, data & 0xff);
if (!(data & 0x200))
{
cpunum_set_input_line(Machine, sound_cpunum, M6809_IRQ_LINE, ASSERT_LINE);
@@ -676,7 +676,7 @@ void williams_adpcm_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- adpcm_bank_select_w(0, 0);
+ adpcm_bank_select_w(Machine, 0, 0);
init_audio_state(Machine);
cpunum_set_input_line(Machine, sound_cpunum, INPUT_LINE_RESET, ASSERT_LINE);
}
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index bb044f859cd..1767dc9d37a 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -266,7 +266,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
@@ -297,17 +297,17 @@ static WRITE8_HANDLER( fortyl_coin_counter_w )
static READ8_HANDLER( fortyl_mcu_r )
{
- return buggychl_mcu_r(offset);
+ return buggychl_mcu_r(machine,offset);
}
static READ8_HANDLER( fortyl_mcu_status_r )
{
- return buggychl_mcu_status_r(offset);
+ return buggychl_mcu_status_r(machine,offset);
}
static WRITE8_HANDLER( fortyl_mcu_w )
{
- buggychl_mcu_w(offset,data);
+ buggychl_mcu_w(machine,offset,data);
}
static WRITE8_HANDLER( bank_select_w )
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 606f311b15d..1beb2277191 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -71,9 +71,9 @@ static WRITE8_HANDLER( sound_control_w )
if ((last & 0x04) == 0x04 && (data & 0x4) == 0x00)
{
if (last & 0x01)
- AY8910_control_port_0_w(0,soundlatch);
+ AY8910_control_port_0_w(machine,0,soundlatch);
else
- AY8910_write_port_0_w(0,soundlatch);
+ AY8910_write_port_0_w(machine,0,soundlatch);
}
last=data;
}
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index f56b12d61e1..969327a4898 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -1510,7 +1510,7 @@ static int sfl_int=0;
static READ8_HANDLER( sfl_input_r )
{
sfl_int^=0x80;//vblank flag ?
- return sfl_int|input_port_1_r(0);
+ return sfl_int|input_port_1_r(machine,0);
}
static ADDRESS_MAP_START( sflush_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 2d279103d0f..2b8a3b88b41 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -40,16 +40,16 @@ static READ8_HANDLER( bankedram_r )
else
{
if (zoomreadroms)
- return K051316_rom_0_r(offset);
+ return K051316_rom_0_r(machine,offset);
else
- return K051316_0_r(offset);
+ return K051316_0_r(machine,offset);
}
}
static WRITE8_HANDLER( bankedram_w )
{
if (videobank) ram[offset] = data;
- else K051316_0_w(offset,data);
+ else K051316_0_w(machine,offset,data);
}
static WRITE8_HANDLER( k88games_5f84_w )
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 24851c741f7..c2cf9871930 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -281,7 +281,7 @@ static READ16_HANDLER(ac_devices_r)
---- ---- ---- --x- (Activate Test)
---- ---- ---- ---x (Advance Thru Tests)
*/
- return input_port_0_word_r(0,0);
+ return input_port_0_word_r(machine,0,0);
case 0x0014/2:
/*
write 0x40,read (~0x08)
@@ -291,14 +291,14 @@ static READ16_HANDLER(ac_devices_r)
*/
return (ac_devram[offset]);
case 0x0016/2:
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine,0);
case 0x0018/2:
/*
---- ---- ---- x--- Astronaut - switch
*/
return ac_devram[offset];
case 0x001a/2:
- return OKIM6295_status_1_r(0);
+ return OKIM6295_status_1_r(machine,0);
case 0x0040/2:
/*
x-x- x-x- x-x- xx-- (ACTIVE HIGH?) [eori #$aaac, D0]
@@ -315,7 +315,7 @@ static READ16_HANDLER(ac_devices_r)
xxxx xxxx ---- ---- DIPSW4
---- ---- xxxx xxxx DIPSW3
*/
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
}
return ac_devram[offset];
}
@@ -329,14 +329,14 @@ static WRITE16_HANDLER(ac_devices_w)
if(ACCESSING_LSB)
{
logerror("Request to play sample %02x with rom 2\n",data);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,data);
}
break;
case 0x1a/2:
if(ACCESSING_LSB)
{
logerror("Request to play sample %02x with rom 1\n",data);
- OKIM6295_data_1_w(0,data);
+ OKIM6295_data_1_w(machine,0,data);
}
break;
case 0x1c/2:
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index bde727a99bb..59d68434f44 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -84,8 +84,8 @@ static READ8_HANDLER( triothep_control_r )
static WRITE8_HANDLER( actfancr_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
/******************************************************************************/
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 9c48939384e..9275e4ff7d6 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -108,8 +108,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -118,8 +118,8 @@ static WRITE16_HANDLER( turbofrc_sound_command_w )
if (ACCESSING_MSB)
{
pending_command = 1;
- soundlatch_w(offset,(data >> 8) & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,(data >> 8) & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -127,8 +127,8 @@ static WRITE16_HANDLER( aerfboot_soundlatch_w )
{
if(data & 0x8000)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -151,7 +151,7 @@ static WRITE8_HANDLER( aerofgt_sh_bankswitch_w )
static MACHINE_RESET( aerofgt )
{
- aerofgt_sh_bankswitch_w(0,0); /* needed by spinlbrk */
+ aerofgt_sh_bankswitch_w(machine,0,0); /* needed by spinlbrk */
}
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 0ee565945a7..92ab60cf79a 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -250,7 +250,7 @@ static READ8_HANDLER( devram_r )
that would reset the main cpu. We avoid this and patch
the rom instead (main cpu has to be reset once at startup) */
case 0xfe0:
- return watchdog_reset_r(0);
+ return watchdog_reset_r(machine,0);
/* Reading a word at eff2 probably yelds the product
of the words written to eff0 and eff2 */
@@ -319,25 +319,25 @@ static READ8_HANDLER( soundcommand_status_r )
static READ8_HANDLER( soundcommand_r )
{
soundlatch_status = 0; // soundlatch has been read
- return soundlatch_r(0);
+ return soundlatch_r(machine,0);
}
static READ8_HANDLER( soundcommand2_r )
{
soundlatch2_status = 0; // soundlatch2 has been read
- return soundlatch2_r(0);
+ return soundlatch2_r(machine,0);
}
static WRITE8_HANDLER( soundcommand_w )
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
soundlatch_status = 1; // soundlatch has been written
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE); // cause a nmi to sub cpu
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE); // cause a nmi to sub cpu
}
static WRITE8_HANDLER( soundcommand2_w )
{
- soundlatch2_w(0, data);
+ soundlatch2_w(machine, 0, data);
soundlatch2_status = 1; // soundlatch2 has been written
}
@@ -587,9 +587,9 @@ static INTERRUPT_GEN( slave_interrupt )
static MACHINE_RESET( airbustr )
{
soundlatch_status = soundlatch2_status = 0;
- master_bankswitch_w(0, 0x02);
- slave_bankswitch_w(0, 0x02);
- sound_bankswitch_w(0, 0x02);
+ master_bankswitch_w(machine, 0, 0x02);
+ slave_bankswitch_w(machine, 0, 0x02);
+ sound_bankswitch_w(machine, 0, 0x02);
}
/* Machine Driver */
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 464b91658db..3f47cf7fa2a 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -111,7 +111,7 @@ static VIDEO_UPDATE( alg )
/* update the Amiga video */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
- amiga_render_scanline(amiga_bitmap, y);
+ amiga_render_scanline(machine, amiga_bitmap, y);
/* at the end of the frame, composite the video */
if (!video_skip_this_frame() && (cliprect->max_y == machine->screen[screen].visarea.max_y))
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 526e8228363..3e88a901b61 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -44,7 +44,7 @@ static READ8_HANDLER( bankedram_r )
static WRITE8_HANDLER( bankedram_w )
{
if (palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
else
ram[offset] = data;
}
@@ -73,8 +73,8 @@ static WRITE8_HANDLER( aliens_coin_counter_w )
static WRITE8_HANDLER( aliens_sh_irqtrigger_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff);
}
static WRITE8_HANDLER( aliens_snd_bankswitch_w )
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index e18d9e7d526..375504f52fc 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -323,20 +323,20 @@ static READ16_HANDLER( jongbou_inputs_r )
static WRITE16_HANDLER( kyros_sound_w )
{
if(ACCESSING_MSB)
- soundlatch_w(0, (data>>8)&0xff);
+ soundlatch_w(machine, 0, (data>>8)&0xff);
}
static WRITE16_HANDLER( alpha68k_II_sound_w )
{
if(ACCESSING_LSB)
- soundlatch_w(0, data&0xff);
+ soundlatch_w(machine, 0, data&0xff);
}
static WRITE16_HANDLER( alpha68k_V_sound_w )
{
/* Sound & fix bank select are in the same word */
if(ACCESSING_LSB)
- soundlatch_w(0,data&0xff);
+ soundlatch_w(machine,0,data&0xff);
if(ACCESSING_MSB)
alpha68k_V_video_bank_w((data>>8)&0xff);
}
@@ -345,7 +345,7 @@ static WRITE16_HANDLER( paddlema_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
}
}
@@ -354,7 +354,7 @@ static WRITE16_HANDLER( tnexspce_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/amidar.c b/src/mame/drivers/amidar.c
index 73b3905f801..8e6391f9189 100644
--- a/src/mame/drivers/amidar.c
+++ b/src/mame/drivers/amidar.c
@@ -61,22 +61,22 @@ static const struct AY8910interface amidar_ay8910_interface_2 =
static READ8_HANDLER(amidar_ppi8255_0_r)
{
- return ppi8255_0_r(offset >> 4);
+ return ppi8255_0_r(machine, offset >> 4);
}
static READ8_HANDLER(amidar_ppi8255_1_r)
{
- return ppi8255_1_r(offset >> 4);
+ return ppi8255_1_r(machine, offset >> 4);
}
static WRITE8_HANDLER(amidar_ppi8255_0_w)
{
- ppi8255_0_w(offset >> 4, data);
+ ppi8255_0_w(machine, offset >> 4, data);
}
static WRITE8_HANDLER(amidar_ppi8255_1_w)
{
- ppi8255_1_w(offset >> 4, data);
+ ppi8255_1_w(machine, offset >> 4, data);
}
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index cf326be437b..132cb942fbb 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -496,7 +496,7 @@ static WRITE8_HANDLER( ampoker2_watchdog_reset_w )
/* watchdog sometimes stop to work */
if (( (data >> 3) & 0x01) == 0) /* check for refresh value (0x08h) */
{
- watchdog_reset_w(0,0);
+ watchdog_reset(machine);
// fprintf(stdout,"Watchdog\n");
}
}
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 9538645f58b..e7b15538b1b 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -63,13 +63,13 @@ AMSPDWY_WHEEL_R( 1 )
static READ8_HANDLER( amspdwy_sound_r )
{
- return (YM2151_status_port_0_r(0) & ~ 0x30) | readinputport(4);
+ return (YM2151_status_port_0_r(machine,0) & ~ 0x30) | readinputport(4);
}
static WRITE8_HANDLER( amspdwy_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 4d15d3ebc87..5331c991682 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -87,7 +87,7 @@ static MACHINE_RESET( aquarium )
static READ16_HANDLER( aquarium_coins_r )
{
int data;
- data = (input_port_2_word_r(0,mem_mask) & 0x7fff); /* IN1 */
+ data = (input_port_2_word_r(machine,0,mem_mask) & 0x7fff); /* IN1 */
data |= aquarium_snd_ack;
aquarium_snd_ack = 0;
return data;
@@ -102,8 +102,8 @@ static WRITE16_HANDLER( aquarium_sound_w )
{
// popmessage("sound write %04x",data);
- soundlatch_w(1,data&0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data&0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
static WRITE8_HANDLER( aquarium_z80_bank_w )
@@ -132,13 +132,13 @@ static UINT8 aquarium_snd_bitswap(UINT8 scrambled_data)
static READ8_HANDLER( aquarium_oki_r )
{
- return (aquarium_snd_bitswap(OKIM6295_status_0_r(0)) );
+ return (aquarium_snd_bitswap(OKIM6295_status_0_r(machine,0)) );
}
static WRITE8_HANDLER( aquarium_oki_w )
{
logerror("Z80-PC:%04x Writing %04x to the OKI M6295\n",activecpu_get_previouspc(),aquarium_snd_bitswap(data));
- OKIM6295_data_0_w( 0, (aquarium_snd_bitswap(data)) );
+ OKIM6295_data_0_w( machine, 0, (aquarium_snd_bitswap(data)) );
}
@@ -343,7 +343,7 @@ static DRIVER_INIT( aquarium )
}
/* reset the sound bank */
- aquarium_z80_bank_w(0, 0);
+ aquarium_z80_bank_w(machine, 0, 0);
}
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index f4160b97825..bb70884f360 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -128,14 +128,14 @@ static MACHINE_RESET( arcadecl )
static READ16_HANDLER( adpcm_r )
{
- return (OKIM6295_status_0_r(offset) << 8) | 0x00ff;
+ return (OKIM6295_status_0_r(machine, offset) << 8) | 0x00ff;
}
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_MSB)
- OKIM6295_data_0_w(offset, (data >> 8) & 0xff);
+ OKIM6295_data_0_w(machine, offset, (data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 6810d9cc888..75d4aec3b8c 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -220,22 +220,22 @@ static READ8_HANDLER( butasan_pagedram_r )
{
if (offset < 0x0800) /* BG0 RAM */
{
- return butasan_bg0ram_r( offset );
+ return butasan_bg0ram_r( machine, offset );
}
else if (offset < 0x1000) /* Back BG0 RAM */
{
- return butasan_bg0backram_r( offset - 0x0800 );
+ return butasan_bg0backram_r( machine, offset - 0x0800 );
}
}
else
{
if (offset < 0x0800) /* Text RAM */
{
- return butasan_txram_r( offset );
+ return butasan_txram_r( machine, offset );
}
else if (offset < 0x1000) /* Back text RAM */
{
- return butasan_txbackram_r( offset - 0x0800 );
+ return butasan_txbackram_r( machine, offset - 0x0800 );
}
}
@@ -248,11 +248,11 @@ static WRITE8_HANDLER( butasan_pagedram_w )
{
if (offset < 0x0800) /* BG0 RAM */
{
- butasan_bg0ram_w( offset, data );
+ butasan_bg0ram_w( machine, offset, data );
}
else if (offset < 0x1000) /* Back BG0 RAM */
{
- butasan_bg0backram_w( offset - 0x0800, data );
+ butasan_bg0backram_w( machine, offset - 0x0800, data );
}
}
@@ -260,11 +260,11 @@ static WRITE8_HANDLER( butasan_pagedram_w )
{
if (offset < 0x0800) /* Text RAM */
{
- butasan_txram_w( offset, data );
+ butasan_txram_w( machine, offset, data );
}
else if (offset < 0x1000) /* Back text RAM */
{
- butasan_txbackram_w( offset - 0x0800, data );
+ butasan_txbackram_w( machine, offset - 0x0800, data );
}
}
}
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 27b96c7ed12..e6d60b151cf 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -226,7 +226,7 @@ static WRITE16_HANDLER( kodure_io_w )
int i;
for (i = 0; i < 0x1000; i++)
{
- armedf_text_videoram_w(i, ' ', 0);
+ armedf_text_videoram_w(machine,i, ' ', 0);
}
}
}
@@ -234,7 +234,7 @@ static WRITE16_HANDLER( kodure_io_w )
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,((data & 0x7f) << 1) | 1);
+ soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}
#ifdef UNUSED_FUNCTION
@@ -446,7 +446,7 @@ ADDRESS_MAP_END
static READ8_HANDLER( soundlatch_clear_r )
{
- soundlatch_clear_w(0,0);
+ soundlatch_clear_w(machine,0,0);
return 0;
}
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index d67874f989b..a51a5fac52e 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -109,9 +109,9 @@ static WRITE16_HANDLER( ashnojoe_soundlatch_w )
{
if(ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
//needed?
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 64325855a2a..126e31861c7 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -68,7 +68,7 @@ static READ16_HANDLER( control1_r )
/* bit 8 is EEPROM data */
/* bit 9 is EEPROM ready */
/* bit 10 is service button */
- res = (EEPROM_read_bit()<<8) | input_port_1_word_r(0,0);
+ res = (EEPROM_read_bit()<<8) | input_port_1_word_r(machine,0,0);
if (init_eeprom_count)
{
@@ -117,7 +117,7 @@ static INTERRUPT_GEN( asterix_interrupt )
static READ16_HANDLER( asterix_sound_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine,2 + offset);
}
static TIMER_CALLBACK( nmi_callback )
@@ -127,13 +127,13 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_arm_nmi_w )
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE);
timer_set(ATTOTIME_IN_USEC(5), NULL,0,nmi_callback);
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
// Check the routine at 7f30 in the ead version.
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 17b81f1a417..6330812935f 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -221,9 +221,9 @@ static READ8_HANDLER( kamikaze_ppi_r )
/* the address lines are used for /CS; yes, they can overlap! */
if (!(offset & 4))
- result &= ppi8255_0_r(offset);
+ result &= ppi8255_0_r(machine, offset);
if (!(offset & 8))
- result &= ppi8255_1_r(offset);
+ result &= ppi8255_1_r(machine, offset);
return result;
}
@@ -232,9 +232,9 @@ static WRITE8_HANDLER( kamikaze_ppi_w )
{
/* the address lines are used for /CS; yes, they can overlap! */
if (!(offset & 4))
- ppi8255_0_w(offset, data);
+ ppi8255_0_w(machine, offset, data);
if (!(offset & 8))
- ppi8255_1_w(offset, data);
+ ppi8255_1_w(machine, offset, data);
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 84d509da005..5b18656f875 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -448,7 +448,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
static void profbank_banksw_restore(void)
{
- profpac_banksw_w(0, profpac_bank);
+ profpac_banksw_w(Machine, 0, profpac_bank);
}
@@ -524,8 +524,8 @@ static MACHINE_START( tenpindx )
static WRITE8_HANDLER( tenpindx_sound_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -1725,7 +1725,7 @@ static DRIVER_INIT( profpac )
memory_install_read8_handler(0, ADDRESS_SPACE_IO, 0x15, 0x15, 0x77ff, 0xff00, profpac_io_2_r);
/* reset banking */
- profpac_banksw_w(0, 0);
+ profpac_banksw_w(machine, 0, 0);
state_save_register_func_postload(profbank_banksw_restore);
}
@@ -1739,7 +1739,7 @@ static DRIVER_INIT( demndrgn )
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x97, 0x97, 0x0000, 0xff00, demndrgn_sound_w);
/* reset banking */
- profpac_banksw_w(0, 0);
+ profpac_banksw_w(machine, 0, 0);
state_save_register_func_postload(profbank_banksw_restore);
}
@@ -1758,7 +1758,7 @@ static DRIVER_INIT( tenpindx )
memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x97, 0x97, 0x0000, 0xff00, tenpindx_sound_w);
/* reset banking */
- profpac_banksw_w(0, 0);
+ profpac_banksw_w(machine, 0, 0);
state_save_register_func_postload(profbank_banksw_restore);
}
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 1176120a2ea..0af2da48e87 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -93,7 +93,7 @@ static void cage_irq_callback(int reason)
if (reason)
atarigen_sound_int_gen(Machine, 0);
else
- atarigen_sound_int_ack_w(0,0,0);
+ atarigen_sound_int_ack_w(Machine,0,0,0);
}
@@ -1087,7 +1087,7 @@ static WRITE32_HANDLER( tmek_pf_w )
if (pc == 0x25834 || pc == 0x25860)
logerror("%06X:PFW@%06X = %08X & %08X (src=%06X)\n", activecpu_get_pc(), 0xd72000 + offset*4, data, ~mem_mask, (UINT32)activecpu_get_reg(M68K_A3) - 2);
- atarigen_playfield32_w(offset, data, mem_mask);
+ atarigen_playfield32_w(machine, offset, data, mem_mask);
}
static DRIVER_INIT( tmek )
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 9802240381a..cca78385b27 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -366,11 +366,11 @@ static WRITE8_HANDLER( via_pb_w )
/* write strobe */
if (!(old & 1) && (tms5220_ctl & 1))
- tms5220_data_w(0, tms5220_out_data);
+ tms5220_data_w(machine, 0, tms5220_out_data);
/* read strobe */
if (!(old & 2) && (tms5220_ctl & 2))
- tms5220_in_data = tms5220_status_r(0);
+ tms5220_in_data = tms5220_status_r(machine, 0);
/* bit 4 is connected to an up-counter, clocked by SYCLKB */
data = 5 | ((data >> 3) & 2);
@@ -417,7 +417,6 @@ static WRITE8_HANDLER( led_w )
static OPBASE_HANDLER( indytemp_setopbase )
{
int prevpc = activecpu_get_previouspc();
-
/*
* This is a slightly ugly kludge for Indiana Jones & the Temple of Doom because it jumps
* directly to code in the slapstic. The general order of things is this:
@@ -437,9 +436,9 @@ static OPBASE_HANDLER( indytemp_setopbase )
*/
if (address & 0x80000)
- atarigen_slapstic_r(0,0);
+ atarigen_slapstic_r(machine,0,0);
else if (prevpc & 0x80000)
- atarigen_slapstic_r((prevpc >> 1) & 0x3fff,0);
+ atarigen_slapstic_r(machine,(prevpc >> 1) & 0x3fff,0);
return address;
}
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index a551c6ffb2b..e916c5fbb38 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -361,8 +361,8 @@ static WRITE16_HANDLER( bankselect_w )
static void bankselect_postload(void)
{
- bankselect_w(0, bankselect[0], 0);
- bankselect_w(1, bankselect[1], 0);
+ bankselect_w(Machine, 0, bankselect[0], 0);
+ bankselect_w(Machine, 1, bankselect[1], 0);
}
@@ -375,7 +375,7 @@ static void bankselect_postload(void)
static READ16_HANDLER( switch_r )
{
- int result = input_port_1_r(offset) | (input_port_2_r(offset) << 8);
+ int result = input_port_1_r(machine, offset) | (input_port_2_r(machine, offset) << 8);
if (atarigen_cpu_to_sound_ready) result ^= 0x20;
if (atarigen_sound_to_cpu_ready) result ^= 0x10;
@@ -386,12 +386,12 @@ static READ16_HANDLER( switch_r )
static READ8_HANDLER( switch_6502_r )
{
- int result = input_port_0_r(offset);
+ int result = input_port_0_r(machine, offset);
if (atarigen_cpu_to_sound_ready) result ^= 0x01;
if (atarigen_sound_to_cpu_ready) result ^= 0x02;
if (!has_tms5220 || tms5220_ready_r()) result ^= 0x04;
- if (!(input_port_2_r(offset) & 0x80)) result ^= 0x10;
+ if (!(input_port_2_r(machine, offset) & 0x80)) result ^= 0x10;
return result;
}
@@ -626,7 +626,7 @@ static WRITE8_HANDLER( sound_reset_w )
/* a large number of signals are reset when this happens */
atarigen_sound_io_reset(1);
sndti_reset(SOUND_YM2151, 0);
- mixer_w(0, 0);
+ mixer_w(machine, 0, 0);
tms5220_data = 0;
tms5220_data_strobe = 0;
}
@@ -639,7 +639,7 @@ static READ16_HANDLER( sound_r )
atarigen_update_interrupts();
/* handle it normally otherwise */
- return atarigen_sound_r(offset,0);
+ return atarigen_sound_r(machine,offset,0);
}
@@ -650,7 +650,7 @@ static WRITE8_HANDLER( sound_6502_w )
atarigen_update_interrupts();
/* handle it normally otherwise */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
}
@@ -661,7 +661,7 @@ static READ8_HANDLER( sound_6502_r )
atarigen_update_interrupts();
/* handle it normally otherwise */
- return atarigen_6502_sound_r(offset);
+ return atarigen_6502_sound_r(machine, offset);
}
@@ -681,7 +681,7 @@ static WRITE8_HANDLER( tms5220_w )
static WRITE8_HANDLER( tms5220_strobe_w )
{
if (!(offset & 1) && tms5220_data_strobe && has_tms5220)
- tms5220_data_w(0, tms5220_data);
+ tms5220_data_w(machine, 0, tms5220_data);
tms5220_data_strobe = offset & 1;
}
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index be2908d3897..06abc7f49b2 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -64,8 +64,8 @@ static READ8_HANDLER(attckufo_io_r)
{
switch(offset)
{
- case 0: return input_port_0_r(0);
- case 2: return input_port_1_r(0);
+ case 0: return input_port_0_r(machine,0);
+ case 2: return input_port_1_r(machine,0);
}
return 0xff;
}
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 5d352e61f91..93a95fb1f5a 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -60,8 +60,8 @@ static READ16_HANDLER( nvram_r )
static READ16_HANDLER( joystick_r )
{
- return (((input_port_0_r (offset) - 0xf) << 8) |
- ((input_port_1_r (offset) - 0xf) & 0xff));
+ return (((input_port_0_r (machine,offset) - 0xf) << 8) |
+ ((input_port_1_r (machine,offset) - 0xf) & 0xff));
}
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 31b183b826d..dfeaff77dee 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -264,21 +264,21 @@ static WRITE32_HANDLER(backfire_eeprom_w)
static WRITE32_HANDLER(wcvol95_nonbuffered_palette_w)
{
COMBINE_DATA(&paletteram32[offset]);
- palette_set_color_rgb(Machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10));
+ palette_set_color_rgb(machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10));
}
static READ32_HANDLER( deco156_snd_r )
{
- return YMZ280B_status_0_r(0);
+ return YMZ280B_status_0_r(machine, 0);
}
static WRITE32_HANDLER( deco156_snd_w )
{
if (offset)
- YMZ280B_data_0_w(0, data);
+ YMZ280B_data_0_w(machine, 0, data);
else
- YMZ280B_register_0_w(0, data);
+ YMZ280B_register_0_w(machine, 0, data);
}
/* map 32-bit writes to 16-bit */
@@ -299,10 +299,10 @@ static READ32_HANDLER( backfire_pf1_data_r ) { return deco16_pf1_data[offset]^0x
static READ32_HANDLER( backfire_pf2_data_r ) { return deco16_pf2_data[offset]^0xffff0000; }
static READ32_HANDLER( backfire_pf3_data_r ) { return deco16_pf3_data[offset]^0xffff0000; }
static READ32_HANDLER( backfire_pf4_data_r ) { return deco16_pf4_data[offset]^0xffff0000; }
-static WRITE32_HANDLER( backfire_pf1_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf1_data_w(offset,data,mem_mask); }
-static WRITE32_HANDLER( backfire_pf2_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf2_data_w(offset,data,mem_mask); }
-static WRITE32_HANDLER( backfire_pf3_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf3_data_w(offset,data,mem_mask); }
-static WRITE32_HANDLER( backfire_pf4_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf4_data_w(offset,data,mem_mask); }
+static WRITE32_HANDLER( backfire_pf1_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf1_data_w(machine,offset,data,mem_mask); }
+static WRITE32_HANDLER( backfire_pf2_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf2_data_w(machine,offset,data,mem_mask); }
+static WRITE32_HANDLER( backfire_pf3_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf3_data_w(machine,offset,data,mem_mask); }
+static WRITE32_HANDLER( backfire_pf4_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf4_data_w(machine,offset,data,mem_mask); }
#ifdef UNUSED_FUNCTION
READ32_HANDLER( backfire_unknown_wheel_r )
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 7e84317eebe..e2032eef180 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -138,7 +138,7 @@ static void scanline_update(running_machine *machine, int scrnum, int scanline)
{
/* sound IRQ is on 32V */
if (scanline & 32)
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
else if (!(readinputport(0) & 0x40))
atarigen_6502_irq_gen(machine, 0);
}
@@ -166,7 +166,7 @@ static MACHINE_RESET( badlands )
static INTERRUPT_GEN( vblank_int )
{
- int pedal_state = input_port_4_r(0);
+ int pedal_state = input_port_4_r(machine, 0);
int i;
/* update the pedals once per frame */
@@ -226,7 +226,7 @@ static READ8_HANDLER( audio_io_r )
break;
case 0x002: /* /RDP */
- result = atarigen_6502_sound_r(offset);
+ result = atarigen_6502_sound_r(machine, offset);
break;
case 0x004: /* /RDIO */
@@ -248,7 +248,7 @@ static READ8_HANDLER( audio_io_r )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* /VOICE */
@@ -274,7 +274,7 @@ static WRITE8_HANDLER( audio_io_w )
break;
case 0x006: /* /IRQACK */
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
break;
case 0x200: /* n/c */
@@ -282,7 +282,7 @@ static WRITE8_HANDLER( audio_io_w )
break;
case 0x202: /* /WRP */
- atarigen_6502_sound_w(offset, data);
+ atarigen_6502_sound_w(machine, offset, data);
break;
case 0x204: /* WRIO */
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index a0533f4243d..93664c747f9 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -83,7 +83,7 @@ static int speech_rom_address = 0;
static UINT8 ls259_buf[8] = {0,0,0,0,0,0,0,0};
-static void start_talking (void)
+static void start_talking (running_machine *machine)
{
#if 0
logerror("Talk started: selected bit %1i, selected roms QS %i QT %i\n",
@@ -96,30 +96,30 @@ static void start_talking (void)
#endif
speech_rom_address = 0x0;
- tms5110_CTL_w(0,TMS5110_CMD_SPEAK);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_CTL_w(machine,0,TMS5110_CMD_SPEAK);
+ tms5110_PDC_w(machine,0,0);
+ tms5110_PDC_w(machine,0,1);
+ tms5110_PDC_w(machine,0,0);
}
-static void reset_talking (void)
+static void reset_talking (running_machine *machine)
{
/*To be extremely accurate there should be a delays between each of
the function calls below. In real they happen with the frequency of 160 kHz.
*/
- tms5110_CTL_w(0,TMS5110_CMD_RESET);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_CTL_w(machine,0,TMS5110_CMD_RESET);
+ tms5110_PDC_w(machine,0,0);
+ tms5110_PDC_w(machine,0,1);
+ tms5110_PDC_w(machine,0,0);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_PDC_w(machine,0,0);
+ tms5110_PDC_w(machine,0,1);
+ tms5110_PDC_w(machine,0,0);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_PDC_w(machine,0,0);
+ tms5110_PDC_w(machine,0,1);
+ tms5110_PDC_w(machine,0,0);
speech_rom_address = 0x0;
}
@@ -164,7 +164,7 @@ static READ8_HANDLER( bagman_ls259_r )
static WRITE8_HANDLER( bagman_ls259_w )
{
- bagman_pal16r6_w(offset,data); /*this is just a simulation*/
+ bagman_pal16r6_w(machine,offset,data); /*this is just a simulation*/
if (ls259_buf[offset] != (data&1) )
{
@@ -174,11 +174,11 @@ static WRITE8_HANDLER( bagman_ls259_w )
{
if (ls259_buf[3] == 0) /* 1->0 transition */
{
- reset_talking();
+ reset_talking(machine);
}
else
{
- start_talking(); /* 0->1 transition */
+ start_talking(machine); /* 0->1 transition */
}
}
}
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 1fae61d0c83..4f1f0a80e52 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -47,8 +47,8 @@ static int control_port_select;
static WRITE8_HANDLER( battlera_sound_w )
{
if (offset==0) {
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
}
@@ -104,8 +104,8 @@ ADDRESS_MAP_END
static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
- case 0: YM2203_control_port_0_w(0,data); break;
- case 1: YM2203_write_port_0_w(0,data); break;
+ case 0: YM2203_control_port_0_w(machine,0,data); break;
+ case 1: YM2203_write_port_0_w(machine,0,data); break;
}
}
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index ebfd5b3f7ca..7111556f2a2 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -268,8 +268,8 @@ static READ16_HANDLER( kludge_r )
static WRITE16_HANDLER( sound_cpu_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static READ16_HANDLER( mechatt_gun_r )
@@ -681,13 +681,13 @@ static INTERRUPT_GEN( bbuster )
static VIDEO_EOF( bbuster )
{
- buffer_spriteram16_w(0,0,0);
- buffer_spriteram16_2_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
+ buffer_spriteram16_2_w(machine,0,0,0);
}
static VIDEO_EOF( mechatt )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
static MACHINE_DRIVER_START( bbusters )
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index e9c4dd9439f..ac6c976c256 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -304,21 +304,21 @@ static READ32_HANDLER( input_3_r )
static READ32_HANDLER( sound_data_r )
{
- return atarigen_sound_r(offset,0);
+ return atarigen_sound_r(machine,offset,0);
}
static WRITE32_HANDLER( sound_data_w )
{
if (ACCESSING_LSB32)
- atarigen_sound_w(offset, data, mem_mask);
+ atarigen_sound_w(machine,offset, data, mem_mask);
}
static WRITE32_HANDLER( sound_reset_w )
{
logerror("Sound reset = %d\n", !offset);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE);
}
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 5b2561d06a3..a56e6cea70d 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -521,12 +521,12 @@ static WRITE8_HANDLER( berzerk_audio_w )
/* offset 6 writes to the sfxcontrol latch */
case 6:
- exidy_sfxctrl_w(data >> 6, data);
+ exidy_sfxctrl_w(machine, data >> 6, data);
break;
/* everything else writes to the 6840 */
default:
- exidy_sh6840_w(offset, data);
+ exidy_sh6840_w(machine, offset, data);
break;
}
@@ -543,7 +543,7 @@ static READ8_HANDLER( berzerk_audio_r )
static SOUND_RESET(berzerk)
{
/* clears the flip-flop controlling the volume and freq on the speech chip */
- berzerk_audio_w(4, 0x40);
+ berzerk_audio_w(machine, 4, 0x40);
}
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index a9311c1591a..00ecc94a2ac 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -894,7 +894,7 @@ static WRITE8_HANDLER( coininhib_w )
static READ8_HANDLER( coin_input_r )
{
- return input_port_0_r(0);
+ return input_port_0_r(machine, 0);
}
///////////////////////////////////////////////////////////////////////////
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 1c18626eb8a..cdec7c08c6a 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -377,7 +377,7 @@ static READ8_HANDLER( sub_cpu_mcu_coin_port_r )
*/
bit5 ^= 0x20;
- return bigevglf_mcu_status_r(0) | (readinputport(1) & 3) | bit5; /* bit 0 and bit 1 - coin inputs */
+ return bigevglf_mcu_status_r(machine,0) | (readinputport(1) & 3) | bit5; /* bit 0 and bit 1 - coin inputs */
}
static ADDRESS_MAP_START( bigevglf_sub_readport, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 319575a2868..70d3661a3bc 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -272,14 +272,14 @@ static VIDEO_UPDATE( bigfghtr )
static VIDEO_EOF( bigfghtr )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,((data & 0x7f) << 1) | 1);
+ soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}
static WRITE16_HANDLER( io_w )
@@ -317,7 +317,7 @@ static READ16_HANDLER(sharedram_r)
break;
case 0x46/2:
- return (input_port_0_word_r(0,0)&0xffff)^0xffff;
+ return (input_port_0_word_r(machine,0,0)&0xffff)^0xffff;
}
@@ -357,7 +357,7 @@ ADDRESS_MAP_END
static READ8_HANDLER( soundlatch_clear_r )
{
- soundlatch_clear_w(0,0);
+ soundlatch_clear_w(machine,0,0);
return 0;
}
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index ae804f9ca8e..13e25ce4b53 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -112,7 +112,7 @@ static UINT16 soundcommand;
static WRITE16_HANDLER( hacked_soundcommand_w )
{
COMBINE_DATA(&soundcommand);
- soundlatch_w(0,soundcommand & 0xff);
+ soundlatch_w(machine,0,soundcommand & 0xff);
}
static READ16_HANDLER( hacked_soundcommand_r )
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 75dc45c07b2..ed441e43370 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -70,34 +70,34 @@ static READ16_HANDLER( bishi_mirror_r )
static READ16_HANDLER( bishi_sound_r )
{
- return YMZ280B_status_0_r(offset)<<8;
+ return YMZ280B_status_0_r(machine, offset)<<8;
}
static WRITE16_HANDLER( bishi_sound_w )
{
if (offset)
{
- YMZ280B_data_0_w(offset, data>>8);
+ YMZ280B_data_0_w(machine, offset, data>>8);
}
else
{
- YMZ280B_register_0_w(offset, data>>8);
+ YMZ280B_register_0_w(machine, offset, data>>8);
}
}
static READ16_HANDLER( dipsw_r ) // dips
{
- return input_port_1_r(0) | (input_port_5_r(0)<<8);
+ return input_port_1_r(machine,0) | (input_port_5_r(machine,0)<<8);
}
static READ16_HANDLER( player1_r ) // players 1 and 3
{
- return 0xff | (input_port_2_r(0)<<8);
+ return 0xff | (input_port_2_r(machine,0)<<8);
}
static READ16_HANDLER( player2_r ) // players 2 and 4
{
- return input_port_3_r(0) | (input_port_4_r(0)<<8);
+ return input_port_3_r(machine,0) | (input_port_4_r(machine,0)<<8);
}
static READ16_HANDLER( bishi_K056832_rom_r )
@@ -115,7 +115,7 @@ static READ16_HANDLER( bishi_K056832_rom_r )
ouroffs += 4;
}
- return K056832_bishi_rom_word_r(ouroffs, mem_mask);
+ return K056832_bishi_rom_word_r(machine, ouroffs, mem_mask);
}
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 751ef4fe969..ef65d37d55e 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -84,8 +84,8 @@ static WRITE8_HANDLER( bking_soundlatch_w )
for (i = 0;i < 8;i++)
if (data & (1 << i)) code |= 0x80 >> i;
- soundlatch_w(offset,code);
- if (sndnmi_enable) cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,code);
+ if (sndnmi_enable) cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static WRITE8_HANDLER( bking3_addr_l_w )
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 3c03c1f623f..2144fcac509 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -89,8 +89,8 @@ static WRITE8_HANDLER( bladestl_bankswitch_w )
static WRITE8_HANDLER( bladestl_sh_irqtrigger_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE);
//logerror("(sound) write %02x\n", data);
}
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index cb685c8cd9f..3f1de2987b8 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -67,7 +67,7 @@ static INTERRUPT_GEN( blockade_interrupt )
{
cpunum_resume(0, SUSPEND_ANY_REASON);
- if ((input_port_0_r(0) & 0x80) == 0)
+ if ((input_port_0_r(machine,0) & 0x80) == 0)
{
just_been_reset = 1;
cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, PULSE_LINE);
@@ -78,7 +78,7 @@ static READ8_HANDLER( blockade_input_port_0_r )
{
/* coin latch is bit 7 */
- UINT8 temp = (input_port_0_r(0)&0x7f);
+ UINT8 temp = (input_port_0_r(machine,0)&0x7f);
return (coin_latch<<7) | (temp);
}
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index b78c9231790..8d68687f925 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -54,7 +54,7 @@ static READ8_HANDLER( bankedram_r )
static WRITE8_HANDLER( bankedram_w )
{
if (palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
else
ram[offset] = data;
}
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index d107fe71e87..d844f20378b 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -36,8 +36,8 @@ static WRITE16_HANDLER( blockout_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 62179f12d50..de527c0e826 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -81,8 +81,8 @@ static READ8_HANDLER( blueprnt_sh_dipsw_r )
static WRITE8_HANDLER( blueprnt_sound_command_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static WRITE8_HANDLER( blueprnt_coin_counter_w )
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index c25aacd8967..fe1dcab6691 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -215,17 +215,17 @@ static WRITE16_HANDLER( scroll_w )
static READ16_HANDLER(via_r)
{
- return via_0_r(offset);
+ return via_0_r(machine,offset);
}
static WRITE16_HANDLER(via_w)
{
- via_0_w(offset,data);
+ via_0_w(machine,offset,data);
}
static READ8_HANDLER(via_b_in)
{
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
}
@@ -447,8 +447,8 @@ static READ8_HANDLER(dips1_r)
{
switch(bmc_input)
{
- case 0x00: return input_port_1_r(0);
- case 0x40: return input_port_2_r(0);
+ case 0x00: return input_port_1_r(machine,0);
+ case 0x40: return input_port_2_r(machine,0);
}
logerror("unknown input - %X (PC=%X)\n",bmc_input,activecpu_get_previouspc());
return 0xff;
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 60932b63464..60a76ee6722 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -47,9 +47,9 @@ static WRITE8_HANDLER( bogeyman_8910_control_w )
{
// bit 4 goes to the 8910 #0 BC1 pin
if (last & 0x10)
- AY8910_control_port_0_w(0,psg_latch);
+ AY8910_control_port_0_w(machine,0,psg_latch);
else
- AY8910_write_port_0_w(0,psg_latch);
+ AY8910_write_port_0_w(machine,0,psg_latch);
}
// bit 7 goes to 8910 #1 BDIR pin
@@ -57,9 +57,9 @@ static WRITE8_HANDLER( bogeyman_8910_control_w )
{
// bit 6 goes to the 8910 #1 BC1 pin
if (last & 0x40)
- AY8910_control_port_1_w(0,psg_latch);
+ AY8910_control_port_1_w(machine,0,psg_latch);
else
- AY8910_write_port_1_w(0,psg_latch);
+ AY8910_write_port_1_w(machine,0,psg_latch);
}
last = data;
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index c4851a803aa..22d6ea7ab8e 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -34,32 +34,32 @@ static int zoomreadroms,K052109_selected;
static READ8_HANDLER( bottom9_bankedram1_r )
{
if (K052109_selected)
- return K052109_051960_r(offset);
+ return K052109_051960_r(machine,offset);
else
{
if (zoomreadroms)
- return K051316_rom_0_r(offset);
+ return K051316_rom_0_r(machine,offset);
else
- return K051316_0_r(offset);
+ return K051316_0_r(machine,offset);
}
}
static WRITE8_HANDLER( bottom9_bankedram1_w )
{
- if (K052109_selected) K052109_051960_w(offset,data);
- else K051316_0_w(offset,data);
+ if (K052109_selected) K052109_051960_w(machine,offset,data);
+ else K051316_0_w(machine,offset,data);
}
static READ8_HANDLER( bottom9_bankedram2_r )
{
- if (K052109_selected) return K052109_051960_r(offset + 0x2000);
+ if (K052109_selected) return K052109_051960_r(machine,offset + 0x2000);
else return paletteram[offset];
}
static WRITE8_HANDLER( bottom9_bankedram2_w )
{
- if (K052109_selected) K052109_051960_w(offset + 0x2000,data);
- else paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ if (K052109_selected) K052109_051960_w(machine,offset + 0x2000,data);
+ else paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
static WRITE8_HANDLER( bankswitch_w )
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 434f89f72f9..c5c55696a6a 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -85,8 +85,8 @@ static WRITE8_HANDLER( darwin_0803_w )
static WRITE8_HANDLER( brkthru_soundlatch_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static INPUT_CHANGED( coin_inserted )
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index ae9f9accafa..a299aad3fba 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -149,13 +149,13 @@ static void btime_decrypt(void)
static WRITE8_HANDLER( lnc_w )
{
if (offset <= 0x3bff) ;
- else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(offset - 0x3c00,data); return; }
- else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(offset - 0x7c00,data); return; }
+ else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(machine,offset - 0x3c00,data); return; }
+ else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(machine,offset - 0x7c00,data); return; }
else if (offset == 0x8000) { return; } /* MWA8_NOP */
- else if (offset == 0x8001) { lnc_video_control_w(0,data); return; }
+ else if (offset == 0x8001) { lnc_video_control_w(machine,0,data); return; }
else if (offset == 0x8003) ;
else if (offset == 0x9000) { return; } /* MWA8_NOP */
- else if (offset == 0x9002) { audio_command_w(0,data); return; }
+ else if (offset == 0x9002) { audio_command_w(machine,0,data); return; }
else if (offset >= 0xb000 && offset <= 0xb1ff) ;
else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
@@ -168,13 +168,13 @@ static WRITE8_HANDLER( lnc_w )
static WRITE8_HANDLER( mmonkey_w )
{
if (offset <= 0x3bff) ;
- else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(offset - 0x3c00,data); return; }
- else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(offset - 0x7c00,data); return; }
- else if (offset == 0x8001) { lnc_video_control_w(0,data); return; }
+ else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(machine,offset - 0x3c00,data); return; }
+ else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(machine,offset - 0x7c00,data); return; }
+ else if (offset == 0x8001) { lnc_video_control_w(machine,0,data); return; }
else if (offset == 0x8003) ;
else if (offset == 0x9000) { return; } /* MWA8_NOP */
- else if (offset == 0x9002) { audio_command_w(0,data); return; }
- else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(offset - 0xb000, data); return; }
+ else if (offset == 0x9002) { audio_command_w(machine,0,data); return; }
+ else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(machine,offset - 0xb000, data); return; }
else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
rambase[offset] = data;
@@ -186,13 +186,13 @@ static WRITE8_HANDLER( mmonkey_w )
static WRITE8_HANDLER( btime_w )
{
if (offset <= 0x07ff) ;
- else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(offset - 0x0c00,data);
+ else if (offset >= 0x0c00 && offset <= 0x0c0f) btime_paletteram_w(machine,offset - 0x0c00,data);
else if (offset >= 0x1000 && offset <= 0x17ff) ;
- else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(offset - 0x1800,data);
- else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(offset - 0x1c00,data);
- else if (offset == 0x4002) btime_video_control_w(0,data);
- else if (offset == 0x4003) audio_command_w(0,data);
- else if (offset == 0x4004) bnj_scroll1_w(0,data);
+ else if (offset >= 0x1800 && offset <= 0x1bff) btime_mirrorvideoram_w(machine,offset - 0x1800,data);
+ else if (offset >= 0x1c00 && offset <= 0x1fff) btime_mirrorcolorram_w(machine,offset - 0x1c00,data);
+ else if (offset == 0x4002) btime_video_control_w(machine,0,data);
+ else if (offset == 0x4003) audio_command_w(machine,0,data);
+ else if (offset == 0x4004) bnj_scroll1_w(machine,0,data);
else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
rambase[offset] = data;
@@ -204,13 +204,13 @@ static WRITE8_HANDLER( zoar_w )
{
if (offset <= 0x07ff) ;
else if (offset >= 0x8000 && offset <= 0x87ff) ;
- else if (offset >= 0x8800 && offset <= 0x8bff) btime_mirrorvideoram_w(offset - 0x8800,data);
- else if (offset >= 0x8c00 && offset <= 0x8fff) btime_mirrorcolorram_w(offset - 0x8c00,data);
- else if (offset == 0x9000) zoar_video_control_w(0, data);
+ else if (offset >= 0x8800 && offset <= 0x8bff) btime_mirrorvideoram_w(machine,offset - 0x8800,data);
+ else if (offset >= 0x8c00 && offset <= 0x8fff) btime_mirrorcolorram_w(machine,offset - 0x8c00,data);
+ else if (offset == 0x9000) zoar_video_control_w(machine,0, data);
else if (offset >= 0x9800 && offset <= 0x9803) ;
- else if (offset == 0x9804) bnj_scroll2_w(0,data);
- else if (offset == 0x9805) bnj_scroll1_w(0,data);
- else if (offset == 0x9806) audio_command_w(0,data);
+ else if (offset == 0x9804) bnj_scroll2_w(machine,0,data);
+ else if (offset == 0x9805) bnj_scroll1_w(machine,0,data);
+ else if (offset == 0x9806) audio_command_w(machine,0,data);
else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
rambase[offset] = data;
@@ -221,10 +221,10 @@ static WRITE8_HANDLER( zoar_w )
static WRITE8_HANDLER( disco_w )
{
if (offset <= 0x04ff) ;
- else if (offset >= 0x2000 && offset <= 0x7fff) deco_charram_w(offset - 0x2000,data);
+ else if (offset >= 0x2000 && offset <= 0x7fff) deco_charram_w(machine,offset - 0x2000,data);
else if (offset >= 0x8000 && offset <= 0x881f) ;
- else if (offset == 0x9a00) audio_command_w(0,data);
- else if (offset == 0x9c00) disco_video_control_w(0,data);
+ else if (offset == 0x9a00) audio_command_w(machine,0,data);
+ else if (offset == 0x9c00) disco_video_control_w(machine,0,data);
else logerror("CPU #%d PC %04x: warning - write %02x to unmapped memory address %04x\n",cpu_getactivecpu(),activecpu_get_pc(),data,offset);
rambase[offset] = data;
@@ -403,8 +403,8 @@ static INPUT_CHANGED( coin_inserted_nmi_lo )
static WRITE8_HANDLER( audio_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
#define COMMON_INPUTS\
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 82b854e956a..7accba44b72 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -172,7 +172,7 @@ static WRITE8_HANDLER( bsmt2000_port_w )
{
UINT16 reg = offset >> 8;
UINT16 val = ((offset & 0xff) << 8) | data;
- BSMT2000_data_0_w(reg, val, 0);
+ BSMT2000_data_0_w(machine, reg, val, 0);
}
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index d535caa1a35..fd28df92be9 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -133,7 +133,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 1f488e744c3..71663581169 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -72,7 +72,7 @@ static INTERRUPT_GEN ( bwp1_interrupt )
ffcount--;
latch_data = sound_fifo[fftail];
fftail = (fftail + 1) & (MAX_SOUNDS - 1);
- soundlatch_w(0, latch_data);
+ soundlatch_w(machine, 0, latch_data);
cpunum_set_input_line(machine, 2, DECO16_IRQ_LINE, HOLD_LINE); // SNDREQ
}
break;
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 214fea04654..4efbc40ce19 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -105,7 +105,7 @@ static READ16_HANDLER( track_r )
static WRITE16_HANDLER( cabal_sound_irq_trigger_word_w )
{
- seibu_main_word_w(4,data,mem_mask);
+ seibu_main_word_w(machine,4,data,mem_mask);
/* spin for a while to let the Z80 read the command, otherwise coins "stick" */
cpu_spinuntil_time(ATTOTIME_IN_USEC(50));
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index bcc73f90224..1c0d3435046 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1053,10 +1053,10 @@ static READ8_HANDLER( mux_port_r )
{
switch( mux_data&0xf0 ) /* bits 4-7 */
{
- case 0x10: return input_port_0_r(0);
- case 0x20: return input_port_1_r(0);
- case 0x40: return input_port_2_r(0);
- case 0x80: return input_port_3_r(0);
+ case 0x10: return input_port_0_r(machine,0);
+ case 0x20: return input_port_1_r(machine,0);
+ case 0x40: return input_port_2_r(machine,0);
+ case 0x80: return input_port_3_r(machine,0);
}
return 0xff;
}
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 50f6b0b43f9..0853f71b437 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -190,8 +190,8 @@ static WRITE8_HANDLER( calorie_flipscreen_w )
static READ8_HANDLER( calorie_soundlatch_r )
{
- UINT8 latch = soundlatch_r(0);
- soundlatch_clear_w(0,0);
+ UINT8 latch = soundlatch_r(machine,0);
+ soundlatch_clear_w(machine,0,0);
return latch;
}
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index f16f91de17b..7d2a421b8ee 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -163,23 +163,23 @@ static WRITE8_HANDLER( capbowl_rom_select_w )
static READ8_HANDLER( track_0_r )
{
- return (input_port_0_r(offset) & 0xf0) | ((input_port_2_r(offset) - last_trackball_val[0]) & 0x0f);
+ return (input_port_0_r(machine, offset) & 0xf0) | ((input_port_2_r(machine, offset) - last_trackball_val[0]) & 0x0f);
}
static READ8_HANDLER( track_1_r )
{
- return (input_port_1_r(offset) & 0xf0) | ((input_port_3_r(offset) - last_trackball_val[1]) & 0x0f);
+ return (input_port_1_r(machine, offset) & 0xf0) | ((input_port_3_r(machine, offset) - last_trackball_val[1]) & 0x0f);
}
static WRITE8_HANDLER( track_reset_w )
{
/* reset the trackball counters */
- last_trackball_val[0] = input_port_2_r(offset);
- last_trackball_val[1] = input_port_3_r(offset);
+ last_trackball_val[0] = input_port_2_r(machine, offset);
+ last_trackball_val[1] = input_port_3_r(machine, offset);
- watchdog_reset_w(offset,data);
+ watchdog_reset_w(machine, offset, data);
}
@@ -192,8 +192,8 @@ static WRITE8_HANDLER( track_reset_w )
static WRITE8_HANDLER( capbowl_sndcmd_w )
{
- cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, HOLD_LINE);
- soundlatch_w(offset, data);
+ cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, offset, data);
}
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index ca6e43bb539..c4a55c2e162 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -221,7 +221,7 @@ static WRITE16_HANDLER( sound_cmd_w )
{
// sound_flag1 = 1;
// sound_flag2 = 1;
- soundlatch_word_w(offset,data,mem_mask);
+ soundlatch_word_w(machine,offset,data,mem_mask);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other cpu to reply
}
@@ -230,14 +230,14 @@ static WRITE16_HANDLER( sound_cmd_w )
static READ8_HANDLER( soundlatch_lo_r )
{
// sound_flag1 = 0;
- return soundlatch_word_r(offset,0) & 0xff;
+ return soundlatch_word_r(machine,offset,0) & 0xff;
}
/* Sound CPU: read the high 8 bits of the 16 bit sound latch */
static READ8_HANDLER( soundlatch_hi_r )
{
// sound_flag2 = 0;
- return soundlatch_word_r(offset,0) >> 8;
+ return soundlatch_word_r(machine,offset,0) >> 8;
}
/* Main CPU: read the latch written by the sound CPU (acknowledge) */
@@ -273,15 +273,15 @@ static WRITE16_HANDLER( cave_sound_w )
{
if (ACCESSING_LSB)
{
- if (offset) YMZ280B_data_0_w (offset, data & 0xff);
- else YMZ280B_register_0_w (offset, data & 0xff);
+ if (offset) YMZ280B_data_0_w (machine, offset, data & 0xff);
+ else YMZ280B_register_0_w (machine, offset, data & 0xff);
}
}
/* Handles reads from the YMZ280B */
static READ16_HANDLER( cave_sound_r )
{
- return YMZ280B_status_0_r(offset);
+ return YMZ280B_status_0_r(machine,offset);
}
@@ -350,7 +350,7 @@ static WRITE16_HANDLER( cave_eeprom_msb_w )
static WRITE16_HANDLER( sailormn_eeprom_msb_w )
{
sailormn_tilebank_w ( data & 0x0100 );
- cave_eeprom_msb_w(offset,data & ~0x0100,mem_mask);
+ cave_eeprom_msb_w(machine,offset,data & ~0x0100,mem_mask);
}
static WRITE16_HANDLER( hotdogst_eeprom_msb_w )
@@ -578,7 +578,7 @@ static READ16_HANDLER( donpachi_videoregs_r )
case 0:
case 1:
case 2:
- case 3: return cave_irq_cause_r(offset,0);
+ case 3: return cave_irq_cause_r(machine,offset,0);
default: return 0x0000;
}
@@ -1082,7 +1082,7 @@ static READ16_HANDLER( sailormn_input0_r )
static READ16_HANDLER( agallet_irq_cause_r )
{
- UINT16 irq_cause = cave_irq_cause_r(offset,mem_mask);
+ UINT16 irq_cause = cave_irq_cause_r(machine,offset,mem_mask);
if (offset == 0)
{
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 5894b4bbbcc..28f7b168f6b 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -51,7 +51,7 @@ static WRITE8_HANDLER( cbasebal_bankswitch_w )
static READ8_HANDLER( bankedram_r )
{
if (rambank == 2)
- return cbasebal_textram_r(offset); /* VRAM */
+ return cbasebal_textram_r(machine,offset); /* VRAM */
else if (rambank == 1)
{
if (offset < 0x800)
@@ -60,21 +60,21 @@ static READ8_HANDLER( bankedram_r )
}
else
{
- return cbasebal_scrollram_r(offset); /* SCROLL */
+ return cbasebal_scrollram_r(machine,offset); /* SCROLL */
}
}
static WRITE8_HANDLER( bankedram_w )
{
if (rambank == 2)
- cbasebal_textram_w(offset,data);
+ cbasebal_textram_w(machine,offset,data);
else if (rambank == 1)
{
if (offset < 0x800)
- paletteram_xxxxBBBBRRRRGGGG_le_w(offset,data);
+ paletteram_xxxxBBBBRRRRGGGG_le_w(machine,offset,data);
}
else
- cbasebal_scrollram_w(offset,data);
+ cbasebal_scrollram_w(machine,offset,data);
}
static WRITE8_HANDLER( cbasebal_coinctrl_w )
@@ -122,7 +122,7 @@ static READ8_HANDLER( eeprom_r )
bit = EEPROM_read_bit() << 7;
- return (input_port_2_r(0) & 0x7f) | bit;
+ return (input_port_2_r(machine,0) & 0x7f) | bit;
}
static WRITE8_HANDLER( eeprom_cs_w )
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 7a92bdfc152..54311e4681b 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -38,15 +38,15 @@ static WRITE16_HANDLER( twocrude_control_w )
{
switch (offset<<1) {
case 0: /* DMA flag */
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
return;
case 6: /* IRQ ack */
return;
case 2: /* Sound CPU write */
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
case 4: /* Protection, maybe this is a PAL on the board?
@@ -158,10 +158,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
@@ -170,10 +170,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index f435dbe4f01..d8c96ecfc16 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -205,8 +205,8 @@ static UINT8 toprollr_rombank;
static WRITE8_HANDLER( swimmer_sh_soundlatch_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 653049d72e3..9ec514a2fd1 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -657,15 +657,15 @@ static WRITE8_HANDLER( bullsdrt_coin_count_w )
static WRITE8_HANDLER( caterplr_AY8910_w )
{
- AY8910_control_port_0_w(0, offset);
- AY8910_write_port_0_w(0, data);
+ AY8910_control_port_0_w(machine, 0, offset);
+ AY8910_write_port_0_w(machine, 0, data);
}
static READ8_HANDLER( caterplr_AY8910_r )
{
- AY8910_control_port_0_w(0, offset);
- return AY8910_read_port_0_r(0);
+ AY8910_control_port_0_w(machine, 0, offset);
+ return AY8910_read_port_0_r(machine, 0);
}
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 1ade38f82ab..045bd65cf5a 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -68,17 +68,17 @@ static WRITE8_HANDLER( sprite_dma_w )
static READ8_HANDLER( psg_4015_r )
{
- return NESPSG_0_r(0x15);
+ return NESPSG_0_r(machine,0x15);
}
static WRITE8_HANDLER( psg_4015_w )
{
- NESPSG_0_w(0x15, data);
+ NESPSG_0_w(machine,0x15, data);
}
static WRITE8_HANDLER( psg_4017_w )
{
- NESPSG_0_w(0x17, data);
+ NESPSG_0_w(machine,0x17, data);
}
static UINT32 in_0;
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index ae1865cb535..8d3564fccc3 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -147,8 +147,8 @@ static WRITE8_HANDLER( chinagat_sub_IRQ_w )
static WRITE8_HANDLER( chinagat_cpu_sound_cmd_w )
{
- soundlatch_w( offset, data );
- cpunum_set_input_line(Machine, 2, sound_irq, (sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE );
+ soundlatch_w( machine, offset, data );
+ cpunum_set_input_line(machine, 2, sound_irq, (sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE );
}
static READ8_HANDLER( saiyugb1_mcu_command_r )
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 1451b26af20..85414cbc5ac 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -89,15 +89,15 @@ static WRITE8_HANDLER ( draco_sound_g_w )
switch (data)
{
case 0x01:
- AY8910_write_port_0_w(0, draco_ay_latch);
+ AY8910_write_port_0_w(machine, 0, draco_ay_latch);
break;
case 0x02:
- draco_ay_latch = AY8910_read_port_0_r(0);
+ draco_ay_latch = AY8910_read_port_0_r(machine, 0);
break;
case 0x03:
- AY8910_control_port_0_w(0, draco_ay_latch);
+ AY8910_control_port_0_w(machine, 0, draco_ay_latch);
break;
}
}
@@ -217,14 +217,14 @@ static WRITE8_HANDLER ( cidelsa_charram_w )
{
int addr = cdp1869_get_cma(offset);
cidelsa_pcb[addr] = activecpu_get_reg(CDP1802_Q);
- cdp1869_charram_w(offset, data);
+ cdp1869_charram_w(machine, offset, data);
}
static READ8_HANDLER ( cidelsa_charram_r )
{
int addr = cdp1869_get_cma(offset);
cdp1869_pcb = cidelsa_pcb[addr];
- return cdp1869_charram_r(offset);
+ return cdp1869_charram_r(machine,offset);
}
/* Memory Maps */
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index 3f3977b94a8..f597fa2a441 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -137,7 +137,7 @@ static WRITE8_HANDLER( coin_reset_w )
static WRITE8_HANDLER( mux_select_w )
{
mux_select = data;
- cinemat_sound_control_w(0x07, data);
+ cinemat_sound_control_w(machine, 0x07, data);
}
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 8e393410ec6..139c6139fa3 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -93,12 +93,12 @@ static WRITE8_HANDLER(circusc_sound_w)
/* CS3 */
case 1:
- SN76496_0_w(0, sn_latch);
+ SN76496_0_w(machine, 0, sn_latch);
break;
/* CS4 */
case 2:
- SN76496_1_w(0, sn_latch);
+ SN76496_1_w(machine, 0, sn_latch);
break;
/* CS5 */
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index d6f8f74778f..2ebd8d2c671 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -205,8 +205,8 @@ static WRITE8_HANDLER( cliff_sound_overlay_w )
render_container_set_palette_alpha(render_container_get_screen(0), 1, overlay ? 0x00 : 0xff );
/* audio */
- discrete_sound_w(CLIFF_ENABLE_SND_1, sound&1);
- discrete_sound_w(CLIFF_ENABLE_SND_2, (sound>>1)&1);
+ discrete_sound_w(machine, CLIFF_ENABLE_SND_1, sound&1);
+ discrete_sound_w(machine, CLIFF_ENABLE_SND_2, (sound>>1)&1);
}
#ifdef UNUSED_FUNCTION
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 069d063e6fc..b74c028f030 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -59,14 +59,14 @@ static UINT16 *cninja_ram;
static WRITE16_HANDLER( cninja_sound_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
static WRITE16_HANDLER( stoneage_sound_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static TIMER_CALLBACK( interrupt_gen )
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 4b4c5a6489e..17424f665bb 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -305,7 +305,7 @@ static WRITE8_HANDLER( cntsteer_int_w )
static WRITE8_HANDLER( cntsteer_sound_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
}
static WRITE8_HANDLER( zerotrgt_ctrl_w )
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 8b96ec34674..c6071d23a5c 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -237,7 +237,7 @@ static emu_timer *combasc_interleave_timer;
static READ8_HANDLER ( combasc_YM2203_status_port_0_r )
{
static int boost = 1;
- int status = YM2203_status_port_0_r(0);
+ int status = YM2203_status_port_0_r(machine,0);
if (activecpu_get_pc() == 0x334)
{
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 5b4376936dd..94ddbe973ca 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -61,7 +61,7 @@ static WRITE8_HANDLER( contra_coin_counter_w )
static WRITE8_HANDLER( cpu_sound_command_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
}
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 892dac15b58..246ca9d26fc 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -202,8 +202,8 @@ static WRITE16_HANDLER( nvram_data_w )
static WRITE16_HANDLER( nvram_thrash_data_w )
{
- nvram_data_w(offset, data, mem_mask);
- nvram_thrash_w(offset, data, mem_mask);
+ nvram_data_w(machine, offset, data, mem_mask);
+ nvram_thrash_w(machine, offset, data, mem_mask);
}
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 31d29629b69..bc7feef0860 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -69,8 +69,8 @@ WRITE8_HANDLER( cop01_vreg_w );
static WRITE8_HANDLER( cop01_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static READ8_HANDLER( cop01_sound_command_r )
@@ -80,7 +80,7 @@ static READ8_HANDLER( cop01_sound_command_r )
#define TIMER_RATE 12000 /* total guess */
- res = (soundlatch_r(offset) & 0x7f) << 1;
+ res = (soundlatch_r(machine,offset) & 0x7f) << 1;
/* bit 0 seems to be a timer */
if ((activecpu_gettotalcycles() / TIMER_RATE) & 1)
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 3b4820f83f5..abd787a57e9 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -112,7 +112,7 @@ static WRITE8_HANDLER( panic_sound_output_w )
static WRITE8_HANDLER( panic_sound_output2_w )
{
- panic_sound_output_w(offset+15, data);
+ panic_sound_output_w(machine, offset+15, data);
}
static WRITE8_HANDLER( cosmicg_output_w )
@@ -189,8 +189,8 @@ static INTERRUPT_GEN( panic_interrupt )
/* mostly not noticed since sound is */
/* only enabled if game in progress! */
- if ((input_port_3_r(0) & 0xc0) != 0xc0)
- panic_sound_output_w(17,1);
+ if ((input_port_3_r(machine,0) & 0xc0) != 0xc0)
+ panic_sound_output_w(machine,17,1);
cpunum_set_input_line_and_vector(machine, 0, 0, HOLD_LINE, 0xcf); /* RST 08h */
}
@@ -228,16 +228,16 @@ static INTERRUPT_GEN( cosmicg_interrupt )
static INTERRUPT_GEN( magspot_interrupt )
{
/* Coin 1 causes an IRQ, Coin 2 an NMI */
- if (input_port_4_r(0) & 0x01)
+ if (input_port_4_r(machine,0) & 0x01)
cpunum_set_input_line(machine, 0, 0, HOLD_LINE);
- else if (input_port_4_r(0) & 0x02)
+ else if (input_port_4_r(machine,0) & 0x02)
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
}
static INTERRUPT_GEN( nomnlnd_interrupt )
{
/* Coin causes an NMI */
- if (input_port_4_r(0) & 0x01)
+ if (input_port_4_r(machine,0) & 0x01)
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -252,12 +252,12 @@ static READ8_HANDLER( cosmicg_port_0_r )
{
/* The top four address lines from the CRTC are bits 0-3 */
- return (input_port_0_r(0) & 0xf0) | ((video_screen_get_vpos(0) & 0xf0) >> 4);
+ return (input_port_0_r(machine,0) & 0xf0) | ((video_screen_get_vpos(0) & 0xf0) >> 4);
}
static READ8_HANDLER( magspot_coinage_dip_r )
{
- return (input_port_5_r(0) & (1 << (7 - offset))) ? 0 : 1;
+ return (input_port_5_r(machine,0) & (1 << (7 - offset))) ? 0 : 1;
}
@@ -266,12 +266,12 @@ static READ8_HANDLER( magspot_coinage_dip_r )
static READ8_HANDLER( nomnlnd_port_0_1_r )
{
int control;
- int fire = input_port_3_r(0);
+ int fire = input_port_3_r(machine,0);
if (offset)
- control = input_port_1_r(0);
+ control = input_port_1_r(machine,0);
else
- control = input_port_0_r(0);
+ control = input_port_0_r(machine,0);
/* If firing - stop tank */
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 91fea3f519e..52f30b40bdf 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -250,7 +250,7 @@ static READ8_HANDLER( cps1_snd_fade_timer_r )
static WRITE16_HANDLER( cps1_sound_command_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
WRITE16_HANDLER( cps1_coinctrl_w )
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 389fbd5ffb7..0413298f53e 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1914,17 +1914,16 @@ static WRITE32_HANDLER( cps3_eeprom_w )
static READ32_HANDLER( cps3_cdrom_r )
{
-
UINT32 retval = 0;
if (ACCESSING_MSB32)
{
- retval |= ((UINT16)wd33c93_r(0))<<16;
+ retval |= ((UINT16)wd33c93_r(machine,0))<<16;
}
if (ACCESSING_LSB32)
{
- retval |= (UINT16)wd33c93_r(1);
+ retval |= (UINT16)wd33c93_r(machine,1);
}
return retval;
@@ -1934,12 +1933,12 @@ static WRITE32_HANDLER( cps3_cdrom_w )
{
if (ACCESSING_MSB32)
{
- wd33c93_w(0,(data & 0x00ff0000)>>16);
+ wd33c93_w(machine,0,(data & 0x00ff0000)>>16);
}
if (ACCESSING_LSB32)
{
- wd33c93_w(1,(data & 0x000000ff)>>0);
+ wd33c93_w(machine,1,(data & 0x000000ff)>>0);
}
}
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index a01298ab951..959682a4a96 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( port_sound_w )
sound_global_enable((data & 0x02) ? TRUE : FALSE);
/* D2 - unlabeled - music enable */
- crbaloon_audio_set_music_enable((data & 0x04) ? TRUE : FALSE);
+ crbaloon_audio_set_music_enable(machine, (data & 0x04) ? TRUE : FALSE);
/* D3 - EXPLOSION */
crbaloon_audio_set_explosion_enable((data & 0x08) ? TRUE : FALSE);
@@ -178,7 +178,7 @@ static WRITE8_HANDLER( port_sound_w )
crbaloon_audio_set_appear_enable((data & 0x20) ? TRUE : FALSE);
/* D6 - unlabeled - laugh enable */
- crbaloon_audio_set_laugh_enable((data & 0x40) ? TRUE : FALSE);
+ crbaloon_audio_set_laugh_enable(machine, (data & 0x40) ? TRUE : FALSE);
/* D7 - unlabeled - goes to PC3259 pin 16 */
@@ -188,7 +188,7 @@ static WRITE8_HANDLER( port_sound_w )
static WRITE8_HANDLER( port_music_w )
{
- crbaloon_audio_set_music_freq(data);
+ crbaloon_audio_set_music_freq(machine, data);
}
@@ -347,8 +347,8 @@ GFXDECODE_END
static MACHINE_RESET( crballoon )
{
pc3092_reset();
- port_sound_w(0, 0);
- port_music_w(0, 0);
+ port_sound_w(machine, 0, 0);
+ port_music_w(machine, 0, 0);
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 36a66f3b479..d8d092f8e59 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -31,8 +31,8 @@ static WRITE8_HANDLER( crimfght_coin_w )
static WRITE8_HANDLER( crimfght_sh_irqtrigger_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static WRITE8_HANDLER( crimfght_snd_bankswitch_w )
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 740972caf2f..4311c4f40a9 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -54,7 +54,7 @@ static WRITE16_HANDLER ( crospang_soundlatch_w )
{
if(ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
}
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 9099ac3e963..36c157d9a1f 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -166,8 +166,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index d579fcb6b2f..44fdacc15ad 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -95,7 +95,7 @@ static UINT8 *mainram;
static void ar_coin_hack(void)
{
- if(input_port_5_r(0)&1)
+ if(input_port_5_r(Machine,0)&1)
{
if(coin_stat==0)
{
@@ -221,8 +221,7 @@ static READ8_HANDLER ( cshooter_coin_r )
/* Even reads must return 0xff - Odd reads must return the contents of input port 5.
Code at 0x5061 is executed once during P.O.S.T. where there is one read.
Code at 0x50b4 is then executed each frame (not sure) where there are 2 reads. */
-
- return ( (cshooter_counter++ & 1) ? 0xff : input_port_5_r(0) );
+ return ( (cshooter_counter++ & 1) ? 0xff : input_port_5_r(machine,0) );
}
static WRITE8_HANDLER ( cshooter_c500_w )
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index e8ca6ae7909..e27597f17c0 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -45,47 +45,29 @@
*/
#include "driver.h"
+#include "memconv.h"
#include "sound/custom.h"
#include "includes/amiga.h"
#include "includes/cubocd32.h"
-//READWRITE16BETO32BE(amiga_cia32,amiga_cia_r,amiga_cia_w)
-//READWRITE16BETO32BE(amiga_custom32,amiga_custom_r,amiga_custom_w)
-
static READ32_HANDLER( amiga_cia32_r )
{
- UINT32 result = 0;
- if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= amiga_cia_r(offset * 2 + 0, mem_mask >> 16) << 16;
- if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= amiga_cia_r(offset * 2 + 1, mem_mask) << 0;
- return result;
+ return read32be_with_16be_handler(amiga_cia_r, machine, offset, mem_mask);
}
static WRITE32_HANDLER( amiga_cia32_w )
{
- if ((mem_mask & 0xffff0000) != 0xffff0000)
- amiga_cia_w( offset * 2 + 0, data >> 16, mem_mask >> 16);
- if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- amiga_cia_w( offset * 2 + 1, data, mem_mask);
+ write32be_with_16be_handler(amiga_cia_w, machine, offset, data, mem_mask);
}
static READ32_HANDLER( amiga_custom32_r )
{
- UINT32 result = 0;
- if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= amiga_custom_r(offset * 2 + 0, mem_mask >> 16) << 16;
- if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= amiga_custom_r(offset * 2 + 1, mem_mask) << 0;
- return result;
+ return read32be_with_16be_handler(amiga_custom_r, machine, offset, mem_mask);
}
static WRITE32_HANDLER( amiga_custom32_w )
{
- if ((mem_mask & 0xffff0000) != 0xffff0000)
- amiga_custom_w( offset * 2 + 0, data >> 16, mem_mask >> 16);
- if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- amiga_custom_w( offset * 2 + 1, data, mem_mask);
+ write32be_with_16be_handler(amiga_custom_w, machine, offset, data, mem_mask);
}
static WRITE32_HANDLER( aga_overlay_w )
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 97d9a7fee9d..18a9333f2df 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -279,12 +279,12 @@ static READ8_HANDLER( cvs_input_r )
/* the lower 4 (or 3?) bits select the port to read */
switch (offset & 0x0f) /* might be 0x07 */
{
- case 0x00: ret = input_port_0_r(0); break;
- case 0x02: ret = input_port_1_r(0); break;
- case 0x03: ret = input_port_2_r(0); break;
- case 0x04: ret = input_port_3_r(0); break;
- case 0x06: ret = input_port_4_r(0); break;
- case 0x07: ret = input_port_5_r(0); break;
+ case 0x00: ret = input_port_0_r(machine, 0); break;
+ case 0x02: ret = input_port_1_r(machine, 0); break;
+ case 0x03: ret = input_port_2_r(machine, 0); break;
+ case 0x04: ret = input_port_3_r(machine, 0); break;
+ case 0x06: ret = input_port_4_r(machine, 0); break;
+ case 0x07: ret = input_port_5_r(machine, 0); break;
default: logerror("%04x : CVS: Reading unmapped input port 0x%02x\n", activecpu_get_pc(), offset & 0x0f); break;
}
@@ -338,7 +338,7 @@ static WRITE8_HANDLER( cvs_4_bit_dac_data_w )
(cvs_4_bit_dac_data[3] << 3);
/* scale up to a full byte and output */
- DAC_1_data_w(0, (dac_value << 4) | dac_value);
+ DAC_1_data_w(machine, 0, (dac_value << 4) | dac_value);
}
@@ -350,35 +350,35 @@ static WRITE8_HANDLER( cvs_4_bit_dac_data_w )
*************************************/
/* temporary code begin */
-static void speech_execute_command(UINT8 command)
+static void speech_execute_command(running_machine *machine, UINT8 command)
{
/* reset */
if (command == 0x3f)
{
- tms5110_CTL_w(0, TMS5110_CMD_RESET);
+ tms5110_CTL_w(machine, 0, TMS5110_CMD_RESET);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_PDC_w(machine, 0,0);
+ tms5110_PDC_w(machine, 0,1);
+ tms5110_PDC_w(machine, 0,0);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_PDC_w(machine, 0,0);
+ tms5110_PDC_w(machine, 0,1);
+ tms5110_PDC_w(machine, 0,0);
- tms5110_PDC_w(0,0);
- tms5110_PDC_w(0,1);
- tms5110_PDC_w(0,0);
+ tms5110_PDC_w(machine, 0,0);
+ tms5110_PDC_w(machine, 0,1);
+ tms5110_PDC_w(machine, 0,0);
speech_rom_bit_address = 0;
}
/* start */
else
{
- tms5110_CTL_w(0, TMS5110_CMD_SPEAK);
+ tms5110_CTL_w(machine, 0, TMS5110_CMD_SPEAK);
- tms5110_PDC_w(0, 0);
- tms5110_PDC_w(0, 1);
- tms5110_PDC_w(0, 0);
+ tms5110_PDC_w(machine, 0, 0);
+ tms5110_PDC_w(machine, 0, 1);
+ tms5110_PDC_w(machine, 0, 0);
speech_rom_bit_address = command * 0x80 * 8;
}
@@ -399,9 +399,9 @@ static WRITE8_HANDLER( cvs_speech_rom_address_hi_w )
}
-static void cvs_set_speech_command_w(UINT8 data)
+static void cvs_set_speech_command_w(running_machine *machine, UINT8 data)
{
- soundlatch2_w(0, data & 0x7f);
+ soundlatch2_w(machine, 0, data & 0x7f);
if (~data & 0x40) LOG(("%04x : CVS: Speech Command W = %04x\n", activecpu_get_pc(), data & 0x7f));
}
@@ -409,7 +409,7 @@ static void cvs_set_speech_command_w(UINT8 data)
static READ8_HANDLER( cvs_speech_command_r )
{
/* bit 7 is TMS status (active LO) */
- return (~tms5110_status_r(0) << 7) | soundlatch2_r(0);
+ return (~tms5110_status_r(machine, 0) << 7) | soundlatch2_r(machine, 0);
}
@@ -470,17 +470,17 @@ static WRITE8_HANDLER( audio_command_w )
/* cause interrupt on audio CPU if bit 7 set */
if (data & 0x80)
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
cvs_dac_cpu_interrupt();
LOG(("%04x : CVS: Audio command = %02x\n", activecpu_get_pc(), data));
}
- cvs_set_speech_command_w(data);
+ cvs_set_speech_command_w(machine, data);
/* temporary code begin */
if ((data & 0x40) == 0)
- speech_execute_command(data & 0x03f);
+ speech_execute_command(machine, data & 0x03f);
/* temporary code end */
}
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index d7a149615fd..c015bc70b38 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -27,8 +27,8 @@ static WRITE8_HANDLER( dambustr_noise_enable_w )
{
if (data != noise_data) {
noise_data = data;
- galaxian_noise_enable_w(offset, data);
- };
+ galaxian_noise_enable_w(machine, offset, data);
+ }
}
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 3428cca5ab1..9959a9c9723 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -173,7 +173,7 @@ static WRITE16_HANDLER( cpua_ctrl_w )
static WRITE16_HANDLER( darius_watchdog_w )
{
- watchdog_reset_w(0,data);
+ watchdog_reset_w(machine,0,data);
}
@@ -186,22 +186,22 @@ static READ16_HANDLER( darius_ioc_r )
switch (offset)
{
case 0x01:
- return (taitosound_comm_r(0) & 0xff); /* sound interface read */
+ return (taitosound_comm_r(machine,0) & 0xff); /* sound interface read */
case 0x04:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
case 0x05:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
case 0x06:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
case 0x07:
return coin_word; /* bits 3&4 coin lockouts, must return zero */
case 0x08:
- return input_port_3_word_r(0,mem_mask); /* DSW */
+ return input_port_3_word_r(machine,0,mem_mask); /* DSW */
}
logerror("CPU #0 PC %06x: warning - read unmapped ioc offset %06x\n",activecpu_get_pc(),offset);
@@ -215,12 +215,12 @@ static WRITE16_HANDLER( darius_ioc_w )
{
case 0x00: /* sound interface write */
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
return;
case 0x01: /* sound interface write */
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
return;
case 0x28: /* unknown, written by both cpus - always 0? */
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 60ebdb09c9c..1d6cd0555a9 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -258,19 +258,19 @@ static WRITE32_HANDLER( darkhors_eeprom_w )
static WRITE32_HANDLER( OKIM6295_data_0_msb32_w )
{
if (ACCESSING_MSB32)
- OKIM6295_data_0_msb_w(offset, data >> 16, mem_mask >> 16);
+ OKIM6295_data_0_msb_w(machine, offset, data >> 16, mem_mask >> 16);
}
static READ32_HANDLER( OKIM6295_status_0_msb32_r )
{
- return OKIM6295_status_0_msb_r(offset, mem_mask >> 16) << 16;
+ return OKIM6295_status_0_msb_r(machine, offset, mem_mask >> 16) << 16;
}
static WRITE32_HANDLER( paletteram32_xBBBBBGGGGGRRRRR_dword_w )
{
paletteram16 = (UINT16 *)paletteram32;
- if (ACCESSING_MSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_LSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(offset*2+1, data, mem_mask);
+ if (ACCESSING_MSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
+ if (ACCESSING_LSW32) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2+1, data, mem_mask);
}
static UINT32 input_sel;
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 40b17ebda59..b7e09dad088 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -38,11 +38,11 @@ static WRITE16_HANDLER( darkseal_control_w )
{
switch (offset<<1) {
case 6: /* DMA flag */
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
return;
case 8: /* Sound CPU write */
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
case 0xa: /* IRQ Ack (VBL) */
return;
@@ -102,10 +102,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
@@ -114,10 +114,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 106bbfe5024..a34a1225570 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -170,8 +170,8 @@ static READ16_HANDLER( dassault_sub_control_r )
static WRITE16_HANDLER( dassault_sound_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 2,0,HOLD_LINE); /* IRQ1 */
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 2,0,HOLD_LINE); /* IRQ1 */
}
/* The CPU-CPU irq controller is overlaid onto the end of the shared memory */
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 3d10d979102..439bf233150 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -282,7 +282,7 @@ static WRITE16_HANDLER( dblewing_prot_w )
if ((offset*2)==0x104) { dblwings_104_data = data; return; } // p1 inputs select screen OK
if ((offset*2)==0x200) { dblwings_200_data = data; return; }
if ((offset*2)==0x28c) { dblwings_28c_data = data; return; }
- if ((offset*2)==0x380) { soundlatch_w(0,data&0xff); /*cpunum_set_input_line(Machine, 1,0,HOLD_LINE);*/ return; } // sound write
+ if ((offset*2)==0x380) { soundlatch_w(machine,0,data&0xff); /*cpunum_set_input_line(Machine, 1,0,HOLD_LINE);*/ return; } // sound write
if ((offset*2)==0x38e) { dblwings_38e_data = data; return; }
if ((offset*2)==0x406) { dblwings_406_data = data; return; } // p2 inputs select screen OK
if ((offset*2)==0x408) { dblwings_408_data = data; return; } // 3rd player 1st level?
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index c9a36b8a970..b40f68cca9f 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -130,7 +130,7 @@ static READ16_HANDLER( dbz_inp2_r )
static WRITE16_HANDLER( dbz_sound_command_w )
{
- soundlatch_w(0, data>>8);
+ soundlatch_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( dbz_sound_cause_nmi )
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index ed1aec59105..f2f73925927 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -134,7 +134,7 @@ static READ16_HANDLER( port_0_r )
static READ16_HANDLER( port_2_r )
{
- return (readinputport(2) & 0xff1f) | (!soundlatch_full << 7) | (ticket_dispenser_r(0) >> 2);
+ return (readinputport(2) & 0xff1f) | (!soundlatch_full << 7) | (ticket_dispenser_r(machine, 0) >> 2);
}
@@ -147,7 +147,7 @@ static WRITE16_HANDLER( eeprom_control_w )
EEPROM_set_cs_line(~data & 8);
EEPROM_write_bit(data & 2);
EEPROM_set_clock_line(data & 4);
- ticket_dispenser_w(0, (data & 1) << 7);
+ ticket_dispenser_w(machine, 0, (data & 1) << 7);
}
}
@@ -158,8 +158,8 @@ static WRITE16_HANDLER( sound_command_w )
{
/* write the latch and set the IRQ */
soundlatch_full = 1;
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
- soundlatch_w(0, data & 0xff);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE);
+ soundlatch_w(machine, 0, data & 0xff);
}
}
@@ -175,8 +175,8 @@ static READ8_HANDLER( sound_command_r )
{
/* read the latch and clear the IRQ */
soundlatch_full = 0;
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
+ return soundlatch_r(machine, 0);
}
@@ -207,7 +207,7 @@ static WRITE8_HANDLER( bsmt_data_w )
if (offset % 2 == 0)
sound_msb_latch = data;
else
- BSMT2000_data_0_w(offset/2, (sound_msb_latch << 8) | data, 0);
+ BSMT2000_data_0_w(machine, offset/2, (sound_msb_latch << 8) | data, 0);
}
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 812f8885ee6..3484b6646cb 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -114,7 +114,7 @@ static const UINT8 protData[0x10]=
static READ8_HANDLER(prot_r)
{
- return (input_port_1_r(0)&0x1f)|protData[protAdr];
+ return (input_port_1_r(machine,0)&0x1f)|protData[protAdr];
}
static WRITE8_HANDLER(prot_w)
@@ -171,8 +171,8 @@ static WRITE8_HANDLER(bg2_w)
static WRITE8_HANDLER( sound_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static WRITE8_HANDLER( i8257_CH0_w )
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 31386c4f2ae..a945115611a 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -236,7 +236,7 @@ static WRITE8_HANDLER( ddenlovr_bgcolor2_w )
static WRITE16_HANDLER( ddenlovr16_bgcolor_w )
{
if (ACCESSING_LSB)
- ddenlovr_bgcolor_w(offset,data);
+ ddenlovr_bgcolor_w(machine,offset,data);
}
@@ -253,7 +253,7 @@ static WRITE8_HANDLER( ddenlovr_priority2_w )
static WRITE16_HANDLER( ddenlovr16_priority_w )
{
if (ACCESSING_LSB)
- ddenlovr_priority_w(offset,data);
+ ddenlovr_priority_w(machine,offset,data);
}
@@ -271,7 +271,7 @@ static WRITE8_HANDLER( ddenlovr_layer_enable2_w )
static WRITE16_HANDLER( ddenlovr16_layer_enable_w )
{
if (ACCESSING_LSB)
- ddenlovr_layer_enable_w(offset,data);
+ ddenlovr_layer_enable_w(machine,offset,data);
}
@@ -1062,11 +1062,11 @@ profiler_mark(PROFILER_VIDEO);
break;
case 0xe4:
- ddenlovr_priority_w(0,data);
+ ddenlovr_priority_w(machine,0,data);
break;
case 0xe6:
- ddenlovr_layer_enable_w(0,data);
+ ddenlovr_layer_enable_w(machine,0,data);
break;
case 0xe8:
@@ -1171,7 +1171,7 @@ static READ8_HANDLER( rongrong_gfxrom_r )
static READ16_HANDLER( ddenlovr_gfxrom_r )
{
- return rongrong_gfxrom_r(offset);
+ return rongrong_gfxrom_r(machine, offset);
}
@@ -1358,13 +1358,13 @@ static WRITE8_HANDLER( rongrong_palette_w )
/* what were they smoking??? */
b = ((d1 & 0xe0) >> 5) | (d2 & 0xc0) >> 3;
- palette_set_color_rgb(Machine,indx,pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine,indx,pal5bit(r),pal5bit(g),pal5bit(b));
}
static WRITE16_HANDLER( ddenlovr_palette_w )
{
if (ACCESSING_LSB)
- rongrong_palette_w(offset,data & 0xff);
+ rongrong_palette_w(machine,offset,data & 0xff);
}
@@ -1471,7 +1471,7 @@ static READ8_HANDLER( unk_r )
static READ16_HANDLER( unk16_r )
{
- return unk_r(offset);
+ return unk_r(machine,offset);
}
@@ -1965,8 +1965,8 @@ static WRITE8_HANDLER( mmpanic_rombank_w )
static WRITE8_HANDLER( mmpanic_soundlatch_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static WRITE8_HANDLER( mmpanic_blitter_w )
@@ -2503,8 +2503,8 @@ static READ8_HANDLER( mjchuuka_keyb_r )
static WRITE8_HANDLER( mjchuuka_blitter_w )
{
- hanakanz_blitter_reg_w(0,offset >> 8);
- hanakanz_blitter_data_w(0,data);
+ hanakanz_blitter_reg_w(machine,0,offset >> 8);
+ hanakanz_blitter_data_w(machine,0,data);
}
static UINT8 mjchuuka_romdata[2];
@@ -2763,7 +2763,7 @@ static READ8_HANDLER( hginga_protection_r )
{
UINT8 *rom = memory_region(REGION_CPU1);
if (hginga_rombank & 0x10)
- return hanakanz_rand_r(0);
+ return hanakanz_rand_r(machine,0);
return rom[0x10000 + 0x8000 * (hginga_rombank & 0x7) + 0xf601 - 0x8000];
}
@@ -2985,7 +2985,7 @@ static READ8_HANDLER( hgokou_protection_r )
{
UINT8 *rom = memory_region(REGION_CPU1);
if (hginga_rombank == 0)
- return hanakanz_rand_r(0);
+ return hanakanz_rand_r(machine,0);
return rom[0x10000 + 0x8000 * (hginga_rombank & 0x7) + 0xe601 - 0x8000];
}
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 321ecd2702e..313d35b81df 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -323,8 +323,8 @@ static WRITE8_HANDLER( ddragon_interrupt_w )
break;
case 3: /* 380e - SND irq */
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, snd_cpu, sound_irq, (sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, snd_cpu, sound_irq, (sound_irq == INPUT_LINE_NMI) ? PULSE_LINE : HOLD_LINE);
break;
case 4: /* 380f - ? */
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 8d1bd2a1a54..04146041e98 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -64,8 +64,8 @@ static WRITE16_HANDLER( ddragon3_io16_w )
break;
case 1: /* soundlatch_w */
- soundlatch_w(1,reg[1]&0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,reg[1]&0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
break;
case 2:
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 52ce21d2607..8a9c66b9309 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -57,18 +57,18 @@ static WRITE16_HANDLER( dec0_control_w )
switch (offset<<1)
{
case 0: /* Playfield & Sprite priority */
- dec0_priority_w(0,data,mem_mask);
+ dec0_priority_w(machine,0,data,mem_mask);
break;
case 2: /* DMA flag */
- dec0_update_sprites_w(0,0,mem_mask);
+ dec0_update_sprites_w(machine,0,0,mem_mask);
break;
case 4: /* 6502 sound cpu */
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
break;
@@ -103,12 +103,12 @@ static WRITE16_HANDLER( slyspy_control_w )
case 0:
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
break;
case 2:
- dec0_priority_w(0,data,mem_mask);
+ dec0_priority_w(machine,0,data,mem_mask);
break;
}
}
@@ -117,8 +117,8 @@ static WRITE16_HANDLER( midres_sound_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
@@ -295,10 +295,10 @@ static WRITE8_HANDLER( YM3812_w )
{
switch (offset) {
case 0:
- YM3812_control_port_0_w(0,data);
+ YM3812_control_port_0_w(machine,0,data);
break;
case 1:
- YM3812_write_port_0_w(0,data);
+ YM3812_write_port_0_w(machine,0,data);
break;
}
}
@@ -307,10 +307,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 6da55c548cf..6fe2d78b987 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -95,7 +95,7 @@ static int msm5205next;
/* Only used by ghostb, gondo, garyoret, other games can control buffering */
static VIDEO_EOF( dec8 )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
static READ8_HANDLER( i8751_h_r )
@@ -426,14 +426,14 @@ static WRITE8_HANDLER( csilver_control_w )
static WRITE8_HANDLER( dec8_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static WRITE8_HANDLER( oscar_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE);
}
static void csilver_adpcm_int(int data)
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index b9b2bc21072..bd9398a95d3 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -175,23 +175,23 @@ static WRITE32_HANDLER( hvysmsh_oki_0_bank_w )
static READ32_HANDLER(hvysmsh_oki_0_r)
{
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
}
static WRITE32_HANDLER(hvysmsh_oki_0_w)
{
// data & 0xff00 is written sometimes too. game bug or needed data?
- OKIM6295_data_0_w(0,data&0xff);
+ OKIM6295_data_0_w(machine,0,data&0xff);
}
static READ32_HANDLER(hvysmsh_oki_1_r)
{
- return OKIM6295_status_1_r(0);
+ return OKIM6295_status_1_r(machine, 0);
}
static WRITE32_HANDLER(hvysmsh_oki_1_w)
{
- OKIM6295_data_1_w(0,data&0xff);
+ OKIM6295_data_1_w(machine,0,data&0xff);
}
static READ32_HANDLER(wcvol95_eeprom_r)
@@ -211,21 +211,21 @@ static WRITE32_HANDLER(wcvol95_eeprom_w)
static WRITE32_HANDLER(wcvol95_nonbuffered_palette_w)
{
COMBINE_DATA(&paletteram32[offset]);
- palette_set_color_rgb(Machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10));
+ palette_set_color_rgb(machine,offset,pal5bit(paletteram32[offset] >> 0),pal5bit(paletteram32[offset] >> 5),pal5bit(paletteram32[offset] >> 10));
}
static READ32_HANDLER( deco156_snd_r )
{
- return YMZ280B_status_0_r(0);
+ return YMZ280B_status_0_r(machine, 0);
}
static WRITE32_HANDLER( deco156_snd_w )
{
if (offset)
- YMZ280B_data_0_w(0, data);
+ YMZ280B_data_0_w(machine, 0, data);
else
- YMZ280B_register_0_w(0, data);
+ YMZ280B_register_0_w(machine, 0, data);
}
/***************************************************************************/
@@ -237,8 +237,8 @@ static READ32_HANDLER ( wcvol95_pf12_control_r ) { return deco16_pf12_control[of
static WRITE32_HANDLER( wcvol95_pf12_control_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; COMBINE_DATA(&deco16_pf12_control[offset]); }
static READ32_HANDLER( wcvol95_pf1_data_r ) { return deco16_pf1_data[offset]^0xffff0000; }
static READ32_HANDLER( wcvol95_pf2_data_r ) { return deco16_pf2_data[offset]^0xffff0000; }
-static WRITE32_HANDLER( wcvol95_pf1_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf1_data_w(offset,data,mem_mask); }
-static WRITE32_HANDLER( wcvol95_pf2_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf2_data_w(offset,data,mem_mask); }
+static WRITE32_HANDLER( wcvol95_pf1_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf1_data_w(machine,offset,data,mem_mask); }
+static WRITE32_HANDLER( wcvol95_pf2_data_w ) { data &=0x0000ffff; mem_mask &=0x0000ffff; deco16_pf2_data_w(machine,offset,data,mem_mask); }
static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index b0552d12ffc..f2e4c411e3c 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -316,8 +316,8 @@ static WRITE32_HANDLER( deco32_irq_controller_w )
static WRITE32_HANDLER( deco32_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
static READ32_HANDLER( deco32_71_r )
@@ -445,12 +445,12 @@ static WRITE32_HANDLER( dragngun_eeprom_w )
static READ32_HANDLER(dragngun_oki_2_r)
{
- return OKIM6295_status_2_r(0);
+ return OKIM6295_status_2_r(machine, 0);
}
static WRITE32_HANDLER(dragngun_oki_2_w)
{
- OKIM6295_data_2_w(0,data&0xff);
+ OKIM6295_data_2_w(machine, 0, data&0xff);
}
/**********************************************************************************/
@@ -477,7 +477,7 @@ static WRITE32_HANDLER( tattass_prot_w )
/* 'Swap bits 0 and 3 to correct for design error from BSMT schematic' */
int soundcommand = (data>>16)&0xff;
soundcommand = BITSWAP8(soundcommand,7,6,5,4,0,2,1,3);
- soundlatch_w(0,soundcommand);
+ soundlatch_w(machine,0,soundcommand);
}
}
@@ -603,7 +603,7 @@ static WRITE32_HANDLER( tattass_control_w )
}
/* Playfield control - Only written in full word memory accesses */
- deco32_pri_w(0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
+ deco32_pri_w(machine,0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
/* Sound board reset control */
if (data&0x80)
@@ -641,7 +641,7 @@ static WRITE32_HANDLER( nslasher_eeprom_w )
EEPROM_write_bit(data & 0x10);
EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
- deco32_pri_w(0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
+ deco32_pri_w(machine,0,data&0x3,0); /* Bit 0 - layer priority toggle, Bit 1 - BG2/3 Joint mode (8bpp) */
}
}
@@ -654,9 +654,9 @@ static WRITE32_HANDLER( nslasher_prot_w )
if (offset==0x700/4) {
/* bit 1 of nslasher_sound_irq specifies IRQ command writes */
- soundlatch_w(0,(data>>16)&0xff);
+ soundlatch_w(machine,0,(data>>16)&0xff);
nslasher_sound_irq |= 0x02;
- cpunum_set_input_line(Machine, 1, 0, (nslasher_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, 0, (nslasher_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
}
}
@@ -1133,8 +1133,8 @@ static WRITE8_HANDLER(deco32_bsmt0_w)
static WRITE8_HANDLER(deco32_bsmt1_w)
{
- BSMT2000_data_0_w(offset^ 0xff, ((bsmt_latch<<8)|data), 0);
- cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, HOLD_LINE); /* BSMT is ready */
+ BSMT2000_data_0_w(machine, offset^ 0xff, ((bsmt_latch<<8)|data), 0);
+ cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE); /* BSMT is ready */
}
static READ8_HANDLER(deco32_bsmt_status_r)
@@ -1180,8 +1180,8 @@ static READ8_HANDLER(latch_r)
{
/* bit 1 of nslasher_sound_irq specifies IRQ command writes */
nslasher_sound_irq &= ~0x02;
- cpunum_set_input_line(Machine, 1, 0, (nslasher_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 1, 0, (nslasher_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
+ return soundlatch_r(machine,0);
}
static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 6d77338d6a1..fe35b70fe47 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -168,7 +168,7 @@ static WRITE32_HANDLER( avengrs_palette_w )
static READ32_HANDLER( avengrs_sound_r )
{
if (mem_mask==0x00ffffff) {
- return YMZ280B_status_0_r(0)<<24;
+ return YMZ280B_status_0_r(machine,0)<<24;
} else {
logerror("%08x: non-byte read from sound mask %08x\n",activecpu_get_pc(),mem_mask);
}
@@ -180,9 +180,9 @@ static WRITE32_HANDLER( avengrs_sound_w )
{
if (mem_mask==0x00ffffff) {
if (offset)
- YMZ280B_data_0_w(0,data>>24);
+ YMZ280B_data_0_w(machine,0,data>>24);
else
- YMZ280B_register_0_w(0,data>>24);
+ YMZ280B_register_0_w(machine,0,data>>24);
} else {
logerror("%08x: non-byte written to sound %08x mask %08x\n",activecpu_get_pc(),data,mem_mask);
}
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index cd68561a894..feab2068904 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -72,14 +72,14 @@ INLINE int swap_bits_5_6(int data)
}
static WRITE8_HANDLER( ram_w ) { decrypted[0x0000 + offset] = swap_bits_5_6(data); decocass_rambase[0x0000 + offset] = data; }
-static WRITE8_HANDLER( charram_w ) { decrypted[0x6000 + offset] = swap_bits_5_6(data); decocass_charram_w(offset, data); }
-static WRITE8_HANDLER( fgvideoram_w ) { decrypted[0xc000 + offset] = swap_bits_5_6(data); decocass_fgvideoram_w(offset, data); }
-static WRITE8_HANDLER( fgcolorram_w ) { decrypted[0xc400 + offset] = swap_bits_5_6(data); decocass_colorram_w(offset, data); }
-static WRITE8_HANDLER( tileram_w ) { decrypted[0xd000 + offset] = swap_bits_5_6(data); decocass_tileram_w(offset, data); }
-static WRITE8_HANDLER( objectram_w ) { decrypted[0xd800 + offset] = swap_bits_5_6(data); decocass_objectram_w(offset, data); }
-
-static WRITE8_HANDLER( mirrorvideoram_w ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); fgvideoram_w(offset, data); }
-static WRITE8_HANDLER( mirrorcolorram_w ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); fgcolorram_w(offset, data); }
+static WRITE8_HANDLER( charram_w ) { decrypted[0x6000 + offset] = swap_bits_5_6(data); decocass_charram_w(machine, offset, data); }
+static WRITE8_HANDLER( fgvideoram_w ) { decrypted[0xc000 + offset] = swap_bits_5_6(data); decocass_fgvideoram_w(machine, offset, data); }
+static WRITE8_HANDLER( fgcolorram_w ) { decrypted[0xc400 + offset] = swap_bits_5_6(data); decocass_colorram_w(machine, offset, data); }
+static WRITE8_HANDLER( tileram_w ) { decrypted[0xd000 + offset] = swap_bits_5_6(data); decocass_tileram_w(machine, offset, data); }
+static WRITE8_HANDLER( objectram_w ) { decrypted[0xd800 + offset] = swap_bits_5_6(data); decocass_objectram_w(machine, offset, data); }
+
+static WRITE8_HANDLER( mirrorvideoram_w ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); fgvideoram_w(machine, offset, data); }
+static WRITE8_HANDLER( mirrorcolorram_w ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); fgcolorram_w(machine, offset, data); }
static READ8_HANDLER( mirrorvideoram_r ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); return decocass_fgvideoram[offset]; }
static READ8_HANDLER( mirrorcolorram_r ) { offset = ((offset >> 5) & 0x1f) | ((offset & 0x1f) << 5); return decocass_colorram[offset]; }
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index a7916a12d84..fc01e15b1b4 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -56,8 +56,8 @@ static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(offset,(data >> 8) & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,(data >> 8) & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
@@ -81,13 +81,13 @@ static MACHINE_RESET( deniam )
static WRITE16_HANDLER( YM3812_control_port_0_msb_w )
{
if (ACCESSING_MSB)
- YM3812_control_port_0_w(0,(data >> 8) & 0xff);
+ YM3812_control_port_0_w(machine,0,(data >> 8) & 0xff);
}
static WRITE16_HANDLER( YM3812_write_port_0_msb_w )
{
if (ACCESSING_MSB)
- YM3812_write_port_0_w(0,(data >> 8) & 0xff);
+ YM3812_write_port_0_w(machine,0,(data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 062e4dd5ff9..651041ab394 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -81,7 +81,7 @@ static WRITE8_HANDLER( destroyr_cursor_load_w )
{
destroyr_cursor = data;
- watchdog_reset_w(offset, data);
+ watchdog_reset_w(machine, offset, data);
}
@@ -122,7 +122,7 @@ static WRITE8_HANDLER( destroyr_output_w )
/* bit 0 => low explosion */
break;
case 8:
- destroyr_misc_w(offset, data);
+ destroyr_misc_w(machine, offset, data);
break;
default:
logerror("unmapped output port %d\n", offset);
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index dc9086bae94..9bba2d232b2 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -163,8 +163,8 @@ static WRITE32_HANDLER( vram_w )
switch(mem_mask)
{
case 0:
- vram_w(offset,data,0x0000ffff);
- vram_w(offset,data,0xffff0000);
+ vram_w(machine,offset,data,0x0000ffff);
+ vram_w(machine,offset,data,0xffff0000);
return;
case 0xffff:
@@ -217,7 +217,7 @@ static READ32_HANDLER( vblank_r )
{
/* burn a bunch of cycles because this is polled frequently during busy loops */
activecpu_adjust_icount(-100);
- return input_port_0_dword_r(offset, 0);
+ return input_port_0_dword_r(machine, offset, 0);
}
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index baf50a6d91b..33766c2ae6d 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -43,10 +43,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 2b16c6aa02a..da24d5e45c5 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -203,8 +203,8 @@ static WRITE8_HANDLER( discoboy_port_03_w ) // sfx? (to sound cpu)
{
// printf("unk discoboy_port_03_w %02x\n",data);
// cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,HOLD_LINE);
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
static WRITE8_HANDLER( discoboy_port_06_w )
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 76e9d54285c..f1f9737561d 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -61,8 +61,8 @@ static WRITE16_HANDLER( soundcmd_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index aac757b9787..575c1bf9f18 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -403,7 +403,7 @@ static WRITE8_HANDLER( beast_data_w )
logerror( "0x%04x: prot_w(0x%02x)\n", activecpu_get_pc(), data );
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
if( prot_mode == ePROT_WAIT_DSW1_WRITEBACK )
{
@@ -715,8 +715,8 @@ static WRITE8_HANDLER( cpu1_bankswitch_w )
static WRITE8_HANDLER( trigger_nmi_on_sound_cpu2 )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
} /* trigger_nmi_on_sound_cpu2 */
static WRITE8_HANDLER( cpu2_bankswitch_w )
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 0473bbe2fab..20469fc2c17 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -145,9 +145,9 @@ static READ16_HANDLER( dual539_16_r )
UINT16 ret = 0;
if (ACCESSING_LSB16)
- ret |= K054539_1_r(offset);
+ ret |= K054539_1_r(machine, offset);
if (ACCESSING_MSB16)
- ret |= K054539_0_r(offset)<<8;
+ ret |= K054539_0_r(machine, offset)<<8;
return ret;
}
@@ -155,9 +155,9 @@ static READ16_HANDLER( dual539_16_r )
static WRITE16_HANDLER( dual539_16_w )
{
if (ACCESSING_LSB16)
- K054539_1_w(offset, data);
+ K054539_1_w(machine, offset, data);
if (ACCESSING_MSB16)
- K054539_0_w(offset, data>>8);
+ K054539_0_w(machine, offset, data>>8);
}
static READ32_HANDLER( dual539_r )
@@ -165,9 +165,9 @@ static READ32_HANDLER( dual539_r )
UINT32 data = 0;
if (~mem_mask & 0xffff0000)
- data |= dual539_16_r(offset * 2, mem_mask >> 16) << 16;
+ data |= dual539_16_r(machine, offset * 2, mem_mask >> 16) << 16;
if (~mem_mask & 0x0000ffff)
- data |= dual539_16_r(offset * 2 + 1, mem_mask);
+ data |= dual539_16_r(machine, offset * 2 + 1, mem_mask);
return data;
}
@@ -175,9 +175,9 @@ static READ32_HANDLER( dual539_r )
static WRITE32_HANDLER( dual539_w )
{
if (~mem_mask & 0xffff0000)
- dual539_16_w(offset * 2, data >> 16, mem_mask >> 16);
+ dual539_16_w(machine, offset * 2, data >> 16, mem_mask >> 16);
if (~mem_mask & 0x0000ffff)
- dual539_16_w(offset * 2 + 1, data, mem_mask);
+ dual539_16_w(machine, offset * 2 + 1, data, mem_mask);
}
@@ -237,7 +237,7 @@ static WRITE32_HANDLER( v_ctrl_w )
static READ32_HANDLER( v_rom_r )
{
UINT8 *mem8 = memory_region(REGION_GFX2);
- int bank = K056832_word_r(0x34/2, 0xffff);
+ int bank = K056832_word_r(machine, 0x34/2, 0xffff);
offset *= 2;
@@ -307,24 +307,24 @@ static WRITE32_HANDLER( turntable_select_w )
static READ32_HANDLER( ide_std_r )
{
if (ACCESSING_LSB32)
- return ide_controller16_0_r(IDE_STD_OFFSET + offset, 0x00ff) >> 8;
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x00ff) >> 8;
else
- return ide_controller16_0_r(IDE_STD_OFFSET + offset, 0x0000) << 16;
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x0000) << 16;
}
static WRITE32_HANDLER( ide_std_w )
{
if (ACCESSING_LSB32)
- ide_controller16_0_w(IDE_STD_OFFSET + offset, data << 8, 0x00ff);
+ ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data << 8, 0x00ff);
else
- ide_controller16_0_w(IDE_STD_OFFSET + offset, data >> 16, 0x0000);
+ ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data >> 16, 0x0000);
}
static READ32_HANDLER( ide_alt_r )
{
if (offset == 0)
- return ide_controller16_0_r(IDE_ALT_OFFSET, 0xff00) << 24;
+ return ide_controller16_0_r(machine, IDE_ALT_OFFSET, 0xff00) << 24;
return 0;
}
@@ -332,7 +332,7 @@ static READ32_HANDLER( ide_alt_r )
static WRITE32_HANDLER( ide_alt_w )
{
if (offset == 0 && !(mem_mask & 0x00ff0000))
- ide_controller16_0_w(IDE_ALT_OFFSET, data >> 24, 0xff00);
+ ide_controller16_0_w(machine, IDE_ALT_OFFSET, data >> 24, 0xff00);
}
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 2fd88fcf229..25207db6410 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -604,7 +604,7 @@ static READ8_HANDLER( dkong_in2_r )
dkongjr_snd_w2(ui_snd-8, (readinputportbytag("TST") & 0x02)>>1);
#endif
- r = (readinputportbytag("IN2") & 0xBF) | (dkong_audio_status_r(0) << 6);
+ r = (readinputportbytag("IN2") & 0xBF) | (dkong_audio_status_r(machine,0) << 6);
coin_counter_w(offset, r >> 7);
if (r & 0x10)
r = (r & ~0x10) | 0x80; /* service ==> coint */
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index c41208dc0c4..752707acaac 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -57,18 +57,18 @@ static WRITE8_HANDLER( dogfgt_soundcontrol_w )
{
/* bit 4 goes to the 8910 #0 BC1 pin */
if (last & 0x10)
- AY8910_control_port_0_w(0,soundlatch);
+ AY8910_control_port_0_w(machine,0,soundlatch);
else
- AY8910_write_port_0_w(0,soundlatch);
+ AY8910_write_port_0_w(machine,0,soundlatch);
}
/* bit 7 goes to 8910 #1 BDIR pin */
if ((last & 0x80) == 0x80 && (data & 0x80) == 0x00)
{
/* bit 6 goes to the 8910 #1 BC1 pin */
if (last & 0x40)
- AY8910_control_port_1_w(0,soundlatch);
+ AY8910_control_port_1_w(machine,0,soundlatch);
else
- AY8910_write_port_1_w(0,soundlatch);
+ AY8910_write_port_1_w(machine,0,soundlatch);
}
last = data;
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 1f1b6af3960..46c27a3842b 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -124,7 +124,7 @@ static WRITE8_HANDLER( dominob_d008_w )
static READ8_HANDLER( dominob_input_2_r )
{
- return input_port_2_r(offset);
+ return input_port_2_r(machine, offset);
}
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 8e83d4cf034..d0a6ccfd454 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -40,7 +40,7 @@ static MACHINE_RESET( dragrace )
timer_pulse(video_screen_get_frame_period(0), NULL, 0, dragrace_frame_callback);
}
-static void dragrace_update_misc_flags(void)
+static void dragrace_update_misc_flags(running_machine *machine)
{
/* 0x0900 = set 3SPEED1 0x00000001
* 0x0901 = set 4SPEED1 0x00000002
@@ -76,21 +76,21 @@ static void dragrace_update_misc_flags(void)
set_led_status(0, dragrace_misc_flags & 0x00008000);
set_led_status(1, dragrace_misc_flags & 0x80000000);
- discrete_sound_w(DRAGRACE_MOTOR1_DATA, ~dragrace_misc_flags & 0x0000001f); // Speed1 data*
- discrete_sound_w(DRAGRACE_EXPLODE1_EN, (dragrace_misc_flags & 0x00000020) ? 1: 0); // Explosion1 enable
- discrete_sound_w(DRAGRACE_SCREECH1_EN, (dragrace_misc_flags & 0x00000040) ? 1: 0); // Screech1 enable
- discrete_sound_w(DRAGRACE_KLEXPL1_EN, (dragrace_misc_flags & 0x00000200) ? 1: 0); // KLEXPL1 enable
- discrete_sound_w(DRAGRACE_MOTOR1_EN, (dragrace_misc_flags & 0x00000800) ? 1: 0); // Motor1 enable
-
- discrete_sound_w(DRAGRACE_MOTOR2_DATA, (~dragrace_misc_flags & 0x001f0000) >> 0x10); // Speed2 data*
- discrete_sound_w(DRAGRACE_EXPLODE2_EN, (dragrace_misc_flags & 0x00200000) ? 1: 0); // Explosion2 enable
- discrete_sound_w(DRAGRACE_SCREECH2_EN, (dragrace_misc_flags & 0x00400000) ? 1: 0); // Screech2 enable
- discrete_sound_w(DRAGRACE_KLEXPL2_EN, (dragrace_misc_flags & 0x02000000) ? 1: 0); // KLEXPL2 enable
- discrete_sound_w(DRAGRACE_MOTOR2_EN, (dragrace_misc_flags & 0x08000000) ? 1: 0); // Motor2 enable
-
- discrete_sound_w(DRAGRACE_ATTRACT_EN, (dragrace_misc_flags & 0x00001000) ? 1: 0); // Attract enable
- discrete_sound_w(DRAGRACE_LOTONE_EN, (dragrace_misc_flags & 0x00002000) ? 1: 0); // LoTone enable
- discrete_sound_w(DRAGRACE_HITONE_EN, (dragrace_misc_flags & 0x20000000) ? 1: 0); // HiTone enable
+ discrete_sound_w(machine, DRAGRACE_MOTOR1_DATA, ~dragrace_misc_flags & 0x0000001f); // Speed1 data*
+ discrete_sound_w(machine, DRAGRACE_EXPLODE1_EN, (dragrace_misc_flags & 0x00000020) ? 1: 0); // Explosion1 enable
+ discrete_sound_w(machine, DRAGRACE_SCREECH1_EN, (dragrace_misc_flags & 0x00000040) ? 1: 0); // Screech1 enable
+ discrete_sound_w(machine, DRAGRACE_KLEXPL1_EN, (dragrace_misc_flags & 0x00000200) ? 1: 0); // KLEXPL1 enable
+ discrete_sound_w(machine, DRAGRACE_MOTOR1_EN, (dragrace_misc_flags & 0x00000800) ? 1: 0); // Motor1 enable
+
+ discrete_sound_w(machine, DRAGRACE_MOTOR2_DATA, (~dragrace_misc_flags & 0x001f0000) >> 0x10); // Speed2 data*
+ discrete_sound_w(machine, DRAGRACE_EXPLODE2_EN, (dragrace_misc_flags & 0x00200000) ? 1: 0); // Explosion2 enable
+ discrete_sound_w(machine, DRAGRACE_SCREECH2_EN, (dragrace_misc_flags & 0x00400000) ? 1: 0); // Screech2 enable
+ discrete_sound_w(machine, DRAGRACE_KLEXPL2_EN, (dragrace_misc_flags & 0x02000000) ? 1: 0); // KLEXPL2 enable
+ discrete_sound_w(machine, DRAGRACE_MOTOR2_EN, (dragrace_misc_flags & 0x08000000) ? 1: 0); // Motor2 enable
+
+ discrete_sound_w(machine, DRAGRACE_ATTRACT_EN, (dragrace_misc_flags & 0x00001000) ? 1: 0); // Attract enable
+ discrete_sound_w(machine, DRAGRACE_LOTONE_EN, (dragrace_misc_flags & 0x00002000) ? 1: 0); // LoTone enable
+ discrete_sound_w(machine, DRAGRACE_HITONE_EN, (dragrace_misc_flags & 0x20000000) ? 1: 0); // HiTone enable
}
static WRITE8_HANDLER( dragrace_misc_w )
@@ -102,8 +102,8 @@ static WRITE8_HANDLER( dragrace_misc_w )
else
dragrace_misc_flags &= (~mask);
logerror("Set %#6x, Mask=%#10x, Flag=%#10x, Data=%x\n", 0x0900+offset, mask, dragrace_misc_flags, data & 0x01);
- dragrace_update_misc_flags();
- }
+ dragrace_update_misc_flags(machine);
+}
static WRITE8_HANDLER( dragrace_misc_clear_w )
{
@@ -111,7 +111,7 @@ static WRITE8_HANDLER( dragrace_misc_clear_w )
UINT32 mask = 0xff << (((offset >> 3) & 0x03) * 8);
dragrace_misc_flags &= (~mask);
logerror("Clear %#6x, Mask=%#10x, Flag=%#10x, Data=%x\n", 0x0920+offset, mask, dragrace_misc_flags, data & 0x01);
- dragrace_update_misc_flags();
+ dragrace_update_misc_flags(machine);
}
static READ8_HANDLER( dragrace_input_r )
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index b32e7c59b56..85908b63363 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -221,14 +221,14 @@ static WRITE32_HANDLER( dreamwld_palette_w )
static READ32_HANDLER(dreamwld_6295_0_r)
{
- return OKIM6295_status_0_r(0)<<24;
+ return OKIM6295_status_0_r(machine, 0)<<24;
}
static WRITE32_HANDLER(dreamwld_6295_0_w)
{
if (!(mem_mask & 0xff000000))
{
- OKIM6295_data_0_w(0, (data>>24) & 0xff);
+ OKIM6295_data_0_w(machine, 0, (data>>24) & 0xff);
}
else
{
@@ -260,14 +260,14 @@ static WRITE32_HANDLER( dreamwld_6295_0_bank_w )
static READ32_HANDLER(dreamwld_6295_1_r)
{
- return OKIM6295_status_1_r(0)<<24;
+ return OKIM6295_status_1_r(machine, 0)<<24;
}
static WRITE32_HANDLER(dreamwld_6295_1_w)
{
if (!(mem_mask & 0xff000000))
{
- OKIM6295_data_1_w(0, (data>>24) & 0xff);
+ OKIM6295_data_1_w(machine, 0, (data>>24) & 0xff);
}
else
{
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 88883f5d544..778f3ece30b 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -70,8 +70,8 @@ static READ8_HANDLER( drgnmst_snd_command_r )
switch (drgnmst_oki_control & 0x1f)
{
- case 0x12: data = (OKIM6295_status_1_r(0) & 0x0f); break;
- case 0x16: data = (OKIM6295_status_0_r(0) & 0x0f); break;
+ case 0x12: data = (OKIM6295_status_1_r(machine, 0) & 0x0f); break;
+ case 0x16: data = (OKIM6295_status_0_r(machine, 0) & 0x0f); break;
case 0x0b:
case 0x0f: data = drgnmst_snd_command; break;
default: break;
@@ -151,12 +151,12 @@ static WRITE8_HANDLER( drgnmst_snd_control_w )
case 0x11:
// logerror("Writing %02x to OKI1",drgnmst_oki_command);
// logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n",drgnmst_oki_control,drgnmst_snd_command,drgnmst_oki0_bank,drgnmst_oki1_bank);
- OKIM6295_data_1_w(0, drgnmst_oki_command);
+ OKIM6295_data_1_w(machine, 0, drgnmst_oki_command);
break;
case 0x15:
// logerror("Writing %02x to OKI0",drgnmst_oki_command);
// logerror(", PortC=%02x, Code=%02x, Bank0=%01x, Bank1=%01x\n",drgnmst_oki_control,drgnmst_snd_command,drgnmst_oki0_bank,drgnmst_oki1_bank);
- OKIM6295_data_0_w(0, drgnmst_oki_command);
+ OKIM6295_data_0_w(machine, 0, drgnmst_oki_command);
break;
default: break;
}
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 3d77ff5a3ac..c9e2513fd43 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -142,7 +142,7 @@ static WRITE8_HANDLER( shr_w )
{
/* bit 3 = watchdog */
if (data & 0x08)
- watchdog_reset_w(0, 0);
+ watchdog_reset(machine);
/* bit 2-0 = SH0-2 */
sh = data & 0x07;
@@ -159,9 +159,9 @@ static WRITE8_HANDLER( shr_w )
static READ8_HANDLER( ioread )
{
if (offset & 0x08)
- return ppi8255_0_r(offset & 3);
+ return ppi8255_0_r(machine, offset & 3);
else if (offset & 0x10)
- return ppi8255_1_r(offset & 3);
+ return ppi8255_1_r(machine, offset & 3);
return 0xff;
}
@@ -169,9 +169,9 @@ static READ8_HANDLER( ioread )
static WRITE8_HANDLER( iowrite )
{
if (offset & 0x08)
- ppi8255_0_w(offset & 3, data);
+ ppi8255_0_w(machine, offset & 3, data);
else if (offset & 0x10)
- ppi8255_1_w(offset & 3, data);
+ ppi8255_1_w(machine, offset & 3, data);
else if (offset & 0x40)
{
dr = ds;
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 5d9cf178e8a..f2d22e34cab 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -60,8 +60,8 @@ static WRITE8_HANDLER( sound_control_w )
D3 - /Reset
*/
- if ((data &7)==7) AY8910_control_port_0_w(0,ay_data);
- if ((data &7)==6) AY8910_write_port_0_w(0,ay_data);
+ if ((data &7)==7) AY8910_control_port_0_w(machine,0,ay_data);
+ if ((data &7)==6) AY8910_write_port_0_w(machine,0,ay_data);
}
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index d034c0a2872..d2c7a049a4a 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -295,7 +295,7 @@ static int palbank;
static WRITE8_HANDLER( hnoridur_palbank_w )
{
palbank = data & 0x0f;
- dynax_blit_palbank_w(0,data);
+ dynax_blit_palbank_w(machine,0,data);
}
static WRITE8_HANDLER( hnoridur_palette_w )
@@ -338,7 +338,6 @@ static WRITE8_HANDLER( hnoridur_palette_w )
static WRITE8_HANDLER( yarunara_palette_w )
{
int addr = 512*palbank + offset;
-
switch (hnoridur_bank)
{
case 0x10:
@@ -346,7 +345,7 @@ static WRITE8_HANDLER( yarunara_palette_w )
break;
case 0x1c: // RTC
- msm6242_w(offset,data);
+ msm6242_w(machine,offset,data);
return;
default:
@@ -360,7 +359,7 @@ static WRITE8_HANDLER( yarunara_palette_w )
int r = br & 0x1f;
int g = bg & 0x1f;
int b = ((bg & 0xc0)>>3) | ((br & 0xe0)>>5);
- palette_set_color_rgb(Machine, 256*palbank + ((offset&0xf)|((offset&0x1e0)>>1)) ,pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine, 256*palbank + ((offset&0xf)|((offset&0x1e0)>>1)) ,pal5bit(r),pal5bit(g),pal5bit(b));
}
}
@@ -444,11 +443,11 @@ static MACHINE_RESET( adpcm )
static WRITE8_HANDLER( yarunara_layer_half_w )
{
- hanamai_layer_half_w(0,data >> 1);
+ hanamai_layer_half_w(machine,0,data >> 1);
}
static WRITE8_HANDLER( yarunara_layer_half2_w )
{
- hnoridur_layer_half2_w(0,data >> 1);
+ hnoridur_layer_half2_w(machine,0,data >> 1);
}
static ADDRESS_MAP_START( sprtmtch_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -657,18 +656,18 @@ static WRITE8_HANDLER( yarunara_rombank_w )
static WRITE8_HANDLER( yarunara_flipscreen_w )
{
- dynax_flipscreen_w(0,(data&2)?1:0);
+ dynax_flipscreen_w(machine,0,(data&2)?1:0);
}
static WRITE8_HANDLER( yarunara_blit_romregion_w )
{
switch(data)
{
- case 0x00: dynax_blit_romregion_w(0,0); return;
- case 0x01: dynax_blit_romregion_w(0,1); return;
- case 0x80: dynax_blit_romregion_w(0,2); return;
- case 0x81: dynax_blit_romregion_w(0,3); return;
- case 0x82: dynax_blit_romregion_w(0,4); return; // mjcomv1
+ case 0x00: dynax_blit_romregion_w(machine,0,0); return;
+ case 0x01: dynax_blit_romregion_w(machine,0,1); return;
+ case 0x80: dynax_blit_romregion_w(machine,0,2); return;
+ case 0x81: dynax_blit_romregion_w(machine,0,3); return;
+ case 0x82: dynax_blit_romregion_w(machine,0,4); return; // mjcomv1
}
logerror("%04x: unmapped romregion=%02X\n",activecpu_get_pc(),data);
}
@@ -955,7 +954,7 @@ ADDRESS_MAP_END
static READ8_HANDLER( mjelctrn_keyboard_1_r )
{
- return (hanamai_keyboard_1_r(0) & 0x3f) | (readinputport(15) ? 0x40 : 0);
+ return (hanamai_keyboard_1_r(machine,0) & 0x3f) | (readinputport(15) ? 0x40 : 0);
}
static READ8_HANDLER( mjelctrn_dsw_r )
@@ -1098,9 +1097,9 @@ static WRITE8_HANDLER( htengoku_blit_romregion_w )
{
switch(data)
{
- case 0x80: dynax_blit_romregion_w(0,0); return;
- case 0x81: dynax_blit_romregion_w(0,1); return;
- case 0x00: dynax_blit_romregion_w(0,2); return;
+ case 0x80: dynax_blit_romregion_w(machine,0,0); return;
+ case 0x81: dynax_blit_romregion_w(machine,0,1); return;
+ case 0x00: dynax_blit_romregion_w(machine,0,2); return;
}
logerror("%04x: unmapped romregion=%02X\n",activecpu_get_pc(),data);
}
@@ -1328,11 +1327,11 @@ static READ8_HANDLER( tenkai_8000_r )
}
else if ( (rombank == 0x10) && (offset < 0x10) )
{
- return msm6242_r(offset);
+ return msm6242_r(machine,offset);
}
else if (rombank == 0x12)
{
- return tenkai_palette_r(offset);
+ return tenkai_palette_r(machine,offset);
}
logerror("%04x: unmapped offset %04X read with rombank=%02X\n",activecpu_get_pc(),offset,rombank);
@@ -1343,12 +1342,12 @@ static WRITE8_HANDLER( tenkai_8000_w )
{
if ( (rombank == 0x10) && (offset < 0x10) )
{
- msm6242_w(offset,data);
+ msm6242_w(machine,offset,data);
return;
}
else if (rombank == 0x12)
{
- tenkai_palette_w(offset,data);
+ tenkai_palette_w(machine,offset,data);
return;
}
@@ -1375,9 +1374,9 @@ static WRITE8_HANDLER( tenkai_blit_romregion_w )
{
switch(data)
{
- case 0x00: dynax_blit_romregion_w(0,0); return;
- case 0x83: dynax_blit_romregion_w(0,1); return;
- case 0x80: dynax_blit_romregion_w(0,2); return;
+ case 0x00: dynax_blit_romregion_w(machine,0,0); return;
+ case 0x83: dynax_blit_romregion_w(machine,0,1); return;
+ case 0x80: dynax_blit_romregion_w(machine,0,2); return;
}
logerror("%04x: unmapped romregion=%02X\n",activecpu_get_pc(),data);
}
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index a9cb53163f5..f9ce10e43cc 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -173,8 +173,8 @@ static WRITE8_HANDLER( egghunt_vidram_bank_w )
static WRITE8_HANDLER( egghunt_soundlatch_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
static READ8_HANDLER( egghunt_okibanking_r )
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 2f8ec9659d5..0dadc4cefbe 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -308,7 +308,7 @@ static READ16_HANDLER(hvoltage_debug_r)
static WRITE16_HANDLER(splndrbt_flip0_w)
{
if (ACCESSING_LSB) splndrbt_flip = 0;
- if (ACCESSING_MSB) equites_bgcolor_w(offset, data, 0x00ff);
+ if (ACCESSING_MSB) equites_bgcolor_w(machine, offset, data, 0x00ff);
}
static WRITE16_HANDLER(splndrbt_flip1_w)
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 8e566472e88..4644fc766a4 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -42,7 +42,7 @@ static WRITE32_HANDLER(video_fifo_w)
static READ32_HANDLER(IOCR_r)
{
- return (input_port_5_r(0)&0x80)|0x34;
+ return (input_port_5_r(machine,0)&0x80)|0x34;
}
static WRITE32_HANDLER(IOCR_w)
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 50d839c0e2f..3912b80b6fd 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -70,8 +70,8 @@ static WRITE16_HANDLER( esd16_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,ASSERT_LINE); // Generate an IRQ
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,ASSERT_LINE); // Generate an IRQ
cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other CPU to reply
}
}
@@ -286,8 +286,8 @@ ADDRESS_MAP_END
static READ8_HANDLER( esd16_sound_command_r )
{
/* Clear IRQ only after reading the command, or some get lost */
- cpunum_set_input_line(Machine, 1,0,CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 1,0,CLEAR_LINE);
+ return soundlatch_r(machine,0);
}
static ADDRESS_MAP_START( multchmp_sound_readport, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index ca4ef857727..05e519af463 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -32,7 +32,7 @@ MACHINE_RESET( espial )
WRITE8_HANDLER( zodiac_master_interrupt_enable_w )
{
- interrupt_enable_w(offset,~data & 1);
+ interrupt_enable_w(machine,offset,~data & 1);
}
@@ -60,8 +60,8 @@ INTERRUPT_GEN( zodiac_master_interrupt )
WRITE8_HANDLER( zodiac_master_soundlatch_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 25b61f81680..324135d8b9a 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -93,20 +93,20 @@ static WRITE8_HANDLER( b800_w )
/* special case to return the value written to 0xb000 */
/* does it reset the chips too ? */
case 0: break;
- case 0xc4: b000_ret = AY8910_read_port_0_r(0); break;
- case 0x94: b000_ret = AY8910_read_port_1_r(0); break;
- case 0x86: b000_ret = AY8910_read_port_2_r(0); break;
+ case 0xc4: b000_ret = AY8910_read_port_0_r(machine,0); break;
+ case 0x94: b000_ret = AY8910_read_port_1_r(machine,0); break;
+ case 0x86: b000_ret = AY8910_read_port_2_r(machine,0); break;
case 0x80:
switch(b800_prev)
{
- case 0xe0: AY8910_control_port_0_w(0,b000_val); break;
- case 0x98: AY8910_control_port_1_w(0,b000_val); break;
- case 0x83: AY8910_control_port_2_w(0,b000_val); break;
+ case 0xe0: AY8910_control_port_0_w(machine,0,b000_val); break;
+ case 0x98: AY8910_control_port_1_w(machine,0,b000_val); break;
+ case 0x83: AY8910_control_port_2_w(machine,0,b000_val); break;
- case 0xa0: AY8910_write_port_0_w(0,b000_val); break;
- case 0x88: AY8910_write_port_1_w(0,b000_val); break;
- case 0x81: AY8910_write_port_2_w(0,b000_val); break;
+ case 0xa0: AY8910_write_port_0_w(machine,0,b000_val); break;
+ case 0x88: AY8910_write_port_1_w(machine,0,b000_val); break;
+ case 0x81: AY8910_write_port_2_w(machine,0,b000_val); break;
}
break;
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index a4d0667c9d5..71f39f362fb 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -31,7 +31,7 @@ static UINT8 *exerion_ram;
static READ8_HANDLER( exerion_port01_r )
{
/* the cocktail flip bit muxes between ports 0 and 1 */
- return exerion_cocktail_flip ? input_port_1_r(offset) : input_port_0_r(offset);
+ return exerion_cocktail_flip ? input_port_1_r(machine,offset) : input_port_0_r(machine,offset);
}
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index de6ee3391db..70ab46d0bb0 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -1413,7 +1413,7 @@ static DRIVER_INIT( fax )
exidy_video_config(0x04, 0x04, TRUE);
/* reset the ROM bank */
- fax_bank_select_w(0,0);
+ fax_bank_select_w(machine,0,0);
}
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index eb7834f8e34..308c93c5d5a 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -435,7 +435,7 @@ static READ8_HANDLER( claypign_protection_r )
static READ8_HANDLER( topsecex_input_port_5_r )
{
- return (input_port_5_r(offset) & 1) ? 0x01 : 0x02;
+ return (input_port_5_r(machine, offset) & 1) ? 0x01 : 0x02;
}
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 6668d53e75d..7e08b1aa9af 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -99,8 +99,8 @@ static READ8_HANDLER( exprraid_protection_r )
static WRITE8_HANDLER( sound_cpu_command_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static READ8_HANDLER( vblank_r )
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index b30fb101e3d..1bfb5f8522f 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -135,7 +135,7 @@ static READ16_HANDLER( exterm_host_data_r )
*
*************************************/
-static UINT16 exterm_trackball_port_r(int which, UINT16 mem_mask)
+static UINT16 exterm_trackball_port_r(running_machine *machine, int which, UINT16 mem_mask)
{
UINT16 port;
@@ -156,8 +156,8 @@ static UINT16 exterm_trackball_port_r(int which, UINT16 mem_mask)
aimpos[which] = (aimpos[which] + trackball_diff) & 0x3f;
/* Combine it with the standard input bits */
- port = which ? input_port_1_word_r(0, mem_mask) :
- input_port_0_word_r(0, mem_mask);
+ port = which ? input_port_1_word_r(machine, 0, mem_mask) :
+ input_port_0_word_r(machine, 0, mem_mask);
return (port & 0xc0ff) | (aimpos[which] << 8);
}
@@ -165,13 +165,13 @@ static UINT16 exterm_trackball_port_r(int which, UINT16 mem_mask)
static READ16_HANDLER( exterm_input_port_0_r )
{
- return exterm_trackball_port_r(0, mem_mask);
+ return exterm_trackball_port_r(machine, 0, mem_mask);
}
static READ16_HANDLER( exterm_input_port_1_r )
{
- return exterm_trackball_port_r(1, mem_mask);
+ return exterm_trackball_port_r(machine, 1, mem_mask);
}
@@ -246,9 +246,9 @@ static WRITE8_HANDLER( ym2151_data_latch_w )
{
/* bit 7 of the sound control selects which port */
if (sound_control & 0x80)
- YM2151_data_port_0_w(offset, data);
+ YM2151_data_port_0_w(machine, offset, data);
else
- YM2151_register_port_0_w(offset, data);
+ YM2151_register_port_0_w(machine, offset, data);
}
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index eea2cd5b9de..039b54f208e 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -20,27 +20,27 @@ static UINT32 *mosaicf2_videoram;
static READ32_HANDLER( oki_32bit_r )
{
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
}
static WRITE32_HANDLER( oki_32bit_w )
{
- OKIM6295_data_0_w(0, data & 0xff);
+ OKIM6295_data_0_w(machine, 0, data & 0xff);
}
static READ32_HANDLER( ym2151_status_32bit_r )
{
- return YM2151_status_port_0_r(0);
+ return YM2151_status_port_0_r(machine, 0);
}
static WRITE32_HANDLER( ym2151_data_32bit_w )
{
- YM2151_data_port_0_w(0, data & 0xff);
+ YM2151_data_port_0_w(machine, 0, data & 0xff);
}
static WRITE32_HANDLER( ym2151_register_32bit_w )
{
- YM2151_register_port_0_w(0,data & 0xff);
+ YM2151_register_port_0_w(machine,0,data & 0xff);
}
static READ32_HANDLER( eeprom_r )
@@ -98,7 +98,7 @@ static READ32_HANDLER( f32_input_port_1_r )
if ((activecpu_get_pc() == 0x000379de) ||
(activecpu_get_pc() == 0x000379cc) ) activecpu_adjust_icount(-100);
//else printf("PC %08x\n", activecpu_get_pc() );
- return input_port_1_dword_r(0, 0);
+ return input_port_1_dword_r(machine, 0, 0);
}
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index b7bad677473..21b51315b68 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -72,8 +72,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 30119cd72c0..0e425abd6ee 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -71,19 +71,19 @@ static WRITE8_HANDLER( fantland_nmi_enable_w )
static WRITE16_HANDLER( fantland_nmi_enable_16_w )
{
if (ACCESSING_LSB)
- fantland_nmi_enable_w(offset*2,data);
+ fantland_nmi_enable_w(machine,offset*2,data);
}
static WRITE8_HANDLER( fantland_soundlatch_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static WRITE16_HANDLER( fantland_soundlatch_16_w )
{
if (ACCESSING_LSB)
- fantland_soundlatch_w(offset*2, data);
+ fantland_soundlatch_w(machine, offset*2, data);
}
/***************************************************************************
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index f5ebe2ca92f..e62531371d0 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -42,7 +42,7 @@ static INTERRUPT_GEN( fastlane_interrupt )
static WRITE8_HANDLER( k007121_registers_w )
{
if (offset < 8)
- K007121_ctrl_0_w(offset,data);
+ K007121_ctrl_0_w(machine,offset,data);
else /* scroll registers */
fastlane_k007121_regs[offset] = data;
}
@@ -71,19 +71,19 @@ static WRITE8_HANDLER( fastlane_bankswitch_w )
static READ8_HANDLER( fastlane_K007232_read_port_0_r )
{
- return K007232_read_port_0_r(offset ^ 1);
+ return K007232_read_port_0_r(machine, offset ^ 1);
}
static WRITE8_HANDLER( fastlane_K007232_write_port_0_w )
{
- K007232_write_port_0_w(offset ^ 1, data);
+ K007232_write_port_0_w(machine, offset ^ 1, data);
}
static READ8_HANDLER( fastlane_K007232_read_port_1_r )
{
- return K007232_read_port_1_r(offset ^ 1);
+ return K007232_read_port_1_r(machine, offset ^ 1);
}
static WRITE8_HANDLER( fastlane_K007232_write_port_1_w )
{
- K007232_write_port_1_w(offset ^ 1, data);
+ K007232_write_port_1_w(machine, offset ^ 1, data);
}
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 5ee9416038a..592aacc828f 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -146,7 +146,7 @@ static READ8_HANDLER( fcombat_protection_r )
static READ8_HANDLER( fcombat_port01_r )
{
/* the cocktail flip bit muxes between ports 0 and 1 */
- return fcombat_cocktail_flip ? input_port_1_r(offset) : input_port_0_r(offset);
+ return fcombat_cocktail_flip ? input_port_1_r(machine,offset) : input_port_0_r(machine,offset);
}
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index be7e655bd15..5fdcf61075d 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -66,7 +66,7 @@ static READ8_HANDLER( portC_r )
static READ8_HANDLER( port1_r )
{
- return input_port_1_r(0) | (ticket_dispenser_0_r(0) >> 5);
+ return input_port_1_r(machine, 0) | (ticket_dispenser_0_r(machine, 0) >> 5);
}
static WRITE8_HANDLER( lamps_w )
@@ -90,10 +90,10 @@ static WRITE8_HANDLER( sound_w )
set_led_status(9,data & 0x08);
/* bit 5 - ticket out in trivia games */
- ticket_dispenser_w(0, (data & 0x20)<< 2);
+ ticket_dispenser_w(machine, 0, (data & 0x20)<< 2);
/* bit 6 enables NMI */
- interrupt_enable_w(0,data & 0x40);
+ interrupt_enable_w(machine, 0,data & 0x40);
/* bit 7 goes directly to the sound amplifier */
DAC_data_w(0,((data & 0x80) >> 7) * 255);
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index ad82ecc86b6..34750928557 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1221,19 +1221,19 @@ static READ32_HANDLER( comm_uart_r )
if (!(mem_mask & 0xff000000))
{
- r |= pc16552d_0_r((offset*4)+0) << 24;
+ r |= pc16552d_0_r(machine, (offset*4)+0) << 24;
}
if (!(mem_mask & 0x00ff0000))
{
- r |= pc16552d_0_r((offset*4)+1) << 16;
+ r |= pc16552d_0_r(machine, (offset*4)+1) << 16;
}
if (!(mem_mask & 0x0000ff00))
{
- r |= pc16552d_0_r((offset*4)+2) << 8;
+ r |= pc16552d_0_r(machine, (offset*4)+2) << 8;
}
if (!(mem_mask & 0x000000ff))
{
- r |= pc16552d_0_r((offset*4)+3) << 0;
+ r |= pc16552d_0_r(machine, (offset*4)+3) << 0;
}
return r;
@@ -1243,19 +1243,19 @@ static WRITE32_HANDLER( comm_uart_w )
{
if (!(mem_mask & 0xff000000))
{
- pc16552d_0_w((offset*4)+0, (data >> 24) & 0xff);
+ pc16552d_0_w(machine, (offset*4)+0, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
{
- pc16552d_0_w((offset*4)+1, (data >> 16) & 0xff);
+ pc16552d_0_w(machine, (offset*4)+1, (data >> 16) & 0xff);
}
if (!(mem_mask & 0x0000ff00))
{
- pc16552d_0_w((offset*4)+2, (data >> 8) & 0xff);
+ pc16552d_0_w(machine, (offset*4)+2, (data >> 8) & 0xff);
}
if (!(mem_mask & 0x000000ff))
{
- pc16552d_0_w((offset*4)+3, (data >> 0) & 0xff);
+ pc16552d_0_w(machine, (offset*4)+3, (data >> 0) & 0xff);
}
}
@@ -1324,11 +1324,11 @@ static READ32_HANDLER( sound_r )
if (!(mem_mask & 0xff000000)) /* External RAM read */
{
- r |= YMZ280B_data_0_r(offset) << 24;
+ r |= YMZ280B_data_0_r(machine, offset) << 24;
}
if (!(mem_mask & 0x00ff0000))
{
- r |= YMZ280B_status_0_r(offset) << 16;
+ r |= YMZ280B_status_0_r(machine, offset) << 16;
}
return r;
@@ -1337,14 +1337,13 @@ static READ32_HANDLER( sound_r )
static WRITE32_HANDLER( sound_w )
{
// printf("sound_w: %08X, %08X, %08X\n", offset, data, mem_mask);
-
if (!(mem_mask & 0xff000000))
{
- YMZ280B_register_0_w(offset, (data >> 24) & 0xff);
+ YMZ280B_register_0_w(machine, offset, (data >> 24) & 0xff);
}
if (!(mem_mask & 0x00ff0000))
{
- YMZ280B_data_0_w(offset, (data >> 16) & 0xff);
+ YMZ280B_data_0_w(machine, offset, (data >> 16) & 0xff);
}
}
@@ -1397,7 +1396,7 @@ static READ32_HANDLER( midi_uart_r )
if (!(mem_mask & 0xff000000))
{
- r |= pc16552d_1_r(offset >> 6) << 24;
+ r |= pc16552d_1_r(machine, offset >> 6) << 24;
}
return r;
@@ -1407,7 +1406,7 @@ static WRITE32_HANDLER( midi_uart_w )
{
if (!(mem_mask & 0xff000000))
{
- pc16552d_1_w(offset >> 6, (data >> 24) & 0xff);
+ pc16552d_1_w(machine, offset >> 6, (data >> 24) & 0xff);
}
}
@@ -1558,7 +1557,7 @@ static WRITE32_HANDLER( lamp_output_w )
static WRITE32_HANDLER( lamp_output_kbm_w )
{
- lamp_output_w(offset, data, mem_mask);
+ lamp_output_w(machine, offset, data, mem_mask);
if (!(mem_mask & 0xff000000))
{
@@ -1577,7 +1576,7 @@ static WRITE32_HANDLER( lamp_output_kbm_w )
static WRITE32_HANDLER( lamp_output_ppp_w )
{
- lamp_output_w(offset, data, mem_mask);
+ lamp_output_w(machine, offset, data, mem_mask);
// ParaParaParadise lamps (active high)
// 0x00000100 Left
@@ -1624,7 +1623,7 @@ static WRITE32_HANDLER( lamp_output2_w )
static WRITE32_HANDLER( lamp_output2_ppp_w )
{
- lamp_output2_w(offset, data, mem_mask);
+ lamp_output2_w(machine, offset, data, mem_mask);
// ParaParaParadise lamps (active high)
// 0x00010000 Top LED 0
@@ -1658,7 +1657,7 @@ static WRITE32_HANDLER( lamp_output3_w )
static WRITE32_HANDLER( lamp_output3_ppp_w )
{
- lamp_output3_w(offset, data, mem_mask);
+ lamp_output3_w(machine, offset, data, mem_mask);
// ParaParaParadise lamps (active high)
// 0x00010000 Lamp 0
@@ -2235,7 +2234,7 @@ static void security_w(UINT8 data)
/*****************************************************************************/
-static void init_lights(write32_handler out1, write32_handler out2, write32_handler out3)
+static void init_lights(write32_machine_func out1, write32_machine_func out2, write32_machine_func out3)
{
if(!out1) out1 = lamp_output_w;
if(!out2) out1 = lamp_output2_w;
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index d42c343303f..b660cf9fae0 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -199,8 +199,8 @@ static WRITE8_HANDLER( firetrap_8751_w )
static WRITE8_HANDLER( firetrap_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static WRITE8_HANDLER( firetrap_sound_2400_w )
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 5b16800670c..53426de81d6 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -42,7 +42,7 @@ static INPUT_CHANGED( service_mode_switch_changed )
static INPUT_CHANGED( firetrk_horn_changed )
{
- discrete_sound_w(FIRETRUCK_HORN_EN, newval);
+ discrete_sound_w(machine, FIRETRUCK_HORN_EN, newval);
}
@@ -56,7 +56,7 @@ static INPUT_CHANGED( gear_changed )
static INTERRUPT_GEN( firetrk_interrupt )
{
/* Super Bug - ASR - when is this used and what is an ASR? */
-// discrete_sound_w(SUPERBUG_ASR_EN, 0);
+// discrete_sound_w(machine, SUPERBUG_ASR_EN, 0);
/* NMI interrupts are disabled during service mode in firetrk and montecar */
if (!in_service_mode)
@@ -95,7 +95,7 @@ static WRITE8_HANDLER( firetrk_output_w )
set_led_status(3, !(data & 0x08));
/* BIT4 => ATTRACT */
- discrete_sound_w(FIRETRUCK_ATTRACT_EN, data & 0x10);
+ discrete_sound_w(machine, FIRETRUCK_ATTRACT_EN, data & 0x10);
coin_lockout_w(0, !(data & 0x10));
coin_lockout_w(1, !(data & 0x10));
@@ -105,7 +105,7 @@ static WRITE8_HANDLER( firetrk_output_w )
/* BIT6 => UNUSED */
/* BIT7 => BELL OUT */
- discrete_sound_w(FIRETRUCK_BELL_EN, data & 0x80);
+ discrete_sound_w(machine, FIRETRUCK_BELL_EN, data & 0x80);
}
@@ -115,7 +115,7 @@ static WRITE8_HANDLER( superbug_output_w )
set_led_status(0, offset & 0x01);
/* BIT1 => ATTRACT */
- discrete_sound_w(SUPERBUG_ATTRACT_EN, offset & 0x02);
+ discrete_sound_w(machine, SUPERBUG_ATTRACT_EN, offset & 0x02);
coin_lockout_w(0, !(offset & 0x02));
coin_lockout_w(1, !(offset & 0x02));
@@ -136,7 +136,7 @@ static WRITE8_HANDLER( montecar_output_1_w )
set_led_status(1, !(data & 0x02));
/* BIT2 => ATTRACT */
- discrete_sound_w(MONTECAR_ATTRACT_INV, data & 0x04);
+ discrete_sound_w(machine, MONTECAR_ATTRACT_INV, data & 0x04);
/* BIT3 => UNUSED */
/* BIT4 => UNUSED */
@@ -156,8 +156,8 @@ static WRITE8_HANDLER( montecar_output_2_w )
{
firetrk_flash = data & 0x80;
- discrete_sound_w(MONTECAR_BEEPER_EN, data & 0x10);
- discrete_sound_w(MONTECAR_DRONE_LOUD_DATA, data & 0x0f);
+ discrete_sound_w(machine, MONTECAR_BEEPER_EN, data & 0x10);
+ discrete_sound_w(machine, MONTECAR_DRONE_LOUD_DATA, data & 0x0f);
}
@@ -266,7 +266,7 @@ static READ8_HANDLER( firetrk_input_r )
static READ8_HANDLER( montecar_input_r )
{
- UINT8 ret = firetrk_input_r(offset);
+ UINT8 ret = firetrk_input_r(machine, offset);
if (firetrk_crash[0])
ret |= 0x02;
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 3d1648001a1..2786537d104 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -78,16 +78,16 @@ static WRITE8_HANDLER( flkatck_ls138_w )
{
switch ((offset & 0x1c) >> 2){
case 0x04: /* bankswitch */
- flkatck_bankswitch_w(0, data);
+ flkatck_bankswitch_w(machine, 0, data);
break;
case 0x05: /* sound code number */
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
break;
case 0x06: /* Cause interrupt on audio CPU */
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
break;
case 0x07: /* watchdog reset */
- watchdog_reset_w(0, data);
+ watchdog_reset_w(machine, 0, data);
break;
}
}
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index d7012f3c770..ada3446a9ea 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -80,9 +80,9 @@ static WRITE8_HANDLER( sn_nmi_enable_w )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
if (sn_nmi_enable)
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
static ADDRESS_MAP_START( flower_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 1b5c3a4a853..9a5fbfd68aa 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -89,7 +89,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
@@ -163,7 +163,7 @@ ADDRESS_MAP_END
static READ8_HANDLER( victnine_port_5_r )
{
- return (victnine_mcu_status_r(0) & 3) | (readinputport(5) & ~3);
+ return (victnine_mcu_status_r(machine,0) & 3) | (readinputport(5) & ~3);
}
static ADDRESS_MAP_START( victnine_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 5f0ddc930a6..ec9dca497b6 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -180,9 +180,9 @@ static WRITE16_HANDLER( digital_w )
/* bit 1 = UPDATE */
if (!(data & 0x04))
- atarigen_scanline_int_ack_w(0,0,0);
+ atarigen_scanline_int_ack_w(machine,0,0,0);
if (!(data & 0x08))
- atarigen_video_int_ack_w(0,0,0);
+ atarigen_video_int_ack_w(machine,0,0,0);
output_set_led_value(0, (data >> 4) & 1);
output_set_led_value(1, (data >> 5) & 1);
@@ -219,13 +219,13 @@ static WRITE16_HANDLER( analog_w )
*
*************************************/
-static READ16_HANDLER( pokey1_word_r ) { return pokey1_r(offset); }
-static READ16_HANDLER( pokey2_word_r ) { return pokey2_r(offset); }
-static READ16_HANDLER( pokey3_word_r ) { return pokey3_r(offset); }
+static READ16_HANDLER( pokey1_word_r ) { return pokey1_r(machine, offset); }
+static READ16_HANDLER( pokey2_word_r ) { return pokey2_r(machine, offset); }
+static READ16_HANDLER( pokey3_word_r ) { return pokey3_r(machine, offset); }
-static WRITE16_HANDLER( pokey1_word_w ) { if (ACCESSING_LSB) pokey1_w(offset, data & 0xff); }
-static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_LSB) pokey2_w(offset, data & 0xff); }
-static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_LSB) pokey3_w(offset, data & 0xff); }
+static WRITE16_HANDLER( pokey1_word_w ) { if (ACCESSING_LSB) pokey1_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_LSB) pokey2_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_LSB) pokey3_w(machine, offset, data & 0xff); }
diff --git a/src/mame/drivers/frogger.c b/src/mame/drivers/frogger.c
index e4aa3ff25ac..c900154e1b5 100644
--- a/src/mame/drivers/frogger.c
+++ b/src/mame/drivers/frogger.c
@@ -43,22 +43,22 @@ GFXDECODE_END
static READ8_HANDLER(frogger_ppi8255_0_r)
{
- return ppi8255_0_r(offset >> 1);
+ return ppi8255_0_r(machine, offset >> 1);
}
static READ8_HANDLER(frogger_ppi8255_1_r)
{
- return ppi8255_1_r(offset >> 1);
+ return ppi8255_1_r(machine, offset >> 1);
}
static WRITE8_HANDLER(frogger_ppi8255_0_w)
{
- ppi8255_0_w(offset >> 1, data);
+ ppi8255_0_w(machine, offset >> 1, data);
}
static WRITE8_HANDLER(frogger_ppi8255_1_w)
{
- ppi8255_1_w(offset >> 1, data);
+ ppi8255_1_w(machine, offset >> 1, data);
}
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 491c9e00671..07c66d37cd2 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -135,10 +135,10 @@ static INTERRUPT_GEN( fromanc2_interrupt )
static WRITE16_HANDLER( fromanc2_sndcmd_w )
{
- soundlatch_w(offset, (data >> 8) & 0xff); // 1P (LEFT)
- soundlatch2_w(offset, data & 0xff); // 2P (RIGHT)
+ soundlatch_w(machine, offset, (data >> 8) & 0xff); // 1P (LEFT)
+ soundlatch2_w(machine, offset, data & 0xff); // 2P (RIGHT)
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
fromanc2_sndcpu_nmi_flag = 0;
}
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index b873af1f3cf..239dca0d0ad 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -93,8 +93,8 @@ extern VIDEO_UPDATE( funkybee );
static READ8_HANDLER( funkybee_input_port_0_r )
{
- watchdog_reset_r(0);
- return input_port_0_r(offset);
+ watchdog_reset_r(machine,0);
+ return input_port_0_r(machine,offset);
}
static WRITE8_HANDLER( funkybee_coin_counter_w )
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index a7b05e6ed8b..19cf61d8c7e 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -80,8 +80,8 @@ static WRITE8_HANDLER ( funybubl_cpurombank_w )
static WRITE8_HANDLER( funybubl_soundcommand_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,0, HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,0, HOLD_LINE);
}
static WRITE8_HANDLER( funybubl_oki_bank_sw )
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index dac265cc08b..e0e4440a05c 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -78,8 +78,8 @@ static WRITE16_HANDLER( fuuki16_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
// cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other CPU to reply
cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50)); // Fixes glitching in rasters
}
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 18c46d0ac2c..ce3c029794f 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -77,8 +77,8 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bigkarnk_sound_command_w )
{
if (ACCESSING_LSB){
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,M6809_FIRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,M6809_FIRQ_LINE,HOLD_LINE);
}
}
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 8fbc412c5ac..75a3a02e2d6 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -144,6 +144,7 @@ REF. 970429
#include "driver.h"
#include "deprecat.h"
+#include "memconv.h"
#include "gaelco3d.h"
#include "cpu/tms32031/tms32031.h"
#include "cpu/adsp2100/adsp2100.h"
@@ -252,7 +253,7 @@ static WRITE16_HANDLER( irq_ack_w )
{
cpunum_set_input_line(Machine, 0, 2, CLEAR_LINE);
}
-static WRITE32_HANDLER( irq_ack_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) irq_ack_w(offset, data >> 16, mem_mask >> 16); }
+static WRITE32_HANDLER( irq_ack_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) irq_ack_w(machine, offset, data >> 16, mem_mask >> 16); }
@@ -270,7 +271,7 @@ static READ16_HANDLER( eeprom_data_r )
logerror("eeprom_data_r(%02X)\n", result);
return result;
}
-static READ32_HANDLER( eeprom_data_020_r ) { return eeprom_data_r(offset, mem_mask) << 16; }
+static READ32_HANDLER( eeprom_data_020_r ) { return eeprom_data_r(machine, offset, mem_mask) << 16; }
static WRITE16_HANDLER( eeprom_data_w )
@@ -278,7 +279,7 @@ static WRITE16_HANDLER( eeprom_data_w )
if (!(mem_mask & 0xff))
EEPROM_write_bit(data & 0x01);
}
-static WRITE32_HANDLER( eeprom_data_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_data_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_data_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_data_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_clock_w )
@@ -286,7 +287,7 @@ static WRITE16_HANDLER( eeprom_clock_w )
if (!(mem_mask & 0xff))
EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE);
}
-static WRITE32_HANDLER( eeprom_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_clock_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_cs_w )
@@ -294,7 +295,7 @@ static WRITE16_HANDLER( eeprom_cs_w )
if (!(mem_mask & 0xff))
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
-static WRITE32_HANDLER( eeprom_cs_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_cs_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_cs_020_w ) { if ((mem_mask & 0xffff) != 0xffff) eeprom_cs_w(machine, offset, data, mem_mask); }
@@ -318,7 +319,7 @@ static WRITE16_HANDLER( sound_data_w )
if (!(mem_mask & 0xff))
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}
-static WRITE32_HANDLER( sound_data_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) sound_data_w(offset, data >> 16, mem_mask >> 16); }
+static WRITE32_HANDLER( sound_data_020_w ) { if ((mem_mask & 0xffff0000) != 0xffff0000) sound_data_w(machine, offset, data >> 16, mem_mask >> 16); }
static READ16_HANDLER( sound_data_r )
@@ -336,7 +337,7 @@ static READ16_HANDLER( sound_status_r )
return sound_status;
return 0xffff;
}
-static READ32_HANDLER( sound_status_020_r ) { if ((mem_mask & 0x0000ffff) != 0x0000ffff) return sound_status_r(offset, mem_mask); return ~0; }
+static READ32_HANDLER( sound_status_020_r ) { if ((mem_mask & 0x0000ffff) != 0x0000ffff) return sound_status_r(machine, offset, mem_mask); return ~0; }
static WRITE16_HANDLER( sound_status_w )
@@ -361,7 +362,7 @@ static READ32_HANDLER( input_port_3_020_r ) { return readinputport(3) << 16; }
static CUSTOM_INPUT( analog_bit_r )
{
- int which = (FPTR)param;
+ int which = (FPTR)machine;
return (analog_ports[which] >> 7) & 0x01;
}
@@ -382,7 +383,7 @@ static WRITE16_HANDLER( analog_port_clock_w )
else
logerror("%06X:analog_port_clock_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
-static WRITE32_HANDLER( analog_port_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_clock_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( analog_port_clock_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( analog_port_latch_w )
@@ -401,7 +402,7 @@ static WRITE16_HANDLER( analog_port_latch_w )
else
logerror("%06X:analog_port_latch_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
-static WRITE32_HANDLER( analog_port_latch_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_latch_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( analog_port_latch_020_w ) { if ((mem_mask & 0xffff) != 0xffff) analog_port_latch_w(machine, offset, data, mem_mask); }
@@ -445,7 +446,7 @@ static WRITE16_HANDLER( tms_reset_w )
logerror("%06X:tms_reset_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data == 0xffff) ? CLEAR_LINE : ASSERT_LINE);
}
-static WRITE32_HANDLER( tms_reset_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_reset_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_reset_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_reset_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_irq_w )
@@ -456,14 +457,14 @@ static WRITE16_HANDLER( tms_irq_w )
if (!(mem_mask & 0xff))
cpunum_set_input_line(Machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
-static WRITE32_HANDLER( tms_irq_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_irq_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_irq_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_irq_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_control3_w )
{
logerror("%06X:tms_control3_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
}
-static WRITE32_HANDLER( tms_control3_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_control3_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_control3_020_w ) { if ((mem_mask & 0xffff) != 0xffff) tms_control3_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_comm_w )
@@ -471,11 +472,7 @@ static WRITE16_HANDLER( tms_comm_w )
COMBINE_DATA(&tms_comm_base[offset ^ tms_offset_xor]);
logerror("%06X:tms_comm_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset*2, data, ~mem_mask);
}
-static WRITE32_HANDLER( tms_comm_020_w )
-{
- if ((mem_mask & 0xffff0000) != 0xffff0000) tms_comm_w(offset * 2 + 0, data >> 16, mem_mask >> 16);
- if ((mem_mask & 0x0000ffff) != 0x0000ffff) tms_comm_w(offset * 2 + 1, data, mem_mask);
-}
+static WRITE32_HANDLER( tms_comm_020_w ) { write32be_with_16be_handler(tms_comm_w, machine, offset, data, mem_mask); }
@@ -711,7 +708,7 @@ static WRITE16_HANDLER( led_0_w )
if (!(mem_mask & 0xff))
set_led_status(0, data != 0);
}
-static WRITE32_HANDLER( led_0_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_0_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( led_0_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_0_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( led_1_w )
@@ -720,7 +717,7 @@ static WRITE16_HANDLER( led_1_w )
if (!(mem_mask & 0xff))
set_led_status(1, data != 0);
}
-static WRITE32_HANDLER( led_1_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_1_w(offset, data, mem_mask); }
+static WRITE32_HANDLER( led_1_020_w ) { if ((mem_mask & 0xffff) != 0xffff) led_1_w(machine, offset, data, mem_mask); }
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index f03fd47d8d0..0170604cb34 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -163,17 +163,17 @@ WRITE16_HANDLER( gaiden_flip_w );
static WRITE16_HANDLER( gaiden_sound_command_w )
{
- if (ACCESSING_LSB) soundlatch_w(0,data & 0xff); /* Ninja Gaiden */
- if (ACCESSING_MSB) soundlatch_w(0,data >> 8); /* Tecmo Knight */
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ if (ACCESSING_LSB) soundlatch_w(machine,0,data & 0xff); /* Ninja Gaiden */
+ if (ACCESSING_MSB) soundlatch_w(machine,0,data >> 8); /* Tecmo Knight */
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static WRITE16_HANDLER( drgnbowl_sound_command_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(0,data >> 8);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data >> 8);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 4c126f50e65..2aa5cc4c3fb 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -814,7 +814,7 @@ static MACHINE_RESET( bosco )
/* Reset all latches */
for (i = 0;i < 8;i++)
- bosco_latch_w(i,0);
+ bosco_latch_w(machine,i,0);
namco_06xx_init(0, 0,
NAMCOIO_51XX, &intf0,
@@ -835,7 +835,7 @@ static MACHINE_RESET( galaga )
/* Reset all latches */
for (i = 0;i < 8;i++)
- bosco_latch_w(i,0);
+ bosco_latch_w(machine,i,0);
namco_06xx_init(0, 0,
NAMCOIO_51XX, &intf0,
@@ -850,7 +850,7 @@ static MACHINE_RESET( xevious )
/* Reset all latches */
for (i = 0;i < 8;i++)
- bosco_latch_w(i,0);
+ bosco_latch_w(machine,i,0);
namco_06xx_init(0, 0,
NAMCOIO_51XX, &intf0,
@@ -865,7 +865,7 @@ static MACHINE_RESET( battles )
/* Reset all latches */
for (i = 0;i < 8;i++)
- bosco_latch_w(i,0);
+ bosco_latch_w(machine,i,0);
battles_customio_init();
}
@@ -876,7 +876,7 @@ static MACHINE_RESET( digdug )
/* Reset all latches */
for (i = 0;i < 8;i++)
- bosco_latch_w(i,0);
+ bosco_latch_w(machine,i,0);
namco_06xx_init(0, 0,
NAMCOIO_51XX, &intf0,
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index e7a888d0b28..d131b090276 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -390,8 +390,8 @@ TO DO :
/* Send sound data to the sound cpu and cause an nmi */
static WRITE8_HANDLER( checkman_sound_command_w )
{
- soundlatch_w (0,data);
- cpunum_set_input_line (Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w (machine,0,data);
+ cpunum_set_input_line (machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static READ8_HANDLER( drivfrcg_port0_r )
@@ -891,12 +891,12 @@ static WRITE8_HANDLER( zigzag_8910_latch_w )
static WRITE8_HANDLER( zigzag_8910_data_trigger_w )
{
- AY8910_write_port_0_w(0,latch);
+ AY8910_write_port_0_w(machine,0,latch);
}
static WRITE8_HANDLER( zigzag_8910_control_trigger_w )
{
- AY8910_control_port_0_w(0,latch);
+ AY8910_control_port_0_w(machine,0,latch);
}
static ADDRESS_MAP_START( zigzag_readmem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 67b5178e6a4..142112e30ad 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -59,15 +59,15 @@ static MACHINE_RESET( galivan )
static WRITE8_HANDLER( galivan_sound_command_w )
{
- soundlatch_w(offset,(data << 1) | 1);
+ soundlatch_w(machine,offset,(data << 1) | 1);
}
static READ8_HANDLER( galivan_sound_command_r )
{
int data;
- data = soundlatch_r(offset);
- soundlatch_clear_w(0,0);
+ data = soundlatch_r(machine,offset);
+ soundlatch_clear_w(machine,0,0);
return data;
}
@@ -83,16 +83,16 @@ static WRITE8_HANDLER( ninjemak_videoreg_w )
switch (offset)
{
case 0x0b:
- ninjemak_scrolly_w(0, data);
+ ninjemak_scrolly_w(machine, 0, data);
break;
case 0x0c:
- ninjemak_scrolly_w(1, data);
+ ninjemak_scrolly_w(machine, 1, data);
break;
case 0x0d:
- ninjemak_scrollx_w(0, data);
+ ninjemak_scrollx_w(machine, 0, data);
break;
case 0x0e:
- ninjemak_scrollx_w(1, data);
+ ninjemak_scrollx_w(machine, 1, data);
break;
default:
break;
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index ebc4a8eceee..551304b35f0 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -212,7 +212,7 @@ static WRITE16_HANDLER( galpanic_bgvideoram_mirror_w )
for(i = 0; i < 8; i++)
{
// or offset + i * 0x2000 ?
- galpanic_bgvideoram_w(offset * 8 + i, data, mem_mask);
+ galpanic_bgvideoram_w(machine, offset * 8 + i, data, mem_mask);
}
}
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 05ff4cf8203..3abe3526c15 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -38,8 +38,8 @@ static WRITE16_HANDLER( soundcommand_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index f7d9a662994..ad15be6e881 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -120,22 +120,22 @@ static VIDEO_UPDATE(gamecstl)
static READ8_HANDLER(at_dma8237_1_r)
{
- return dma8237_1_r(offset / 2);
+ return dma8237_1_r(machine, offset / 2);
}
static WRITE8_HANDLER(at_dma8237_1_w)
{
- dma8237_1_w(offset / 2, data);
+ dma8237_1_w(machine, offset / 2, data);
}
static READ32_HANDLER(at32_dma8237_1_r)
{
- return read32le_with_read8_handler(at_dma8237_1_r, offset, mem_mask);
+ return read32le_with_read8_handler(at_dma8237_1_r, machine, offset, mem_mask);
}
static WRITE32_HANDLER(at32_dma8237_1_w)
{
- write32le_with_write8_handler(at_dma8237_1_w, offset, data, mem_mask);
+ write32le_with_write8_handler(at_dma8237_1_w, machine, offset, data, mem_mask);
}
@@ -303,23 +303,23 @@ static WRITE32_HANDLER( pnp_data_w )
static READ32_HANDLER( ide0_r )
{
- return ide_controller32_0_r(0x1f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x1f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( ide0_w )
{
- ide_controller32_0_w(0x1f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x1f0/4 + offset, data, mem_mask);
}
static READ32_HANDLER( fdc_r )
{
- return ide_controller32_0_r(0x3f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x3f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( fdc_w )
{
//mame_printf_debug("FDC: write %08X, %08X, %08X\n", data, offset, mem_mask);
- ide_controller32_0_w(0x3f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x3f0/4 + offset, data, mem_mask);
}
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index cb476e1ab88..51d0e0b6574 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -141,12 +141,12 @@ static WRITE8_HANDLER( audio_cmd_w )
static WRITE8_HANDLER( audio_trigger_w )
{
- gameplan_state *state = Machine->driver_data;
+ gameplan_state *state = machine->driver_data;
UINT8 cmd = (data << 7) | (state->audio_cmd & 0x7f);
- soundlatch_w(0, cmd);
- r6532_0_porta_w(0, cmd);
+ soundlatch_w(machine, 0, cmd);
+ r6532_0_porta_w(machine, 0, cmd);
}
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index 0154740ed76..3dcd1bd9ba8 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -264,7 +264,7 @@ static READ8_HANDLER( gaplus_snd_sharedram_r )
static WRITE8_HANDLER( gaplus_snd_sharedram_w )
{
if (offset < 0x40)
- namco_15xx_w(offset,data);
+ namco_15xx_w(machine,offset,data);
else
namco_soundregs[offset] = data;
}
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 71458adc2fb..376d966ce04 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -168,7 +168,7 @@ static void scanline_update(running_machine *machine, int scrnum, int scanline)
if (scanline & 32)
atarigen_6502_irq_gen(machine, 0);
else
- atarigen_6502_irq_ack_r(0);
+ atarigen_6502_irq_ack_r(machine, 0);
}
@@ -273,7 +273,7 @@ static WRITE8_HANDLER( sound_ctl_w )
case 1: /* speech write, bit D7, active low */
if (((data ^ last_speech_write) & 0x80) && (data & 0x80))
- tms5220_data_w(0, speech_val);
+ tms5220_data_w(machine, 0, speech_val);
last_speech_write = data;
break;
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index c40b96284f6..d1d7208011b 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -44,7 +44,7 @@ static READ8_HANDLER( bankedram_r )
static WRITE8_HANDLER( bankedram_w )
{
if (palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
else
ram[offset] = data;
}
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index 44d75727272..2504001e65b 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -81,17 +81,17 @@ static READ16_HANDLER( ioc_r )
switch (offset)
{
case 0x80/2:
- return input_port_0_word_r(0,mem_mask); /* DSW */
+ return input_port_0_word_r(machine,0,mem_mask); /* DSW */
case 0x84/2:
- return input_port_1_word_r(0,mem_mask); /* IN0 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN0 */
case 0x86/2:
- return input_port_2_word_r(0,mem_mask); /* IN1 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN1 */
case 0x50:
case 0x51:
- return OKIM6295_status_0_r(0)<<8;
+ return OKIM6295_status_0_r(machine,0)<<8;
break;
}
@@ -149,7 +149,7 @@ static WRITE16_HANDLER( ioc_w )
// OKIM6295
case 0x50:
case 0x51:
- OKIM6295_data_0_w(0, data>>8);
+ OKIM6295_data_0_w(machine, 0, data>>8);
break;
// MSM6585 ADPCM - mini emulation
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index f1beff18cdf..7ac64cdc8d0 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -271,11 +271,11 @@ READ16_HANDLER ( genesis_68k_to_z80_r )
switch (offset & 3)
{
case 0:
- if (ACCESSING_MSB) return YM3438_status_port_0_A_r(0) << 8;
- else return YM3438_read_port_0_r(0);
+ if (ACCESSING_MSB) return YM3438_status_port_0_A_r(machine, 0) << 8;
+ else return YM3438_read_port_0_r(machine, 0);
break;
case 2:
- if (ACCESSING_MSB) return YM3438_status_port_0_B_r(0) << 8;
+ if (ACCESSING_MSB) return YM3438_status_port_0_B_r(machine, 0) << 8;
else return 0;
break;
}
@@ -331,11 +331,11 @@ READ16_HANDLER ( megaplay_68k_to_z80_r )
switch (offset & 3)
{
case 0:
- if (ACCESSING_MSB) return YM3438_status_port_0_A_r(0) << 8;
- else return YM3438_read_port_0_r(0);
+ if (ACCESSING_MSB) return YM3438_status_port_0_A_r(machine, 0) << 8;
+ else return YM3438_read_port_0_r(machine, 0);
break;
case 2:
- if (ACCESSING_MSB) return YM3438_status_port_0_B_r(0) << 8;
+ if (ACCESSING_MSB) return YM3438_status_port_0_B_r(machine, 0) << 8;
else return 0;
break;
}
@@ -383,12 +383,12 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w )
switch (offset & 3)
{
case 0:
- if (ACCESSING_MSB) YM3438_control_port_0_A_w (0, (data >> 8) & 0xff);
- else YM3438_data_port_0_A_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM3438_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ else YM3438_data_port_0_A_w (machine, 0, (data >> 0) & 0xff);
break;
case 2:
- if (ACCESSING_MSB) YM3438_control_port_0_B_w (0, (data >> 8) & 0xff);
- else YM3438_data_port_0_B_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM3438_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ else YM3438_data_port_0_B_w (machine, 0, (data >> 0) & 0xff);
break;
}
}
@@ -412,8 +412,8 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w )
if ( (offset >= 0x10) && (offset <=0x17) )
{
- if (ACCESSING_LSB) SN76496_0_w(0, data & 0xff);
- if (ACCESSING_MSB) SN76496_0_w(0, (data >>8) & 0xff);
+ if (ACCESSING_LSB) SN76496_0_w(machine, 0, data & 0xff);
+ if (ACCESSING_MSB) SN76496_0_w(machine, 0, (data >>8) & 0xff);
}
}
@@ -677,9 +677,9 @@ READ8_HANDLER ( genesis_z80_r )
{
switch (offset & 3)
{
- case 0: return YM3438_status_port_0_A_r(0);
- case 1: return YM3438_read_port_0_r(0);
- case 2: return YM3438_status_port_0_B_r(0);
+ case 0: return YM3438_status_port_0_A_r(machine, 0);
+ case 1: return YM3438_read_port_0_r(machine, 0);
+ case 2: return YM3438_status_port_0_B_r(machine, 0);
case 3: return 0;
}
}
@@ -714,13 +714,13 @@ WRITE8_HANDLER ( genesis_z80_w )
{
switch (offset & 3)
{
- case 0: YM3438_control_port_0_A_w (0, data);
+ case 0: YM3438_control_port_0_A_w (machine, 0, data);
break;
- case 1: YM3438_data_port_0_A_w (0, data);
+ case 1: YM3438_data_port_0_A_w (machine, 0, data);
break;
- case 2: YM3438_control_port_0_B_w (0, data);
+ case 2: YM3438_control_port_0_B_w (machine, 0, data);
break;
- case 3: YM3438_data_port_0_B_w (0, data);
+ case 3: YM3438_data_port_0_B_w (machine, 0, data);
break;
}
}
@@ -728,7 +728,7 @@ WRITE8_HANDLER ( genesis_z80_w )
/* Bank Register */
if ((offset >= 0x6000) && (offset <= 0x60ff))
{
- genesis_bank_select_w(offset & 0xff, data);
+ genesis_bank_select_w(machine, offset & 0xff, data);
}
/* Unused / Illegal */
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index 1444b4ea515..877f4f95b0e 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -79,7 +79,7 @@ static WRITE8_HANDLER( getrivia_bitmap_w )
static READ8_HANDLER( port1_r )
{
- return input_port_1_r(0) | (ticket_dispenser_0_r(0) >> 5);
+ return input_port_1_r(machine, 0) | (ticket_dispenser_0_r(machine, 0) >> 5);
}
static WRITE8_HANDLER( lamps_w )
@@ -105,10 +105,10 @@ static WRITE8_HANDLER( sound_w )
set_led_status(9,data & 0x08);
/* bit 5 - ticket out in trivia games */
- ticket_dispenser_w(0, (data & 0x20)<< 2);
+ ticket_dispenser_w(machine,0, (data & 0x20)<< 2);
/* bit 6 enables NMI */
- interrupt_enable_w(0,data & 0x40);
+ interrupt_enable_w(machine,0,data & 0x40);
/* bit 7 goes directly to the sound amplifier */
DAC_data_w(0,((data & 0x80) >> 7) * 255);
@@ -143,7 +143,7 @@ static WRITE8_HANDLER( nmi_w )
set_led_status(8,data & 0x10);
/* bit 6 enables NMI */
- interrupt_enable_w(0,data & 0x40);
+ interrupt_enable_w(machine,0,data & 0x40);
}
static WRITE8_HANDLER( banksel_1_1_w )
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 60f2db500db..d75a377d5db 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -97,7 +97,7 @@ static READ16_HANDLER( control1_r )
/* bit 8 is EEPROM data */
/* bit 9 is EEPROM ready */
/* bit 11 is service button */
- res = (EEPROM_read_bit()<<8) | input_port_0_word_r(0,0);
+ res = (EEPROM_read_bit()<<8) | input_port_0_word_r(machine,0,0);
if (init_eeprom_count)
{
@@ -185,18 +185,18 @@ static WRITE16_HANDLER( sound_cmd_w )
{
if(ACCESSING_LSB) {
data &= 0xff;
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( sound_status_r )
{
- return soundlatch2_r(0);
+ return soundlatch2_r(machine,0);
}
static void sound_nmi(void)
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index d9cd69b4c94..123c4f1858e 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -309,14 +309,14 @@ static WRITE8_HANDLER( glad_adpcm_w )
static WRITE8_HANDLER( glad_cpu_sound_command_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, ASSERT_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, ASSERT_LINE);
}
static READ8_HANDLER( glad_cpu_sound_command_r )
{
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
+ return soundlatch_r(machine,0);
}
static WRITE8_HANDLER( gladiatr_flipscreen_w )
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index dc71b448ba3..642da763b01 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -31,8 +31,8 @@ static WRITE16_HANDLER( goal92_sound_command_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(0, (data >> 8) & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine, 0, (data >> 8) & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index d83a27e213a..e70e75c665f 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -197,19 +197,19 @@ static int track[2];
static READ8_HANDLER( gottlieb_track_0_r )
{
- return input_port_2_r(offset) - track[0];
+ return input_port_2_r(machine, offset) - track[0];
}
static READ8_HANDLER( gottlieb_track_1_r )
{
- return input_port_3_r(offset) - track[1];
+ return input_port_3_r(machine, offset) - track[1];
}
static WRITE8_HANDLER( gottlieb_track_reset_w )
{
/* reset the trackball counters */
- track[0] = input_port_2_r(offset);
- track[1] = input_port_3_r(offset);
+ track[0] = input_port_2_r(machine, offset);
+ track[1] = input_port_3_r(machine, offset);
}
static int joympx;
@@ -240,13 +240,13 @@ static WRITE8_HANDLER( reactor_output_w )
set_led_status(0,data & 0x20);
set_led_status(1,data & 0x40);
set_led_status(2,data & 0x80);
- gottlieb_video_outputs_w(offset,data);
+ gottlieb_video_outputs_w(machine,offset,data);
}
static WRITE8_HANDLER( stooges_output_w )
{
joympx = (data >> 5) & 0x03;
- gottlieb_video_outputs_w(offset,data);
+ gottlieb_video_outputs_w(machine,offset,data);
}
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 47ac412c77c..b6bc63622d9 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -35,40 +35,40 @@ VIDEO_UPDATE( gradius3 );
static READ16_HANDLER( K052109_halfword_r )
{
- return K052109_r(offset);
+ return K052109_r(machine,offset);
}
static WRITE16_HANDLER( K052109_halfword_w )
{
if (ACCESSING_LSB)
- K052109_w(offset,data & 0xff);
+ K052109_w(machine,offset,data & 0xff);
/* is this a bug in the game or something else? */
if (!ACCESSING_LSB)
- K052109_w(offset,(data >> 8) & 0xff);
+ K052109_w(machine,offset,(data >> 8) & 0xff);
// logerror("%06x half %04x = %04x\n",activecpu_get_pc(),offset,data);
}
static READ16_HANDLER( K051937_halfword_r )
{
- return K051937_r(offset);
+ return K051937_r(machine,offset);
}
static WRITE16_HANDLER( K051937_halfword_w )
{
if (ACCESSING_LSB)
- K051937_w(offset,data & 0xff);
+ K051937_w(machine,offset,data & 0xff);
}
static READ16_HANDLER( K051960_halfword_r )
{
- return K051960_r(offset);
+ return K051960_r(machine,offset);
}
static WRITE16_HANDLER( K051960_halfword_w )
{
if (ACCESSING_LSB)
- K051960_w(offset,data & 0xff);
+ K051960_w(machine,offset,data & 0xff);
}
@@ -139,7 +139,7 @@ static WRITE16_HANDLER( cpuB_irqtrigger_w )
if (irqBmask & 4)
{
logerror("%04x trigger cpu B irq 4 %02x\n",activecpu_get_pc(),data);
- cpunum_set_input_line(Machine, 1,4,HOLD_LINE);
+ cpunum_set_input_line(machine, 1,4,HOLD_LINE);
}
else
logerror("%04x MISSED cpu B irq 4 %02x\n",activecpu_get_pc(),data);
@@ -148,7 +148,7 @@ logerror("%04x MISSED cpu B irq 4 %02x\n",activecpu_get_pc(),data);
static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_MSB)
- soundlatch_w(0,(data >> 8) & 0xff);
+ soundlatch_w(machine,0,(data >> 8) & 0xff);
}
static WRITE16_HANDLER( sound_irq_w )
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 80416923382..95e552618c6 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -118,7 +118,7 @@ static INTERRUPT_GEN( grchamp_cpu1_interrupt )
static WRITE8_HANDLER( cpu0_outputs_w )
{
- grchamp_state *state = Machine->driver_data;
+ grchamp_state *state = machine->driver_data;
UINT8 diff = data ^ state->cpu0_out[offset];
state->cpu0_out[offset] = data;
@@ -133,7 +133,7 @@ static WRITE8_HANDLER( cpu0_outputs_w )
/* bit 6: FOG OUT */
/* bit 7: RADARON */
if ((diff & 0x01) && !(data & 0x01))
- cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
if ((diff & 0x02) && !(data & 0x02))
state->collide = state->collmode = 0;
break;
@@ -186,13 +186,13 @@ static WRITE8_HANDLER( cpu0_outputs_w )
break;
case 0x0d: /* OUT13 */
- watchdog_reset(Machine);
+ watchdog_reset(machine);
break;
case 0x0e: /* OUT14 */
/* O-21 connector */
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
break;
}
}
@@ -245,7 +245,7 @@ static WRITE8_HANDLER( led_board_w )
static WRITE8_HANDLER( cpu1_outputs_w )
{
- grchamp_state *state = Machine->driver_data;
+ grchamp_state *state = machine->driver_data;
UINT8 diff = data ^ state->cpu1_out[offset];
state->cpu1_out[offset] = data;
@@ -272,7 +272,7 @@ static WRITE8_HANDLER( cpu1_outputs_w )
case 0x04: /* OUT4 */
/* bit 0: interrupt enable for CPU 1 */
if ((diff & 0x01) && !(data & 0x01))
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
break;
case 0x05: /* OUT5 - unused */
@@ -308,18 +308,18 @@ static WRITE8_HANDLER( cpu1_outputs_w )
/* bit 2-4: ATTACK UP 1-3 */
/* bit 5-6: SIFT 1-2 */
/* bit 7: ENGINE CS */
- discrete_sound_w(GRCHAMP_ENGINE_CS_EN, data & 0x80);
- discrete_sound_w(GRCHAMP_SIFT_DATA, (data >> 5) & 0x03);
- discrete_sound_w(GRCHAMP_ATTACK_UP_DATA, (data >> 2) & 0x07);
- discrete_sound_w(GRCHAMP_IDLING_EN, data & 0x02);
- discrete_sound_w(GRCHAMP_FOG_EN, data & 0x01);
+ discrete_sound_w(machine, GRCHAMP_ENGINE_CS_EN, data & 0x80);
+ discrete_sound_w(machine, GRCHAMP_SIFT_DATA, (data >> 5) & 0x03);
+ discrete_sound_w(machine, GRCHAMP_ATTACK_UP_DATA, (data >> 2) & 0x07);
+ discrete_sound_w(machine, GRCHAMP_IDLING_EN, data & 0x02);
+ discrete_sound_w(machine, GRCHAMP_FOG_EN, data & 0x01);
break;
case 0x0d: /* OUTD */
/* bit 0-3: ATTACK SPEED 1-4 */
/* bit 4-7: PLAYER SPEED 1-4 */
- discrete_sound_w(GRCHAMP_PLAYER_SPEED_DATA, (data >> 4) & 0x0f);
- discrete_sound_w(GRCHAMP_ATTACK_SPEED_DATA, data & 0x0f);
+ discrete_sound_w(machine, GRCHAMP_PLAYER_SPEED_DATA, (data >> 4) & 0x0f);
+ discrete_sound_w(machine, GRCHAMP_ATTACK_SPEED_DATA, data & 0x0f);
break;
default:
@@ -424,12 +424,12 @@ static READ8_HANDLER( main_to_sub_comm_r )
static WRITE8_HANDLER( grchamp_portA_0_w )
{
- discrete_sound_w(GRCHAMP_A_DATA, data);
+ discrete_sound_w(machine, GRCHAMP_A_DATA, data);
}
static WRITE8_HANDLER( grchamp_portB_0_w )
{
- discrete_sound_w(GRCHAMP_B_DATA, 255-data);
+ discrete_sound_w(machine, GRCHAMP_B_DATA, 255-data);
}
static WRITE8_HANDLER( grchamp_portA_2_w )
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index efd661351f0..e46f1925ef4 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -164,13 +164,13 @@ static READ32_HANDLER( groundfx_input_r )
{
case 0x00:
{
- return (input_port_0_word_r(0,0) << 16) | input_port_1_word_r(0,0) |
+ return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) |
(EEPROM_read_bit() << 7) | frame_counter;
}
case 0x01:
{
- return input_port_2_word_r(0,0) | (coin_word << 16);
+ return input_port_2_word_r(machine,0,0) | (coin_word << 16);
}
}
@@ -185,7 +185,7 @@ static WRITE32_HANDLER( groundfx_input_w )
{
if (ACCESSING_MSB32) /* $500000 is watchdog */
{
- watchdog_reset_w(0,data >> 24);
+ watchdog_reset(machine);
}
if (ACCESSING_LSB32)
@@ -215,7 +215,7 @@ static WRITE32_HANDLER( groundfx_input_w )
static READ32_HANDLER( groundfx_adc_r )
{
- return (input_port_3_word_r(0,0) << 8) | input_port_4_word_r(0,0);
+ return (input_port_3_word_r(machine,0,0) << 8) | input_port_4_word_r(machine,0,0);
}
static WRITE32_HANDLER( groundfx_adc_w )
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index bcbb1d3c8a3..13f7fc88914 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -166,10 +166,10 @@ static ADDRESS_MAP_START( gstream_32bit_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xFFF80000, 0xFFFFFFFF) AM_ROM AM_REGION(REGION_USER1,0) // boot rom
ADDRESS_MAP_END
-static READ32_HANDLER( gstream_oki_0_r ) { return OKIM6295_status_0_r(0); }
-static READ32_HANDLER( gstream_oki_1_r ) { return OKIM6295_status_1_r(0); }
-static WRITE32_HANDLER( gstream_oki_0_w ) { OKIM6295_data_0_w(0, data & 0xff); }
-static WRITE32_HANDLER( gstream_oki_1_w ) { OKIM6295_data_1_w(0, data & 0xff); }
+static READ32_HANDLER( gstream_oki_0_r ) { return OKIM6295_status_0_r(machine, 0); }
+static READ32_HANDLER( gstream_oki_1_r ) { return OKIM6295_status_1_r(machine, 0); }
+static WRITE32_HANDLER( gstream_oki_0_w ) { OKIM6295_data_0_w(machine, 0, data & 0xff); }
+static WRITE32_HANDLER( gstream_oki_1_w ) { OKIM6295_data_1_w(machine, 0, data & 0xff); }
static WRITE32_HANDLER( gstream_oki_4030_w )
{
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index d18d9da3961..919f2a5ce62 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -206,8 +206,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 9779ff9f3cf..da8c00d27ff 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -331,12 +331,12 @@ static WRITE8_HANDLER( josvolly_nmi_enable_w )
static WRITE8_HANDLER( gsword_AY8910_control_port_0_w )
{
- AY8910_control_port_0_w(offset,data);
+ AY8910_control_port_0_w(machine,offset,data);
fake8910_0 = data;
}
static WRITE8_HANDLER( gsword_AY8910_control_port_1_w )
{
- AY8910_control_port_1_w(offset,data);
+ AY8910_control_port_1_w(machine,offset,data);
fake8910_1 = data;
}
@@ -358,8 +358,8 @@ static WRITE8_HANDLER( gsword_adpcm_data_w )
static WRITE8_HANDLER( adpcm_soundcommand_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
static ADDRESS_MAP_START( cpu1_map, 0 , 8 )
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 33eda236af5..de0b466b279 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -92,13 +92,13 @@ static READ32_HANDLER( gunbustr_input_r )
{
case 0x00:
{
- return (input_port_0_word_r(0,0) << 16) | input_port_1_word_r(0,0) |
+ return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) |
(EEPROM_read_bit() << 7);
}
case 0x01:
{
- return input_port_2_word_r(0,0) | (coin_word << 16);
+ return input_port_2_word_r(machine,0,0) | (coin_word << 16);
}
}
logerror("CPU #0 PC %06x: read input %06x\n",activecpu_get_pc(),offset);
@@ -126,7 +126,7 @@ popmessage(t);
{
if (ACCESSING_MSB32) /* $400000 is watchdog */
{
- watchdog_reset_w(0,data >> 24);
+ watchdog_reset(machine);
}
if (ACCESSING_LSB32)
@@ -175,8 +175,8 @@ static WRITE32_HANDLER( motor_control_w )
static READ32_HANDLER( gunbustr_gun_r )
{
- return ( input_port_3_word_r(0,0) << 24) | (input_port_4_word_r(0,0) << 16) |
- ( input_port_5_word_r(0,0) << 8) | input_port_6_word_r(0,0);
+ return ( input_port_3_word_r(machine,0,0) << 24) | (input_port_4_word_r(machine,0,0) << 16) |
+ ( input_port_5_word_r(machine,0,0) << 8) | input_port_6_word_r(machine,0,0);
}
static WRITE32_HANDLER( gunbustr_gun_w )
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index 4f8d18a6756..1c813522f1b 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -72,7 +72,7 @@ static WRITE8_HANDLER( aso_scroll_sync_w )
aso_scroll_sync[offset] = data;
}
-static void hal21_sound_scheduler(int mode, int data)
+static void hal21_sound_scheduler(running_machine *machine, int mode, int data)
{
static int busy, hold, ffcount, ffhead, fftail;
@@ -116,8 +116,8 @@ static void hal21_sound_scheduler(int mode, int data)
}
snk_sound_busy_bit = 0x20;
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
/**************************************************************************/
@@ -551,28 +551,28 @@ GFXDECODE_END
static READ8_HANDLER( CPUC_ready_r ) { snk_sound_busy_bit = 0; return 0; }
-static READ8_HANDLER( hal21_input_port_0_r ) { return input_port_0_r(0) | snk_sound_busy_bit; }
+static READ8_HANDLER( hal21_input_port_0_r ) { return input_port_0_r(machine,0) | snk_sound_busy_bit; }
-static WRITE8_HANDLER( hal21_soundcommand_w ) { hal21_sound_scheduler(1, data); }
-static WRITE8_HANDLER( hal21_soundack_w ) { hal21_sound_scheduler(2, data); }
+static WRITE8_HANDLER( hal21_soundcommand_w ) { hal21_sound_scheduler(machine, 1, data); }
+static WRITE8_HANDLER( hal21_soundack_w ) { hal21_sound_scheduler(machine,2, data); }
static READ8_HANDLER( hal21_soundcommand_r )
{
- int data = soundlatch_r(0);
- soundlatch_clear_w(0, 0);
+ int data = soundlatch_r(machine, 0);
+ soundlatch_clear_w(machine, 0, 0);
return data;
}
static WRITE8_HANDLER( aso_soundcommand_w )
{
snk_sound_busy_bit = 0x20;
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, 0, HOLD_LINE );
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, 0, HOLD_LINE );
}
static INTERRUPT_GEN( hal21_sound_interrupt )
{
- hal21_sound_scheduler(3, 0);
+ hal21_sound_scheduler(machine, 3, 0);
}
/**************************************************************************/
@@ -691,7 +691,7 @@ static DRIVER_INIT( hal21 )
static MACHINE_RESET( aso )
{
memset(hal21_vreg, 0, 8);
- hal21_sound_scheduler(0, 0);
+ hal21_sound_scheduler(machine, 0, 0);
snk_sound_busy_bit = 0;
}
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index d83c4695483..9ad16cfc2ae 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1499,7 +1499,7 @@ static INTERRUPT_GEN( halleys_interrupt )
latch_data = sound_fifo[fftail];
fftail = (fftail + 1) & (MAX_SOUNDS - 1);
latch_delay = (latch_data) ? 0 : 4;
- soundlatch_w(0, latch_data);
+ soundlatch_w(machine, 0, latch_data);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -1539,7 +1539,7 @@ static INTERRUPT_GEN( benberob_interrupt )
latch_data = sound_fifo[fftail];
fftail = (fftail + 1) & (MAX_SOUNDS - 1);
latch_delay = (latch_data) ? 0 : 4;
- soundlatch_w(0, latch_data);
+ soundlatch_w(machine, 0, latch_data);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
break;
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index a8b15daccd8..d68d8099460 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -69,7 +69,7 @@ static READ8_HANDLER( hanaawas_input_port_0_r )
}
}
- return (input_port_0_r(0) & 0xf0) | ordinal;
+ return (input_port_0_r(machine,0) & 0xf0) | ordinal;
}
static WRITE8_HANDLER( hanaawas_inputs_mux_w )
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index c57b4c19c30..a5db3800eab 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -189,15 +189,15 @@ static WRITE8_HANDLER( output_port_0_w )
attotime duration = attotime_make(0, ATTOSECONDS_PER_SECOND * 0.45 * 6.8e-6 * resistance * (data+1));
timeout_time = attotime_add(timer_get_time(), duration);
- discrete_sound_w(HITME_DOWNCOUNT_VAL, data);
- discrete_sound_w(HITME_OUT0, 1);
+ discrete_sound_w(machine, HITME_DOWNCOUNT_VAL, data);
+ discrete_sound_w(machine, HITME_OUT0, 1);
}
static WRITE8_HANDLER( output_port_1_w )
{
- discrete_sound_w(HITME_ENABLE_VAL, data);
- discrete_sound_w(HITME_OUT1, 1);
+ discrete_sound_w(machine, HITME_ENABLE_VAL, data);
+ discrete_sound_w(machine, HITME_OUT1, 1);
}
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index d4e9172a608..385f916381a 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -298,7 +298,7 @@ static int sndbank;
static READ8_HANDLER( mrokumei_sound_io_r )
{
if (sndbank & 4)
- return(soundlatch_r(0));
+ return(soundlatch_r(machine,0));
else
return memory_region(REGION_CPU2)[0x10000 + offset + (sndbank & 1) * 0x10000];
}
@@ -326,8 +326,8 @@ static WRITE8_HANDLER( mrokumei_sound_io_w )
static WRITE8_HANDLER( mrokumei_sound_cmd_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
@@ -373,17 +373,17 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w )
if (BIT(upd7807_portc,5) && !BIT(data,5)) /* write clock 1->0 */
{
if (BIT(data,3))
- YM2203_write_port_0_w(0,upd7807_porta);
+ YM2203_write_port_0_w(machine,0,upd7807_porta);
else
- YM2203_control_port_0_w(0,upd7807_porta);
+ YM2203_control_port_0_w(machine,0,upd7807_porta);
}
if (BIT(upd7807_portc,4) && !BIT(data,4)) /* read clock 1->0 */
{
if (BIT(data,3))
- upd7807_porta = YM2203_read_port_0_r(0);
+ upd7807_porta = YM2203_read_port_0_r(machine,0);
else
- upd7807_porta = YM2203_status_port_0_r(0);
+ upd7807_porta = YM2203_status_port_0_r(machine,0);
}
upd7807_portc = data;
@@ -393,7 +393,7 @@ static MACHINE_RESET( reikaids_upd7807 )
{
/* on reset, ports are set as input (high impedance), therefore 0xff output */
reikaids_which=homedata_priority;
- reikaids_upd7807_portc_w(0,0xff);
+ reikaids_upd7807_portc_w(machine,0,0xff);
}
static READ8_HANDLER( reikaids_io_r )
@@ -529,7 +529,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w )
coin_counter_w(0,~data & 0x80);
if (BIT(upd7807_portc,5) && !BIT(data,5)) /* clock 1->0 */
- SN76496_0_w(0,upd7807_porta);
+ SN76496_0_w(machine,0,upd7807_porta);
upd7807_portc = data;
}
@@ -537,7 +537,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w )
static MACHINE_RESET( pteacher_upd7807 )
{
/* on reset, ports are set as input (high impedance), therefore 0xff output */
- pteacher_upd7807_portc_w(0,0xff);
+ pteacher_upd7807_portc_w(machine,0,0xff);
}
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 950ebf7dabc..0f4cba29b6a 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -92,9 +92,9 @@ ADDRESS_MAP_END
static READ8_HANDLER(homerun_40_r)
{
if(video_screen_get_vpos(0)>116)
- return input_port_0_r(0)|0x40;
+ return input_port_0_r(machine,0)|0x40;
else
- return input_port_0_r(0);
+ return input_port_0_r(machine,0);
}
static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 62da70638f8..903a49167be 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -299,13 +299,13 @@ INLINE int blt_read(const UINT8 *ROM, const int offs)
return ROM[offs] ^ 0xff;
}
-INLINE void blt_write(const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask)
+INLINE void blt_write(running_machine *machine, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask)
{
switch( tmap )
{
- case 1: hyprduel_vram_0_w(offs,data,mask); break;
- case 2: hyprduel_vram_1_w(offs,data,mask); break;
- case 3: hyprduel_vram_2_w(offs,data,mask); break;
+ case 1: hyprduel_vram_0_w(machine,offs,data,mask); break;
+ case 2: hyprduel_vram_1_w(machine,offs,data,mask); break;
+ case 3: hyprduel_vram_2_w(machine,offs,data,mask); break;
}
// logerror("CPU #0 PC %06X : Blitter %X] %04X <- %04X & %04X\n",activecpu_get_pc(),tmap,offs,data,mask);
}
@@ -380,7 +380,7 @@ static WRITE16_HANDLER( hyprduel_blitter_w )
src_offs++;
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2,mask);
+ blt_write(machine,tmap,dst_offs,b2,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
}
break;
@@ -396,7 +396,7 @@ static WRITE16_HANDLER( hyprduel_blitter_w )
while (count--)
{
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2<<shift,mask);
+ blt_write(machine,tmap,dst_offs,b2<<shift,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
b2++;
}
@@ -413,7 +413,7 @@ static WRITE16_HANDLER( hyprduel_blitter_w )
while (count--)
{
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2,mask);
+ blt_write(machine,tmap,dst_offs,b2,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
}
break;
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index d1db1769314..78a114fc527 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -1013,13 +1013,13 @@ static READ16_HANDLER( xymg_magic_r )
static WRITE16_HANDLER( igs_YM3812_control_port_0_w )
{
if (ACCESSING_LSB)
- YM3812_control_port_0_w(0,data);
+ YM3812_control_port_0_w(machine,0,data);
}
static WRITE16_HANDLER( igs_YM3812_write_port_0_w )
{
if (ACCESSING_LSB)
- YM3812_write_port_0_w(0,data);
+ YM3812_write_port_0_w(machine,0,data);
}
static ADDRESS_MAP_START( chindrag_readmem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1158,9 +1158,9 @@ static READ16_HANDLER( ics2115_0_word_r )
{
switch(offset)
{
- case 0: return ics2115_r(0);
- case 1: return ics2115_r(1);
- case 2: return (ics2115_r(3) << 8) | ics2115_r(2);
+ case 0: return ics2115_r(machine,0);
+ case 1: return ics2115_r(machine,1);
+ case 2: return (ics2115_r(machine,3) << 8) | ics2115_r(machine,2);
}
return 0xff;
}
@@ -1170,11 +1170,11 @@ static WRITE16_HANDLER( ics2115_0_word_w )
switch(offset)
{
case 1:
- if (ACCESSING_LSB) ics2115_w(1,data);
+ if (ACCESSING_LSB) ics2115_w(machine,1,data);
break;
case 2:
- if (ACCESSING_LSB) ics2115_w(2,data);
- if (ACCESSING_MSB) ics2115_w(3,data>>8);
+ if (ACCESSING_LSB) ics2115_w(machine,2,data);
+ if (ACCESSING_MSB) ics2115_w(machine,3,data>>8);
break;
}
}
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 522e496b69f..4f41fc1e334 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -109,8 +109,8 @@ static WRITE16_HANDLER( inufuku_soundcommand_w )
if (data == 0x08) return;
pending_command = 1;
- soundlatch_w(0, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -141,7 +141,7 @@ static MACHINE_RESET( inufuku )
static DRIVER_INIT( inufuku )
{
pending_command = 1;
- inufuku_soundrombank_w(0, 0);
+ inufuku_soundrombank_w(machine, 0, 0);
}
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index cfc30282317..4be0e4cf1c5 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -466,8 +466,8 @@ static READ32_HANDLER( trackball32_4bit_p2_r )
static READ32_HANDLER( trackball32_4bit_combined_r )
{
- return trackball32_4bit_r(offset, mem_mask) |
- (trackball32_4bit_p2_r(offset, mem_mask) << 8);
+ return trackball32_4bit_r(machine, offset, mem_mask) |
+ (trackball32_4bit_p2_r(machine, offset, mem_mask) << 8);
}
@@ -601,7 +601,7 @@ static WRITE8_HANDLER( drivedge_portb_out )
set_led_status(1, data & 0x01);
set_led_status(2, data & 0x02);
set_led_status(3, data & 0x04);
- ticket_dispenser_w(0, (data & 0x10) << 3);
+ ticket_dispenser_w(machine, 0, (data & 0x10) << 3);
coin_counter_w(0, (data & 0x20) >> 5);
}
@@ -619,7 +619,7 @@ static WRITE8_HANDLER( pia_portb_out )
/* bit 4 controls the ticket dispenser */
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
- ticket_dispenser_w(0, (data & 0x10) << 3);
+ ticket_dispenser_w(machine, 0, (data & 0x10) << 3);
coin_counter_w(0, (data & 0x20) >> 5);
}
@@ -759,32 +759,32 @@ static READ32_HANDLER( drivedge_tms2_speedup_r )
static READ32_HANDLER( input_port_0_msw_r )
{
- return input_port_0_word_r(offset,0) << 16;
+ return input_port_0_word_r(machine,offset,0) << 16;
}
static READ32_HANDLER( input_port_1_msw_r )
{
- return input_port_1_word_r(offset,0) << 16;
+ return input_port_1_word_r(machine,offset,0) << 16;
}
static READ32_HANDLER( input_port_2_msw_r )
{
- return input_port_2_word_r(offset,0) << 16;
+ return input_port_2_word_r(machine,offset,0) << 16;
}
static READ32_HANDLER( input_port_3_msw_r )
{
- return input_port_3_word_r(offset,0) << 16;
+ return input_port_3_word_r(machine,offset,0) << 16;
}
static READ32_HANDLER( input_port_4_msw_r )
{
- return special_port4_r(offset,0) << 16;
+ return special_port4_r(machine,offset,0) << 16;
}
static WRITE32_HANDLER( int1_ack32_w )
{
- int1_ack_w(offset, data, mem_mask);
+ int1_ack_w(machine, offset, data, mem_mask);
}
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 2bc66b310ea..dd206fbee3f 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -454,6 +454,7 @@
#include "driver.h"
#include "deprecat.h"
+#include "memconv.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/6522via.h"
@@ -692,7 +693,7 @@ static WRITE8_HANDLER( blitter_w )
memory_set_bankptr(1, &memory_region(REGION_CPU1)[0x4000 + 0xc000 * ((data >> 5) & 1)]);
/* the rest is handled by the video hardware */
- itech8_blitter_w(offset, data);
+ itech8_blitter_w(machine, offset, data);
}
@@ -751,7 +752,7 @@ static WRITE8_HANDLER( pia_portb_out )
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
pia_portb_data = data;
- ticket_dispenser_w(0, (data & 0x10) << 3);
+ ticket_dispenser_w(machine, 0, (data & 0x10) << 3);
coin_counter_w(0, (data & 0x20) >> 5);
}
@@ -765,7 +766,7 @@ static WRITE8_HANDLER( ym2203_portb_out )
/* bit 6 controls the diagnostic sound LED */
/* bit 7 controls the ticket dispenser */
pia_portb_data = data;
- ticket_dispenser_w(0, data & 0x80);
+ ticket_dispenser_w(machine, 0, data & 0x80);
coin_counter_w(0, (data & 0x20) >> 5);
}
@@ -833,7 +834,7 @@ static void via_irq(int state)
static READ16_HANDLER( blitter16_r )
{
- return (itech8_blitter_r(offset * 2 + 0) << 8) + itech8_blitter_r(offset * 2 + 1);
+ return read16be_with_read8_handler(itech8_blitter_r, machine, offset, mem_mask);
}
@@ -844,18 +845,18 @@ static READ16_HANDLER( tms34061_16_r )
/* bit doesn't matter in XY addressing mode */
if ((offset & 0x700) == 0x100)
{
- int result = itech8_tms34061_r(offset * 2);
+ int result = itech8_tms34061_r(machine, offset * 2);
return (result << 8) | result;
}
else
- return (itech8_tms34061_r(offset * 2 + 0) << 8) + itech8_tms34061_r(offset * 2 + 1);
+ return (itech8_tms34061_r(machine, offset * 2 + 0) << 8) + itech8_tms34061_r(machine, offset * 2 + 1);
}
static WRITE16_HANDLER( sound_data16_w )
{
if (ACCESSING_MSB)
- sound_data_w(0, data >> 8);
+ sound_data_w(machine, 0, data >> 8);
}
@@ -869,39 +870,33 @@ static WRITE16_HANDLER( grom_bank16_w )
static WRITE16_HANDLER( display_page16_w )
{
if (ACCESSING_MSB)
- itech8_page_w(0, ~data >> 8);
+ itech8_page_w(machine, 0, ~data >> 8);
}
static WRITE16_HANDLER( tms34061_latch16_w )
{
if (ACCESSING_MSB)
- tms34061_latch_w(0, data >> 8);
+ tms34061_latch_w(machine, 0, data >> 8);
}
static WRITE16_HANDLER( blitter16_w )
{
- if (ACCESSING_MSB)
- itech8_blitter_w(offset * 2 + 0, data >> 8);
- if (ACCESSING_LSB)
- itech8_blitter_w(offset * 2 + 1, data);
+ write16be_with_write8_handler(itech8_blitter_w, machine, offset, data, mem_mask);
}
static WRITE16_HANDLER( palette16_w )
{
if (ACCESSING_MSB)
- itech8_palette_w(offset / 8, data >> 8);
+ itech8_palette_w(machine, offset / 8, data >> 8);
}
static WRITE16_HANDLER( tms34061_16_w )
{
- if (ACCESSING_MSB)
- itech8_tms34061_w(offset * 2 + 0, data >> 8);
- else if (ACCESSING_LSB)
- itech8_tms34061_w(offset * 2 + 1, data);
+ write16be_with_write8_handler(itech8_tms34061_w, machine, offset, data, mem_mask);
}
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 52f80b73177..1c3177e40c3 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -72,8 +72,8 @@ static READ8_HANDLER( timer_r )
static WRITE8_HANDLER( jack_sh_command_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 113bb3c41ee..a4ddceba7f5 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -195,21 +195,21 @@ static VIDEO_START( jalmah )
}
#define MCU_READ(_number_,_bit_,_offset_,_retval_)\
-if((0xffff - input_port_##_number_##_word_r(0,0)) & _bit_) { jm_regs[_offset_] = _retval_; }
+if((0xffff - readinputport(_number_)) & _bit_) { jm_regs[_offset_] = _retval_; }
/*RAM-based protection handlings*/
static void daireika_mcu_run(running_machine *machine)
{
static UINT16 prg_prot;
- if((0xffff - input_port_0_word_r(0,0)) & 0x0008)//service_mode
+ if((0xffff - input_port_0_word_r(machine,0,0)) & 0x0008)//service_mode
{
- jm_regs[0x000/2] = input_port_2_word_r(0,0);
- jm_regs[0x002/2] = input_port_3_word_r(0,0);
- jm_regs[0x004/2] = input_port_4_word_r(0,0);
- jm_regs[0x006/2] = input_port_5_word_r(0,0);
- jm_regs[0x008/2] = input_port_6_word_r(0,0);
- jm_regs[0x00a/2] = input_port_7_word_r(0,0);
+ jm_regs[0x000/2] = input_port_2_word_r(machine,0,0);
+ jm_regs[0x002/2] = input_port_3_word_r(machine,0,0);
+ jm_regs[0x004/2] = input_port_4_word_r(machine,0,0);
+ jm_regs[0x006/2] = input_port_5_word_r(machine,0,0);
+ jm_regs[0x008/2] = input_port_6_word_r(machine,0,0);
+ jm_regs[0x00a/2] = input_port_7_word_r(machine,0,0);
}
else
{
@@ -247,14 +247,14 @@ static void urashima_mcu_run(running_machine *machine)
{
static UINT16 prg_prot;
- if((0xffff - input_port_0_word_r(0,0)) & 0x0008)//service_mode
+ if((0xffff - input_port_0_word_r(machine,0,0)) & 0x0008)//service_mode
{
- jm_regs[0x300/2] = input_port_2_word_r(0,0);
- jm_regs[0x302/2] = input_port_3_word_r(0,0);
- jm_regs[0x304/2] = input_port_4_word_r(0,0);
- jm_regs[0x306/2] = input_port_5_word_r(0,0);
- jm_regs[0x308/2] = input_port_6_word_r(0,0);
- jm_regs[0x30a/2] = input_port_7_word_r(0,0);
+ jm_regs[0x300/2] = input_port_2_word_r(machine,0,0);
+ jm_regs[0x302/2] = input_port_3_word_r(machine,0,0);
+ jm_regs[0x304/2] = input_port_4_word_r(machine,0,0);
+ jm_regs[0x306/2] = input_port_5_word_r(machine,0,0);
+ jm_regs[0x308/2] = input_port_6_word_r(machine,0,0);
+ jm_regs[0x30a/2] = input_port_7_word_r(machine,0,0);
}
else
{
@@ -289,11 +289,11 @@ static void urashima_mcu_run(running_machine *machine)
static void second_mcu_run(running_machine *machine)
{
- if((0xffff - input_port_1_word_r(0,0)) & 0x0004)//service_mode
+ if((0xffff - input_port_1_word_r(machine,0,0)) & 0x0004)//service_mode
{
- jm_regs[0x200/2] = input_port_2_word_r(0,0);
- jm_regs[0x202/2] = input_port_3_word_r(0,0);
- jm_regs[0x204/2] = input_port_4_word_r(0,0);
+ jm_regs[0x200/2] = input_port_2_word_r(machine,0,0);
+ jm_regs[0x202/2] = input_port_3_word_r(machine,0,0);
+ jm_regs[0x204/2] = input_port_4_word_r(machine,0,0);
}
else
{
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index 44304366a7b..f3b27d4b617 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -55,14 +55,14 @@ static const struct namco_interface snkwave_interface =
static WRITE8_HANDLER( sound_command_w )
{
sound_cpu_busy = 0x20;
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
static READ8_HANDLER( sound_command_r )
{
sound_cpu_busy = 0;
- return(soundlatch_r(0));
+ return(soundlatch_r(machine,0));
}
static READ8_HANDLER( sound_nmi_ack_r )
@@ -73,7 +73,7 @@ static READ8_HANDLER( sound_nmi_ack_r )
static READ8_HANDLER( jcross_port_0_r )
{
- return(input_port_0_r(0) | sound_cpu_busy);
+ return(input_port_0_r(machine,0) | sound_cpu_busy);
}
static WRITE8_HANDLER(jcross_vregs0_w){jcross_vregs[0]=data;}
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index 7d9a8244fef..36995af631d 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -210,7 +210,7 @@ static WRITE8_HANDLER( rom_banksel_w )
static READ8_HANDLER( a2d_data_r )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
UINT8 ret = 0;
switch (state->a2d_select)
@@ -225,7 +225,7 @@ static READ8_HANDLER( a2d_data_r )
static WRITE8_HANDLER( a2d_select_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
state->a2d_select = offset;
}
@@ -246,7 +246,7 @@ static WRITE8_HANDLER( jedi_coin_counter_w )
static WRITE8_HANDLER( nvram_data_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
if (state->nvram_enabled)
generic_nvram[offset] = data;
@@ -255,7 +255,7 @@ static WRITE8_HANDLER( nvram_data_w )
static WRITE8_HANDLER( nvram_enable_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
state->nvram_enabled = ~offset & 1;
}
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 558bd87ef79..bd1b826986c 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -168,8 +168,8 @@ static WRITE8_HANDLER( i8039_irqen_and_status_w )
static WRITE8_HANDLER( flip_screen_w )
{
- tutankhm_flip_screen_x_w(0, data);
- tutankhm_flip_screen_y_w(0, data);
+ tutankhm_flip_screen_x_w(machine, 0, data);
+ tutankhm_flip_screen_y_w(machine, 0, data);
}
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 8596f0c09a0..5c3a6fb4af5 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -272,8 +272,8 @@ static WRITE16_HANDLER( kaneko16_soundlatch_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(0, (data & 0xff00) >> 8 );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, (data & 0xff00) >> 8 );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -282,31 +282,31 @@ static WRITE16_HANDLER( kaneko16_soundlatch_w )
static READ16_HANDLER( kaneko16_YM2149_0_r )
{
/* Each 2149 register is mapped to a different address */
- AY8910_control_port_0_w(0,offset);
- return AY8910_read_port_0_r(0);
+ AY8910_control_port_0_w(machine,0,offset);
+ return AY8910_read_port_0_r(machine,0);
}
static READ16_HANDLER( kaneko16_YM2149_1_r )
{
/* Each 2149 register is mapped to a different address */
- AY8910_control_port_1_w(0,offset);
- return AY8910_read_port_1_r(0);
+ AY8910_control_port_1_w(machine,0,offset);
+ return AY8910_read_port_1_r(machine,0);
}
static WRITE16_HANDLER( kaneko16_YM2149_0_w )
{
/* Each 2149 register is mapped to a different address */
- AY8910_control_port_0_w(0,offset);
+ AY8910_control_port_0_w(machine,0,offset);
/* The registers are mapped to odd addresses, except one! */
- if (ACCESSING_LSB) AY8910_write_port_0_w(0, data & 0xff);
- else AY8910_write_port_0_w(0,(data >> 8) & 0xff);
+ if (ACCESSING_LSB) AY8910_write_port_0_w(machine,0, data & 0xff);
+ else AY8910_write_port_0_w(machine,0,(data >> 8) & 0xff);
}
static WRITE16_HANDLER( kaneko16_YM2149_1_w )
{
/* Each 2149 register is mapped to a different address */
- AY8910_control_port_1_w(0,offset);
+ AY8910_control_port_1_w(machine,0,offset);
/* The registers are mapped to odd addresses, except one! */
- if (ACCESSING_LSB) AY8910_write_port_1_w(0, data & 0xff);
- else AY8910_write_port_1_w(0,(data >> 8) & 0xff);
+ if (ACCESSING_LSB) AY8910_write_port_1_w(machine,0, data & 0xff);
+ else AY8910_write_port_1_w(machine,0,(data >> 8) & 0xff);
}
@@ -631,7 +631,7 @@ static WRITE16_HANDLER( gtmr_oki_0_data_w )
{
if (ACCESSING_LSB)
{
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,data);
// logerror("CPU #0 PC %06X : OKI0 <- %08X\n",activecpu_get_pc(),data);
}
}
@@ -640,7 +640,7 @@ static WRITE16_HANDLER( gtmr_oki_1_data_w )
{
if (ACCESSING_LSB)
{
- OKIM6295_data_1_w(0,data);
+ OKIM6295_data_1_w(machine,0,data);
// logerror("CPU #0 PC %06X : OKI1 <- %08X\n",activecpu_get_pc(),data);
}
}
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 125033f8a74..3fc199b60d0 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -262,19 +262,19 @@ static WRITE16_HANDLER( karnov_control_w )
/* Mnemonics filled in from the schematics, brackets are my comments */
switch (offset<<1) {
case 0: /* SECLR (Interrupt ack for Level 6 i8751 interrupt) */
- cpunum_set_input_line(Machine, 0,6,CLEAR_LINE);
+ cpunum_set_input_line(machine, 0,6,CLEAR_LINE);
if (i8751_needs_ack) {
/* If a command and coin insert happen at once, then the i8751 will queue the
coin command until the previous command is ACK'd */
if (i8751_coin_pending) {
i8751_return=i8751_coin_pending;
- cpunum_set_input_line(Machine, 0,6,HOLD_LINE);
+ cpunum_set_input_line(machine, 0,6,HOLD_LINE);
i8751_coin_pending=0;
} else if (i8751_command_queue) {
/* Pending control command - just write it back as SECREQ */
i8751_needs_ack=0;
- karnov_control_w(3,i8751_command_queue,0xffff);
+ karnov_control_w(machine,3,i8751_command_queue,0xffff);
i8751_command_queue=0;
} else {
i8751_needs_ack=0;
@@ -283,12 +283,12 @@ static WRITE16_HANDLER( karnov_control_w )
return;
case 2: /* SONREQ (Sound CPU byte) */
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line (Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line (machine, 1, INPUT_LINE_NMI, PULSE_LINE);
break;
case 4: /* DM (DMA to buffer spriteram) */
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
break;
case 6: /* SECREQ (Interrupt & Data to i8751) */
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 56e40d0c8cb..ca7cfc05155 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -128,8 +128,8 @@ static WRITE8_HANDLER( sound_control_w ) {
}
static WRITE8_HANDLER( sound_command_w ) {
- soundlatch_w( 0, data );
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff );
+ soundlatch_w( machine, 0, data );
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff );
}
static int msm_data = 0;
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 469f031dc48..6bc50aa4861 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -226,7 +226,7 @@ static WRITE16_HANDLER( actionhw_snd_w )
case 0xfd: OKIM6295_set_bank_base(0, (2 * 0x40000)); break;
case 0xfe: OKIM6295_set_bank_base(0, (1 * 0x40000)); break;
case 0xff: OKIM6295_set_bank_base(0, (3 * 0x40000)); break;
- case 0x78: OKIM6295_data_0_w(0,data);
+ case 0x78: OKIM6295_data_0_w(machine,0,data);
snd_sam[0]=00; snd_sam[1]=00; snd_sam[2]=00; snd_sam[3]=00;
break;
default: if (snd_new) /* Play new sample */
@@ -234,44 +234,44 @@ static WRITE16_HANDLER( actionhw_snd_w )
if ((data & 0x80) && (snd_sam[3] != snd_new))
{
logerror("About to play sample %02x at vol %02x\n",snd_new,data);
- if ((OKIM6295_status_0_r(0) & 0x08) != 0x08)
+ if ((OKIM6295_status_0_r(machine,0) & 0x08) != 0x08)
{
logerror("Playing sample %02x at vol %02x\n",snd_new,data);
- OKIM6295_data_0_w(0,snd_new);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,snd_new);
+ OKIM6295_data_0_w(machine,0,data);
}
snd_new = 00;
}
if ((data & 0x40) && (snd_sam[2] != snd_new))
{
logerror("About to play sample %02x at vol %02x\n",snd_new,data);
- if ((OKIM6295_status_0_r(0) & 0x04) != 0x04)
+ if ((OKIM6295_status_0_r(machine,0) & 0x04) != 0x04)
{
logerror("Playing sample %02x at vol %02x\n",snd_new,data);
- OKIM6295_data_0_w(0,snd_new);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,snd_new);
+ OKIM6295_data_0_w(machine,0,data);
}
snd_new = 00;
}
if ((data & 0x20) && (snd_sam[1] != snd_new))
{
logerror("About to play sample %02x at vol %02x\n",snd_new,data);
- if ((OKIM6295_status_0_r(0) & 0x02) != 0x02)
+ if ((OKIM6295_status_0_r(machine,0) & 0x02) != 0x02)
{
logerror("Playing sample %02x at vol %02x\n",snd_new,data);
- OKIM6295_data_0_w(0,snd_new);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,snd_new);
+ OKIM6295_data_0_w(machine,0,data);
}
snd_new = 00;
}
if ((data & 0x10) && (snd_sam[0] != snd_new))
{
logerror("About to play sample %02x at vol %02x\n",snd_new,data);
- if ((OKIM6295_status_0_r(0) & 0x01) != 0x01)
+ if ((OKIM6295_status_0_r(machine,0) & 0x01) != 0x01)
{
logerror("Playing sample %02x at vol %02x\n",snd_new,data);
- OKIM6295_data_0_w(0,snd_new);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,snd_new);
+ OKIM6295_data_0_w(machine,0,data);
}
snd_new = 00;
}
@@ -286,7 +286,7 @@ static WRITE16_HANDLER( actionhw_snd_w )
else /* Turn a channel off */
{
logerror("Turning channel %02x off\n",data);
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,data);
if (data & 0x40) snd_sam[3] = 00;
if (data & 0x20) snd_sam[2] = 00;
if (data & 0x10) snd_sam[1] = 00;
@@ -305,7 +305,7 @@ static int m6295_bank;
static UINT16 m6295_key_delay;
static INTERRUPT_GEN( kickgoal_interrupt )
{
- if ((OKIM6295_status_0_r(0) & 0x08) == 0)
+ if ((OKIM6295_status_0_r(machine,0) & 0x08) == 0)
{
switch(kickgoal_melody_loop)
{
@@ -334,8 +334,8 @@ static INTERRUPT_GEN( kickgoal_interrupt )
if (kickgoal_melody_loop)
{
// logerror("Changing to sample %02x\n",kickgoal_melody_loop);
- OKIM6295_data_0_w(0,((0x80 | kickgoal_melody_loop) & 0xff));
- OKIM6295_data_0_w(0,0x81);
+ OKIM6295_data_0_w(machine,0,((0x80 | kickgoal_melody_loop) & 0xff));
+ OKIM6295_data_0_w(machine,0,0x81);
}
}
if ( input_code_pressed_once(KEYCODE_PGUP) )
@@ -412,9 +412,9 @@ static INTERRUPT_GEN( kickgoal_interrupt )
{
if (m6295_key_delay >= (0x80 * oki_time_base))
{
- OKIM6295_data_0_w(0,0x78);
- OKIM6295_data_0_w(0,(0x80 | m6295_comm));
- OKIM6295_data_0_w(0,0x11);
+ OKIM6295_data_0_w(machine,0,0x78);
+ OKIM6295_data_0_w(machine,0,(0x80 | m6295_comm));
+ OKIM6295_data_0_w(machine,0,0x11);
popmessage("Playing sound %02x on Bank %02x",m6295_comm,m6295_bank);
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index c9fb58dbacd..cb35db0c5b6 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -61,21 +61,21 @@ static WRITE8_HANDLER( sprite_shared_w ) {
}
static WRITE8_HANDLER( video_interrupt_w ) {
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff );
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff );
}
static WRITE8_HANDLER( sprite_interrupt_w ) {
- cpunum_set_input_line_and_vector(Machine, 2, 0, HOLD_LINE, 0xff );
+ cpunum_set_input_line_and_vector(machine, 2, 0, HOLD_LINE, 0xff );
}
static WRITE8_HANDLER( scroll_interrupt_w ) {
- sprite_interrupt_w( offset, data );
+ sprite_interrupt_w( machine, offset, data );
*kingofb_scroll_y = data;
}
static WRITE8_HANDLER( sound_command_w ) {
- soundlatch_w( 0, data );
- cpunum_set_input_line_and_vector(Machine, 3, 0, HOLD_LINE, 0xff );
+ soundlatch_w( machine, 0, data );
+ cpunum_set_input_line_and_vector(machine, 3, 0, HOLD_LINE, 0xff );
}
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 30075815b5d..e94c8ffedcc 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -275,25 +275,25 @@ static const struct ide_interface ide_intf =
static READ32_HANDLER( ide_controller_r )
{
- return midway_ide_asic_r(offset / 2, mem_mask);
+ return midway_ide_asic_r(machine, offset / 2, mem_mask);
}
static WRITE32_HANDLER( ide_controller_w )
{
- midway_ide_asic_w(offset / 2, data, mem_mask);
+ midway_ide_asic_w(machine, offset / 2, data, mem_mask);
}
static READ32_HANDLER( ide_controller_extra_r )
{
- return ide_controller32_0_r(0x3f6/4, 0xff00ffff) >> 16;
+ return ide_controller32_0_r(machine, 0x3f6/4, 0xff00ffff) >> 16;
}
static WRITE32_HANDLER( ide_controller_extra_w )
{
- ide_controller32_0_w(0x3f6/4, data << 16, 0xff00ffff);
+ ide_controller32_0_w(machine, 0x3f6/4, data << 16, 0xff00ffff);
}
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 78587f0fc75..8b8e81faf5e 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -84,12 +84,12 @@ ADDRESS_MAP_END
static READ8_HANDLER( spc_ram_100_r )
{
- return spc_ram_r(offset + 0x100);
+ return spc_ram_r(machine, offset + 0x100);
}
static WRITE8_HANDLER( spc_ram_100_w )
{
- spc_ram_w(offset + 0x100, data);
+ spc_ram_w(machine, offset + 0x100, data);
}
static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 3c782feaf52..4955672b32d 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -54,8 +54,8 @@ static void scanline_update(running_machine *machine, int scrnum, int scanline)
static WRITE16_HANDLER( interrupt_ack_w )
{
- atarigen_scanline_int_ack_w(offset, data, mem_mask);
- atarigen_video_int_ack_w(offset, data, mem_mask);
+ atarigen_scanline_int_ack_w(machine, offset, data, mem_mask);
+ atarigen_video_int_ack_w(machine, offset, data, mem_mask);
}
@@ -83,14 +83,14 @@ static MACHINE_RESET( klax )
static READ16_HANDLER( adpcm_r )
{
- return OKIM6295_status_0_r(offset) | 0xff00;
+ return OKIM6295_status_0_r(machine, offset) | 0xff00;
}
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_LSB)
- OKIM6295_data_0_w(offset, data & 0xff);
+ OKIM6295_data_0_w(machine, offset, data & 0xff);
}
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index ea7539caf9a..8089816abf7 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -73,7 +73,7 @@ static READ8_HANDLER(input_r)
if(inputcnt<0){ return 0; }
if(!inputcnt)
{
- int key=input_port_2_word_r(0,0);
+ int key=input_port_2_word_r(machine,0,0);
int keyval=0; //we must return 0 (0x2 in 2nd read) to clear 4 bit at $6600 and allow next read
if(key)
@@ -104,7 +104,7 @@ static READ8_HANDLER(io_r)
{
if(!offset)
{
- return input_port_1_r(0)^ioram[4]; //coin
+ return input_port_1_r(machine,0)^ioram[4]; //coin
}
return 0;
}
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index eaaf0037afc..1f627c855ad 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -225,11 +225,11 @@ static READ16_HANDLER( dual539_r )
data = 0;
if( ACCESSING_LSB16 )
{
- data |= K054539_1_r( offset );
+ data |= K054539_1_r( machine, offset );
}
if( ACCESSING_MSB16 )
{
- data |= K054539_0_r( offset ) << 8;
+ data |= K054539_0_r( machine, offset ) << 8;
}
return data;
}
@@ -238,11 +238,11 @@ static WRITE16_HANDLER( dual539_w )
{
if( ACCESSING_LSB16 )
{
- K054539_1_w( offset, data );
+ K054539_1_w( machine, offset, data );
}
if( ACCESSING_MSB16 )
{
- K054539_0_w( offset, data >> 8 );
+ K054539_0_w( machine, offset, data >> 8 );
}
}
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index ec13b2f8099..a76ea199314 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -919,12 +919,12 @@ static READ32_HANDLER( players_r )
static READ32_HANDLER( gx5bppspr_r )
{
- return (K055673_rom_word_r(offset*2+1, 0xffff) | K055673_rom_word_r(offset*2, 0xffff)<<16);
+ return (K055673_rom_word_r(machine, offset*2+1, 0xffff) | K055673_rom_word_r(machine, offset*2, 0xffff)<<16);
}
static READ32_HANDLER( gx6bppspr_r )
{
- return (K055673_GX6bpp_rom_word_r(offset*2+1, 0xffff) | K055673_GX6bpp_rom_word_r(offset*2, 0xffff)<<16);
+ return (K055673_GX6bpp_rom_word_r(machine, offset*2+1, 0xffff) | K055673_GX6bpp_rom_word_r(machine, offset*2, 0xffff)<<16);
}
static READ32_HANDLER( type1_roz_r1 )
@@ -1208,9 +1208,9 @@ static READ16_HANDLER( dual539_r )
UINT16 ret = 0;
if (ACCESSING_LSB16)
- ret |= K054539_1_r(offset);
+ ret |= K054539_1_r(machine, offset);
if (ACCESSING_MSB16)
- ret |= K054539_0_r(offset)<<8;
+ ret |= K054539_0_r(machine, offset)<<8;
return ret;
}
@@ -1218,9 +1218,9 @@ static READ16_HANDLER( dual539_r )
static WRITE16_HANDLER( dual539_w )
{
if (ACCESSING_LSB16)
- K054539_1_w(offset, data);
+ K054539_1_w(machine, offset, data);
if (ACCESSING_MSB16)
- K054539_0_w(offset, data>>8);
+ K054539_0_w(machine, offset, data>>8);
}
static READ16_HANDLER( sndcomm68k_r )
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 907471ebcf5..673b432361c 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -18,12 +18,12 @@ static INTERRUPT_GEN( kopunch_interrupt )
{
if (cpu_getiloops() == 0)
{
- if (~input_port_1_r(0) & 0x80) /* coin 1 */
+ if (~input_port_1_r(machine,0) & 0x80) /* coin 1 */
{
cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0xf7); /* RST 30h */
return;
}
- else if (~input_port_1_r(0) & 0x08) /* coin 2 */
+ else if (~input_port_1_r(machine,0) & 0x08) /* coin 2 */
{
cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0xef); /* RST 28h */
return;
@@ -37,9 +37,9 @@ static READ8_HANDLER( kopunch_in_r )
{
/* port 31 + low 3 bits of port 32 contain the punch strength */
if (offset == 0)
- return mame_rand(Machine);
+ return mame_rand(machine);
else
- return (mame_rand(Machine) & 0x07) | input_port_1_r(0);
+ return (mame_rand(machine) & 0x07) | input_port_1_r(machine,0);
}
static WRITE8_HANDLER( kopunch_lamp_w )
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 138422d0e32..381f55d7ce2 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -91,7 +91,7 @@ static WRITE8_HANDLER( bank_select_w )
static WRITE8_HANDLER( latch_w )
{
sound_status&=~0x80;
- soundlatch_w(0,data|0x80);
+ soundlatch_w(machine,0,data|0x80);
}
static READ8_HANDLER (sound_status_r)
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 27e48428b77..51079b1c3a0 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -40,7 +40,7 @@ MACHINE_RESET( kyugo )
{
// must start with interrupts and sub CPU disabled
cpu_interrupt_enable(0, 0);
- kyugo_sub_cpu_control_w(0, 0);
+ kyugo_sub_cpu_control_w(machine, 0, 0);
}
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 0c2a205d675..f4e71ae1394 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -97,7 +97,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 56cf854c662..a67e1e67613 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -599,9 +599,9 @@ static int active_8910,port0a;
static READ8_HANDLER( zaccaria_port0a_r )
{
if (active_8910 == 0)
- return AY8910_read_port_0_r(0);
+ return AY8910_read_port_0_r(machine,0);
else
- return AY8910_read_port_1_r(0);
+ return AY8910_read_port_1_r(machine,0);
}
static WRITE8_HANDLER( zaccaria_port0a_w )
@@ -619,9 +619,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
{
/* bit 0 goes to the 8910 #0 BC1 pin */
if (last & 0x01)
- AY8910_control_port_0_w(0,port0a);
+ AY8910_control_port_0_w(machine,0,port0a);
else
- AY8910_write_port_0_w(0,port0a);
+ AY8910_write_port_0_w(machine,0,port0a);
}
else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02)
{
@@ -634,9 +634,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
{
/* bit 2 goes to the 8910 #1 BC1 pin */
if (last & 0x04)
- AY8910_control_port_1_w(0,port0a);
+ AY8910_control_port_1_w(machine,0,port0a);
else
- AY8910_write_port_1_w(0,port0a);
+ AY8910_write_port_1_w(machine,0,port0a);
}
else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08)
{
@@ -683,7 +683,7 @@ static INTERRUPT_GEN( zaccaria_cb1_toggle )
{
static int toggle;
- pia_0_cb1_w(0,toggle & 1);
+ pia_0_cb1_w(machine,0,toggle & 1);
toggle ^= 1;
}
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 3b325330ee7..cfa801d338e 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -45,14 +45,14 @@ static UINT8 *lasso_chip_data;
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1, 0, PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1, 0, PULSE_LINE);
}
static WRITE8_HANDLER( pinbo_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ8_HANDLER( sound_status_r )
@@ -66,10 +66,10 @@ static WRITE8_HANDLER( sound_select_w )
UINT8 to_write = BITSWAP8(*lasso_chip_data, 0, 1, 2, 3, 4, 5, 6, 7);
if (~data & 0x01) /* chip #0 */
- SN76496_0_w(0, to_write);
+ SN76496_0_w(machine, 0, to_write);
if (~data & 0x02) /* chip #1 */
- SN76496_1_w(0, to_write);
+ SN76496_1_w(machine, 0, to_write);
}
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 8fe5448812c..0deb8b220fb 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -40,7 +40,7 @@ extern UINT16 *lastduel_vram,*lastduel_scroll2,*lastduel_scroll1;
static WRITE16_HANDLER( lastduel_sound_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
/******************************************************************************/
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 539bd6758ac..230d2f68bbb 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -286,7 +286,7 @@ static WRITE8_HANDLER( lazercmd_data_port_w )
static READ8_HANDLER( lazercmd_data_port_r )
{
int data;
- data = input_port_2_r(0) & 0x0f;
+ data = input_port_2_r(machine,0) & 0x0f;
return data;
}
@@ -381,16 +381,16 @@ static READ8_HANDLER( lazercmd_hardware_r )
switch (offset)
{
case 0: /* player 1 joysticks */
- data = input_port_0_r(0);
+ data = input_port_0_r(machine,0);
break;
case 1: /* player 2 joysticks */
- data = input_port_1_r(0);
+ data = input_port_1_r(machine,0);
break;
case 2: /* player 1 + 2 buttons */
- data = input_port_4_r(0);
+ data = input_port_4_r(machine,0);
break;
case 3: /* coin slot + start buttons */
- data = input_port_3_r(0);
+ data = input_port_3_r(machine,0);
break;
case 4: /* vertical scan counter */
data = ((timer_count&0x10)>>1)|((timer_count&0x20)>>3)|((timer_count&0x40)>>5)|((timer_count&0x80)>>7);
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 9e09d219b9b..5381fb68592 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -543,27 +543,27 @@ static READ16_HANDLER( mcu_r )
/* Non-protection reads */
case (0x708/2): /* seibu sound: these three around $b10 on */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x70c/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x714/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
/* Inputs */
case (0x740/2): /* code at $b00 sticks waiting for bit 6 hi */
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x744/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x748/2): /* code at $f4a reads this 4 times in _weird_ fashion */
- return input_port_0_word_r(0,0);
+ return input_port_0_word_r(machine,0,0);
case (0x74c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
}
//logerror("CPU0 PC %06x unknown MCU read offset: %04x\n",activecpu_get_previouspc(),offset);
@@ -699,22 +699,22 @@ static WRITE16_HANDLER( mcu_w )
}
case (0x700/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x704/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x710/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x718/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
// default:
@@ -1129,27 +1129,27 @@ static READ16_HANDLER( cop2_mcu_r )
/* Non-protection reads */
case (0x7c8/2): /* seibu sound */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x7cc/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x7d4/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
/* Inputs */
case (0x740/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x744/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x748/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x74c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
}
//logerror("CPU0 PC %06x unknown MCU read offset: %04x\n",activecpu_get_previouspc(),offset);
@@ -1359,22 +1359,22 @@ static WRITE16_HANDLER( cop2_mcu_w )
}
case (0x7c0/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x7c4/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x7d0/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x7d8/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
default:
@@ -1443,30 +1443,30 @@ static READ16_HANDLER( sdgndmrb_cop_mcu_r )
/* Non-protection reads */
case (0x708/2): /* seibu sound */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x70c/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x714/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
/* Inputs */
case (0x740/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x744/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x748/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x74c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
case (0x75c/2):
- return input_port_5_word_r(0,0);
+ return input_port_5_word_r(machine,0,0);
}
// return mame_rand(Machine);
if(offset > (0x500/2) && offset < (0x600/2))
@@ -1822,22 +1822,22 @@ static WRITE16_HANDLER( sdgndmrb_cop_mcu_w )
case (0x700/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x704/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x710/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x718/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
@@ -1885,27 +1885,27 @@ static READ16_HANDLER( denjinmk_cop_mcu_r )
/* Non-protection reads */
case (0x708/2): /* seibu sound */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x70c/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x714/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
/* Inputs */
case (0x740/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x744/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x748/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x74c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
}
//logerror("CPU0 PC %06x unknown MCU read offset: %04x\n",activecpu_get_previouspc(),offset);
@@ -1967,22 +1967,22 @@ static WRITE16_HANDLER( denjinmk_cop_mcu_w )
}
case (0x700/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x704/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x710/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x718/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
// default:
@@ -2029,27 +2029,27 @@ static READ16_HANDLER( godzilla_cop_mcu_r )
/* Non-protection reads */
case (0x7c8/2): /* seibu sound */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x7cc/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x7d4/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
/* Inputs */
case (0x740/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x744/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x748/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x74c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
}
// if(offset >= (0x400/2) && offset < (0x600/2) && offset != (0x5a4/2))
@@ -2129,22 +2129,22 @@ static WRITE16_HANDLER( godzilla_cop_mcu_w )
case (0x7c0/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x7c4/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x7d0/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x7d8/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
// default:
@@ -2162,26 +2162,26 @@ static READ16_HANDLER( copdx_0_r )
// return mcu_ram[offset];
case (0x700/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x704/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x708/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x70c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
case (0x71c/2):
- return input_port_5_word_r(0,0);
+ return input_port_5_word_r(machine,0,0);
case (0x748/2): /* seibu sound */
- return seibu_main_word_r(2,0);
+ return seibu_main_word_r(machine,2,0);
case (0x74c/2):
- return seibu_main_word_r(3,0);
+ return seibu_main_word_r(machine,3,0);
case (0x754/2):
- return seibu_main_word_r(5,0);
+ return seibu_main_word_r(machine,5,0);
}
@@ -2386,22 +2386,22 @@ static WRITE16_HANDLER( copdx_0_w )
case (0x740/2): /* seibu(0) */
{
- seibu_main_word_w(0,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,0,mcu_ram[offset],0xff00);
break;
}
case (0x744/2): /* seibu(1) */
{
- seibu_main_word_w(1,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,1,mcu_ram[offset],0xff00);
break;
}
case (0x750/2): /* seibu(4) */
{
- seibu_main_word_w(4,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,4,mcu_ram[offset],0xff00);
break;
}
case (0x758/2): /* seibu(6) */
{
- seibu_main_word_w(6,mcu_ram[offset],0xff00);
+ seibu_main_word_w(machine,6,mcu_ram[offset],0xff00);
break;
}
}
@@ -2418,19 +2418,19 @@ static READ16_HANDLER( copdxbl_0_r )
// return mcu_ram[offset];
case (0x700/2):
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
case (0x704/2):
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
case (0x708/2):
- return input_port_4_word_r(0,0);
+ return input_port_4_word_r(machine,0,0);
case (0x70c/2):
- return input_port_3_word_r(0,0);
+ return input_port_3_word_r(machine,0,0);
case (0x71c/2):
- return input_port_5_word_r(0,0);
+ return input_port_5_word_r(machine,0,0);
#if 0
case (0x748/2): /* seibu sound */
return seibu_main_word_r(2,0);
@@ -2564,8 +2564,8 @@ static WRITE16_HANDLER( copdxbl_0_w )
/*WRONG*/
case (0x65c/2):
{
- soundlatch_w(1,data&0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data&0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
break;
}
/*video regs (not scrollram,something else)*/
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 3de0eb8c93d..83ad94bff40 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -74,8 +74,8 @@ static WRITE16_HANDLER( lemmings_palette_24bit_w )
static WRITE16_HANDLER( lemmings_sound_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,1,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,1,HOLD_LINE);
}
static WRITE8_HANDLER( lemmings_sound_ack_w )
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index e6425f92afb..f142017ab76 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -230,7 +230,7 @@ static NVRAM_HANDLER( lethalen )
static READ8_HANDLER( control2_r )
{
- return 0x02 | EEPROM_read_bit() | (input_port_1_r(0) & 0xf0);
+ return 0x02 | EEPROM_read_bit() | (input_port_1_r(machine,0) & 0xf0);
}
static WRITE8_HANDLER( control2_w )
@@ -257,7 +257,7 @@ static INTERRUPT_GEN(lethalen_interrupt)
static WRITE8_HANDLER( sound_cmd_w )
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
static WRITE8_HANDLER( sound_irq_w )
@@ -301,7 +301,7 @@ static READ8_HANDLER( le_4800_r )
case 0x44:
case 0x45:
case 0x46:
- return K053244_r(offset-0x40);
+ return K053244_r(machine,offset-0x40);
break;
case 0x80:
@@ -336,24 +336,24 @@ static READ8_HANDLER( le_4800_r )
case 0x9d:
case 0x9e:
case 0x9f:
- return K054000_r(offset-0x80);
+ return K054000_r(machine,offset-0x80);
break;
case 0xca:
- return sound_status_r(0);
+ return sound_status_r(machine,0);
break;
}
}
else if (offset < 0x1800)
- return K053245_r((offset - 0x0800) & 0x07ff);
+ return K053245_r(machine,(offset - 0x0800) & 0x07ff);
else if (offset < 0x2000)
- return K056832_ram_code_lo_r(offset - 0x1800);
+ return K056832_ram_code_lo_r(machine,offset - 0x1800);
else if (offset < 0x2800)
- return K056832_ram_code_hi_r(offset - 0x2000);
+ return K056832_ram_code_hi_r(machine,offset - 0x2000);
else if (offset < 0x3000)
- return K056832_ram_attr_lo_r(offset - 0x2800);
+ return K056832_ram_attr_lo_r(machine,offset - 0x2800);
else // (offset < 0x3800)
- return K056832_ram_attr_hi_r(offset - 0x3000);
+ return K056832_ram_attr_hi_r(machine,offset - 0x3000);
}
return 0;
@@ -363,7 +363,7 @@ static WRITE8_HANDLER( le_4800_w )
{
if (cur_control2 & 0x10) // RAM enable
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
else
{
@@ -372,11 +372,11 @@ static WRITE8_HANDLER( le_4800_w )
switch (offset)
{
case 0xc6:
- sound_cmd_w(0, data);
+ sound_cmd_w(machine, 0, data);
break;
case 0xc7:
- sound_irq_w(0, data);
+ sound_irq_w(machine, 0, data);
break;
case 0x40:
@@ -386,7 +386,7 @@ static WRITE8_HANDLER( le_4800_w )
case 0x44:
case 0x45:
case 0x46:
- K053244_w(offset-0x40, data);
+ K053244_w(machine, offset-0x40, data);
break;
case 0x80:
@@ -421,7 +421,7 @@ static WRITE8_HANDLER( le_4800_w )
case 0x9d:
case 0x9e:
case 0x9f:
- K054000_w(offset-0x80, data);
+ K054000_w(machine, offset-0x80, data);
break;
default:
@@ -431,24 +431,24 @@ static WRITE8_HANDLER( le_4800_w )
}
else if (offset < 0x1800)
{
- K053245_w((offset - 0x0800) & 0x07ff, data);
+ K053245_w(machine, (offset - 0x0800) & 0x07ff, data);
}
else if (offset < 0x2000)
- K056832_ram_code_lo_w(offset - 0x1800, data);
+ K056832_ram_code_lo_w(machine, offset - 0x1800, data);
else if (offset < 0x2800)
- K056832_ram_code_hi_w(offset - 0x2000, data);
+ K056832_ram_code_hi_w(machine, offset - 0x2000, data);
else if (offset < 0x3000)
- K056832_ram_attr_lo_w(offset - 0x2800, data);
+ K056832_ram_attr_lo_w(machine, offset - 0x2800, data);
else // (offset < 0x3800)
- K056832_ram_attr_hi_w(offset - 0x3000, data);
+ K056832_ram_attr_hi_w(machine, offset - 0x3000, data);
}
}
// use one more palette entry for the BG color
static WRITE8_HANDLER(le_bgcolor_w)
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(0x3800+offset, data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,0x3800+offset, data);
}
static READ8_HANDLER(guns_r)
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 720a6d50709..86c63708857 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -64,7 +64,7 @@ Note 2: Lethal Justice uses a TMS34010FNL-50 instead of the TMS34010FNL-40
static CUSTOM_INPUT( ticket_status )
{
- return ticket_dispenser_0_r(0) >> 7;
+ return ticket_dispenser_0_r(machine, 0) >> 7;
}
@@ -85,14 +85,14 @@ static CUSTOM_INPUT( cclownz_paddle )
static WRITE16_HANDLER( ripribit_control_w )
{
coin_counter_w(0, data & 1);
- ticket_dispenser_0_w(0, ((data >> 1) & 1) << 7);
+ ticket_dispenser_0_w(machine, 0, ((data >> 1) & 1) << 7);
output_set_lamp_value(0, (data >> 2) & 1);
}
static WRITE16_HANDLER( cfarm_control_w )
{
- ticket_dispenser_0_w(0, ((data >> 0) & 1) << 7);
+ ticket_dispenser_0_w(machine, 0, ((data >> 0) & 1) << 7);
output_set_lamp_value(0, (data >> 2) & 1);
output_set_lamp_value(1, (data >> 3) & 1);
output_set_lamp_value(2, (data >> 4) & 1);
@@ -102,7 +102,7 @@ static WRITE16_HANDLER( cfarm_control_w )
static WRITE16_HANDLER( cclownz_control_w )
{
- ticket_dispenser_0_w(0, ((data >> 0) & 1) << 7);
+ ticket_dispenser_0_w(machine, 0, ((data >> 0) & 1) << 7);
output_set_lamp_value(0, (data >> 2) & 1);
output_set_lamp_value(1, (data >> 4) & 1);
output_set_lamp_value(2, (data >> 5) & 1);
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index aaf5c3f4e64..73cbcbfe424 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -94,7 +94,7 @@ static WRITE32_HANDLER( fg_videoram_w )
static WRITE32_HANDLER( spotty_soundlatch_w )
{
- soundlatch_w(0, (data >> 16) & 0xff);
+ soundlatch_w(machine, 0, (data >> 16) & 0xff);
}
/*****************************************************************************************************
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index 013610c69cc..c33252ee228 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -62,7 +62,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( lkage_sound_command_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index ff638712f24..2135dc92345 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -161,7 +161,7 @@ static WRITE16_HANDLER( inten_w )
static WRITE16_HANDLER( emres_w )
{
- watchdog_reset_r(0);
+ watchdog_reset(machine);
lockon_main_inten = 0;
}
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 7f8361232da..7abadf2dba0 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -312,21 +312,21 @@ static INTERRUPT_GEN( looping_interrupt )
static WRITE8_HANDLER( level2_irq_set )
{
if (!(data & 1))
- cpunum_set_input_line_and_vector(Machine, 0, 0, ASSERT_LINE, 4);
+ cpunum_set_input_line_and_vector(machine, 0, 0, ASSERT_LINE, 4);
}
static WRITE8_HANDLER( main_irq_ack_w )
{
if (data == 0)
- cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
}
static WRITE8_HANDLER( looping_souint_clr )
{
if (data == 0)
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
}
@@ -338,8 +338,8 @@ static void looping_spcint(int state)
static WRITE8_HANDLER( looping_soundlatch_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line_and_vector(Machine, 1, 0, ASSERT_LINE, 4);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line_and_vector(machine, 1, 0, ASSERT_LINE, 4);
}
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 583883d4c7d..336ee87fa5e 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -152,11 +152,11 @@ static WRITE16_HANDLER( lordgun_priority_w )
// popmessage("PR: %04x", data);
}
-static READ16_HANDLER( lordgun_ppi8255_0_r ) { return ppi8255_0_r(offset); }
-static READ16_HANDLER( lordgun_ppi8255_1_r ) { return ppi8255_1_r(offset); }
+static READ16_HANDLER( lordgun_ppi8255_0_r ) { return ppi8255_0_r(machine, offset); }
+static READ16_HANDLER( lordgun_ppi8255_1_r ) { return ppi8255_1_r(machine, offset); }
-static WRITE16_HANDLER( lordgun_ppi8255_0_w ) { ppi8255_0_w(offset, data & 0xff); }
-static WRITE16_HANDLER( lordgun_ppi8255_1_w ) { ppi8255_1_w(offset, data & 0xff); }
+static WRITE16_HANDLER( lordgun_ppi8255_0_w ) { ppi8255_0_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( lordgun_ppi8255_1_w ) { ppi8255_1_w(machine, offset, data & 0xff); }
static READ16_HANDLER( lordgun_gun_0_x_r ) { return lordgun_gun[0].hw_x; }
static READ16_HANDLER( lordgun_gun_0_y_r ) { return lordgun_gun[0].hw_y; }
@@ -166,10 +166,10 @@ static READ16_HANDLER( lordgun_gun_1_y_r ) { return lordgun_gun[1].hw_y; }
static WRITE16_HANDLER( lordgun_soundlatch_w )
{
- if (ACCESSING_LSB) soundlatch_w (0, (data >> 0) & 0xff);
- if (ACCESSING_MSB) soundlatch2_w(0, (data >> 8) & 0xff);
+ if (ACCESSING_LSB) soundlatch_w (machine, 0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) soundlatch2_w(machine, 0, (data >> 8) & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static ADDRESS_MAP_START( lordgun_map, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 7c234a783a0..fa48ddf72ea 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -88,7 +88,7 @@ static WRITE8_HANDLER( lwings_bankswitch_w )
memory_set_bankptr(1,&RAM[0x10000 + bank*0x4000]);
/* bit 3 enables NMI */
- interrupt_enable_w(0,data & 0x08);
+ interrupt_enable_w(machine,0,data & 0x08);
/* bits 6 and 7 are coin counters */
coin_counter_w(1,data & 0x40);
@@ -97,7 +97,7 @@ static WRITE8_HANDLER( lwings_bankswitch_w )
static INTERRUPT_GEN( lwings_interrupt )
{
- if (interrupt_enable_r(0))
+ if (interrupt_enable_r(machine, 0))
cpunum_set_input_line_and_vector(machine, 0,0,HOLD_LINE,0xd7); /* RST 10h */
}
@@ -125,7 +125,7 @@ static WRITE8_HANDLER( avengers_protection_w )
else if( pc == 0x0445 )
{
avengers_soundstate = 0x80;
- soundlatch_w( 0, data );
+ soundlatch_w( machine, 0, data );
}
}
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 59a8b963293..773427a47b1 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -122,7 +122,7 @@ static TIMER_CALLBACK( setvector_callback )
static WRITE16_HANDLER( m107_soundlatch_w )
{
timer_call_after_resynch(NULL, V30_ASSERT,setvector_callback);
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(machine, 0, data & 0xff);
// logerror("soundlatch_w %02x\n",data);
}
@@ -135,7 +135,7 @@ static READ16_HANDLER( m107_sound_status_r )
static READ16_HANDLER( m107_soundlatch_r )
{
- return soundlatch_r(offset) | 0xff00;
+ return soundlatch_r(machine, offset) | 0xff00;
}
static WRITE16_HANDLER( m107_sound_irq_ack_w )
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index ceb4a4ae5a9..3d95d0bc4c1 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -186,9 +186,9 @@ static int find_sample(int num)
static INTERRUPT_GEN(fake_nmi)
{
- int sample = m72_sample_r(0);
+ int sample = m72_sample_r(machine,0);
if (sample)
- m72_sample_w(0,sample);
+ m72_sample_w(machine,0,sample);
}
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index ee594ecd428..303a1d9922d 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -111,12 +111,12 @@ static const int ControllerTable[32] = {
static READ8_HANDLER( gray5bit_controller0_r )
{
- return (input_port_2_r(0) & 0xe0) | (~ControllerTable[input_port_2_r(0) & 0x1f] & 0x1f);
+ return (input_port_2_r(machine,0) & 0xe0) | (~ControllerTable[input_port_2_r(machine,0) & 0x1f] & 0x1f);
}
static READ8_HANDLER( gray5bit_controller1_r )
{
- return (input_port_3_r(0) & 0xe0) | (~ControllerTable[input_port_3_r(0) & 0x1f] & 0x1f);
+ return (input_port_3_r(machine,0) & 0xe0) | (~ControllerTable[input_port_3_r(machine,0) & 0x1f] & 0x1f);
}
static WRITE8_HANDLER( sound_w )
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 0a45db9ef9e..9677968c91a 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -333,7 +333,7 @@ static TIMER_CALLBACK( setvector_callback )
static WRITE16_HANDLER( m92_soundlatch_w )
{
timer_call_after_resynch(NULL, V30_ASSERT, setvector_callback);
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(machine, 0, data & 0xff);
}
static READ16_HANDLER( m92_sound_status_r )
@@ -344,7 +344,7 @@ static READ16_HANDLER( m92_sound_status_r )
static READ16_HANDLER( m92_soundlatch_r )
{
- return soundlatch_r(offset) | 0xff00;
+ return soundlatch_r(machine, offset) | 0xff00;
}
static WRITE16_HANDLER( m92_sound_irq_ack_w )
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index eb802995faa..9a21d2b1792 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -278,7 +278,7 @@ static WRITE32_HANDLER( macrossp_soundcmd_w )
if (ACCESSING_MSW32)
{
//logerror("%08x write soundcmd %08x (%08x)\n",activecpu_get_pc(),data,mem_mask);
- soundlatch_word_w(0,data >> 16,0);
+ soundlatch_word_w(machine,0,data >> 16,0);
sndpending = 1;
cpunum_set_input_line(Machine, 1,2,HOLD_LINE);
/* spin for a while to let the sound CPU read the command */
@@ -290,7 +290,7 @@ static READ16_HANDLER( macrossp_soundcmd_r )
{
// logerror("%06x read soundcmd\n",activecpu_get_pc());
sndpending = 0;
- return soundlatch_word_r(offset,mem_mask);
+ return soundlatch_word_r(machine,offset,mem_mask);
}
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 8a9032fc52c..6a0a5018d73 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -57,17 +57,15 @@ static WRITE8_HANDLER( madalien_output_w )
static WRITE8_HANDLER( madalien_sound_command_w )
{
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
-
- soundlatch_w(offset, data);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE);
+ soundlatch_w(machine, offset, data);
}
static READ8_HANDLER(madalien_sound_command_r )
{
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
-
- return soundlatch_r(offset);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
+ return soundlatch_r(machine, offset);
}
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 5bdddbcedc1..9f4704e1b74 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -43,8 +43,8 @@ static WRITE16_HANDLER( madmotor_sound_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
@@ -89,10 +89,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
@@ -101,10 +101,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 0a526d7ab40..b736d6afbe3 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -454,11 +454,11 @@ static READ8_HANDLER( mux_port_r )
{
switch( mux_data & 0x0f ) /* bits 0-3 */
{
- case 0x01: return input_port_0_r(0);
- case 0x02: return input_port_1_r(0);
- case 0x04: return input_port_2_r(0);
- case 0x08: return input_port_3_r(0);
- case 0x00: return input_port_4_r(0);
+ case 0x01: return input_port_0_r(machine,0);
+ case 0x02: return input_port_1_r(machine,0);
+ case 0x04: return input_port_2_r(machine,0);
+ case 0x08: return input_port_3_r(machine,0);
+ case 0x00: return input_port_4_r(machine,0);
}
return 0xff;
}
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index c0f6ecee75f..b075ca78de7 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -97,12 +97,12 @@ static WRITE8_HANDLER( mainevt_sh_irqcontrol_w )
upd7759_reset_w(0, data & 2);
upd7759_start_w(0, data & 1);
- interrupt_enable_w(0,data & 4);
+ interrupt_enable_w(machine,0,data & 4);
}
static WRITE8_HANDLER( devstor_sh_irqcontrol_w )
{
-interrupt_enable_w(0,data & 4);
+ interrupt_enable_w(machine,0,data & 4);
}
static WRITE8_HANDLER( mainevt_sh_bankswitch_w )
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 52a613067d4..d1eb1e3631b 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -117,7 +117,7 @@ static READ8_HANDLER( sound_ack_r )
static READ8_HANDLER( mainsnk_port_0_r )
{
- int result = input_port_0_r( 0 );
+ int result = input_port_0_r( machine, 0 );
if( !sound_cpu_ready ) result |= 0x20;
return result;
}
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 60a9e4acb94..c6367c8ca88 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -691,7 +691,7 @@ static DRIVER_INIT( 58_56 )
static WRITE8_HANDLER( mappy_snd_sharedram_w )
{
if (offset < 0x40)
- namco_15xx_w(offset,data);
+ namco_15xx_w(machine,offset,data);
else
namco_soundregs[offset] = data;
}
@@ -833,7 +833,7 @@ static MACHINE_RESET( superpac )
/* Reset all latches */
for (i = 0;i < 0x10;i += 2)
- superpac_latch_w(i,0);
+ superpac_latch_w(machine,i,0);
}
static MACHINE_RESET( phozon )
@@ -842,7 +842,7 @@ static MACHINE_RESET( phozon )
/* Reset all latches */
for (i = 0;i < 0x10;i += 2)
- phozon_latch_w(i,0);
+ phozon_latch_w(machine,i,0);
}
static MACHINE_RESET( mappy )
@@ -851,7 +851,7 @@ static MACHINE_RESET( mappy )
/* Reset all latches */
for (i = 0;i < 0x10;i += 2)
- mappy_latch_w(i,0);
+ mappy_latch_w(machine,i,0);
}
static INTERRUPT_GEN( mappy_interrupt_1 )
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 919f0f277ce..9b5ff3af6cd 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -110,14 +110,14 @@ static void init_sound( int busy_bit )
static WRITE8_HANDLER( sound_command_w )
{
sound_cpu_busy = snk_sound_busy_bit;
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, 0, HOLD_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, 0, HOLD_LINE);
}
static READ8_HANDLER( sound_command_r )
{
sound_cpu_busy = 0;
- return(soundlatch_r(0));
+ return(soundlatch_r(machine,0));
}
static READ8_HANDLER( sound_nmi_ack_r )
@@ -129,7 +129,7 @@ static READ8_HANDLER( sound_nmi_ack_r )
/* this input port has one of its bits mapped to sound CPU status */
static READ8_HANDLER( marvins_port_0_r )
{
- return(input_port_0_r(0) | sound_cpu_busy);
+ return(input_port_0_r(machine,0) | sound_cpu_busy);
}
static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 962aebd0e70..78c00a440c9 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -60,8 +60,8 @@ READ8_HANDLER( maniach_mcu_status_r );
static WRITE8_HANDLER( matmania_sh_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,M6502_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,M6502_IRQ_LINE,HOLD_LINE);
}
static WRITE8_HANDLER( matmania_dac_w )
@@ -72,8 +72,8 @@ static WRITE8_HANDLER( matmania_dac_w )
static WRITE8_HANDLER( maniach_sh_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,HOLD_LINE);
}
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 8a7429e4f0d..215b6df95b1 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -41,7 +41,7 @@ static WRITE8_HANDLER( bank_sel_w )
static MACHINE_RESET( mayumi )
{
- bank_sel_w(0,0);
+ bank_sel_w(machine,0,0);
}
static WRITE8_HANDLER( input_sel_w )
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 69952ab752c..a160f6ee618 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -161,8 +161,8 @@ static READ16_HANDLER( mcatadv_dsw_r )
static WRITE16_HANDLER( mcat_soundlatch_w )
{
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
#if 0 // mcat only.. install read handler?
@@ -180,7 +180,7 @@ static WRITE16_HANDLER( mcat_coin_w )
static READ16_HANDLER( mcat_wd_r )
{
- watchdog_reset_r(0);
+ watchdog_reset_r(machine,0);
return 0xc00;
}
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 6af8d5f375e..8cf20484d5e 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -487,7 +487,7 @@ static WRITE8_HANDLER( dotron_op4_w )
/* bit 4 = SEL0 (J1-8) on squawk n talk board */
/* bits 3-0 = MD3-0 connected to squawk n talk (J1-4,3,2,1) */
- squawkntalk_data_w(offset, data);
+ squawkntalk_data_w(machine, offset, data);
}
@@ -568,7 +568,7 @@ static WRITE8_HANDLER( nflfoot_op4_w )
/* bit 4 = SEL0 (J1-8) on squawk n talk board */
/* bits 3-0 = MD3-0 connected to squawk n talk (J1-4,3,2,1) */
- squawkntalk_data_w(offset, data);
+ squawkntalk_data_w(machine, offset, data);
}
@@ -595,7 +595,7 @@ static WRITE8_HANDLER( demoderb_op4_w )
{
if (data & 0x40) input_mux = 1;
if (data & 0x80) input_mux = 0;
- turbocs_data_w(offset, data);
+ turbocs_data_w(machine, offset, data);
}
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 1a636c86207..4004eb14c1b 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -137,7 +137,7 @@ static WRITE8_HANDLER( demoderm_op6_w )
if (data & 0x40) input_mux = 1;
/* low 5 bits control the turbo CS */
- turbocs_data_w(offset, data);
+ turbocs_data_w(machine, offset, data);
}
@@ -204,14 +204,13 @@ static WRITE8_HANDLER( maxrpm_op5_w )
maxrpm_adc_control = data & 0x0f;
/* remaining bits go to standard connections */
- mcrmono_control_port_w(offset, data);
+ mcrmono_control_port_w(machine, offset, data);
}
static WRITE8_HANDLER( maxrpm_op6_w )
{
static const char *const inputs[] = { "MONO.IP1", "MONO.IP1.ALT1", "MONO.IP1.ALT2", "MONO.IP1.ALT3" };
-
/*
Reflective Sensor Control:
4 bits of input from OP5 are routed to a transceiver at U2, and
@@ -241,7 +240,7 @@ static WRITE8_HANDLER( maxrpm_op6_w )
maxrpm_adc_select = (maxrpm_adc_control >> 1) & 3;
/* low 5 bits control the turbo CS */
- turbocs_data_w(offset, data);
+ turbocs_data_w(machine, offset, data);
}
@@ -254,7 +253,7 @@ static WRITE8_HANDLER( maxrpm_op6_w )
static READ8_HANDLER( rampage_ip4_r )
{
- return readinputportbytag("MONO.IP4") | (soundsgood_status_r(0) << 7);
+ return readinputportbytag("MONO.IP4") | (soundsgood_status_r(machine,0) << 7);
}
@@ -264,7 +263,7 @@ static WRITE8_HANDLER( rampage_op6_w )
soundsgood_reset_w((~data >> 5) & 1);
/* low 5 bits go directly to the Sounds Good board */
- soundsgood_data_w(offset, data);
+ soundsgood_data_w(machine, offset, data);
}
@@ -277,7 +276,7 @@ static WRITE8_HANDLER( rampage_op6_w )
static READ8_HANDLER( powerdrv_ip2_r )
{
- return readinputportbytag("MONO.IP2") | (soundsgood_status_r(0) << 7);
+ return readinputportbytag("MONO.IP2") | (soundsgood_status_r(machine, 0) << 7);
}
@@ -298,7 +297,7 @@ static WRITE8_HANDLER( powerdrv_op5_w )
set_led_status(2, (data >> 1) & 1);
/* remaining bits go to standard connections */
- mcrmono_control_port_w(offset, data);
+ mcrmono_control_port_w(machine, offset, data);
}
@@ -308,7 +307,7 @@ static WRITE8_HANDLER( powerdrv_op6_w )
soundsgood_reset_w((~data >> 5) & 1);
/* low 5 bits go directly to the Sounds Good board */
- soundsgood_data_w(offset, data);
+ soundsgood_data_w(machine, offset, data);
}
@@ -322,7 +321,7 @@ static WRITE8_HANDLER( powerdrv_op6_w )
static READ8_HANDLER( stargrds_ip0_r )
{
UINT8 result = readinputportbytag(input_mux ? "MONO.IP0.ALT" : "MONO.IP0");
- return result | ((soundsgood_status_r(0) << 4) & 0x10);
+ return result | ((soundsgood_status_r(machine, 0) << 4) & 0x10);
}
@@ -339,7 +338,7 @@ static WRITE8_HANDLER( stargrds_op5_w )
set_led_status(2, (data >> 4) & 1);
/* remaining bits go to standard connections */
- mcrmono_control_port_w(offset, data);
+ mcrmono_control_port_w(machine, offset, data);
}
@@ -349,7 +348,7 @@ static WRITE8_HANDLER( stargrds_op6_w )
soundsgood_reset_w((~data >> 6) & 1);
/* unline the other games, the STROBE is in the high bit instead of the low bit */
- soundsgood_data_w(offset, (data << 1) | (data >> 7));
+ soundsgood_data_w(machine, offset, (data << 1) | (data >> 7));
}
@@ -362,7 +361,7 @@ static WRITE8_HANDLER( stargrds_op6_w )
static READ8_HANDLER( spyhunt_ip1_r )
{
- return readinputportbytag("SSIO.IP1") | (csdeluxe_status_r(0) << 5);
+ return readinputportbytag("SSIO.IP1") | (csdeluxe_status_r(machine, 0) << 5);
}
@@ -406,7 +405,7 @@ static WRITE8_HANDLER( spyhunt_op4_w )
last_op4 = data;
/* low 5 bits go to control the Chip Squeak Deluxe */
- csdeluxe_data_w(offset, data);
+ csdeluxe_data_w(machine, offset, data);
}
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 0b096f38554..584a3e266aa 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -92,7 +92,7 @@ static READ16_HANDLER( zwackery_6840_r )
/* make this happen, we must assume that reads from the */
/* 6840 take 14 additional cycles */
activecpu_adjust_icount(-14);
- return mcr68_6840_upper_r(offset,0);
+ return mcr68_6840_upper_r(machine,offset,0);
}
@@ -107,7 +107,7 @@ static WRITE16_HANDLER( xenophobe_control_w )
{
COMBINE_DATA(&control_word);
/* soundsgood_reset_w(~control_word & 0x0020);*/
- soundsgood_data_w(offset, ((control_word & 0x000f) << 1) | ((control_word & 0x0010) >> 4));
+ soundsgood_data_w(machine, offset, ((control_word & 0x000f) << 1) | ((control_word & 0x0010) >> 4));
}
@@ -122,7 +122,7 @@ static WRITE16_HANDLER( blasted_control_w )
{
COMBINE_DATA(&control_word);
/* soundsgood_reset_w(~control_word & 0x0020);*/
- soundsgood_data_w(offset, (control_word >> 8) & 0x1f);
+ soundsgood_data_w(machine, offset, (control_word >> 8) & 0x1f);
}
@@ -138,14 +138,14 @@ static READ16_HANDLER( spyhunt2_port_0_r )
int result = readinputportbytag("IN0");
int which = (control_word >> 3) & 3;
int analog = readinputport(3 + which);
- return result | ((soundsgood_status_r(0) & 1) << 5) | (analog << 8);
+ return result | ((soundsgood_status_r(machine, 0) & 1) << 5) | (analog << 8);
}
static READ16_HANDLER( spyhunt2_port_1_r )
{
int result = readinputportbytag("IN1");
- return result | ((turbocs_status_r(0) & 1) << 7);
+ return result | ((turbocs_status_r(machine, 0) & 1) << 7);
}
@@ -154,10 +154,10 @@ static WRITE16_HANDLER( spyhunt2_control_w )
COMBINE_DATA(&control_word);
/* turbocs_reset_w(~control_word & 0x0080);*/
- turbocs_data_w(offset, (control_word >> 8) & 0x001f);
+ turbocs_data_w(machine, offset, (control_word >> 8) & 0x001f);
soundsgood_reset_w(~control_word & 0x2000);
- soundsgood_data_w(offset, (control_word >> 8) & 0x001f);
+ soundsgood_data_w(machine, offset, (control_word >> 8) & 0x001f);
}
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 060c65d8733..3d8488a7479 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -352,44 +352,44 @@ static WRITE32_HANDLER( disp_ctrl_w )
static READ8_HANDLER(at_dma8237_1_r)
{
- return dma8237_1_r(offset / 2);
+ return dma8237_1_r(machine, offset / 2);
}
static WRITE8_HANDLER(at_dma8237_1_w)
{
- dma8237_1_w(offset / 2, data);
+ dma8237_1_w(machine, offset / 2, data);
}
static READ32_HANDLER(at32_dma8237_1_r)
{
- return read32le_with_read8_handler(at_dma8237_1_r, offset, mem_mask);
+ return read32le_with_read8_handler(at_dma8237_1_r, machine, offset, mem_mask);
}
static WRITE32_HANDLER(at32_dma8237_1_w)
{
- write32le_with_write8_handler(at_dma8237_1_w, offset, data, mem_mask);
+ write32le_with_write8_handler(at_dma8237_1_w, machine, offset, data, mem_mask);
}
static READ32_HANDLER( ide0_r )
{
- return ide_controller32_0_r(0x1f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x1f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( ide0_w )
{
- ide_controller32_0_w(0x1f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x1f0/4 + offset, data, mem_mask);
}
static READ32_HANDLER( fdc_r )
{
- return ide_controller32_0_r(0x3f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x3f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( fdc_w )
{
- ide_controller32_0_w(0x3f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x3f0/4 + offset, data, mem_mask);
}
@@ -469,7 +469,7 @@ static READ32_HANDLER( io20_r )
// 0x20 - 0x21, PIC
if ((mem_mask & 0x0000ffff) != 0xffff)
{
- r |= pic8259_32le_0_r(offset, mem_mask);
+ r |= pic8259_32le_0_r(machine, offset, mem_mask);
}
// 0x22, 0x23, Cyrix configuration registers
@@ -489,7 +489,7 @@ static WRITE32_HANDLER( io20_w )
// 0x20 - 0x21, PIC
if ((mem_mask & 0x0000ffff) != 0xffff)
{
- pic8259_32le_0_w(offset, data, mem_mask);
+ pic8259_32le_0_w(machine, offset, data, mem_mask);
}
// 0x22, 0x23, Cyrix configuration registers
@@ -976,7 +976,7 @@ static READ32_HANDLER( speedup9_r ) { return generic_speedup(&speedup_table[9]);
static READ32_HANDLER( speedup10_r ) { return generic_speedup(&speedup_table[10]); }
static READ32_HANDLER( speedup11_r ) { return generic_speedup(&speedup_table[11]); }
-static const read32_handler speedup_handlers[] =
+static const read32_machine_func speedup_handlers[] =
{
speedup0_r, speedup1_r, speedup2_r, speedup3_r,
speedup4_r, speedup5_r, speedup6_r, speedup7_r,
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 30b06ad6b26..0750e524c57 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -889,8 +889,6 @@ static void megadriv_vdp_ctrl_port_w(int data)
static WRITE16_HANDLER( megadriv_vdp_w )
{
-
-
switch (offset<<1)
{
case 0x00:
@@ -925,8 +923,8 @@ static WRITE16_HANDLER( megadriv_vdp_w )
case 0x12:
case 0x14:
case 0x16:
- if (ACCESSING_LSB) SN76496_0_w(0, data & 0xff);
- //if (ACCESSING_MSB) SN76496_0_w(0, (data >>8) & 0xff);
+ if (ACCESSING_LSB) SN76496_0_w(machine, 0, data & 0xff);
+ //if (ACCESSING_MSB) SN76496_0_w(machine, 0, (data >>8) & 0xff);
break;
default:
@@ -1334,12 +1332,12 @@ static READ16_HANDLER( megadriv_68k_YM2612_read)
switch (offset)
{
case 0:
- if (ACCESSING_MSB) return YM2612_status_port_0_A_r(0) << 8;
- else return YM2612_status_port_0_A_r(0);
+ if (ACCESSING_MSB) return YM2612_status_port_0_A_r(machine, 0) << 8;
+ else return YM2612_status_port_0_A_r(machine, 0);
break;
case 1:
- if (ACCESSING_MSB) return YM2612_status_port_0_A_r(0) << 8;
- else return YM2612_status_port_0_A_r(0);
+ if (ACCESSING_MSB) return YM2612_status_port_0_A_r(machine, 0) << 8;
+ else return YM2612_status_port_0_A_r(machine, 0);
break;
}
}
@@ -1362,12 +1360,12 @@ static WRITE16_HANDLER( megadriv_68k_YM2612_write)
switch (offset)
{
case 0:
- if (ACCESSING_MSB) YM2612_control_port_0_A_w (0, (data >> 8) & 0xff);
- else YM2612_data_port_0_A_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM2612_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ else YM2612_data_port_0_A_w (machine, 0, (data >> 0) & 0xff);
break;
case 1:
- if (ACCESSING_MSB) YM2612_control_port_0_B_w (0, (data >> 8) & 0xff);
- else YM2612_data_port_0_B_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM2612_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ else YM2612_data_port_0_B_w (machine, 0, (data >> 0) & 0xff);
break;
}
}
@@ -1381,10 +1379,10 @@ static READ8_HANDLER( megadriv_z80_YM2612_read )
{
switch (offset)
{
- case 0: return YM2612_status_port_0_A_r(0);
- case 1: return YM2612_status_port_0_A_r(0);
- case 2: return YM2612_status_port_0_A_r(0);
- case 3: return YM2612_status_port_0_A_r(0);
+ case 0: return YM2612_status_port_0_A_r(machine,0);
+ case 1: return YM2612_status_port_0_A_r(machine,0);
+ case 2: return YM2612_status_port_0_A_r(machine,0);
+ case 3: return YM2612_status_port_0_A_r(machine,0);
}
@@ -1396,10 +1394,10 @@ static WRITE8_HANDLER( megadriv_z80_YM2612_write )
//mame_printf_debug("megadriv_z80_YM2612_write %02x %02x\n",offset,data);
switch (offset)
{
- case 0: YM2612_control_port_0_A_w(0, data); break;
- case 1: YM2612_data_port_0_A_w(0, data); break;
- case 2: YM2612_control_port_0_B_w(0, data); break;
- case 3: YM2612_data_port_0_B_w(0, data); break;
+ case 0: YM2612_control_port_0_A_w(machine, 0, data); break;
+ case 1: YM2612_data_port_0_A_w(machine, 0, data); break;
+ case 2: YM2612_control_port_0_B_w(machine, 0, data); break;
+ case 3: YM2612_data_port_0_B_w(machine, 0, data); break;
}
}
@@ -2373,15 +2371,13 @@ static READ8_HANDLER( z80_read_68k_banked_data )
static WRITE8_HANDLER( megadriv_z80_vdp_write )
{
-
-
switch (offset)
{
case 0x11:
case 0x13:
case 0x15:
case 0x17:
- SN76496_0_w(0, data);
+ SN76496_0_w(machine, 0, data);
break;
default:
@@ -2412,7 +2408,7 @@ static WRITE8_HANDLER( z80_write_68k_banked_data )
else if (fulladdress == 0xc00011)
{
/* quite a few early games write here, most of the later ones don't */
- SN76496_0_w(0, data);
+ SN76496_0_w(machine, 0, data);
}
else
{
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 6a7083aae92..2a0b27aca06 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -440,7 +440,7 @@ static READ8_HANDLER( bank_r )
UINT8* game = memory_region(REGION_CPU1);
if(game_banksel == 0x142) // Genesis I/O
- return megaplay_genesis_io_r((offset & 0x1f) / 2, 0xffff);
+ return megaplay_genesis_io_r(machine, (offset & 0x1f) / 2, 0xffff);
if(bios_mode & MP_ROM)
{
@@ -473,7 +473,7 @@ static READ8_HANDLER( bank_r )
static WRITE8_HANDLER ( bank_w )
{
if(game_banksel == 0x142) // Genesis I/O
- genesis_io_w((offset & 0x1f) / 2, data, 0xffff);
+ genesis_io_w(machine, (offset & 0x1f) / 2, data, 0xffff);
if(offset <= 0x1fff && (bios_width & 0x08))
ic37_ram[(0x2000 * (bios_bank & 0x03)) + offset] = data;
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 8b81f96eacb..312bad4e6c7 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -274,11 +274,11 @@ static READ16_HANDLER( ip_select_r )
switch (i)
{
- case 0 : return coins_r(0,0); break;
- case 1 : return player1_r(0,0); break;
- case 2 : return player2_r(0,0); break;
- case 3 : return dsw1_r(0,0); break;
- case 4 : return dsw2_r(0,0); break;
+ case 0 : return coins_r(machine,0,0); break;
+ case 1 : return player1_r(machine,0,0); break;
+ case 2 : return player2_r(machine,0,0); break;
+ case 3 : return dsw1_r(machine,0,0); break;
+ case 4 : return dsw2_r(machine,0,0); break;
default : return 0x0006;
}
}
@@ -467,7 +467,7 @@ static READ16_HANDLER( oki_status_0_r )
if (megasys1_ignore_oki_status == 1)
return 0;
else
- return OKIM6295_status_0_lsb_r(offset,mem_mask);
+ return OKIM6295_status_0_lsb_r(machine,offset,mem_mask);
}
static READ16_HANDLER( oki_status_1_r )
@@ -475,7 +475,7 @@ static READ16_HANDLER( oki_status_1_r )
if (megasys1_ignore_oki_status == 1)
return 0;
else
- return OKIM6295_status_1_lsb_r(offset,mem_mask);
+ return OKIM6295_status_1_lsb_r(machine,offset,mem_mask);
}
/***************************************************************************
@@ -2931,8 +2931,8 @@ static READ16_HANDLER( protection_peekaboo_r )
switch (protection_val)
{
case 0x02: return 0x03;
- case 0x51: return player1_r(0,0);
- case 0x52: return player2_r(0,0);
+ case 0x51: return player1_r(machine,0,0);
+ case 0x52: return player2_r(machine,0,0);
default: return protection_val;
}
}
@@ -3859,13 +3859,13 @@ static DRIVER_INIT( iganinju )
static WRITE16_HANDLER( OKIM6295_data_0_both_w )
{
- if (ACCESSING_LSB) OKIM6295_data_0_w(0, (data >> 0) & 0xff );
- else OKIM6295_data_0_w(0, (data >> 8) & 0xff );
+ if (ACCESSING_LSB) OKIM6295_data_0_w(machine, 0, (data >> 0) & 0xff );
+ else OKIM6295_data_0_w(machine, 0, (data >> 8) & 0xff );
}
static WRITE16_HANDLER( OKIM6295_data_1_both_w )
{
- if (ACCESSING_LSB) OKIM6295_data_1_w(0, (data >> 0) & 0xff );
- else OKIM6295_data_1_w(0, (data >> 8) & 0xff );
+ if (ACCESSING_LSB) OKIM6295_data_1_w(machine, 0, (data >> 0) & 0xff );
+ else OKIM6295_data_1_w(machine, 0, (data >> 8) & 0xff );
}
static DRIVER_INIT( jitsupro )
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 91444f0dc90..6288c766c38 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -69,7 +69,7 @@ static unsigned deposits1=0, deposits2=0, credits=0;
static WRITE16_HANDLER( sound_w )
{
if(ACCESSING_LSB)
- soundlatch_w(0, data&0xff);
+ soundlatch_w(machine, 0, data&0xff);
}
static READ16_HANDLER( alpha_mcu_r )
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index a31d5cce637..cce368540cb 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -111,14 +111,14 @@ static UINT8 *mermaid_AY8910_enable;
static WRITE8_HANDLER( mermaid_AY8910_write_port_w )
{
- if (mermaid_AY8910_enable[0]) AY8910_write_port_0_w(offset, data);
- if (mermaid_AY8910_enable[1]) AY8910_write_port_1_w(offset, data);
+ if (mermaid_AY8910_enable[0]) AY8910_write_port_0_w(machine, offset, data);
+ if (mermaid_AY8910_enable[1]) AY8910_write_port_1_w(machine, offset, data);
}
static WRITE8_HANDLER( mermaid_AY8910_control_port_w )
{
- if (mermaid_AY8910_enable[0]) AY8910_control_port_0_w(offset, data);
- if (mermaid_AY8910_enable[1]) AY8910_control_port_1_w(offset, data);
+ if (mermaid_AY8910_enable[0]) AY8910_control_port_0_w(machine, offset, data);
+ if (mermaid_AY8910_enable[1]) AY8910_control_port_1_w(machine, offset, data);
}
/* Memory Map */
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 0946c4dda1d..025a308336d 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -157,7 +157,7 @@ static void update_irq_state(void)
{
/* Get the pending IRQs (only the enabled ones, e.g. where
irq_enable is *0*) */
- UINT16 irq = metro_irq_cause_r(0,0) & ~*metro_irq_enable;
+ UINT16 irq = metro_irq_cause_r(Machine,0,0) & ~*metro_irq_enable;
if (irq_line == -1) /* mouja, gakusai, gakusai2, dokyusei, dokyusp */
{
@@ -344,9 +344,9 @@ static int metro_io_callback(int ioline, int state)
switch ( ioline )
{
case UPD7810_RXD: /* read the RxD line */
- data = soundlatch_r(0);
+ data = soundlatch_r(Machine,0);
state = data & 1;
- soundlatch_w(0, data >> 1);
+ soundlatch_w(Machine, 0, data >> 1);
break;
default:
logerror("upd7810 ioline %d not handled\n", ioline);
@@ -359,8 +359,8 @@ static WRITE16_HANDLER( metro_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpu_spinuntil_int();
busy_sndcpu = 1;
}
@@ -443,9 +443,9 @@ static WRITE8_HANDLER( metro_portb_w )
{
/* write */
if (BIT(data,1))
- YM2413_data_port_0_w(0,porta);
+ YM2413_data_port_0_w(machine,0,porta);
else
- YM2413_register_port_0_w(0,porta);
+ YM2413_register_port_0_w(machine,0,porta);
}
portb = data;
return;
@@ -455,7 +455,7 @@ static WRITE8_HANDLER( metro_portb_w )
{
/* write */
if (!BIT(data,4))
- OKIM6295_data_0_w(0,porta);
+ OKIM6295_data_0_w(machine,0,porta);
}
portb = data;
}
@@ -487,15 +487,15 @@ static WRITE8_HANDLER( daitorid_portb_w )
{
/* write */
if (BIT(data,1))
- YM2151_data_port_0_w(0,porta);
+ YM2151_data_port_0_w(machine,0,porta);
else
- YM2151_register_port_0_w(0,porta);
+ YM2151_register_port_0_w(machine,0,porta);
}
if (!BIT(data,3))
{
/* read */
if (BIT(data,1))
- porta = YM2151_status_port_0_r(0);
+ porta = YM2151_status_port_0_r(machine,0);
}
portb = data;
return;
@@ -505,13 +505,13 @@ static WRITE8_HANDLER( daitorid_portb_w )
{
/* write */
if (!BIT(data,4))
- OKIM6295_data_0_w(0,porta);
+ OKIM6295_data_0_w(machine,0,porta);
}
if (BIT(portb,3) && !BIT(data,3)) /* clock 1->0 */
{
/* read */
if (!BIT(data,4))
- porta = OKIM6295_status_0_r(0);
+ porta = OKIM6295_status_0_r(machine,0);
}
portb = data;
}
@@ -529,7 +529,7 @@ static const struct YM2151interface ym2151_interface =
static READ16_HANDLER( ymf278b_r )
{
- return YMF278B_status_port_0_r(0);
+ return YMF278B_status_port_0_r(machine, 0);
}
static WRITE16_HANDLER( ymf278b_w )
@@ -538,22 +538,22 @@ static WRITE16_HANDLER( ymf278b_w )
switch(offset)
{
case 0:
- YMF278B_control_port_0_A_w(0, data);
+ YMF278B_control_port_0_A_w(machine, 0, data);
break;
case 1:
- YMF278B_data_port_0_A_w(0, data);
+ YMF278B_data_port_0_A_w(machine, 0, data);
break;
case 2:
- YMF278B_control_port_0_B_w(0, data);
+ YMF278B_control_port_0_B_w(machine, 0, data);
break;
case 3:
- YMF278B_data_port_0_B_w(0, data);
+ YMF278B_data_port_0_B_w(machine, 0, data);
break;
case 4:
- YMF278B_control_port_0_C_w(0, data);
+ YMF278B_control_port_0_C_w(machine, 0, data);
break;
case 5:
- YMF278B_data_port_0_C_w(0, data);
+ YMF278B_data_port_0_C_w(machine, 0, data);
break;
}
}
@@ -689,13 +689,13 @@ INLINE int blt_read(const UINT8 *ROM, const int offs)
return ROM[offs] ^ 0xff;
}
-INLINE void blt_write(const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask)
+INLINE void blt_write(running_machine *machine, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask)
{
switch( tmap )
{
- case 1: metro_vram_0_w(offs,data,mask); break;
- case 2: metro_vram_1_w(offs,data,mask); break;
- case 3: metro_vram_2_w(offs,data,mask); break;
+ case 1: metro_vram_0_w(machine,offs,data,mask); break;
+ case 2: metro_vram_1_w(machine,offs,data,mask); break;
+ case 3: metro_vram_2_w(machine,offs,data,mask); break;
}
// logerror("CPU #0 PC %06X : Blitter %X] %04X <- %04X & %04X\n",activecpu_get_pc(),tmap,offs,data,mask);
}
@@ -770,7 +770,7 @@ static WRITE16_HANDLER( metro_blitter_w )
src_offs++;
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2,mask);
+ blt_write(machine,tmap,dst_offs,b2,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
}
break;
@@ -786,7 +786,7 @@ static WRITE16_HANDLER( metro_blitter_w )
while (count--)
{
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2<<shift,mask);
+ blt_write(machine,tmap,dst_offs,b2<<shift,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
b2++;
}
@@ -803,7 +803,7 @@ static WRITE16_HANDLER( metro_blitter_w )
while (count--)
{
dst_offs &= 0xffff;
- blt_write(tmap,dst_offs,b2,mask);
+ blt_write(machine,tmap,dst_offs,b2,mask);
dst_offs = ((dst_offs+1) & (0x100-1)) | (dst_offs & (~(0x100-1)));
}
break;
@@ -1184,7 +1184,7 @@ static READ16_HANDLER( karatour_vram_##_n_##_r ) \
} \
static WRITE16_HANDLER( karatour_vram_##_n_##_w ) \
{ \
- metro_vram_##_n_##_w(KARATOUR_OFFS(offset),data,mem_mask); \
+ metro_vram_##_n_##_w(machine,KARATOUR_OFFS(offset),data,mem_mask); \
}
KARATOUR_VRAM( 0 )
@@ -1928,8 +1928,8 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( blzntrnd_sound_w )
{
- soundlatch_w(offset, data>>8);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, offset, data>>8);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static WRITE8_HANDLER( blzntrnd_sh_bankswitch_w )
@@ -2151,12 +2151,12 @@ ADDRESS_MAP_END
static READ8_HANDLER( puzzlet_port7_r )
{
- return input_port_2_word_r(0,0);
+ return input_port_2_word_r(machine,0,0);
}
static READ8_HANDLER( puzzlet_serB_r )
{
- return input_port_0_word_r(0,0); // coin
+ return input_port_0_word_r(machine,0,0); // coin
}
static WRITE8_HANDLER( puzzlet_portb_w )
@@ -4767,7 +4767,7 @@ static DRIVER_INIT( metro )
porta = 0x00;
portb = 0x00;
busy_sndcpu = 0;
- metro_sound_rombank_w(0, 0x00);
+ metro_sound_rombank_w(machine, 0, 0x00);
}
static DRIVER_INIT( karatour )
@@ -4790,7 +4790,7 @@ static DRIVER_INIT( daitorid )
porta = 0x00;
portb = 0x00;
busy_sndcpu = 0;
- daitorid_sound_rombank_w(0, 0x00);
+ daitorid_sound_rombank_w(machine, 0, 0x00);
}
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index a3b6d5a4e97..0b7a58fbb38 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -72,7 +72,7 @@ VIDEO_UPDATE( kikikai );
//AT
static READ8_HANDLER( kiki_2203_r )
{
- return(YM2203_status_port_0_r(0) & 0x7f);
+ return(YM2203_status_port_0_r(machine,0) & 0x7f);
}
//ZT
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index ab5c4e684ae..23d9f208edf 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -206,9 +206,9 @@ static READ8_HANDLER( dual_pokey_r )
int pokey_reg = (offset % 8) | control;
if (pokey_num == 0)
- return pokey1_r(pokey_reg);
+ return pokey1_r(machine, pokey_reg);
else
- return pokey2_r(pokey_reg);
+ return pokey2_r(machine, pokey_reg);
}
@@ -219,9 +219,9 @@ static WRITE8_HANDLER( dual_pokey_w )
int pokey_reg = (offset % 8) | control;
if (pokey_num == 0)
- pokey1_w(pokey_reg, data);
+ pokey1_w(machine, pokey_reg, data);
else
- pokey2_w(pokey_reg, data);
+ pokey2_w(machine, pokey_reg, data);
}
@@ -239,7 +239,7 @@ static WRITE8_HANDLER( speech_data_w )
static WRITE8_HANDLER( speech_strobe_w )
{
- tms5220_data_w(0, speech_write_buffer);
+ tms5220_data_w(machine, 0, speech_write_buffer);
}
/*************************************
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index d7378a8a0a4..53f1b0793a1 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -796,11 +796,11 @@ switch(offset)
if(data & 0x10)
{
- upd7759_0_reset_w(0,0);
+ upd7759_0_reset_w(machine,0,0);
}
else
{
- upd7759_0_reset_w(0,1);
+ upd7759_0_reset_w(machine,0,1);
}
break;
}
@@ -812,7 +812,7 @@ static READ8_HANDLER(sound_io_r)
switch(offset)
{
case 0x01: return readinputport(3); /* Test push switch */
- case 0x03: return (int)(upd7759_0_busy_r(0))<<3;
+ case 0x03: return (int)(upd7759_0_busy_r(machine,0))<<3;
default: return 0;
}
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 82e770868d9..1446a842cdc 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -219,7 +219,7 @@ static WRITE32_HANDLER( midvunit_control_w )
/* bit 3 is the watchdog */
if ((olddata ^ control_data) & 0x0008)
- watchdog_reset_w(0, 0);
+ watchdog_reset_w(machine, 0, 0);
/* bit 1 is the DCS sound reset */
dcs_reset_w((~control_data >> 1) & 1);
@@ -240,7 +240,7 @@ static WRITE32_HANDLER( crusnwld_control_w )
/* bit 9 is the watchdog */
if ((olddata ^ control_data) & 0x0200)
- watchdog_reset_w(0, 0);
+ watchdog_reset_w(machine, 0, 0);
/* bit 8 is the LED */
@@ -386,7 +386,7 @@ static WRITE32_HANDLER( bit_reset_w )
static READ32_HANDLER( offroadc_serial_status_r )
{
int status = midway_serial_pic2_status_r();
- return (port1_r(offset, mem_mask) & 0x7fff7fff) | (status << 31) | (status << 15);
+ return (port1_r(machine, offset, mem_mask) & 0x7fff7fff) | (status << 31) | (status << 15);
}
@@ -447,7 +447,7 @@ static WRITE32_HANDLER( midvplus_misc_w )
/* bit 0x10 resets watchdog */
if ((olddata ^ midvplus_misc[offset]) & 0x0010)
{
- watchdog_reset_w(0, 0);
+ watchdog_reset_w(machine, 0, 0);
logit = 0;
}
break;
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 28754a38555..86c4f01641a 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -164,14 +164,14 @@ static WRITE32_HANDLER( cmos_protect_w )
static READ32_HANDLER( timekeeper_r )
{
- return timekeeper_0_r(offset) | 0xffffff00;
+ return timekeeper_0_r(machine, offset) | 0xffffff00;
}
static WRITE32_HANDLER( timekeeper_w )
{
if (bitlatch[2] && !cmos_protected)
- timekeeper_0_w(offset, data);
+ timekeeper_0_w(machine, offset, data);
else
logerror("%06X:timekeeper_w with bitlatch[2] = %d, cmos_protected = %d\n", activecpu_get_pc(), bitlatch[2], cmos_protected);
cmos_protected = TRUE;
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 01cd792e8fe..4e394a5b1d1 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -106,8 +106,8 @@ static WRITE8_HANDLER(ay1_sel)
{
if(activecpu_get_previouspc()==0x309)
{
- AY8910_control_port_0_w(0,nAyCtrl);
- AY8910_write_port_0_w(0,nAyData);
+ AY8910_control_port_0_w(machine,0,nAyCtrl);
+ AY8910_write_port_0_w(machine,0,nAyData);
}
}
@@ -116,8 +116,8 @@ static WRITE8_HANDLER(ay2_sel)
if(activecpu_get_previouspc()==0x309)
{
- AY8910_control_port_1_w(0,nAyCtrl);
- AY8910_write_port_1_w(0,nAyData);
+ AY8910_control_port_1_w(machine,0,nAyCtrl);
+ AY8910_write_port_1_w(machine,0,nAyData);
}
}
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 6f3ac318958..49fb8cec89c 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -591,7 +591,7 @@ static WRITE8_HANDLER( missile_w )
/* POKEY */
else if (offset < 0x4800)
- pokey1_w(offset & 0x0f, data);
+ pokey1_w(machine, offset & 0x0f, data);
/* OUT0 */
else if (offset < 0x4900)
@@ -650,7 +650,7 @@ static READ8_HANDLER( missile_r )
/* POKEY */
else if (offset < 0x4800)
- result = pokey1_r(offset & 0x0f);
+ result = pokey1_r(machine, offset & 0x0f);
/* IN0 */
else if (offset < 0x4900)
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 0fb3d9455d9..94a7cbb4562 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -193,7 +193,7 @@ static READ8_HANDLER( pang_port5_r )
if (pang_port5_kludge) /* hack... music doesn't work otherwise */
bit ^= 0x08;
- return (input_port_0_r(0) & 0x76) | bit;
+ return (input_port_0_r(machine,0) & 0x76) | bit;
}
static WRITE8_HANDLER( eeprom_cs_w )
@@ -307,11 +307,11 @@ static READ8_HANDLER( input_r )
return readinputport(1 + offset);
break;
case 1: /* Mahjong games */
- if (offset) return mahjong_input_r(offset-1);
+ if (offset) return mahjong_input_r(machine,offset-1);
else return readinputport(1);
break;
case 2: /* Block Block - dial control */
- if (offset) return block_input_r(offset-1);
+ if (offset) return block_input_r(machine,offset-1);
else return readinputport(1);
break;
case 3: /* Super Pang - simulate START 1 press to initialize EEPROM */
@@ -335,10 +335,10 @@ static WRITE8_HANDLER( input_w )
logerror("PC %04x: write %02x to port 01\n",activecpu_get_pc(),data);
break;
case 1:
- mahjong_input_select_w(offset,data);
+ mahjong_input_select_w(machine,offset,data);
break;
case 2:
- block_dial_control_w(offset,data);
+ block_dial_control_w(machine,offset,data);
break;
}
}
@@ -483,8 +483,8 @@ ADDRESS_MAP_END
static WRITE8_HANDLER(mstworld_sound_w)
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
extern WRITE8_HANDLER( mstworld_gfxctrl_w );
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 0078a0f8db7..975480a9fcf 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -822,7 +822,7 @@ static WRITE16_HANDLER(md0_w)
static WRITE16_HANDLER(p_w)
{
UINT16 old = paletteram16[offset];
- paletteram16_xBBBBBGGGGGRRRRR_word_w(offset, data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset, data, mem_mask);
if(0 && paletteram16[offset] != old)
logerror("XVIDEO: p_w %x, %04x @ %04x (%x)\n", offset, data, mem_mask, activecpu_get_pc());
}
@@ -1000,12 +1000,12 @@ static READ16_HANDLER( m1_snd_v60_ready_r )
static READ16_HANDLER( m1_snd_mpcm0_r )
{
- return MultiPCM_reg_0_r(0);
+ return MultiPCM_reg_0_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_mpcm0_w )
{
- MultiPCM_reg_0_w(offset, data);
+ MultiPCM_reg_0_w(machine, offset, data);
}
static WRITE16_HANDLER( m1_snd_mpcm0_bnk_w )
@@ -1015,12 +1015,12 @@ static WRITE16_HANDLER( m1_snd_mpcm0_bnk_w )
static READ16_HANDLER( m1_snd_mpcm1_r )
{
- return MultiPCM_reg_1_r(0);
+ return MultiPCM_reg_1_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_mpcm1_w )
{
- MultiPCM_reg_1_w(offset, data);
+ MultiPCM_reg_1_w(machine, offset, data);
}
static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
@@ -1030,7 +1030,7 @@ static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
static READ16_HANDLER( m1_snd_ym_r )
{
- return YM3438_status_port_0_A_r(0);
+ return YM3438_status_port_0_A_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_ym_w )
@@ -1038,19 +1038,19 @@ static WRITE16_HANDLER( m1_snd_ym_w )
switch (offset)
{
case 0:
- YM3438_control_port_0_A_w(0, data);
+ YM3438_control_port_0_A_w(machine, 0, data);
break;
case 1:
- YM3438_data_port_0_A_w(0, data);
+ YM3438_data_port_0_A_w(machine, 0, data);
break;
case 2:
- YM3438_control_port_0_B_w(0, data);
+ YM3438_control_port_0_B_w(machine, 0, data);
break;
case 3:
- YM3438_data_port_0_B_w(0, data);
+ YM3438_data_port_0_B_w(machine, 0, data);
break;
}
}
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 3d70426e6ae..8ca72bafbbd 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -944,7 +944,7 @@ static WRITE32_HANDLER( model2_serial_w )
{
if (((mem_mask & 0xff) == 0) && (offset == 0))
{
- SCSP_MidiIn(0, data&0xff, 0);
+ SCSP_MidiIn(machine, 0, data&0xff, 0);
// give the 68k time to notice
cpu_spinuntil_time(ATTOTIME_IN_USEC(40));
@@ -1578,12 +1578,12 @@ static READ16_HANDLER( m1_snd_v60_ready_r )
static READ16_HANDLER( m1_snd_mpcm0_r )
{
- return MultiPCM_reg_0_r(0);
+ return MultiPCM_reg_0_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_mpcm0_w )
{
- MultiPCM_reg_0_w(offset, data);
+ MultiPCM_reg_0_w(machine, offset, data);
}
static WRITE16_HANDLER( m1_snd_mpcm0_bnk_w )
@@ -1593,12 +1593,12 @@ static WRITE16_HANDLER( m1_snd_mpcm0_bnk_w )
static READ16_HANDLER( m1_snd_mpcm1_r )
{
- return MultiPCM_reg_1_r(0);
+ return MultiPCM_reg_1_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_mpcm1_w )
{
- MultiPCM_reg_1_w(offset, data);
+ MultiPCM_reg_1_w(machine, offset, data);
}
static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
@@ -1608,7 +1608,7 @@ static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
static READ16_HANDLER( m1_snd_ym_r )
{
- return YM3438_status_port_0_A_r(0);
+ return YM3438_status_port_0_A_r(machine, 0);
}
static WRITE16_HANDLER( m1_snd_ym_w )
@@ -1616,19 +1616,19 @@ static WRITE16_HANDLER( m1_snd_ym_w )
switch (offset)
{
case 0:
- YM3438_control_port_0_A_w(0, data);
+ YM3438_control_port_0_A_w(machine, 0, data);
break;
case 1:
- YM3438_data_port_0_A_w(0, data);
+ YM3438_data_port_0_A_w(machine, 0, data);
break;
case 2:
- YM3438_control_port_0_B_w(0, data);
+ YM3438_control_port_0_B_w(machine, 0, data);
break;
case 3:
- YM3438_data_port_0_B_w(0, data);
+ YM3438_data_port_0_B_w(machine, 0, data);
break;
}
}
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 45eeb6488dd..6e1db5ce196 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1287,10 +1287,10 @@ static READ64_HANDLER( model3_rtc_r )
{
UINT64 r = 0;
if(!(mem_mask & U64(0xff00000000000000))) {
- r |= (UINT64)rtc72421_r((offset*2)+0, (UINT32)(mem_mask >> 32)) << 32;
+ r |= (UINT64)rtc72421_r(machine, (offset*2)+0, (UINT32)(mem_mask >> 32)) << 32;
}
if(!(mem_mask & U64(0x00000000ff000000))) {
- r |= (UINT64)rtc72421_r((offset*2)+1, (UINT32)(mem_mask));
+ r |= (UINT64)rtc72421_r(machine, (offset*2)+1, (UINT32)(mem_mask));
}
return r;
}
@@ -1298,10 +1298,10 @@ static READ64_HANDLER( model3_rtc_r )
static WRITE64_HANDLER( model3_rtc_w )
{
if(!(mem_mask & U64(0xff00000000000000))) {
- rtc72421_w((offset*2)+0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
+ rtc72421_w(machine, (offset*2)+0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
}
if(!(mem_mask & U64(0x00000000ff000000))) {
- rtc72421_w((offset*2)+1, (UINT32)(data), (UINT32)(mem_mask));
+ rtc72421_w(machine, (offset*2)+1, (UINT32)(data), (UINT32)(mem_mask));
}
}
@@ -1325,7 +1325,7 @@ static WRITE64_HANDLER(model3_sound_w)
// serial configuration writes
if ((mem_mask == U64(0x00ffffffffffffff)) && (offset == 0))
{
- SCSP_MidiIn(0, (data>>56)&0xff, 0);
+ SCSP_MidiIn(machine, 0, (data>>56)&0xff, 0);
// give the 68k time to notice
cpu_spinuntil_time(ATTOTIME_IN_USEC(40));
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 7a7d12687e8..0497c57d999 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -99,8 +99,8 @@ ADDRESS_MAP_END
static WRITE8_HANDLER(dac_w)
{
- DAC_0_data_w(0, data & 0xf0 ); /* left */
- DAC_1_data_w(0, (data & 0x0f)<<4 ); /* right */
+ DAC_0_data_w(machine, 0, data & 0xf0 ); /* left */
+ DAC_1_data_w(machine, 0, (data & 0x0f)<<4 ); /* right */
}
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 3d0a4b833b6..39bd4a69f6a 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -98,7 +98,7 @@ static READ16_HANDLER( control1_r )
/* bit 1 is EEPROM ready */
/* bit 3 is service button */
/* bits 4-7 are DIP switches */
- res = EEPROM_read_bit() | input_port_1_r(0);
+ res = EEPROM_read_bit() | input_port_1_r(machine,0);
if (init_eeprom_count)
{
@@ -202,25 +202,25 @@ static WRITE16_HANDLER( sound_cmd1_w )
{
if((data & 0x00ff0000) == 0) {
data &= 0xff;
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
}
static WRITE16_HANDLER( sound_cmd2_w )
{
if((data & 0x00ff0000) == 0) {
- soundlatch2_w(0, data & 0xff);
+ soundlatch2_w(machine, 0, data & 0xff);
}
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( sound_status_r )
{
- return soundlatch3_r(0);
+ return soundlatch3_r(machine,0);
}
static WRITE8_HANDLER( sound_bankswitch_w )
@@ -240,7 +240,7 @@ static READ16_HANDLER( K053247_scattered_word_r )
else
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- return K053247_word_r(offset,mem_mask);
+ return K053247_word_r(machine,offset,mem_mask);
}
}
@@ -252,7 +252,7 @@ static WRITE16_HANDLER( K053247_scattered_word_w )
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- K053247_word_w(offset,data,mem_mask);
+ K053247_word_w(machine,offset,data,mem_mask);
}
}
@@ -261,12 +261,12 @@ static WRITE16_HANDLER( K053247_scattered_word_w )
static READ16_HANDLER( player1_r ) // players 1 and 3
{
- return input_port_2_r(0) | (input_port_4_r(0)<<8);
+ return input_port_2_r(machine,0) | (input_port_4_r(machine,0)<<8);
}
static READ16_HANDLER( player2_r ) // players 2 and 4
{
- return input_port_3_r(0) | (input_port_5_r(0)<<8);
+ return input_port_3_r(machine,0) | (input_port_5_r(machine,0)<<8);
}
static WRITE16_HANDLER( moo_prot_w )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index b030386bad6..8d0f61f6ea8 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -715,7 +715,7 @@ BDIR BC1 |
*/
/* PSG function selected */
-static void update_ay(void)
+static void update_ay(running_machine *machine)
{
if (!pia_get_output_cb2(2))
{
@@ -733,13 +733,13 @@ static void update_ay(void)
}
case 0x02:
{/* CA2 = 0 CB2 = 1? : Write to selected PSG register and write data to Port A */
- AY8910_write_port_0_w(0, pia_get_output_a(3));
+ AY8910_write_port_0_w(machine, 0, pia_get_output_a(3));
LOG(("AY Chip Write \n"));
break;
}
case 0x03:
{/* CA2 = 1 CB2 = 1? : The register will now be selected and the user can read from or write to it. The register will remain selected until another is chosen.*/
- AY8910_control_port_0_w(0, pia_get_output_a(3));
+ AY8910_control_port_0_w(machine, 0, pia_get_output_a(3));
LOG(("AY Chip Select \n"));
break;
}
@@ -754,7 +754,7 @@ static void update_ay(void)
static WRITE8_HANDLER( pia_ic5_cb2_w )
{
- update_ay();
+ update_ay(machine);
}
static const pia6821_interface pia_ic5_intf =
@@ -789,7 +789,7 @@ static WRITE8_HANDLER( pia_ic6_porta_w )
if (mod_number <4)
{
aydata = data;
- update_ay();
+ update_ay(machine);
}
}
@@ -800,7 +800,7 @@ static WRITE8_HANDLER( pia_ic6_ca2_w )
{
if ( data ) ay8913_address |= 0x01;
else ay8913_address &= ~0x01;
- update_ay();
+ update_ay(machine);
}
}
@@ -811,7 +811,7 @@ static WRITE8_HANDLER( pia_ic6_cb2_w )
{
if ( data ) ay8913_address |= 0x02;
else ay8913_address &= ~0x02;
- update_ay();
+ update_ay(machine);
}
}
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 91457b8e60f..d56ee673650 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -88,7 +88,7 @@ static void mquake_cia_0_portb_w(UINT8 data)
static READ16_HANDLER( es5503_word_lsb_r )
{
- return (ACCESSING_LSB) ? (ES5503_reg_0_r(offset) | 0xff00) : 0xffff;
+ return (ACCESSING_LSB) ? (ES5503_reg_0_r(machine, offset) | 0xff00) : 0xffff;
}
static WRITE16_HANDLER( es5503_word_lsb_w )
@@ -109,7 +109,7 @@ static WRITE16_HANDLER( es5503_word_lsb_w )
}
}
- ES5503_reg_0_w(offset, data);
+ ES5503_reg_0_w(machine, offset, data);
}
}
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index d2d25ce1bef..a303b57483d 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -238,21 +238,21 @@ static ADDRESS_MAP_START( readport_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static WRITE8_HANDLER( mrflea_data0_w ){
- AY8910_control_port_0_w( offset, mrflea_select0 );
- AY8910_write_port_0_w( offset, data );
+ AY8910_control_port_0_w( machine, offset, mrflea_select0 );
+ AY8910_write_port_0_w( machine, offset, data );
}
static WRITE8_HANDLER( mrflea_data1_w ){
}
static WRITE8_HANDLER( mrflea_data2_w ){
- AY8910_control_port_1_w( offset, mrflea_select2 );
- AY8910_write_port_1_w( offset, data );
+ AY8910_control_port_1_w( machine, offset, mrflea_select2 );
+ AY8910_write_port_1_w( machine, offset, data );
}
static WRITE8_HANDLER( mrflea_data3_w ){
- AY8910_control_port_2_w( offset, mrflea_select3 );
- AY8910_write_port_2_w( offset, data );
+ AY8910_control_port_2_w( machine, offset, mrflea_select3 );
+ AY8910_write_port_2_w( machine, offset, data );
}
static ADDRESS_MAP_START( writeport_io, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index c132b0fd937..876a94db1b2 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -75,7 +75,7 @@ ADDRESS_MAP_END
static WRITE8_HANDLER( io_0x00_w )
{
- mrjong_flipscreen_w(0, ((data & 0x04) > 2));
+ mrjong_flipscreen_w(machine, 0, ((data & 0x04) > 2));
}
static READ8_HANDLER( io_0x03_r )
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 994b743d0c7..9a9a5288d3b 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -275,8 +275,8 @@ static READ32_HANDLER ( ms32_read_inputs3 )
static WRITE32_HANDLER( ms32_sound_w )
{
- soundlatch_w(0, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
+ soundlatch_w(machine,0, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
// give the Z80 time to respond
cpu_spinuntil_time(ATTOTIME_IN_USEC(40));
@@ -1306,8 +1306,8 @@ static INTERRUPT_GEN(ms32_interrupt)
static READ8_HANDLER( latch_r )
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE);
- return soundlatch_r(0)^0xff;
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE);
+ return soundlatch_r(machine,0)^0xff;
}
static WRITE8_HANDLER( ms32_snd_bank_w )
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 25ea60ffee8..4c15667cf5b 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -69,7 +69,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index a486705818b..06df1aade81 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -62,8 +62,8 @@ static WRITE16_HANDLER( mugsmash_reg2_w )
switch (offset)
{
case 1:
- soundlatch_w(1,data&0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data&0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
break;
default:
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 49c76df0734..701b17edcb0 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -51,17 +51,17 @@ static WRITE8_HANDLER( sprite_dma_w )
static READ8_HANDLER( psg_4015_r )
{
- return NESPSG_0_r(0x15);
+ return NESPSG_0_r(machine, 0x15);
}
static WRITE8_HANDLER( psg_4015_w )
{
- NESPSG_0_w(0x15, data);
+ NESPSG_0_w(machine, 0x15, data);
}
static WRITE8_HANDLER( psg_4017_w )
{
- NESPSG_0_w(0x17, data);
+ NESPSG_0_w(machine, 0x17, data);
}
/* Inputs */
@@ -254,7 +254,7 @@ static VIDEO_UPDATE( multigam )
static DRIVER_INIT( multigam )
{
- multigam_mapper_w( 0x0fff, 0x01 );
+ multigam_mapper_w( machine, 0x0fff, 0x01 );
}
static GFXDECODE_START( multigam )
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index b38d6d1d434..110a5981444 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -58,8 +58,8 @@ static INTERRUPT_GEN( mnchmobl_interrupt )
static WRITE8_HANDLER( mnchmobl_soundlatch_w )
{
- soundlatch_w( offset, data );
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE );
+ soundlatch_w( machine, offset, data );
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE );
}
static WRITE8_HANDLER( sound_nmi_ack_w )
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 0014106ebc5..300a7306392 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -141,6 +141,7 @@
****************************************************************************/
#include "driver.h"
+#include "deprecat.h"
#include "rendlay.h"
#include "rescap.h"
#include "mw8080bw.h"
@@ -163,7 +164,7 @@ static UINT8 rev_shift_res;
static READ8_HANDLER( mw8080bw_shift_result_rev_r )
{
- UINT8 ret = mb14241_0_shift_result_r(0);
+ UINT8 ret = mb14241_0_shift_result_r(machine, 0);
return BITSWAP8(ret,0,1,2,3,4,5,6,7);
}
@@ -175,11 +176,11 @@ static READ8_HANDLER( mw8080bw_reversable_shift_result_r )
if (rev_shift_res)
{
- ret = mw8080bw_shift_result_rev_r(0);
+ ret = mw8080bw_shift_result_rev_r(machine, 0);
}
else
{
- ret = mb14241_0_shift_result_r(0);
+ ret = mb14241_0_shift_result_r(machine, 0);
}
return ret;
@@ -187,7 +188,7 @@ static READ8_HANDLER( mw8080bw_reversable_shift_result_r )
static WRITE8_HANDLER( mw8080bw_reversable_shift_count_w)
{
- mb14241_0_shift_count_w(offset, data);
+ mb14241_0_shift_count_w(machine, offset, data);
rev_shift_res = data & 0x08;
}
@@ -421,11 +422,11 @@ MACHINE_DRIVER_END
static WRITE8_HANDLER( gunfight_io_w )
{
- if (offset & 0x01) gunfight_audio_w(0, data);
+ if (offset & 0x01) gunfight_audio_w(machine, 0, data);
- if (offset & 0x02) mb14241_0_shift_count_w(0, data);
+ if (offset & 0x02) mb14241_0_shift_count_w(machine, 0, data);
- if (offset & 0x04) mb14241_0_shift_data_w(0, data);
+ if (offset & 0x04) mb14241_0_shift_data_w(machine, 0, data);
}
@@ -610,11 +611,11 @@ static CUSTOM_INPUT( tornbase_score_input_r )
static WRITE8_HANDLER( tornbase_io_w )
{
- if (offset & 0x01) tornbase_audio_w(0, data);
+ if (offset & 0x01) tornbase_audio_w(machine, 0, data);
- if (offset & 0x02) mb14241_0_shift_count_w(0, data);
+ if (offset & 0x02) mb14241_0_shift_count_w(machine, 0, data);
- if (offset & 0x04) mb14241_0_shift_data_w(0, data);
+ if (offset & 0x04) mb14241_0_shift_data_w(machine, 0, data);
}
@@ -858,14 +859,14 @@ static UINT8 maze_tone_timing_state;
static void maze_update_discrete(void)
{
- maze_write_discrete(maze_tone_timing_state);
+ maze_write_discrete(Machine, maze_tone_timing_state);
}
static TIMER_CALLBACK( maze_tone_timing_timer_callback )
{
maze_tone_timing_state = !maze_tone_timing_state;
- maze_write_discrete(maze_tone_timing_state);
+ maze_write_discrete(machine, maze_tone_timing_state);
}
@@ -895,9 +896,9 @@ static WRITE8_HANDLER( maze_coin_counter_w )
static WRITE8_HANDLER( maze_io_w )
{
- if (offset & 0x01) maze_coin_counter_w(0, data);
+ if (offset & 0x01) maze_coin_counter_w(machine, 0, data);
- if (offset & 0x02) watchdog_reset_w(0, data);
+ if (offset & 0x02) watchdog_reset_w(machine, 0, data);
}
@@ -1054,9 +1055,9 @@ MACHINE_DRIVER_END
static WRITE8_HANDLER( checkmat_io_w )
{
- if (offset & 0x01) checkmat_audio_w(0, data);
+ if (offset & 0x01) checkmat_audio_w(machine, 0, data);
- if (offset & 0x02) watchdog_reset_w(0, data);
+ if (offset & 0x02) watchdog_reset_w(machine, 0, data);
}
@@ -2095,19 +2096,19 @@ static WRITE8_HANDLER( spcenctr_io_w )
{ /* A7 A6 A5 A4 A3 A2 A1 A0 */
if ((offset & 0x07) == 0x02)
{
- watchdog_reset_w(0, data); /* - - - - - 0 1 0 */
+ watchdog_reset_w(machine, 0, data); /* - - - - - 0 1 0 */
}
else if ((offset & 0x5f) == 0x01)
{
- spcenctr_audio_1_w(0, data); /* - 0 - 0 0 0 0 1 */
+ spcenctr_audio_1_w(machine, 0, data); /* - 0 - 0 0 0 0 1 */
}
else if ((offset & 0x5f) == 0x09)
{
- spcenctr_audio_2_w(0, data); /* - 0 - 0 1 0 0 1 */
+ spcenctr_audio_2_w(machine, 0, data); /* - 0 - 0 1 0 0 1 */
}
else if ((offset & 0x5f) == 0x11)
{
- spcenctr_audio_3_w(0, data); /* - 0 - 1 0 0 0 1 */
+ spcenctr_audio_3_w(machine, 0, data); /* - 0 - 1 0 0 0 1 */
}
else if ((offset & 0x07) == 0x03)
{ /* - - - - - 0 1 1 */
@@ -2324,7 +2325,7 @@ static READ8_HANDLER( bowler_shift_result_r )
anything unusual on the schematics that would cause
the bits to flip */
- return ~mb14241_0_shift_result_r(0);
+ return ~mb14241_0_shift_result_r(machine,0);
}
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index cc1c8d023a0..1d46c7246ad 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -48,18 +48,18 @@ static WRITE8_HANDLER( mystston_soundcontrol_w )
{
/* bit 4 goes to the 8910 #0 BC1 pin */
if (last & 0x10)
- AY8910_control_port_0_w(0,soundlatch);
+ AY8910_control_port_0_w(machine,0,soundlatch);
else
- AY8910_write_port_0_w(0,soundlatch);
+ AY8910_write_port_0_w(machine,0,soundlatch);
}
/* bit 7 goes to 8910 #1 BDIR pin */
if ((last & 0x80) == 0x80 && (data & 0x80) == 0x00)
{
/* bit 6 goes to the 8910 #1 BC1 pin */
if (last & 0x40)
- AY8910_control_port_1_w(0,soundlatch);
+ AY8910_control_port_1_w(machine,0,soundlatch);
else
- AY8910_write_port_1_w(0,soundlatch);
+ AY8910_write_port_1_w(machine,0,soundlatch);
}
last = data;
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 5ebbd608f56..0f5ed749202 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -258,34 +258,34 @@ static INTERRUPT_GEN(ddd_interrupt)
static WRITE16_HANDLER( sound_cmd1_w )
{
- soundlatch_w(0, data&0xff);
+ soundlatch_w(machine, 0, data&0xff);
}
static WRITE16_HANDLER( sound_cmd1_msb_w )
{
- soundlatch_w(0, data>>8);
+ soundlatch_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( sound_cmd2_w )
{
- soundlatch2_w(0, data&0xff);
+ soundlatch2_w(machine, 0, data&0xff);
return;
}
static WRITE16_HANDLER( sound_cmd2_msb_w )
{
- soundlatch2_w(0, data>>8);
+ soundlatch2_w(machine, 0, data>>8);
return;
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( sound_status_r )
{
- int latch = soundlatch3_r(0);
+ int latch = soundlatch3_r(machine,0);
if ((latch & 0xf) == 0xe) latch |= 1;
@@ -294,7 +294,7 @@ static READ16_HANDLER( sound_status_r )
static READ16_HANDLER( sound_status_msb_r )
{
- int latch = soundlatch3_r(0);
+ int latch = soundlatch3_r(machine,0);
if ((latch & 0xf) == 0xe) latch |= 1;
@@ -303,7 +303,7 @@ static READ16_HANDLER( sound_status_msb_r )
static WRITE16_HANDLER( irq_ack_w )
{
- K056832_b_word_w(offset, data, mem_mask);
+ K056832_b_word_w(machine, offset, data, mem_mask);
if (offset == 3 && ACCESSING_LSB)
{
@@ -369,7 +369,7 @@ static READ16_HANDLER( K053247_scattered_word_r )
else
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- return K053247_word_r(offset,mem_mask);
+ return K053247_word_r(machine,offset,mem_mask);
}
}
@@ -384,7 +384,7 @@ static WRITE16_HANDLER( K053247_scattered_word_w )
{
offset = (offset & 0x0007) | ((offset & 0x7f80) >> 4);
- K053247_word_w(offset,data,mem_mask);
+ K053247_word_w(machine,offset,data,mem_mask);
}
}
@@ -557,7 +557,7 @@ static READ16_HANDLER( K053247_martchmp_word_r )
else
{
offset = (offset & 0x0007) | ((offset & 0x1fe0) >> 2);
- return K053247_word_r(offset,mem_mask);
+ return K053247_word_r(machine,offset,mem_mask);
}
}
@@ -571,7 +571,7 @@ static WRITE16_HANDLER( K053247_martchmp_word_w )
{
offset = (offset & 0x0007) | ((offset & 0x1fe0) >> 2);
- K053247_word_w(offset,data,mem_mask);
+ K053247_word_w(machine,offset,data,mem_mask);
}
}
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 3e258588888..b537a1d7a57 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -813,7 +813,7 @@ static READ16_HANDLER( namcona1_vreg_r )
} /* namcona1_vreg_r */
static int
-transfer_dword( UINT32 dest, UINT32 source )
+transfer_dword( running_machine *machine, UINT32 dest, UINT32 source )
{
UINT16 data;
@@ -836,15 +836,15 @@ transfer_dword( UINT32 dest, UINT32 source )
}
if( dest>=0xf00000 && dest<=0xf02000 )
{
- namcona1_paletteram_w( (dest-0xf00000)/2, data, 0x0000 );
+ namcona1_paletteram_w( machine, (dest-0xf00000)/2, data, 0x0000 );
}
else if( dest>=0xf40000 && dest<=0xf80000 )
{
- namcona1_gfxram_w( (dest-0xf40000)/2, data, 0x0000 );
+ namcona1_gfxram_w( machine, (dest-0xf40000)/2, data, 0x0000 );
}
else if( dest>=0xff0000 && dest<0xff8000 )
{
- namcona1_videoram_w( (dest-0xff0000)/2, data, 0x0000 );
+ namcona1_videoram_w( machine, (dest-0xff0000)/2, data, 0x0000 );
}
else if( dest>=0xff8000 && dest<=0xffdfff )
{
@@ -957,7 +957,7 @@ Emeralda:
$efff80: 0048 0177 0020 0100 0000 00fd 0000 GFXE
*/
-static void namcona1_blit( void )
+static void namcona1_blit( running_machine *machine )
{
int src0 = namcona1_vreg[0x0];
int src1 = namcona1_vreg[0x1];
@@ -1009,7 +1009,7 @@ static void namcona1_blit( void )
while( num_bytes>0 )
{
- if( transfer_dword(
+ if( transfer_dword(machine,
dst_baseaddr + dest_offset,
src_baseaddr + source_offset ) )
{
@@ -1041,7 +1041,7 @@ static WRITE16_HANDLER( namcona1_vreg_w )
switch( offset )
{
case 0x18/2:
- namcona1_blit();
+ namcona1_blit(machine);
/* see also 0x1e */
break;
@@ -1154,19 +1154,19 @@ static WRITE16_HANDLER( na1mcu_shared_w )
static READ16_HANDLER(snd_r)
{
- return C140_r(offset*2+1) | C140_r(offset*2)<<8;
+ return C140_r(machine,offset*2+1) | C140_r(machine,offset*2)<<8;
}
static WRITE16_HANDLER(snd_w)
{
if (ACCESSING_LSB16)
{
- C140_w((offset*2)+1, data);
+ C140_w(machine,(offset*2)+1, data);
}
if (ACCESSING_MSB16)
{
- C140_w((offset*2), data>>8);
+ C140_w(machine,(offset*2), data>>8);
}
}
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 03bb713e679..a1cef7c083e 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -765,7 +765,7 @@ ADDRESS_MAP_END
static const struct
{
const char *s_name;
- read32_handler keycus_r;
+ read32_machine_func keycus_r;
int n_daughterboard;
} namcos11_config_table[] =
{
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 024ea71f86d..83916419bf0 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1208,7 +1208,7 @@ static READ32_HANDLER( tektagt_protection_2_r )
static MACHINE_RESET( namcos12 )
{
psx_machine_init();
- bankoffset_w(0,0,0);
+ bankoffset_w(machine,0,0,0);
if( strcmp( machine->gamedrv->name, "tektagt" ) == 0 ||
strcmp( machine->gamedrv->name, "tektagta" ) == 0 ||
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 34693dd6882..e3f59653e07 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -283,7 +283,7 @@ static WRITE8_HANDLER( watchdog1_w )
if (wdog == 3)
{
wdog = 0;
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
}
}
@@ -293,7 +293,7 @@ static WRITE8_HANDLER( watchdog2_w )
if (wdog == 3)
{
wdog = 0;
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
}
}
@@ -331,7 +331,7 @@ static WRITE8_HANDLER( cus115_w )
break;
case 4:
- bankswitch1_ext_w(0,data);
+ bankswitch1_ext_w(machine,0,data);
break;
case 5: // not used?
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index eb80c0152c1..3d6c497702c 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -111,14 +111,14 @@ TODO:
static READ8_HANDLER( in0_port_r )
{
- int in0 = input_port_0_r(0);
+ int in0 = input_port_0_r(machine,0);
if ( naughtyb_cocktail )
{
// cabinet == cocktail -AND- handling player 2
in0 = ( in0 & 0x03 ) | // start buttons
- ( input_port_1_r(0) & 0xFC ); // cocktail inputs
+ ( input_port_1_r(machine,0) & 0xFC ); // cocktail inputs
}
return in0;
@@ -128,8 +128,8 @@ static READ8_HANDLER( dsw0_port_r )
{
// vblank replaces the cabinet dip
- return ( ( input_port_2_r(0) & 0x7F ) | // dsw0
- ( input_port_3_r(0) & 0x80 ) ); // vblank
+ return ( ( input_port_2_r(machine,0) & 0x7F ) | // dsw0
+ ( input_port_3_r(machine,0) & 0x80 ) ); // vblank
}
/* Pop Flamer
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 5e5531c1879..a79fbd473a0 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -60,20 +60,20 @@ extern WRITE8_HANDLER( nbmj8991_clut_w );
static WRITE8_HANDLER( nbmj8991_soundbank_w )
{
- if (!(data & 0x80)) soundlatch_clear_w(0, 0);
+ if (!(data & 0x80)) soundlatch_clear_w(machine, 0, 0);
memory_set_bank(1, data & 0x03);
}
static WRITE8_HANDLER( nbmj8991_sound_w )
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
static READ8_HANDLER( nbmj8991_sound_r )
{
int data;
- data = soundlatch_r(0);
+ data = soundlatch_r(machine,0);
return data;
}
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index e8a778e8265..c7a4d142c09 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -86,19 +86,19 @@ static void nbmj9195_soundbank_w(int data)
memory_set_bankptr(1, &SNDROM[0x08000 + (0x8000 * (data & 0x03))]);
}
-static int nbmj9195_sound_r(int offset)
+static int nbmj9195_sound_r(running_machine *machine, int offset)
{
- return soundlatch_r(0);
+ return soundlatch_r(machine, 0);
}
static WRITE8_HANDLER( nbmj9195_sound_w )
{
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
-static void nbmj9195_soundclr_w(int offset, int data)
+static void nbmj9195_soundclr_w(running_machine *machine, int offset, int data)
{
- soundlatch_clear_w(0, 0);
+ soundlatch_clear_w(machine, 0, 0);
}
static void nbmj9195_outcoin_flag_w(int data)
@@ -169,7 +169,7 @@ static READ8_HANDLER( mscoutm_dipsw_1_r )
static UINT8 pio_dir[5 * 2], pio_latch[5 * 2];
-static int tmpz84c011_pio_r(int offset)
+static int tmpz84c011_pio_r(running_machine *machine, int offset)
{
int portdata;
@@ -249,7 +249,7 @@ static int tmpz84c011_pio_r(int offset)
portdata = 0xff;
break;
case 8: /* PD_1 */
- portdata = nbmj9195_sound_r(0);
+ portdata = nbmj9195_sound_r(machine, 0);
break;
case 9: /* PE_1 */
portdata = 0xff;
@@ -334,7 +334,7 @@ static int tmpz84c011_pio_r(int offset)
portdata = 0xff;
break;
case 8: /* PD_1 */
- portdata = nbmj9195_sound_r(0);
+ portdata = nbmj9195_sound_r(machine, 0);
break;
case 9: /* PE_1 */
portdata = 0xff;
@@ -350,7 +350,7 @@ static int tmpz84c011_pio_r(int offset)
return portdata;
}
-static void tmpz84c011_pio_w(int offset, int data)
+static void tmpz84c011_pio_w(running_machine *machine, int offset, int data)
{
if ((!strcmp(Machine->gamedrv->name, "imekura")) ||
(!strcmp(Machine->gamedrv->name, "mscoutm")) ||
@@ -377,15 +377,15 @@ static void tmpz84c011_pio_w(int offset, int data)
nbmj9195_soundbank_w(data);
break;
case 6: /* PB_1 */
- DAC_1_WRITE(0, data);
+ DAC_1_WRITE(machine, 0, data);
break;
case 7: /* PC_1 */
- DAC_0_WRITE(0, data);
+ DAC_0_WRITE(machine, 0, data);
break;
case 8: /* PD_1 */
break;
case 9: /* PE_1 */
- if (!(data & 0x01)) nbmj9195_soundclr_w(0, 0);
+ if (!(data & 0x01)) nbmj9195_soundclr_w(machine, 0, 0);
break;
default:
@@ -415,15 +415,15 @@ static void tmpz84c011_pio_w(int offset, int data)
nbmj9195_soundbank_w(data);
break;
case 6: /* PB_1 */
- DAC_1_WRITE(0, data);
+ DAC_1_WRITE(machine, 0, data);
break;
case 7: /* PC_1 */
- DAC_0_WRITE(0, data);
+ DAC_0_WRITE(machine, 0, data);
break;
case 8: /* PD_1 */
break;
case 9: /* PE_1 */
- if (!(data & 0x01)) nbmj9195_soundclr_w(0, 0);
+ if (!(data & 0x01)) nbmj9195_soundclr_w(machine, 0, 0);
break;
default:
@@ -437,17 +437,17 @@ static void tmpz84c011_pio_w(int offset, int data)
/* CPU interface */
/* device 0 */
-static READ8_HANDLER( tmpz84c011_0_pa_r ) { return (tmpz84c011_pio_r(0) & ~pio_dir[0]) | (pio_latch[0] & pio_dir[0]); }
-static READ8_HANDLER( tmpz84c011_0_pb_r ) { return (tmpz84c011_pio_r(1) & ~pio_dir[1]) | (pio_latch[1] & pio_dir[1]); }
-static READ8_HANDLER( tmpz84c011_0_pc_r ) { return (tmpz84c011_pio_r(2) & ~pio_dir[2]) | (pio_latch[2] & pio_dir[2]); }
-static READ8_HANDLER( tmpz84c011_0_pd_r ) { return (tmpz84c011_pio_r(3) & ~pio_dir[3]) | (pio_latch[3] & pio_dir[3]); }
-static READ8_HANDLER( tmpz84c011_0_pe_r ) { return (tmpz84c011_pio_r(4) & ~pio_dir[4]) | (pio_latch[4] & pio_dir[4]); }
-
-static WRITE8_HANDLER( tmpz84c011_0_pa_w ) { pio_latch[0] = data; tmpz84c011_pio_w(0, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pb_w ) { pio_latch[1] = data; tmpz84c011_pio_w(1, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pc_w ) { pio_latch[2] = data; tmpz84c011_pio_w(2, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pd_w ) { pio_latch[3] = data; tmpz84c011_pio_w(3, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pe_w ) { pio_latch[4] = data; tmpz84c011_pio_w(4, data); }
+static READ8_HANDLER( tmpz84c011_0_pa_r ) { return (tmpz84c011_pio_r(machine,0) & ~pio_dir[0]) | (pio_latch[0] & pio_dir[0]); }
+static READ8_HANDLER( tmpz84c011_0_pb_r ) { return (tmpz84c011_pio_r(machine,1) & ~pio_dir[1]) | (pio_latch[1] & pio_dir[1]); }
+static READ8_HANDLER( tmpz84c011_0_pc_r ) { return (tmpz84c011_pio_r(machine,2) & ~pio_dir[2]) | (pio_latch[2] & pio_dir[2]); }
+static READ8_HANDLER( tmpz84c011_0_pd_r ) { return (tmpz84c011_pio_r(machine,3) & ~pio_dir[3]) | (pio_latch[3] & pio_dir[3]); }
+static READ8_HANDLER( tmpz84c011_0_pe_r ) { return (tmpz84c011_pio_r(machine,4) & ~pio_dir[4]) | (pio_latch[4] & pio_dir[4]); }
+
+static WRITE8_HANDLER( tmpz84c011_0_pa_w ) { pio_latch[0] = data; tmpz84c011_pio_w(machine, 0, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pb_w ) { pio_latch[1] = data; tmpz84c011_pio_w(machine, 1, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pc_w ) { pio_latch[2] = data; tmpz84c011_pio_w(machine, 2, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pd_w ) { pio_latch[3] = data; tmpz84c011_pio_w(machine, 3, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pe_w ) { pio_latch[4] = data; tmpz84c011_pio_w(machine, 4, data); }
static READ8_HANDLER( tmpz84c011_0_dir_pa_r ) { return pio_dir[0]; }
static READ8_HANDLER( tmpz84c011_0_dir_pb_r ) { return pio_dir[1]; }
@@ -462,17 +462,17 @@ static WRITE8_HANDLER( tmpz84c011_0_dir_pd_w ) { pio_dir[3] = data; }
static WRITE8_HANDLER( tmpz84c011_0_dir_pe_w ) { pio_dir[4] = data; }
/* device 1 */
-static READ8_HANDLER( tmpz84c011_1_pa_r ) { return (tmpz84c011_pio_r(5) & ~pio_dir[5]) | (pio_latch[5] & pio_dir[5]); }
-static READ8_HANDLER( tmpz84c011_1_pb_r ) { return (tmpz84c011_pio_r(6) & ~pio_dir[6]) | (pio_latch[6] & pio_dir[6]); }
-static READ8_HANDLER( tmpz84c011_1_pc_r ) { return (tmpz84c011_pio_r(7) & ~pio_dir[7]) | (pio_latch[7] & pio_dir[7]); }
-static READ8_HANDLER( tmpz84c011_1_pd_r ) { return (tmpz84c011_pio_r(8) & ~pio_dir[8]) | (pio_latch[8] & pio_dir[8]); }
-static READ8_HANDLER( tmpz84c011_1_pe_r ) { return (tmpz84c011_pio_r(9) & ~pio_dir[9]) | (pio_latch[9] & pio_dir[9]); }
-
-static WRITE8_HANDLER( tmpz84c011_1_pa_w ) { pio_latch[5] = data; tmpz84c011_pio_w(5, data); }
-static WRITE8_HANDLER( tmpz84c011_1_pb_w ) { pio_latch[6] = data; tmpz84c011_pio_w(6, data); }
-static WRITE8_HANDLER( tmpz84c011_1_pc_w ) { pio_latch[7] = data; tmpz84c011_pio_w(7, data); }
-static WRITE8_HANDLER( tmpz84c011_1_pd_w ) { pio_latch[8] = data; tmpz84c011_pio_w(8, data); }
-static WRITE8_HANDLER( tmpz84c011_1_pe_w ) { pio_latch[9] = data; tmpz84c011_pio_w(9, data); }
+static READ8_HANDLER( tmpz84c011_1_pa_r ) { return (tmpz84c011_pio_r(machine,5) & ~pio_dir[5]) | (pio_latch[5] & pio_dir[5]); }
+static READ8_HANDLER( tmpz84c011_1_pb_r ) { return (tmpz84c011_pio_r(machine,6) & ~pio_dir[6]) | (pio_latch[6] & pio_dir[6]); }
+static READ8_HANDLER( tmpz84c011_1_pc_r ) { return (tmpz84c011_pio_r(machine,7) & ~pio_dir[7]) | (pio_latch[7] & pio_dir[7]); }
+static READ8_HANDLER( tmpz84c011_1_pd_r ) { return (tmpz84c011_pio_r(machine,8) & ~pio_dir[8]) | (pio_latch[8] & pio_dir[8]); }
+static READ8_HANDLER( tmpz84c011_1_pe_r ) { return (tmpz84c011_pio_r(machine,9) & ~pio_dir[9]) | (pio_latch[9] & pio_dir[9]); }
+
+static WRITE8_HANDLER( tmpz84c011_1_pa_w ) { pio_latch[5] = data; tmpz84c011_pio_w(machine, 5, data); }
+static WRITE8_HANDLER( tmpz84c011_1_pb_w ) { pio_latch[6] = data; tmpz84c011_pio_w(machine, 6, data); }
+static WRITE8_HANDLER( tmpz84c011_1_pc_w ) { pio_latch[7] = data; tmpz84c011_pio_w(machine, 7, data); }
+static WRITE8_HANDLER( tmpz84c011_1_pd_w ) { pio_latch[8] = data; tmpz84c011_pio_w(machine, 8, data); }
+static WRITE8_HANDLER( tmpz84c011_1_pe_w ) { pio_latch[9] = data; tmpz84c011_pio_w(machine, 9, data); }
static READ8_HANDLER( tmpz84c011_1_dir_pa_r ) { return pio_dir[5]; }
static READ8_HANDLER( tmpz84c011_1_dir_pb_r ) { return pio_dir[6]; }
@@ -500,8 +500,8 @@ static void ctc1_interrupt(int state)
/* CTC of main cpu, ch0 trigger is vblank */
static INTERRUPT_GEN( ctc0_trg1 )
{
- z80ctc_0_trg1_w(0, 1);
- z80ctc_0_trg1_w(0, 0);
+ z80ctc_0_trg1_w(machine, 0, 1);
+ z80ctc_0_trg1_w(machine, 0, 0);
}
static z80ctc_interface ctc_intf_1 =
@@ -541,7 +541,7 @@ static MACHINE_RESET( sailorws )
for (i = 0; i < (5 * 2); i++)
{
pio_dir[i] = pio_latch[i] = 0;
- tmpz84c011_pio_w(i, 0);
+ tmpz84c011_pio_w(machine, i, 0);
}
}
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 20c561ac359..4901d0a1e56 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -102,8 +102,8 @@ static INTERRUPT_GEN( nemesis_interrupt )
static WRITE16_HANDLER( salamand_soundlatch_word_w )
{
if(ACCESSING_LSB) {
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
@@ -245,10 +245,10 @@ static READ16_HANDLER( selected_ip_r )
{
switch (hcrash_selected_ip & 0xf)
{ // From WEC Le Mans Schems:
- case 0xc: return input_port_8_r(offset); // Accel - Schems: Accelevr
- case 0: return input_port_8_r(offset);
- case 0xd: return input_port_9_r(offset); // Wheel - Schems: Handlevr
- case 1: return input_port_9_r(offset);
+ case 0xc: return input_port_8_r(machine,offset); // Accel - Schems: Accelevr
+ case 0: return input_port_8_r(machine,offset);
+ case 0xd: return input_port_9_r(machine,offset); // Wheel - Schems: Handlevr
+ case 1: return input_port_9_r(machine,offset);
default: return ~0;
}
@@ -257,7 +257,7 @@ static READ16_HANDLER( selected_ip_r )
static WRITE16_HANDLER( nemesis_soundlatch_word_w )
{
if(ACCESSING_LSB) {
- soundlatch_w(offset,data & 0xff);
+ soundlatch_w(machine,offset,data & 0xff);
}
}
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index b47cee899ad..a3e1f0d497c 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -368,7 +368,7 @@ static WRITE16_HANDLER( io_control_w )
case 0x00: select_controller(data & 0x00ff); break;
case 0x18: set_output_latch(data & 0x00ff); break;
case 0x20: set_output_data(data & 0x00ff); break;
- case 0x28: pd4990a_control_16_w(0, data, mem_mask); break;
+ case 0x28: pd4990a_control_16_w(machine, 0, data, mem_mask); break;
// case 0x30: break; // coin counters
// case 0x31: break; // coin counters
// case 0x32: break; // coin lockout
@@ -444,7 +444,7 @@ static void calendar_clock(void)
static CUSTOM_INPUT( get_calendar_status )
{
- return (pd4990a_databit_r(0) << 1) | pd4990a_testbit_r(0);
+ return (pd4990a_databit_r(machine, 0) << 1) | pd4990a_testbit_r(machine, 0);
}
@@ -564,7 +564,7 @@ static WRITE16_HANDLER( audio_command_w )
/* accessing the LSB only is not mapped */
if (mem_mask != 0xff00)
{
- soundlatch_w(0, data >> 8);
+ soundlatch_w(machine, 0, data >> 8);
audio_cpu_assert_nmi();
@@ -578,12 +578,12 @@ static WRITE16_HANDLER( audio_command_w )
static READ8_HANDLER( audio_command_r )
{
- UINT8 ret = soundlatch_r(0);
+ UINT8 ret = soundlatch_r(machine, 0);
if (LOG_CPU_COMM) logerror(" AUD CPU PC %04x: audio_command_r %02x\n", activecpu_get_pc(), ret);
/* this is a guess */
- audio_cpu_clear_nmi_w(0, 0);
+ audio_cpu_clear_nmi_w(machine, 0, 0);
return ret;
}
@@ -877,7 +877,7 @@ static WRITE16_HANDLER( watchdog_w )
/* only an LSB write resets the watchdog */
if (ACCESSING_LSB)
{
- watchdog_reset16_w(offset, data, mem_mask);
+ watchdog_reset16_w(machine, offset, data, mem_mask);
}
}
@@ -1008,7 +1008,7 @@ static MACHINE_RESET( neogeo )
/* reset system control registers */
for (offs = 0; offs < 8; offs++)
- system_control_w(offs, 0, 0xff00);
+ system_control_w(machine, offs, 0, 0xff00);
neogeo_reset_rng();
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 89fbb57c4c0..91ac8930459 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -249,9 +249,9 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( ninjaw_sound_w )
{
if (offset == 0)
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
else if (offset == 1)
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
#ifdef MAME_DEBUG
if (data & 0xff00)
@@ -262,7 +262,7 @@ static WRITE16_HANDLER( ninjaw_sound_w )
static READ16_HANDLER( ninjaw_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff));
+ return ((taitosound_comm_r (machine,0) & 0xff));
else return 0;
}
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 63a5f649470..5ec16315540 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -84,26 +84,26 @@ static void niyanpai_soundbank_w(int data)
memory_set_bankptr(1, &SNDROM[0x08000 + (0x8000 * (data & 0x03))]);
}
-static int niyanpai_sound_r(int offset)
+static int niyanpai_sound_r(running_machine *machine, int offset)
{
- return soundlatch_r(0);
+ return soundlatch_r(machine, 0);
}
static WRITE16_HANDLER( niyanpai_sound_w )
{
- soundlatch_w(0, ((data >> 8) & 0xff));
+ soundlatch_w(machine, 0, ((data >> 8) & 0xff));
}
-static void niyanpai_soundclr_w(int offset, int data)
+static void niyanpai_soundclr_w(running_machine *machine, int offset, int data)
{
- soundlatch_clear_w(0, 0);
+ soundlatch_clear_w(machine, 0, 0);
}
/* TMPZ84C011 PIO emulation */
static UINT8 pio_dir[5], pio_latch[5];
-static int tmpz84c011_pio_r(int offset)
+static int tmpz84c011_pio_r(running_machine *machine, int offset)
{
int portdata;
@@ -119,7 +119,7 @@ static int tmpz84c011_pio_r(int offset)
portdata = 0xff;
break;
case 3: /* PD_0 */
- portdata = niyanpai_sound_r(0);
+ portdata = niyanpai_sound_r(machine, 0);
break;
case 4: /* PE_0 */
portdata = 0xff;
@@ -134,7 +134,7 @@ static int tmpz84c011_pio_r(int offset)
return portdata;
}
-static void tmpz84c011_pio_w(int offset, int data)
+static void tmpz84c011_pio_w(running_machine *machine, int offset, int data)
{
switch (offset)
{
@@ -142,15 +142,15 @@ static void tmpz84c011_pio_w(int offset, int data)
niyanpai_soundbank_w(data & 0x03);
break;
case 1: /* PB_0 */
- DAC_1_WRITE(0, data);
+ DAC_1_WRITE(machine, 0, data);
break;
case 2: /* PC_0 */
- DAC_0_WRITE(0, data);
+ DAC_0_WRITE(machine, 0, data);
break;
case 3: /* PD_0 */
break;
case 4: /* PE_0 */
- if (!(data & 0x01)) niyanpai_soundclr_w(0, 0);
+ if (!(data & 0x01)) niyanpai_soundclr_w(machine, 0, 0);
break;
default:
@@ -160,17 +160,17 @@ static void tmpz84c011_pio_w(int offset, int data)
}
/* CPU interface */
-static READ8_HANDLER( tmpz84c011_0_pa_r ) { return (tmpz84c011_pio_r(0) & ~pio_dir[0]) | (pio_latch[0] & pio_dir[0]); }
-static READ8_HANDLER( tmpz84c011_0_pb_r ) { return (tmpz84c011_pio_r(1) & ~pio_dir[1]) | (pio_latch[1] & pio_dir[1]); }
-static READ8_HANDLER( tmpz84c011_0_pc_r ) { return (tmpz84c011_pio_r(2) & ~pio_dir[2]) | (pio_latch[2] & pio_dir[2]); }
-static READ8_HANDLER( tmpz84c011_0_pd_r ) { return (tmpz84c011_pio_r(3) & ~pio_dir[3]) | (pio_latch[3] & pio_dir[3]); }
-static READ8_HANDLER( tmpz84c011_0_pe_r ) { return (tmpz84c011_pio_r(4) & ~pio_dir[4]) | (pio_latch[4] & pio_dir[4]); }
-
-static WRITE8_HANDLER( tmpz84c011_0_pa_w ) { pio_latch[0] = data; tmpz84c011_pio_w(0, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pb_w ) { pio_latch[1] = data; tmpz84c011_pio_w(1, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pc_w ) { pio_latch[2] = data; tmpz84c011_pio_w(2, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pd_w ) { pio_latch[3] = data; tmpz84c011_pio_w(3, data); }
-static WRITE8_HANDLER( tmpz84c011_0_pe_w ) { pio_latch[4] = data; tmpz84c011_pio_w(4, data); }
+static READ8_HANDLER( tmpz84c011_0_pa_r ) { return (tmpz84c011_pio_r(machine,0) & ~pio_dir[0]) | (pio_latch[0] & pio_dir[0]); }
+static READ8_HANDLER( tmpz84c011_0_pb_r ) { return (tmpz84c011_pio_r(machine,1) & ~pio_dir[1]) | (pio_latch[1] & pio_dir[1]); }
+static READ8_HANDLER( tmpz84c011_0_pc_r ) { return (tmpz84c011_pio_r(machine,2) & ~pio_dir[2]) | (pio_latch[2] & pio_dir[2]); }
+static READ8_HANDLER( tmpz84c011_0_pd_r ) { return (tmpz84c011_pio_r(machine,3) & ~pio_dir[3]) | (pio_latch[3] & pio_dir[3]); }
+static READ8_HANDLER( tmpz84c011_0_pe_r ) { return (tmpz84c011_pio_r(machine,4) & ~pio_dir[4]) | (pio_latch[4] & pio_dir[4]); }
+
+static WRITE8_HANDLER( tmpz84c011_0_pa_w ) { pio_latch[0] = data; tmpz84c011_pio_w(machine, 0, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pb_w ) { pio_latch[1] = data; tmpz84c011_pio_w(machine, 1, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pc_w ) { pio_latch[2] = data; tmpz84c011_pio_w(machine, 2, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pd_w ) { pio_latch[3] = data; tmpz84c011_pio_w(machine, 3, data); }
+static WRITE8_HANDLER( tmpz84c011_0_pe_w ) { pio_latch[4] = data; tmpz84c011_pio_w(machine, 4, data); }
static READ8_HANDLER( tmpz84c011_0_dir_pa_r ) { return pio_dir[0]; }
static READ8_HANDLER( tmpz84c011_0_dir_pb_r ) { return pio_dir[1]; }
@@ -215,7 +215,7 @@ static MACHINE_RESET( niyanpai )
for (i = 0; i < 5; i++)
{
pio_dir[i] = pio_latch[i] = 0;
- tmpz84c011_pio_w(i, 0);
+ tmpz84c011_pio_w(machine, i, 0);
}
}
@@ -295,7 +295,7 @@ static READ16_HANDLER( musobana_inputport_1_r )
// bit 2 motor on
// bit 3 coin lock
- if (tmp68301_parallel_interface_r(0x0005, 0x00ff) & 0x0004) musobana_outcoin_flag ^= 1;
+ if (tmp68301_parallel_interface_r(machine, 0x0005, 0x00ff) & 0x0004) musobana_outcoin_flag ^= 1;
else musobana_outcoin_flag = 1;
return (((readinputport(2) & 0xdf) | ((musobana_outcoin_flag & 0x01) << 5)) << 8);
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 72140a44e7e..24c07fe4345 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -245,8 +245,8 @@ static WRITE16_HANDLER( nmg5_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index e5a21a769dd..668edb1f5d3 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -277,8 +277,8 @@ static WRITE16_HANDLER ( ssmissin_sound_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0, HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0, HOLD_LINE);
}
}
@@ -330,18 +330,18 @@ static READ16_HANDLER( tharrier_mcu_r )
return res << 8;
}
else
- return ~input_port_1_word_r(0,0);
+ return ~input_port_1_word_r(machine,0,0);
}
static WRITE16_HANDLER( macross2_sound_command_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
static READ16_HANDLER( macross2_sound_result_r )
{
- return soundlatch2_r(0);
+ return soundlatch2_r(machine,0);
}
static WRITE8_HANDLER( macross2_sound_bank_w )
@@ -373,8 +373,8 @@ static WRITE16_HANDLER( afega_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
}
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 0629ea91792..0e931219adc 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -310,12 +310,12 @@ ADDRESS_MAP_END
static READ8_HANDLER( spc_ram_100_r )
{
- return spc_ram_r(offset + 0x100);
+ return spc_ram_r(machine, offset + 0x100);
}
static WRITE8_HANDLER( spc_ram_100_w )
{
- spc_ram_w(offset + 0x100, data);
+ spc_ram_w(machine, offset + 0x100, data);
}
static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index e298d965e47..9b141c2a924 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -270,7 +270,7 @@ static TIMER_CALLBACK( nmi_callback )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index d94dc98fdfb..e6daa4e57c5 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -139,13 +139,13 @@ static INTERRUPT_GEN( update_pia_1 )
/* update the different PIA pins from the input ports */
/* CA1 - copy of PA0 (COIN1) */
- pia_1_ca1_w(0, input_port_0_r(0) & 0x01);
+ pia_1_ca1_w(machine, 0, input_port_0_r(machine, 0) & 0x01);
/* CA2 - copy of PA1 (SERVICE1) */
- pia_1_ca2_w(0, input_port_0_r(0) & 0x02);
+ pia_1_ca2_w(machine, 0, input_port_0_r(machine, 0) & 0x02);
/* CB1 - (crosshatch) */
- pia_1_cb1_w(0, input_port_5_r(0));
+ pia_1_cb1_w(machine, 0, input_port_5_r(machine, 0));
/* CB2 - NOT CONNECTED */
}
@@ -181,7 +181,7 @@ static WRITE8_HANDLER( pia_2_port_b_w )
star_enable = data & 0x10;
/* bits 5-7 go to the music board connector */
- audio_2_command_w(0, data & 0xe0);
+ audio_2_command_w(machine, 0, data & 0xe0);
}
@@ -208,7 +208,7 @@ static const pia6821_interface pia_2_intf =
static void ic48_1_74123_output_changed(int output)
{
- pia_2_ca1_w(0, output);
+ pia_2_ca1_w(Machine, 0, output);
}
@@ -451,15 +451,15 @@ static VIDEO_UPDATE( nyny )
static WRITE8_HANDLER( audio_1_command_w )
{
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 1, M6802_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, M6802_IRQ_LINE, HOLD_LINE);
}
static WRITE8_HANDLER( audio_1_answer_w )
{
- soundlatch3_w(0, data);
- cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch3_w(machine, 0, data);
+ cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, HOLD_LINE);
}
@@ -502,8 +502,8 @@ static const struct AY8910interface ay8910_64_interface =
static WRITE8_HANDLER( audio_2_command_w )
{
- soundlatch2_w(0, (data & 0x60) >> 5);
- cpunum_set_input_line(Machine, 2, M6802_IRQ_LINE, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
+ soundlatch2_w(machine, 0, (data & 0x60) >> 5);
+ cpunum_set_input_line(machine, 2, M6802_IRQ_LINE, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
}
@@ -519,8 +519,8 @@ static READ8_HANDLER( nyny_pia_1_2_r )
UINT8 ret = 0;
/* the address bits are directly connected to the chip selects */
- if (offset & 0x04) ret = pia_1_r(offset & 0x03);
- if (offset & 0x08) ret = pia_2_alt_r(offset & 0x03);
+ if (offset & 0x04) ret = pia_1_r(machine, offset & 0x03);
+ if (offset & 0x08) ret = pia_2_alt_r(machine, offset & 0x03);
return ret;
}
@@ -529,8 +529,8 @@ static READ8_HANDLER( nyny_pia_1_2_r )
static WRITE8_HANDLER( nyny_pia_1_2_w )
{
/* the address bits are directly connected to the chip selects */
- if (offset & 0x04) pia_1_w(offset & 0x03, data);
- if (offset & 0x08) pia_2_alt_w(offset & 0x03, data);
+ if (offset & 0x04) pia_1_w(machine, offset & 0x03, data);
+ if (offset & 0x08) pia_2_alt_w(machine, offset & 0x03, data);
}
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index dc3547906b1..0c3c226e4c2 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -55,7 +55,7 @@ VIDEO_UPDATE( ojankoc );
VIDEO_START( ojankoc );
WRITE8_HANDLER( ojankoc_palette_w );
WRITE8_HANDLER( ojankoc_videoram_w );
-void ojankoc_flipscreen(int data);
+void ojankoc_flipscreen(running_machine *machine, int data);
static int ojankohs_portselect;
@@ -133,7 +133,7 @@ static WRITE8_HANDLER( ojankoc_ctrl_w )
ojankohs_adpcm_reset = ((data & 0x10) >> 4);
MSM5205_reset_w(0, (!(data & 0x10) >> 4));
- ojankoc_flipscreen(data);
+ ojankoc_flipscreen(machine, data);
}
static WRITE8_HANDLER( ojankohs_portselect_w )
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 8b10adb126b..5dadc432cb7 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -173,7 +173,7 @@ static WRITE8_HANDLER( sound_command_w )
for (c = 15;c >= 0;c--)
if (cmd & (1 << c)) break;
- if (c >= 0) soundlatch_w(0,15-c);
+ if (c >= 0) soundlatch_w(machine,0,15-c);
}
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 27da8af56e2..be47fd49ae4 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -235,7 +235,7 @@
static MACHINE_RESET( omegrace )
{
/* Omega Race expects the vector processor to be ready. */
- avgdvg_reset_w (0, 0);
+ avgdvg_reset_w (machine,0, 0);
}
@@ -248,7 +248,7 @@ static MACHINE_RESET( omegrace )
static READ8_HANDLER( omegrace_vg_go_r )
{
- avgdvg_go_w(0,0);
+ avgdvg_go_w(machine,0,0);
return 0;
}
@@ -322,8 +322,8 @@ static WRITE8_HANDLER( omegrace_leds_w )
static WRITE8_HANDLER( omegrace_soundlatch_w )
{
- soundlatch_w (offset, data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w (machine, offset, data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index d9406f181bb..d7531cfd667 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -68,15 +68,15 @@ static WRITE8_HANDLER( onetwo_cpubank_w )
static WRITE8_HANDLER( onetwo_coin_counters_w )
{
- watchdog_reset_w(0, data & 0x01);
+ watchdog_reset(machine);
coin_counter_w(0, data & 0x02);
coin_counter_w(1, data & 0x04);
}
static WRITE8_HANDLER( onetwo_soundlatch_w )
{
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static void setColor(int offset)
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 605df85b5cc..03b35319ffb 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -34,7 +34,7 @@ static INTERRUPT_GEN( orbit_interrupt )
}
-static void update_misc_flags(UINT8 val)
+static void update_misc_flags(running_machine *machine, UINT8 val)
{
orbit_misc_flags = val;
@@ -48,7 +48,7 @@ static void update_misc_flags(UINT8 val)
/* BIT7 => WARNING SND */
orbit_nmi_enable = (orbit_misc_flags >> 2) & 1;
- discrete_sound_w(ORBIT_WARNING_EN, orbit_misc_flags & 0x80);
+ discrete_sound_w(machine, ORBIT_WARNING_EN, orbit_misc_flags & 0x80);
set_led_status(0, orbit_misc_flags & 0x08);
set_led_status(1, orbit_misc_flags & 0x40);
@@ -60,7 +60,7 @@ static void update_misc_flags(UINT8 val)
static MACHINE_RESET( orbit )
{
- update_misc_flags(0);
+ update_misc_flags(machine, 0);
}
@@ -70,11 +70,11 @@ static WRITE8_HANDLER( orbit_misc_w )
if (offset & 1)
{
- update_misc_flags(orbit_misc_flags | (1 << bit));
+ update_misc_flags(machine, orbit_misc_flags | (1 << bit));
}
else
{
- update_misc_flags(orbit_misc_flags & ~(1 << bit));
+ update_misc_flags(machine, orbit_misc_flags & ~(1 << bit));
}
}
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 6d621508207..564defc3d3d 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -385,7 +385,7 @@ if (data & 4)
break;
default:
- TC0220IOC_w(offset,data & 0xff);
+ TC0220IOC_w(machine,offset,data & 0xff);
}
}
}
@@ -403,7 +403,7 @@ static READ16_HANDLER( othunder_TC0220IOC_r )
return eeprom_r();
default:
- return TC0220IOC_r( offset );
+ return TC0220IOC_r( machine, offset );
}
}
@@ -457,15 +457,15 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( othunder_sound_w )
{
if (offset == 0)
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
else if (offset == 1)
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
}
static READ16_HANDLER( othunder_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff));
+ return ((taitosound_comm_r (machine, 0) & 0xff));
else return 0;
}
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index f8c35aa8821..bea0ab5cac6 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -35,46 +35,46 @@ VIDEO_UPDATE( overdriv );
static READ16_HANDLER( K051316_0_msb_r )
{
- return K051316_0_r(offset) << 8;
+ return K051316_0_r(machine,offset) << 8;
}
static READ16_HANDLER( K051316_1_msb_r )
{
- return K051316_1_r(offset) << 8;
+ return K051316_1_r(machine,offset) << 8;
}
static READ16_HANDLER( K051316_rom_0_msb_r )
{
- return K051316_rom_0_r(offset) << 8;
+ return K051316_rom_0_r(machine,offset) << 8;
}
static READ16_HANDLER( K051316_rom_1_msb_r )
{
- return K051316_rom_1_r(offset) << 8;
+ return K051316_rom_1_r(machine,offset) << 8;
}
static WRITE16_HANDLER( K051316_0_msb_w )
{
if (ACCESSING_MSB)
- K051316_0_w(offset,data >> 8);
+ K051316_0_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_1_msb_w )
{
if (ACCESSING_MSB)
- K051316_1_w(offset,data >> 8);
+ K051316_1_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_ctrl_0_msb_w )
{
if (ACCESSING_MSB)
- K051316_ctrl_0_w(offset,data >> 8);
+ K051316_ctrl_0_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_ctrl_1_msb_w )
{
if (ACCESSING_MSB)
- K051316_ctrl_1_w(offset,data >> 8);
+ K051316_ctrl_1_w(machine,offset,data >> 8);
}
@@ -129,7 +129,7 @@ static READ16_HANDLER( eeprom_r )
//logerror("%06x eeprom_r\n",activecpu_get_pc());
/* bit 6 is EEPROM data */
- res = (EEPROM_read_bit() << 6) | input_port_0_word_r(0,0);
+ res = (EEPROM_read_bit() << 6) | input_port_0_word_r(machine,0,0);
return res;
}
@@ -227,12 +227,12 @@ static WRITE16_HANDLER( sharedram_w )
static READ16_HANDLER( overdriv_sound_0_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine,2 + offset);
}
static READ16_HANDLER( overdriv_sound_1_r )
{
- return K053260_1_r(2 + offset);
+ return K053260_1_r(machine,2 + offset);
}
static WRITE16_HANDLER( overdriv_soundirq_w )
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index d3ac1b2e219..aa63f0da8c1 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -522,11 +522,11 @@ static WRITE8_HANDLER( alibaba_sound_w )
/* since the sound region in Ali Baba is not contiguous, translate the
offset into the 0-0x1f range */
if (offset < 0x10)
- pacman_sound_w(offset, data);
+ pacman_sound_w(machine, offset, data);
else if (offset < 0x20)
spriteram_2[offset - 0x10] = data;
else
- pacman_sound_w(offset - 0x10, data);
+ pacman_sound_w(machine, offset - 0x10, data);
}
@@ -557,7 +557,7 @@ static READ8_HANDLER( alibaba_mystery_2_r )
static READ8_HANDLER( maketrax_special_port2_r )
{
- int data = input_port_2_r(offset);
+ int data = input_port_2_r(machine,offset);
int pc = activecpu_get_previouspc();
if ((pc == 0x1973) || (pc == 0x2389)) return data | 0x40;
@@ -600,7 +600,7 @@ static READ8_HANDLER( maketrax_special_port3_r )
static READ8_HANDLER( korosuke_special_port2_r )
{
- int data = input_port_2_r(offset);
+ int data = input_port_2_r(machine,offset);
int pc = activecpu_get_previouspc();
if ((pc == 0x196e) || (pc == 0x2387)) return data | 0x40;
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 2ab569ad0ec..1f5083bdde1 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -62,7 +62,7 @@ static WRITE8_HANDLER( pandoras_int_control_w ){
break;
case 0x03: coin_counter_w(1,data & 0x01);
break;
- case 0x05: pandoras_flipscreen_w(0, data);
+ case 0x05: pandoras_flipscreen_w(machine, 0, data);
break;
case 0x06: if (!data) cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, CLEAR_LINE);
irq_enable_b = data;
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 1d47cae3ce7..ef88f25cf5a 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -45,9 +45,9 @@ static WRITE8_HANDLER( bankedram_w )
if (videobank & 0x01)
{
if (videobank & 0x04)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset + 0x0800,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset + 0x0800,data);
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
else
ram[offset] = data;
@@ -56,17 +56,17 @@ static WRITE8_HANDLER( bankedram_w )
static READ8_HANDLER( parodius_052109_053245_r )
{
if (videobank & 0x02)
- return K053245_r(offset);
+ return K053245_r(machine,offset);
else
- return K052109_r(offset);
+ return K052109_r(machine,offset);
}
static WRITE8_HANDLER( parodius_052109_053245_w )
{
if (videobank & 0x02)
- K053245_w(offset,data);
+ K053245_w(machine,offset,data);
else
- K052109_w(offset,data);
+ K052109_w(machine,offset,data);
}
static WRITE8_HANDLER( parodius_videobank_w )
@@ -95,7 +95,7 @@ static WRITE8_HANDLER( parodius_3fc0_w )
static READ8_HANDLER( parodius_sound_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine,2 + offset);
}
static WRITE8_HANDLER( parodius_sh_irqtrigger_w )
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 82743f9726a..30f7999987b 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -141,8 +141,8 @@ static WRITE16_HANDLER( bitmap_1_w )
switch(mem_mask)
{
case 0:
- bitmap_1_w(offset,data,0x00ff);
- bitmap_1_w(offset,data,0xff00);
+ bitmap_1_w(machine,offset,data,0x00ff);
+ bitmap_1_w(machine,offset,data,0xff00);
return;
case 0x00ff:
@@ -162,7 +162,7 @@ static WRITE16_HANDLER( bitmap_1_w )
static READ16_HANDLER( oki_0_r )
{
if(offset)
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
else
return 0;
}
@@ -170,19 +170,19 @@ static READ16_HANDLER( oki_0_r )
static WRITE16_HANDLER( oki_0_w )
{
if(offset)
- OKIM6295_data_0_w(0, data);
+ OKIM6295_data_0_w(machine, 0, data);
}
static WRITE16_HANDLER( oki_1_w )
{
if(offset)
- OKIM6295_data_1_w(0, data);
+ OKIM6295_data_1_w(machine, 0, data);
}
static READ16_HANDLER( oki_1_r )
{
if(offset)
- return OKIM6295_status_1_r(0);
+ return OKIM6295_status_1_r(machine, 0);
else
return 0;
}
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 59b8f9bf72f..9bd72b54205 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -117,7 +117,7 @@ WRITE16_HANDLER( pass_bg_videoram_w );
static WRITE16_HANDLER ( pass_soundwrite )
{
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
/* todo: check all memory regions actually readable / read from */
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index d2b79a7586d..80308234e68 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -54,8 +54,8 @@ extern VIDEO_UPDATE( pbaction );
static WRITE8_HANDLER( pbaction_sh_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0x00);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0x00);
}
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 4b9800c2ec6..aeb9b068ef6 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -46,8 +46,8 @@ static WRITE8_HANDLER( pcktgal_sound_bank_w )
static WRITE8_HANDLER( pcktgal_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static int msm5205next;
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index e3df45ae402..ca6718f9b73 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -445,15 +445,15 @@ static WRITE16_HANDLER ( m68k_l1_w )
{
if(ACCESSING_LSB) {
if (PGMLOGERROR) logerror("SL 1 m68.w %02x (%06x) IRQ\n", data & 0xff, activecpu_get_pc());
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
}
static WRITE8_HANDLER( z80_l3_w )
{
if (PGMLOGERROR) logerror("SL 3 z80.w %02x (%04x)\n", data, activecpu_get_pc());
- soundlatch3_w(0, data);
+ soundlatch3_w(machine, 0, data);
}
static void sound_irq(int level)
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 9f39bee5f0c..f4a472d28ca 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -155,7 +155,7 @@ static WRITE8_HANDLER( pipedrm_bankswitch_w )
memory_set_bank(1, data & 0x7);
/* map to the fromance gfx register */
- fromance_gfxreg_w(offset, ((data >> 6) & 0x01) | /* flipscreen */
+ fromance_gfxreg_w(machine, offset, ((data >> 6) & 0x01) | /* flipscreen */
((~data >> 2) & 0x02)); /* videoram select */
}
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 1744c3ec027..744feff1667 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -170,7 +170,7 @@ static READ16_HANDLER( pirates_in1_r )
bit = 1;
/* bit 4 is EEPROM data, bit 7 is protection */
- return input_port_1_word_r(0,0) | (EEPROM_read_bit() << 4) | (bit << 7);
+ return input_port_1_word_r(machine,0,0) | (EEPROM_read_bit() << 4) | (bit << 7);
}
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index a08b444289a..671e952340f 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -49,14 +49,14 @@ static WRITE16_HANDLER( pkscramble_YM2203_w )
{
switch (offset)
{
- case 0: YM2203_control_port_0_w(0,data & 0xff);break;
- case 1: YM2203_write_port_0_w(0,data & 0xff);break;
+ case 0: YM2203_control_port_0_w(machine,0,data & 0xff);break;
+ case 1: YM2203_write_port_0_w(machine,0,data & 0xff);break;
}
}
static READ16_HANDLER( pkscramble_YM2203_r )
{
- return YM2203_status_port_0_r(0);
+ return YM2203_status_port_0_r(machine,0);
}
// input bit 0x20 in port1 should stay low until bit 0x20 is written here, then
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index ee32b2806be..56a899b341e 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -409,17 +409,17 @@ static WRITE8_HANDLER( time_w )
static READ8_HANDLER( psg_4015_r )
{
- return NESPSG_0_r(0x15);
+ return NESPSG_0_r(machine, 0x15);
}
static WRITE8_HANDLER( psg_4015_w )
{
- NESPSG_0_w(0x15, data);
+ NESPSG_0_w(machine, 0x15, data);
}
static WRITE8_HANDLER( psg_4017_w )
{
- NESPSG_0_w(0x17, data);
+ NESPSG_0_w(machine, 0x17, data);
}
/******************************************************************************/
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index bd1e523f1b8..2b6b789f193 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -137,7 +137,7 @@ static READ16_HANDLER( wbeachvl_port0_r )
bit = EEPROM_read_bit() << 7;
- return (input_port_0_r(0) & 0x7f) | bit;
+ return (input_port_0_r(machine,0) & 0x7f) | bit;
}
static READ16_HANDLER( hotmind_port2_r )
@@ -146,7 +146,7 @@ static READ16_HANDLER( hotmind_port2_r )
bit = EEPROM_read_bit() << 7;
- return (input_port_2_r(0) & 0x7f) | bit;
+ return (input_port_2_r(machine,0) & 0x7f) | bit;
}
static WRITE16_HANDLER( wbeachvl_coin_eeprom_w )
@@ -202,7 +202,7 @@ static READ8_HANDLER( playmark_snd_command_r )
// logerror("PortB reading %02x from the 68K\n",data);
}
else if ((playmark_oki_control & 0x38) == 0x28) {
- data = (OKIM6295_status_0_r(0) & 0x0f);
+ data = (OKIM6295_status_0_r(machine,0) & 0x0f);
// logerror("PortB reading %02x from the OKI status port\n",data);
}
@@ -255,13 +255,12 @@ static WRITE8_HANDLER( playmark_snd_control_w )
1 Not used
0 Not used
*/
-
playmark_oki_control = data;
if ((data & 0x38) == 0x18)
{
// logerror("Writing %02x to OKI1, PortC=%02x, Code=%02x\n",playmark_oki_command,playmark_oki_control,playmark_snd_command);
- OKIM6295_data_0_w(0, playmark_oki_command);
+ OKIM6295_data_0_w(machine, 0, playmark_oki_command);
}
}
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 785a3436a27..c63e7174669 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -166,7 +166,7 @@ static INTERRUPT_GEN(polygonet_interrupt)
static READ32_HANDLER( sound_r )
{
- int latch = soundlatch3_r(0);
+ int latch = soundlatch3_r(machine, 0);
if (latch == 0xe) latch = 0xf; /* hack: until 54539 NMI disable found */
@@ -177,11 +177,11 @@ static WRITE32_HANDLER( sound_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(0, (data>>8)&0xff);
+ soundlatch_w(machine, 0, (data>>8)&0xff);
}
else
{
- soundlatch2_w(0, data&0xff);
+ soundlatch2_w(machine, 0, data&0xff);
}
}
diff --git a/src/mame/drivers/pmpoker.c b/src/mame/drivers/pmpoker.c
index d9126975798..4b09f46f9c4 100644
--- a/src/mame/drivers/pmpoker.c
+++ b/src/mame/drivers/pmpoker.c
@@ -902,10 +902,10 @@ static READ8_HANDLER( mux_port_r )
{
switch( mux_data&0xf0 ) /* bits 4-7 */
{
- case 0x10: return input_port_0_r(0);
- case 0x20: return input_port_1_r(0);
- case 0x40: return input_port_2_r(0);
- case 0x80: return input_port_3_r(0);
+ case 0x10: return input_port_0_r(machine,0);
+ case 0x20: return input_port_1_r(machine,0);
+ case 0x40: return input_port_2_r(machine,0);
+ case 0x80: return input_port_3_r(machine,0);
}
return 0xff;
}
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 9a5f9a6e2e9..f14821dbfc6 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -94,8 +94,8 @@ static WRITE8_HANDLER( pokechmp_sound_bank_w )
static WRITE8_HANDLER( pokechmp_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index f62d747fe7b..7ac541956cb 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -327,7 +327,7 @@ static WRITE8_HANDLER( polepos_latch_w )
case 0x00: /* IRQON */
cpu_interrupt_enable(0,bit);
if (!bit)
- cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
break;
case 0x01: /* IOSEL */
@@ -338,8 +338,8 @@ static WRITE8_HANDLER( polepos_latch_w )
polepos_sound_enable(bit);
if (!bit)
{
- polepos_engine_sound_lsb_w(0,0);
- polepos_engine_sound_msb_w(0,0);
+ polepos_engine_sound_lsb_w(machine,0,0);
+ polepos_engine_sound_msb_w(machine,0,0);
}
break;
@@ -348,11 +348,11 @@ static WRITE8_HANDLER( polepos_latch_w )
break;
case 0x04: /* RESB */
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
break;
case 0x05: /* RESA */
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, bit ? CLEAR_LINE : ASSERT_LINE);
break;
case 0x06: /* SB0 */
@@ -360,7 +360,7 @@ static WRITE8_HANDLER( polepos_latch_w )
break;
case 0x07: /* CHACL */
- polepos_chacl_w(offset,data);
+ polepos_chacl_w(machine,offset,data);
break;
}
}
@@ -417,7 +417,7 @@ static MACHINE_RESET( polepos )
/* Reset all latches */
for (i = 0;i < 8;i++)
- polepos_latch_w(i,0);
+ polepos_latch_w(machine,i,0);
namco_06xx_init(0, 0,
NAMCOIO_51XX, &intf0,
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 7416b6baaf8..efa8082e8ec 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -188,7 +188,7 @@ static WRITE32_HANDLER( control_w )
/* toggling BSMT off then on causes a reset */
if (!(old & 0x80000000) && (control_data & 0x80000000))
{
- BSMT2000_data_0_w(bsmt_data_bank, 0, 0);
+ BSMT2000_data_0_w(machine, bsmt_data_bank, 0, 0);
sndti_reset(SOUND_BSMT2000, 0);
}
@@ -208,7 +208,7 @@ static WRITE32_HANDLER( control_w )
static WRITE32_HANDLER( bsmt2000_reg_w )
{
if (control_data & 0x80000000)
- BSMT2000_data_0_w(bsmt_reg, data & 0xffff, mem_mask | 0xffff0000);
+ BSMT2000_data_0_w(machine, bsmt_reg, data & 0xffff, mem_mask | 0xffff0000);
else
COMBINE_DATA(&bsmt_data_offset);
}
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index df2666712fd..da7dbf0be5e 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -65,7 +65,7 @@ static WRITE8_HANDLER( poolshrk_watchdog_w )
{
if ((offset & 3) == 3)
{
- watchdog_reset_w(0, 0);
+ watchdog_reset_w(machine, 0, 0);
}
}
@@ -82,7 +82,7 @@ static READ8_HANDLER( poolshrk_input_r )
if ((offset & 3) == 3)
{
- watchdog_reset_r(0);
+ watchdog_reset_r(machine, 0);
}
return val;
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 4499b57e303..58a929963e0 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -463,8 +463,8 @@ static READ8_HANDLER( popeye_portA_r )
int res;
- res = input_port_3_r(offset);
- res |= (input_port_4_r(offset) << (7-dswbit)) & 0x80;
+ res = input_port_3_r(machine,offset);
+ res |= (input_port_4_r(machine,offset) << (7-dswbit)) & 0x80;
return res;
}
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 2c69bffde48..0d4745a6856 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -63,7 +63,7 @@ static NVRAM_HANDLER( magicstk )
static READ16_HANDLER( magicstk_port2_r )
{
- return (input_port_2_r(0) & 0xfe) | EEPROM_read_bit();
+ return (input_port_2_r(machine,0) & 0xfe) | EEPROM_read_bit();
}
static WRITE16_HANDLER( magicstk_coin_eeprom_w )
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index d67f1db5057..7a41c2d3262 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -77,7 +77,7 @@ static WRITE16_HANDLER( powerins_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(machine, 0, data & 0xff);
}
}
static READ8_HANDLER( powerinb_fake_ym2203_r )
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 4535c2d30ef..18ffcf5f72d 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -190,9 +190,9 @@ static WRITE8_HANDLER(ppmast_sound_w)
{
switch(offset&0xff)
{
- case 0: YM2413_register_port_0_w(0,data); break;
- case 1: YM2413_data_port_0_w(0,data); break;
- case 2: DAC_0_data_w(0,data);break;
+ case 0: YM2413_register_port_0_w(machine,0,data); break;
+ case 1: YM2413_data_port_0_w(machine,0,data); break;
+ case 2: DAC_0_data_w(machine,0,data);break;
default: logerror("%x %x - %x\n",offset,data,activecpu_get_previouspc());
}
}
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index c64bc174f63..f985f326ea7 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -29,8 +29,8 @@ static UINT16 *prehisle_ram16;
static WRITE16_HANDLER( prehisle_sound16_w )
{
- soundlatch_w(0, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
/*******************************************************************************/
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index efc57e7d553..f1da4e0ba24 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -311,8 +311,8 @@ static READ32_HANDLER( s1945_input_r )
switch(offset)
{
case 0x0: return (readinputport(0) << 16) | psikyo_readcoinport(1);
- case 0x1: return (((readinputport(2) << 16) | readinputport(3)) & 0xffff000f) | s1945_mcu_r(offset-1, mem_mask);
- case 0x2: return s1945_mcu_r(offset-1, mem_mask);
+ case 0x1: return (((readinputport(2) << 16) | readinputport(3)) & 0xffff000f) | s1945_mcu_r(machine, offset-1, mem_mask);
+ case 0x2: return s1945_mcu_r(machine, offset-1, mem_mask);
default: logerror("PC %06X - Read input %02X !\n", activecpu_get_pc(), offset*2);
return 0;
}
@@ -331,9 +331,9 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
{
paletteram16 = (UINT16 *)paletteram32;
if (ACCESSING_MSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2, data >> 16, mem_mask >> 16);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
if (ACCESSING_LSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2+1, data, mem_mask);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
static ADDRESS_MAP_START( psikyo_readmem, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index d4a8cbfc2e8..1b15997bdea 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -365,29 +365,29 @@ static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */
static READ32_HANDLER( psh_ymf_fm_r )
{
- return YMF278B_status_port_0_r(0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
+ return YMF278B_status_port_0_r(machine, 0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
}
static WRITE32_HANDLER( psh_ymf_fm_w )
{
if (!(mem_mask & 0xff000000)) // FM bank 1 address (OPL2/OPL3 compatible)
{
- YMF278B_control_port_0_A_w(0, data>>24);
+ YMF278B_control_port_0_A_w(machine, 0, data>>24);
}
if (!(mem_mask & 0x00ff0000)) // FM bank 1 data
{
- YMF278B_data_port_0_A_w(0, data>>16);
+ YMF278B_data_port_0_A_w(machine, 0, data>>16);
}
if (!(mem_mask & 0x0000ff00)) // FM bank 2 address (OPL3/YMF 262 extended)
{
- YMF278B_control_port_0_B_w(0, data>>8);
+ YMF278B_control_port_0_B_w(machine, 0, data>>8);
}
if (!(mem_mask & 0x000000ff)) // FM bank 2 data
{
- YMF278B_data_port_0_B_w(0, data);
+ YMF278B_data_port_0_B_w(machine, 0, data);
}
}
@@ -395,7 +395,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
{
if (!(mem_mask & 0xff000000)) // PCM address (OPL4/YMF 278B extended)
{
- YMF278B_control_port_0_C_w(0, data>>24);
+ YMF278B_control_port_0_C_w(machine, 0, data>>24);
#if ROMTEST
if (data>>24 == 0x06) // Reset Sample reading (They always write this code immediately before reading data)
@@ -407,7 +407,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
if (!(mem_mask & 0x00ff0000)) // PCM data
{
- YMF278B_data_port_0_C_w(0, data>>16);
+ YMF278B_data_port_0_C_w(machine, 0, data>>16);
}
}
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index e57eb6f8b97..7051134a58d 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -463,29 +463,29 @@ static READ32_HANDLER( psh_sample_r ) /* Send sample data for test */
static READ32_HANDLER( psh_ymf_fm_r )
{
- return YMF278B_status_port_0_r(0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
+ return YMF278B_status_port_0_r(machine,0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
}
static WRITE32_HANDLER( psh_ymf_fm_w )
{
if (!(mem_mask & 0xff000000)) // FM bank 1 address (OPL2/OPL3 compatible)
{
- YMF278B_control_port_0_A_w(0, data>>24);
+ YMF278B_control_port_0_A_w(machine, 0, data>>24);
}
if (!(mem_mask & 0x00ff0000)) // FM bank 1 data
{
- YMF278B_data_port_0_A_w(0, data>>16);
+ YMF278B_data_port_0_A_w(machine, 0, data>>16);
}
if (!(mem_mask & 0x0000ff00)) // FM bank 2 address (OPL3/YMF 262 extended)
{
- YMF278B_control_port_0_B_w(0, data>>8);
+ YMF278B_control_port_0_B_w(machine, 0, data>>8);
}
if (!(mem_mask & 0x000000ff)) // FM bank 2 data
{
- YMF278B_data_port_0_B_w(0, data);
+ YMF278B_data_port_0_B_w(machine, 0, data);
}
}
@@ -493,7 +493,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
{
if (!(mem_mask & 0xff000000)) // PCM address (OPL4/YMF 278B extended)
{
- YMF278B_control_port_0_C_w(0, data>>24);
+ YMF278B_control_port_0_C_w(machine, 0, data>>24);
#if ROMTEST
if (data>>24 == 0x06) // Reset Sample reading (They always write this code immediately before reading data)
@@ -505,7 +505,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
if (!(mem_mask & 0x00ff0000)) // PCM data
{
- YMF278B_data_port_0_C_w(0, data>>16);
+ YMF278B_data_port_0_C_w(machine, 0, data>>16);
}
}
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index cc7dd080053..3110b31bec0 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -201,7 +201,7 @@ static WRITE8_HANDLER( nmi_sub_enable_w )
static WRITE8_HANDLER(sound_w)
{
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
}
@@ -441,7 +441,7 @@ static INTERRUPT_GEN( pturn_main_intgen )
static MACHINE_RESET( pturn )
{
- soundlatch_clear_w(0,0);
+ soundlatch_clear_w(machine,0,0);
}
static MACHINE_DRIVER_START( pturn )
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 6769c257af0..82c6195fff5 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -92,7 +92,7 @@ INPUT_PORTS_END
static READ16_HANDLER( puckpkmn_YM3438_r )
{
- return YM3438_status_port_0_A_r(0) << 8;
+ return YM3438_status_port_0_A_r(machine, 0) << 8;
}
static WRITE16_HANDLER( puckpkmn_YM3438_w )
@@ -100,12 +100,12 @@ static WRITE16_HANDLER( puckpkmn_YM3438_w )
switch (offset)
{
case 0:
- if (ACCESSING_MSB) YM3438_control_port_0_A_w (0, (data >> 8) & 0xff);
- else YM3438_data_port_0_A_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM3438_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ else YM3438_data_port_0_A_w (machine, 0, (data >> 0) & 0xff);
break;
case 1:
- if (ACCESSING_MSB) YM3438_control_port_0_B_w (0, (data >> 8) & 0xff);
- else YM3438_data_port_0_B_w (0, (data >> 0) & 0xff);
+ if (ACCESSING_MSB) YM3438_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ else YM3438_data_port_0_B_w (machine, 0, (data >> 0) & 0xff);
break;
}
}
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 19a468f826c..6e2a544d55f 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -136,7 +136,7 @@ DRIVER_INIT( armwrest );
static READ8_HANDLER( punchout_input_3_r )
{
- int data = input_port_3_r(offset);
+ int data = input_port_3_r(machine, offset);
/* bit 4 is busy pin level */
if( VLM5030_BSY() ) data &= ~0x10;
else data |= 0x10;
@@ -305,90 +305,90 @@ static WRITE8_HANDLER( spunchout_prot_w ) {
}
static READ8_HANDLER( spunchout_prot_0_r ) {
- return spunchout_prot_r( 0 );
+ return spunchout_prot_r( machine, 0 );
}
static WRITE8_HANDLER( spunchout_prot_0_w ) {
- spunchout_prot_w( 0, data );
+ spunchout_prot_w( machine, 0, data );
}
static READ8_HANDLER( spunchout_prot_1_r ) {
- return spunchout_prot_r( 1 );
+ return spunchout_prot_r( machine, 1 );
}
static WRITE8_HANDLER( spunchout_prot_1_w ) {
- spunchout_prot_w( 1, data );
+ spunchout_prot_w( machine, 1, data );
}
static READ8_HANDLER( spunchout_prot_2_r ) {
- return spunchout_prot_r( 2 );
+ return spunchout_prot_r( machine, 2 );
}
static WRITE8_HANDLER( spunchout_prot_2_w ) {
- spunchout_prot_w( 2, data );
+ spunchout_prot_w( machine, 2, data );
}
static READ8_HANDLER( spunchout_prot_3_r ) {
- return spunchout_prot_r( 3 );
+ return spunchout_prot_r( machine, 3 );
}
static WRITE8_HANDLER( spunchout_prot_3_w ) {
- spunchout_prot_w( 3, data );
+ spunchout_prot_w( machine, 3, data );
}
static READ8_HANDLER( spunchout_prot_5_r ) {
- return spunchout_prot_r( 5 );
+ return spunchout_prot_r( machine, 5 );
}
static WRITE8_HANDLER( spunchout_prot_5_w ) {
- spunchout_prot_w( 5, data );
+ spunchout_prot_w( machine, 5, data );
}
static READ8_HANDLER( spunchout_prot_6_r ) {
- return spunchout_prot_r( 6 );
+ return spunchout_prot_r( machine, 6 );
}
static WRITE8_HANDLER( spunchout_prot_6_w ) {
- spunchout_prot_w( 6, data );
+ spunchout_prot_w( machine, 6, data );
}
static READ8_HANDLER( spunchout_prot_9_r ) {
- return spunchout_prot_r( 9 );
+ return spunchout_prot_r( machine, 9 );
}
static READ8_HANDLER( spunchout_prot_b_r ) {
- return spunchout_prot_r( 11 );
+ return spunchout_prot_r( machine, 11 );
}
static WRITE8_HANDLER( spunchout_prot_b_w ) {
- spunchout_prot_w( 11, data );
+ spunchout_prot_w( machine, 11, data );
}
static READ8_HANDLER( spunchout_prot_c_r ) {
- return spunchout_prot_r( 12 );
+ return spunchout_prot_r( machine, 12 );
}
static WRITE8_HANDLER( spunchout_prot_d_w ) {
- spunchout_prot_w( 13, data );
+ spunchout_prot_w( machine, 13, data );
}
static READ8_HANDLER( spunchout_prot_a_r ) {
- return spunchout_prot_r( 10 );
+ return spunchout_prot_r( machine, 10 );
}
static WRITE8_HANDLER( spunchout_prot_a_w ) {
- spunchout_prot_w( 10, data );
+ spunchout_prot_w( machine, 10, data );
}
#if 0
static READ8_HANDLER( spunchout_prot_f_r ) {
- return spunchout_prot_r( 15 );
+ return spunchout_prot_r( machine, 15 );
}
#endif
static WRITE8_HANDLER( spunchout_prot_f_w ) {
- spunchout_prot_w( 15, data );
+ spunchout_prot_w( machine, 15, data );
}
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 2bc8e1ee927..e7f1f408c87 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -40,7 +40,7 @@ static UINT16 latch,new_latch=0;
static WRITE16_HANDLER( pushman_control_w )
{
if (ACCESSING_MSB)
- soundlatch_w(0,(data>>8)&0xff);
+ soundlatch_w(machine,0,(data>>8)&0xff);
}
static READ16_HANDLER( pushman_68705_r )
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 5ad13b2e829..080fc4f5b46 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -47,16 +47,15 @@ static INT32 gp2_irq_control;
static READ16_HANDLER( i_port1_r )
{
if (control & 0x0080)
- return input_port_0_word_r(0,0);
+ return input_port_0_word_r(machine,0,0);
else
- return input_port_1_word_r(0,0);
+ return input_port_1_word_r(machine,0,0);
}
static READ16_HANDLER( i_port2_r )
{
/* bit 0-1 battery power sensor: 3=good, 2=low, other=bad */
-
- return (input_port_2_word_r(0,0) & 0xfffc) | 0x0003;
+ return (input_port_2_word_r(machine,0,0) & 0xfffc) | 0x0003;
}
@@ -129,7 +128,7 @@ static WRITE16_HANDLER( gp2_control_w )
static READ16_HANDLER( v_rom_r )
{
UINT8 *mem8 = memory_region(REGION_GFX1);
- int bank = K056832_word_r(0x34/2, 0xffff);
+ int bank = K056832_word_r(machine, 0x34/2, 0xffff);
offset += bank * 0x800 * 4;
@@ -143,33 +142,33 @@ static READ16_HANDLER( v_rom_r )
static READ16_HANDLER( gp2_vram_r )
{
if (offset < 0x1000/2)
- return K056832_ram_word_r(offset*2+1, mem_mask);
+ return K056832_ram_word_r(machine, offset*2+1, mem_mask);
else
- return K056832_ram_word_r((offset-0x1000/2)*2, mem_mask);
+ return K056832_ram_word_r(machine, (offset-0x1000/2)*2, mem_mask);
}
static READ16_HANDLER( gp2_vram_mirror_r )
{
if (offset < 0x1000/2)
- return K056832_ram_word_r(offset*2, mem_mask);
+ return K056832_ram_word_r(machine, offset*2, mem_mask);
else
- return K056832_ram_word_r((offset-0x1000/2)*2+1, mem_mask);
+ return K056832_ram_word_r(machine, (offset-0x1000/2)*2+1, mem_mask);
}
static WRITE16_HANDLER( gp2_vram_w )
{
if (offset < 0x1000/2)
- K056832_ram_word_w(offset*2+1, data, mem_mask);
+ K056832_ram_word_w(machine, offset*2+1, data, mem_mask);
else
- K056832_ram_word_w((offset-0x1000/2)*2, data, mem_mask);
+ K056832_ram_word_w(machine, (offset-0x1000/2)*2, data, mem_mask);
}
static WRITE16_HANDLER( gp2_vram_mirror_w )
{
if (offset < 0x1000/2)
- K056832_ram_word_w(offset*2, data, mem_mask);
+ K056832_ram_word_w(machine, offset*2, data, mem_mask);
else
- K056832_ram_word_w((offset-0x1000/2)*2+1, data, mem_mask);
+ K056832_ram_word_w(machine, (offset-0x1000/2)*2+1, data, mem_mask);
}
@@ -196,7 +195,7 @@ static WRITE16_HANDLER( sndram_w )
static READ16_HANDLER( k054539_word_r )
{
if (ACCESSING_LSB16)
- return K054539_0_r(offset);
+ return K054539_0_r(machine, offset);
return 0;
}
@@ -204,7 +203,7 @@ static READ16_HANDLER( k054539_word_r )
static WRITE16_HANDLER( k054539_word_w )
{
if (ACCESSING_LSB16)
- K054539_0_w(offset, data);
+ K054539_0_w(machine, offset, data);
}
/*************/
@@ -215,23 +214,23 @@ static WRITE16_HANDLER( k054539_word_w )
static READ16_HANDLER( ide_std_r )
{
if (offset & 0x01)
- return ide_controller16_0_r(IDE_STD_OFFSET + offset/2, 0x00ff) >> 8;
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset/2, 0x00ff) >> 8;
else
- return ide_controller16_0_r(IDE_STD_OFFSET + offset/2, 0x0000);
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset/2, 0x0000);
}
static WRITE16_HANDLER( ide_std_w )
{
if (offset & 0x01)
- ide_controller16_0_w(IDE_STD_OFFSET + offset/2, data << 8, 0x00ff);
+ ide_controller16_0_w(machine, IDE_STD_OFFSET + offset/2, data << 8, 0x00ff);
else
- ide_controller16_0_w(IDE_STD_OFFSET + offset/2, data, 0x0000);
+ ide_controller16_0_w(machine, IDE_STD_OFFSET + offset/2, data, 0x0000);
}
static READ16_HANDLER( ide_alt_r )
{
if (offset == 0)
- return ide_controller16_0_r(IDE_ALT_OFFSET, 0xff00);
+ return ide_controller16_0_r(machine, IDE_ALT_OFFSET, 0xff00);
return 0;
}
@@ -239,7 +238,7 @@ static READ16_HANDLER( ide_alt_r )
static WRITE16_HANDLER( ide_alt_w )
{
if (offset == 0)
- ide_controller16_0_w(IDE_ALT_OFFSET, data, 0xff00);
+ ide_controller16_0_w(machine, IDE_ALT_OFFSET, data, 0xff00);
}
@@ -261,9 +260,9 @@ static READ16_HANDLER( gp2_ide_std_r )
break;
}
}
- return ide_controller16_0_r(IDE_STD_OFFSET + offset/2, 0x00ff) >> 8;
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset/2, 0x00ff) >> 8;
} else {
- return ide_controller16_0_r(IDE_STD_OFFSET + offset/2, 0x0000);
+ return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset/2, 0x0000);
}
}
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index e96167ee741..2eb50836bd4 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -120,18 +120,18 @@ static WRITE16_HANDLER( led_w )
static WRITE16_HANDLER( pokey_word_w )
{
if (offset & 0x10) /* A5 selects chip */
- pokey2_w(offset & 0x0f, data);
+ pokey2_w(machine, offset & 0x0f, data);
else
- pokey1_w(offset & 0x0f, data);
+ pokey1_w(machine, offset & 0x0f, data);
}
static READ16_HANDLER( pokey_word_r )
{
if (offset & 0x10)
- return pokey2_r(offset & 0x0f);
+ return pokey2_r(machine, offset & 0x0f);
else
- return pokey1_r(offset & 0x0f);
+ return pokey1_r(machine, offset & 0x0f);
}
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 9b040adb18e..c4859d3af19 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -112,10 +112,10 @@ static READ8_HANDLER( quasar_IO_r )
{
UINT8 ans = 0;
- if (IOpage == 0) ans = input_port_0_r(0);
- if (IOpage == 1) ans = input_port_1_r(0);
- if (IOpage == 2) ans = input_port_2_r(0);
- if (IOpage == 3) ans = input_port_3_r(0);
+ if (IOpage == 0) ans = input_port_0_r(machine, 0);
+ if (IOpage == 1) ans = input_port_1_r(machine, 0);
+ if (IOpage == 2) ans = input_port_2_r(machine, 0);
+ if (IOpage == 3) ans = input_port_3_r(machine, 0);
return ans;
}
@@ -150,7 +150,7 @@ static READ8_HANDLER( quasar_sh_command_r )
// return input_port_5_r(0);
// Add in sound DIP switch
- return (Quasar_Command) + (input_port_5_r(0) & 0x30);
+ return (Quasar_Command) + (input_port_5_r(machine, 0) & 0x30);
}
static READ8_HANDLER( Quasar_T1_r )
@@ -160,7 +160,7 @@ static READ8_HANDLER( Quasar_T1_r )
static WRITE8_HANDLER( Quasar_DAC_w )
{
- DAC_0_signed_data_w(0,data);
+ DAC_0_signed_data_w(machine,0,data);
}
// memory map taken from the manual
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 58b045ae00e..f51899495ab 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -91,7 +91,7 @@ static void main_cpu_irq(int state)
static READ8_HANDLER( audio_command_r )
{
- UINT8 ret = soundlatch_r(0);
+ UINT8 ret = soundlatch_r(machine, 0);
if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", safe_activecpu_get_pc(), ret);
@@ -101,8 +101,8 @@ if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", safe_activ
static WRITE8_HANDLER( audio_command_w )
{
- soundlatch_w(0, ~data);
- cpunum_set_input_line(Machine, 1, M6802_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, 0, ~data);
+ cpunum_set_input_line(machine, 1, M6802_IRQ_LINE, HOLD_LINE);
if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", safe_activecpu_get_pc(), data^0xff);
}
@@ -110,7 +110,7 @@ if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", safe_act
static READ8_HANDLER( audio_answer_r )
{
- UINT8 ret = soundlatch2_r(0);
+ UINT8 ret = soundlatch2_r(machine, 0);
if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Answer Read: %x\n", safe_activecpu_get_pc(), ret);
return ret;
@@ -123,8 +123,8 @@ static WRITE8_HANDLER( audio_answer_w )
if (safe_activecpu_get_pc() == 0xfb12)
data = 0x00;
- soundlatch2_w(0, data);
- cpunum_set_input_line(Machine, 0, M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch2_w(machine, 0, data);
+ cpunum_set_input_line(machine, 0, M6809_IRQ_LINE, HOLD_LINE);
if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Answer Write: %x\n", safe_activecpu_get_pc(), data);
}
@@ -151,12 +151,12 @@ static READ8_HANDLER( AY8910_port_r )
if (AY8910_selected & 0x08)
{
- ret = AY8910_read_port_0_r(offset);
+ ret = AY8910_read_port_0_r(machine, offset);
if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #0 Port Read: %x\n", safe_activecpu_get_pc(), ret);}
if (AY8910_selected & 0x10)
{
- ret = AY8910_read_port_1_r(offset);
+ ret = AY8910_read_port_1_r(machine, offset);
if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #1 Port Read: %x\n", safe_activecpu_get_pc(), ret);}
return ret;
@@ -169,23 +169,23 @@ static WRITE8_HANDLER( AY8910_port_w )
{
if (AY8910_selected & 0x08)
{if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #0 Control Write: %x\n", safe_activecpu_get_pc(), data);
- AY8910_control_port_0_w(offset, data);
+ AY8910_control_port_0_w(machine, offset, data);
}
if (AY8910_selected & 0x10)
{if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #1 Control Write: %x\n", safe_activecpu_get_pc(), data);
- AY8910_control_port_1_w(offset, data);
+ AY8910_control_port_1_w(machine, offset, data);
}
}
else
{
if (AY8910_selected & 0x08)
{if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #0 Port Write: %x\n", safe_activecpu_get_pc(), data);
- AY8910_write_port_0_w(offset, data);
+ AY8910_write_port_0_w(machine, offset, data);
}
if (AY8910_selected & 0x10)
{if (LOG_AUDIO_COMM) logerror("%08X CPU#1 AY8910 #1 Port Write: %x\n", safe_activecpu_get_pc(), data);
- AY8910_write_port_1_w(offset, data);
+ AY8910_write_port_1_w(machine, offset, data);
}
}
}
@@ -220,7 +220,7 @@ static const struct AY8910interface ay8910_2_interface =
static void ttl74123_output_changed(int output)
{
- pia_0_ca1_w(0, output);
+ pia_0_ca1_w(Machine, 0, output);
ttl74123_output = output;
}
@@ -429,7 +429,7 @@ static VIDEO_UPDATE( r2dtank )
static WRITE8_HANDLER( pia_comp_0_w )
{
- pia_0_w(offset, ~data);
+ pia_0_w(machine, offset, ~data);
}
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 1ab121e636d..f66218ddf60 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -228,7 +228,7 @@ static INTERRUPT_GEN( raiden_interrupt )
static VIDEO_EOF( raiden )
{
- buffer_spriteram16_w(0,0,0); /* Could be a memory location instead */
+ buffer_spriteram16_w(machine,0,0,0); /* Could be a memory location instead */
}
static MACHINE_DRIVER_START( raiden )
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index cf5076f4e90..686619cc5a0 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -2097,12 +2097,12 @@ static READ16_HANDLER( r2_playerin_r )
}
static READ16_HANDLER( rdx_v33_oki_r )
{
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine,0);
}
static WRITE16_HANDLER( rdx_v33_oki_w )
{
- if (ACCESSING_LSB) OKIM6295_data_0_w(0, data & 0x00ff);
+ if (ACCESSING_LSB) OKIM6295_data_0_w(machine, 0, data & 0x00ff);
if (ACCESSING_MSB) logerror("rdx_v33_oki_w MSB %04x\n",data);
}
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 7b3cb2d2014..22ee0d0deb0 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -228,7 +228,7 @@ static WRITE8_HANDLER( rallyx_latch_w )
switch (offset)
{
case 0x00: /* BANG */
- rallyx_bang_w(0,bit);
+ rallyx_bang_w(machine,0,bit);
break;
case 0x01: /* INT ON */
@@ -272,7 +272,7 @@ static WRITE8_HANDLER( locomotn_latch_w )
switch (offset)
{
case 0x00: /* SOUNDON */
- timeplt_sh_irqtrigger_w(0,bit);
+ timeplt_sh_irqtrigger_w(machine,0,bit);
break;
case 0x01: /* INTST */
@@ -299,7 +299,7 @@ static WRITE8_HANDLER( locomotn_latch_w )
break;
case 0x07: /* STARSON */
- tactcian_starson_w(offset,bit);
+ tactcian_starson_w(machine,offset,bit);
break;
}
}
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 05622795dcd..229f4c65725 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -86,14 +86,14 @@ static MACHINE_RESET( rampart )
static READ16_HANDLER( adpcm_r )
{
- return (OKIM6295_status_0_r(offset) << 8) | 0x00ff;
+ return (OKIM6295_status_0_r(machine, offset) << 8) | 0x00ff;
}
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_MSB)
- OKIM6295_data_0_w(offset, (data >> 8) & 0xff);
+ OKIM6295_data_0_w(machine, offset, (data >> 8) & 0xff);
}
@@ -109,9 +109,9 @@ static WRITE16_HANDLER( ym2413_w )
if (ACCESSING_MSB)
{
if (offset & 1)
- YM2413_data_port_0_w(0, (data >> 8) & 0xff);
+ YM2413_data_port_0_w(machine, 0, (data >> 8) & 0xff);
else
- YM2413_register_port_0_w(0, (data >> 8) & 0xff);
+ YM2413_register_port_0_w(machine, 0, (data >> 8) & 0xff);
}
}
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index ad48f136544..51b56e7ad56 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -88,7 +88,7 @@ static WRITE16_HANDLER( gms_write3 )
static READ16_HANDLER( eeprom_r )
{
- return (EEPROM_read_bit() << 15)|(input_port_3_word_r(0,0)&0x7fff);
+ return (EEPROM_read_bit() << 15)|(input_port_3_word_r(machine,0,0)&0x7fff);
}
static WRITE16_HANDLER( eeprom_w )
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index eb8f01d925b..baeb0b477e7 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -73,14 +73,14 @@ static READ16_HANDLER( pkgnsh_input_r )
{
case 0x00/2: return 0xffff;
case 0x02/2: return 0xffff;
- case 0x04/2: return input_port_0_word_r(0,0);/*Service buttons*/
- case 0x06/2: return input_port_1_word_r(0,0);/*DIP 2*/
- case 0x08/2: return input_port_2_word_r(0,0);/*DIP 1*/
- case 0x0a/2: return input_port_3_word_r(0,0);/*DIP 1+2 Hi-Bits*/
- case 0x0c/2: return input_port_4_word_r(0,0);/*Handle 1p*/
- case 0x0e/2: return input_port_5_word_r(0,0);/*Buttons 1p*/
- case 0x10/2: return input_port_6_word_r(0,0);/*Handle 2p*/
- case 0x12/2: return input_port_7_word_r(0,0);/*Buttons 2p*/
+ case 0x04/2: return input_port_0_word_r(machine,0,0);/*Service buttons*/
+ case 0x06/2: return input_port_1_word_r(machine,0,0);/*DIP 2*/
+ case 0x08/2: return input_port_2_word_r(machine,0,0);/*DIP 1*/
+ case 0x0a/2: return input_port_3_word_r(machine,0,0);/*DIP 1+2 Hi-Bits*/
+ case 0x0c/2: return input_port_4_word_r(machine,0,0);/*Handle 1p*/
+ case 0x0e/2: return input_port_5_word_r(machine,0,0);/*Buttons 1p*/
+ case 0x10/2: return input_port_6_word_r(machine,0,0);/*Handle 2p*/
+ case 0x12/2: return input_port_7_word_r(machine,0,0);/*Buttons 2p*/
}
return 0xffff;
}
@@ -92,22 +92,22 @@ static READ16_HANDLER( pkgnshdx_input_r )
switch(offset)
{
case 0x00/2: return 0xffff;
- case 0x02/2: return input_port_0_word_r(0,0);/*Service buttons*/
+ case 0x02/2: return input_port_0_word_r(machine,0,0);/*Service buttons*/
/*DSW,same handling as realbrk*/
case 0x04/2:
- if (sel & 0x01) return (input_port_1_word_r(0,0) & 0x00ff) << 8; // DSW1 low bits
- if (sel & 0x02) return (input_port_2_word_r(0,0) & 0x00ff) << 8; // DSW2 low bits
- if (sel & 0x04) return (input_port_3_word_r(0,0) & 0x00ff) << 8; // DSW3 low bits
- if (sel & 0x08) return (input_port_4_word_r(0,0) & 0x00ff) << 8; // DSW4 low bits
+ if (sel & 0x01) return (input_port_1_word_r(machine,0,0) & 0x00ff) << 8; // DSW1 low bits
+ if (sel & 0x02) return (input_port_2_word_r(machine,0,0) & 0x00ff) << 8; // DSW2 low bits
+ if (sel & 0x04) return (input_port_3_word_r(machine,0,0) & 0x00ff) << 8; // DSW3 low bits
+ if (sel & 0x08) return (input_port_4_word_r(machine,0,0) & 0x00ff) << 8; // DSW4 low bits
- if (sel & 0x10) return ((input_port_1_word_r(0,0) & 0x0300) << 0) | // DSWs high 2 bits
- ((input_port_2_word_r(0,0) & 0x0300) << 2) |
- ((input_port_3_word_r(0,0) & 0x0300) << 4) |
- ((input_port_4_word_r(0,0) & 0x0300) << 6) ;
+ if (sel & 0x10) return ((input_port_1_word_r(machine,0,0) & 0x0300) << 0) | // DSWs high 2 bits
+ ((input_port_2_word_r(machine,0,0) & 0x0300) << 2) |
+ ((input_port_3_word_r(machine,0,0) & 0x0300) << 4) |
+ ((input_port_4_word_r(machine,0,0) & 0x0300) << 6) ;
return 0xffff;
- case 0x06/2: return input_port_6_word_r(0,0);/*Buttons+Handle 2p*/
- case 0x08/2: return input_port_5_word_r(0,0);/*Buttons+Handle 1p*/
+ case 0x06/2: return input_port_6_word_r(machine,0,0);/*Buttons+Handle 2p*/
+ case 0x08/2: return input_port_5_word_r(machine,0,0);/*Buttons+Handle 1p*/
case 0x0a/2: return 0xffff;
case 0x0c/2: return 0xffff;
case 0x0e/2: return 0xffff;
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 9675b69b77f..b4c2c209b4b 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -105,7 +105,7 @@ static READ8_HANDLER( redalert_interrupt_clear_r )
static WRITE8_HANDLER( redalert_interrupt_clear_w )
{
- redalert_interrupt_clear_r(0);
+ redalert_interrupt_clear_r(machine, 0);
}
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 3fc6b00dd9a..337cdbc9144 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -135,14 +135,14 @@ static WRITE16_HANDLER( audio_volume_w )
static READ16_HANDLER( adpcm_r )
{
- return OKIM6295_status_0_r(offset) | 0xff00;
+ return OKIM6295_status_0_r(machine, offset) | 0xff00;
}
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_LSB)
- OKIM6295_data_0_w(offset, data & 0xff);
+ OKIM6295_data_0_w(machine, offset, data & 0xff);
}
@@ -158,9 +158,9 @@ static WRITE16_HANDLER( ym2413_w )
if (ACCESSING_LSB)
{
if (offset & 1)
- YM2413_data_port_0_w(0, data & 0xff);
+ YM2413_data_port_0_w(machine, 0, data & 0xff);
else
- YM2413_register_port_0_w(0, data & 0xff);
+ YM2413_register_port_0_w(machine, 0, data & 0xff);
}
}
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index dc48f83d4ca..11b5a21e2f9 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -200,8 +200,8 @@ static WRITE8_HANDLER( adpcm_play_w )
static WRITE8_HANDLER( sound_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE);
}
/********************************************************************************************/
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index a6f01307d9a..20a7b278608 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -93,8 +93,8 @@ static READ8_HANDLER( cpu0_mf800_r )
static WRITE8_HANDLER( soundcommand_w )
{
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 2, 0, HOLD_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 2, 0, HOLD_LINE);
}
static WRITE8_HANDLER( irq0_ack_w )
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 31cff61f9a9..8ed4ab70205 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -163,7 +163,7 @@ logerror("banksw %d\n",bank);
static MACHINE_RESET( themj )
{
- themj_rombank_w(0,0);
+ themj_rombank_w(machine,0,0);
}
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index f755548bd06..bae8575bb1e 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -87,8 +87,8 @@ static WRITE8_HANDLER( rockrage_bankswitch_w )
static WRITE8_HANDLER( rockrage_sh_irqtrigger_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,HOLD_LINE);
}
static READ8_HANDLER( rockrage_VLM5030_busy_r ) {
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 422e16bcbb3..c8f2f64b677 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -44,15 +44,15 @@ logerror("%04x: write %02x to 0010\n",activecpu_get_pc(),data);
static READ8_HANDLER( rollerg_K051316_r )
{
- if (readzoomroms) return K051316_rom_0_r(offset);
- else return K051316_0_r(offset);
+ if (readzoomroms) return K051316_rom_0_r(machine, offset);
+ else return K051316_0_r(machine, offset);
}
static READ8_HANDLER( rollerg_sound_r )
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine, 2 + offset);
}
static WRITE8_HANDLER( soundirq_w )
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 05f394bf0f6..160954d90dd 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -221,26 +221,26 @@ static WRITE8_HANDLER( input_port_select_w )
static READ8_HANDLER( royalmah_player_1_port_r )
{
- int ret = (input_port_0_r(offset) & 0xc0) | 0x3f;
+ int ret = (input_port_0_r(machine,offset) & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_0_r(offset);
- if ((input_port_select & 0x02) == 0) ret &= input_port_1_r(offset);
- if ((input_port_select & 0x04) == 0) ret &= input_port_2_r(offset);
- if ((input_port_select & 0x08) == 0) ret &= input_port_3_r(offset);
- if ((input_port_select & 0x10) == 0) ret &= input_port_4_r(offset);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_0_r(machine,offset);
+ if ((input_port_select & 0x02) == 0) ret &= input_port_1_r(machine,offset);
+ if ((input_port_select & 0x04) == 0) ret &= input_port_2_r(machine,offset);
+ if ((input_port_select & 0x08) == 0) ret &= input_port_3_r(machine,offset);
+ if ((input_port_select & 0x10) == 0) ret &= input_port_4_r(machine,offset);
return ret;
}
static READ8_HANDLER( royalmah_player_2_port_r )
{
- int ret = (input_port_5_r(offset) & 0xc0) | 0x3f;
+ int ret = (input_port_5_r(machine,offset) & 0xc0) | 0x3f;
- if ((input_port_select & 0x01) == 0) ret &= input_port_5_r(offset);
- if ((input_port_select & 0x02) == 0) ret &= input_port_6_r(offset);
- if ((input_port_select & 0x04) == 0) ret &= input_port_7_r(offset);
- if ((input_port_select & 0x08) == 0) ret &= input_port_8_r(offset);
- if ((input_port_select & 0x10) == 0) ret &= input_port_9_r(offset);
+ if ((input_port_select & 0x01) == 0) ret &= input_port_5_r(machine,offset);
+ if ((input_port_select & 0x02) == 0) ret &= input_port_6_r(machine,offset);
+ if ((input_port_select & 0x04) == 0) ret &= input_port_7_r(machine,offset);
+ if ((input_port_select & 0x08) == 0) ret &= input_port_8_r(machine,offset);
+ if ((input_port_select & 0x10) == 0) ret &= input_port_9_r(machine,offset);
return ret;
}
@@ -574,7 +574,7 @@ static READ8_HANDLER( mjifb_rom_io_r )
{
case 0x8000: return readinputport(14); // dsw 4
case 0x8200: return readinputport(13); // dsw 3
- case 0x9001: return AY8910_read_port_0_r(0); // inputs
+ case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
case 0x9011: return readinputport(10);
}
@@ -595,12 +595,12 @@ static WRITE8_HANDLER( mjifb_rom_io_w )
switch(offset)
{
case 0x8e00: palette_base = data & 0x1f; return;
- case 0x9002: AY8910_write_port_0_w(0,data); return;
- case 0x9003: AY8910_control_port_0_w(0,data); return;
+ case 0x9002: AY8910_write_port_0_w(machine,0,data); return;
+ case 0x9003: AY8910_control_port_0_w(machine,0,data); return;
case 0x9010:
- mjifb_coin_counter_w(0,data);
+ mjifb_coin_counter_w(machine,0,data);
return;
- case 0x9011: input_port_select_w(0,data); return;
+ case 0x9011: input_port_select_w(machine,0,data); return;
case 0x9013:
// if (data) popmessage("%02x",data);
return;
@@ -681,7 +681,7 @@ static READ8_HANDLER( mjdejavu_rom_io_r )
{
case 0x8000: return readinputport(14); // dsw 2
case 0x8001: return readinputport(13); // dsw 1
- case 0x9001: return AY8910_read_port_0_r(0); // inputs
+ case 0x9001: return AY8910_read_port_0_r(machine,0); // inputs
case 0x9011: return readinputport(10);
}
@@ -700,11 +700,11 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w )
offset += 0x8000;
switch(offset)
{
- case 0x8802: palette_base = data & 0x1f; return;
- case 0x9002: AY8910_write_port_0_w(0,data); return;
- case 0x9003: AY8910_control_port_0_w(0,data); return;
- case 0x9010: mjifb_coin_counter_w(0,data); return;
- case 0x9011: input_port_select_w(0,data); return;
+ case 0x8802: palette_base = data & 0x1f; return;
+ case 0x9002: AY8910_write_port_0_w(machine,0,data); return;
+ case 0x9003: AY8910_control_port_0_w(machine,0,data); return;
+ case 0x9010: mjifb_coin_counter_w(machine,0,data); return;
+ case 0x9011: input_port_select_w(machine,0,data); return;
case 0x9013:
// if (data) popmessage("%02x",data);
return;
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 74bfbce1644..eb2526e184c 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -119,7 +119,7 @@ static READ16_HANDLER( rng_sysregs_r )
bit8 : freeze
bit9 : joysticks layout(auto detect???)
*/
- return(input_port_0_word_r(0, 0));
+ return(input_port_0_word_r(machine, 0, 0));
break;
case 0x06/2:
@@ -181,13 +181,13 @@ static WRITE16_HANDLER( rng_sysregs_w )
static WRITE16_HANDLER( sound_cmd1_w )
{
if (ACCESSING_MSB)
- soundlatch_w(0, data>>8);
+ soundlatch_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( sound_cmd2_w )
{
if (ACCESSING_MSB)
- soundlatch2_w(0, data>>8);
+ soundlatch2_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( sound_irq_w )
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index cac12a19c01..f172f1a84bb 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -125,7 +125,7 @@ static PALETTE_INIT( safarir )
static TILE_GET_INFO( get_bg_tile_info )
{
int color;
- UINT8 code = ram_r(tile_index | 0x400);
+ UINT8 code = ram_r(machine,tile_index | 0x400);
/* this is wrong */
if (code & 0x80)
@@ -140,7 +140,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static TILE_GET_INFO( get_fg_tile_info )
{
int color, flags;
- UINT8 code = ram_r(tile_index);
+ UINT8 code = ram_r(machine,tile_index);
if (code & 0x80)
color = 7; /* white */
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 673fc0f0fb4..85a064ce47d 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -187,7 +187,7 @@ static WRITE16_HANDLER( sandscrp_latchstatus_word_w )
static READ16_HANDLER( sandscrp_soundlatch_word_r )
{
latch2_full = 0;
- return soundlatch2_r(0);
+ return soundlatch2_r(machine,0);
}
static WRITE16_HANDLER( sandscrp_soundlatch_word_w )
@@ -195,8 +195,8 @@ static WRITE16_HANDLER( sandscrp_soundlatch_word_w )
if (ACCESSING_LSB)
{
latch1_full = 1;
- soundlatch_w(0, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpu_spinuntil_time(ATTOTIME_IN_USEC(100)); // Allow the other cpu to reply
}
}
@@ -253,13 +253,13 @@ static READ8_HANDLER( sandscrp_latchstatus_r )
static READ8_HANDLER( sandscrp_soundlatch_r )
{
latch1_full = 0;
- return soundlatch_r(0);
+ return soundlatch_r(machine,0);
}
static WRITE8_HANDLER( sandscrp_soundlatch_w )
{
latch2_full = 1;
- soundlatch2_w(0,data);
+ soundlatch2_w(machine,0,data);
}
static ADDRESS_MAP_START( sandscrp_soundmem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 8a07c4be3dd..74fcdd571a5 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -103,13 +103,13 @@ VIDEO_UPDATE( trckydoc );
static WRITE8_HANDLER( sauro_sound_command_w )
{
data |= 0x80;
- soundlatch_w(offset, data);
+ soundlatch_w(machine, offset, data);
}
static READ8_HANDLER( sauro_sound_command_r )
{
- int ret = soundlatch_r(offset);
- soundlatch_clear_w(offset, 0);
+ int ret = soundlatch_r(machine, offset);
+ soundlatch_clear_w(machine, offset, 0);
return ret;
}
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( flip_screen_w )
static WRITE8_HANDLER( adpcm_w )
{
- sp0256_ALD_w(0, data);
+ sp0256_ALD_w(machine, 0, data);
}
static void lrq_callback(int state)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 07dd3f63b89..715aea484cd 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -153,7 +153,7 @@ static WRITE8_HANDLER (system_w)
{
int offs;
for (offs = 0;offs < videoram_size; offs++)
- sbw_videoram_w(offs, videoram[offs]);
+ sbw_videoram_w(machine, offs, videoram[offs]);
}
sbw_system = data;
}
@@ -177,9 +177,9 @@ static WRITE8_HANDLER(graph_control_w)
static READ8_HANDLER (controls_r)
{
if(sbw_system&2)
- return input_port_2_r(0);
+ return input_port_2_r(machine,0);
else
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 66ce127aa7a..fea75fbdf48 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -90,42 +90,42 @@ static const struct AY8910interface hustler_ay8910_interface =
static READ8_HANDLER(scobra_type2_ppi8255_0_r)
{
- return ppi8255_0_r(offset >> 2);
+ return ppi8255_0_r(machine, offset >> 2);
}
static READ8_HANDLER(scobra_type2_ppi8255_1_r)
{
- return ppi8255_1_r(offset >> 2);
+ return ppi8255_1_r(machine, offset >> 2);
}
static WRITE8_HANDLER(scobra_type2_ppi8255_0_w)
{
- ppi8255_0_w(offset >> 2, data);
+ ppi8255_0_w(machine, offset >> 2, data);
}
static WRITE8_HANDLER(scobra_type2_ppi8255_1_w)
{
- ppi8255_1_w(offset >> 2, data);
+ ppi8255_1_w(machine, offset >> 2, data);
}
static READ8_HANDLER(hustler_ppi8255_0_r)
{
- return ppi8255_0_r(offset >> 3);
+ return ppi8255_0_r(machine, offset >> 3);
}
static READ8_HANDLER(hustler_ppi8255_1_r)
{
- return ppi8255_1_r(offset >> 3);
+ return ppi8255_1_r(machine, offset >> 3);
}
static WRITE8_HANDLER(hustler_ppi8255_0_w)
{
- ppi8255_0_w(offset >> 3, data);
+ ppi8255_0_w(machine, offset >> 3, data);
}
static WRITE8_HANDLER(hustler_ppi8255_1_w)
{
- ppi8255_1_w(offset >> 3, data);
+ ppi8255_1_w(machine, offset >> 3, data);
}
static ADDRESS_MAP_START( type1_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -267,57 +267,57 @@ ADDRESS_MAP_END
static READ8_HANDLER( anteatg_ppi8255_0_reg0_r )
{
- return ppi8255_0_r(0);
+ return ppi8255_0_r(machine, 0);
}
static READ8_HANDLER( anteatg_ppi8255_0_reg1_r )
{
- return ppi8255_0_r(1);
+ return ppi8255_0_r(machine, 1);
}
static READ8_HANDLER( anteatg_ppi8255_0_reg2_r )
{
- return ppi8255_0_r(2);
+ return ppi8255_0_r(machine, 2);
}
static READ8_HANDLER( anteatg_ppi8255_0_reg3_r )
{
- return ppi8255_0_r(3);
+ return ppi8255_0_r(machine, 3);
}
static WRITE8_HANDLER( anteatg_ppi8255_0_reg0_w )
{
- ppi8255_0_w(0, data);
+ ppi8255_0_w(machine, 0, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_0_reg1_w )
{
- ppi8255_0_w(1, data);
+ ppi8255_0_w(machine, 1, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_0_reg2_w )
{
- ppi8255_0_w(2, data);
+ ppi8255_0_w(machine, 2, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_0_reg3_w )
{
- ppi8255_0_w(3, data);
+ ppi8255_0_w(machine, 3, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_1_reg0_w )
{
- ppi8255_1_w(0, data);
+ ppi8255_1_w(machine, 0, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_1_reg1_w )
{
- ppi8255_1_w(1, data);
+ ppi8255_1_w(machine, 1, data);
}
static WRITE8_HANDLER( anteatg_ppi8255_1_reg3_w )
{
- ppi8255_1_w(3, data);
+ ppi8255_1_w(machine, 3, data);
}
static ADDRESS_MAP_START( anteatg_readmem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index bbcafd71053..e5707323a9d 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -37,8 +37,8 @@ static INTERRUPT_GEN( scotrsht_interrupt )
static WRITE8_HANDLER( scotrsht_soundlatch_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static ADDRESS_MAP_START( scotrsht_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index d9f0d75606c..f265783a020 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -212,22 +212,22 @@ ADDRESS_MAP_END
static READ8_HANDLER(mars_ppi8255_0_r)
{
- return ppi8255_0_r(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
+ return ppi8255_0_r(machine, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
}
static READ8_HANDLER(mars_ppi8255_1_r)
{
- return ppi8255_1_r(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
+ return ppi8255_1_r(machine, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
}
static WRITE8_HANDLER(mars_ppi8255_0_w)
{
- ppi8255_0_w(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
+ ppi8255_0_w(machine, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
}
static WRITE8_HANDLER(mars_ppi8255_1_w)
{
- ppi8255_1_w(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
+ ppi8255_1_w(machine, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
}
@@ -505,22 +505,22 @@ ADDRESS_MAP_END
static READ8_HANDLER(frogf_ppi8255_0_r)
{
- return ppi8255_0_r(offset >> 3);
+ return ppi8255_0_r(machine, offset >> 3);
}
static READ8_HANDLER(frogf_ppi8255_1_r)
{
- return ppi8255_1_r(offset >> 3);
+ return ppi8255_1_r(machine, offset >> 3);
}
static WRITE8_HANDLER(frogf_ppi8255_0_w)
{
- ppi8255_0_w(offset >> 3, data);
+ ppi8255_0_w(machine, offset >> 3, data);
}
static WRITE8_HANDLER(frogf_ppi8255_1_w)
{
- ppi8255_1_w(offset >> 3, data);
+ ppi8255_1_w(machine, offset >> 3, data);
}
static ADDRESS_MAP_START( frogf_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index fa83eaebc72..d20d1978cb3 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -469,7 +469,7 @@ static void vblank_assert(int state);
static void update_vblank_irq(void);
static void galileo_reset(void);
static TIMER_CALLBACK( galileo_timer_callback );
-static void galileo_perform_dma(int which);
+static void galileo_perform_dma(running_machine *machine, int which);
static void voodoo_stall(int stall);
static void widget_reset(void);
static void update_widget_irq(void);
@@ -652,7 +652,7 @@ static READ32_HANDLER( interrupt_state_r )
static READ32_HANDLER( interrupt_state2_r )
{
- UINT32 result = interrupt_state_r(offset, mem_mask);
+ UINT32 result = interrupt_state_r(machine, offset, mem_mask);
result |= vblank_state << 8;
return result;
}
@@ -973,7 +973,7 @@ static int galileo_dma_fetch_next(int which)
}
-static void galileo_perform_dma(int which)
+static void galileo_perform_dma(running_machine *machine, int which)
{
do
{
@@ -1024,7 +1024,7 @@ static void galileo_perform_dma(int which)
}
/* write the data and advance */
- voodoo_0_w((dstaddr & 0xffffff) / 4, program_read_dword(srcaddr), 0);
+ voodoo_0_w(machine, (dstaddr & 0xffffff) / 4, program_read_dword(srcaddr), 0);
srcaddr += srcinc;
dstaddr += dstinc;
bytesleft -= 4;
@@ -1188,7 +1188,7 @@ static WRITE32_HANDLER( galileo_w )
/* if enabling, start the DMA */
if (!(oldata & 0x1000) && (data & 0x1000))
- galileo_perform_dma(which);
+ galileo_perform_dma(machine, which);
break;
}
@@ -1306,7 +1306,7 @@ static WRITE32_HANDLER( seattle_voodoo_w )
/* if we're not stalled, just write and get out */
if (!voodoo_stalled)
{
- voodoo_0_w(offset, data, mem_mask);
+ voodoo_0_w(machine, offset, data, mem_mask);
return;
}
@@ -1362,7 +1362,7 @@ static void voodoo_stall(int stall)
/* resume execution */
cpuintrf_push_context(0);
- galileo_perform_dma(which);
+ galileo_perform_dma(Machine, which);
cpuintrf_pop_context();
break;
}
@@ -1372,7 +1372,7 @@ static void voodoo_stall(int stall)
{
/* if the CPU had a pending write, do it now */
if (cpu_stalled_on_voodoo)
- voodoo_0_w(cpu_stalled_offset, cpu_stalled_data, cpu_stalled_mem_mask);
+ voodoo_0_w(Machine, cpu_stalled_offset, cpu_stalled_data, cpu_stalled_mem_mask);
cpu_stalled_on_voodoo = FALSE;
/* resume CPU execution */
@@ -1473,18 +1473,18 @@ static WRITE32_HANDLER( carnevil_gun_w )
static READ32_HANDLER( ethernet_r )
{
if (!(offset & 8))
- return smc91c94_r(offset & 7, mem_mask | 0x0000);
+ return smc91c94_r(machine, offset & 7, mem_mask | 0x0000);
else
- return smc91c94_r(offset & 7, mem_mask | 0xff00);
+ return smc91c94_r(machine, offset & 7, mem_mask | 0xff00);
}
static WRITE32_HANDLER( ethernet_w )
{
if (!(offset & 8))
- smc91c94_w(offset & 7, data & 0xffff, mem_mask | 0x0000);
+ smc91c94_w(machine, offset & 7, data & 0xffff, mem_mask | 0x0000);
else
- smc91c94_w(offset & 7, data & 0x00ff, mem_mask | 0xff00);
+ smc91c94_w(machine, offset & 7, data & 0x00ff, mem_mask | 0xff00);
}
@@ -1532,11 +1532,11 @@ static READ32_HANDLER( widget_r )
break;
case WREG_ANALOG:
- result = analog_port_r(0, mem_mask);
+ result = analog_port_r(machine, 0, mem_mask);
break;
case WREG_ETHER_DATA:
- result = smc91c94_r(widget.ethernet_addr & 7, mem_mask & 0xffff);
+ result = smc91c94_r(machine, widget.ethernet_addr & 7, mem_mask & 0xffff);
break;
}
@@ -1563,11 +1563,11 @@ static WRITE32_HANDLER( widget_w )
break;
case WREG_ANALOG:
- analog_port_w(0, data, mem_mask);
+ analog_port_w(machine, 0, data, mem_mask);
break;
case WREG_ETHER_DATA:
- smc91c94_w(widget.ethernet_addr & 7, data & 0xffff, mem_mask & 0xffff);
+ smc91c94_w(machine, widget.ethernet_addr & 7, data & 0xffff, mem_mask & 0xffff);
break;
}
}
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 52497eddf10..51598d34cb0 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -180,9 +180,9 @@ static READ16_HANDLER( ym3438_r )
{
switch (offset)
{
- case 0: return YM3438_status_port_0_A_r(0);
- case 1: return YM3438_read_port_0_r(0);
- case 2: return YM3438_status_port_0_B_r(0);
+ case 0: return YM3438_status_port_0_A_r(machine, 0);
+ case 1: return YM3438_read_port_0_r(machine, 0);
+ case 2: return YM3438_status_port_0_B_r(machine, 0);
}
return 0xff;
}
@@ -205,10 +205,10 @@ static WRITE16_HANDLER( ym3438_w )
switch (offset)
{
- case 0: YM3438_control_port_0_A_w(0, data & 0xff); last_port = data; break;
- case 1: YM3438_data_port_0_A_w(0, data & 0xff); break;
- case 2: YM3438_control_port_0_B_w(0, data & 0xff); last_port = data; break;
- case 3: YM3438_data_port_0_B_w(0, data & 0xff); break;
+ case 0: YM3438_control_port_0_A_w(machine, 0, data & 0xff); last_port = data; break;
+ case 1: YM3438_data_port_0_A_w(machine, 0, data & 0xff); break;
+ case 2: YM3438_control_port_0_B_w(machine, 0, data & 0xff); last_port = data; break;
+ case 3: YM3438_data_port_0_B_w(machine, 0, data & 0xff); break;
}
}
}
@@ -372,7 +372,7 @@ static READ16_HANDLER( io_chip_r )
/* otherwise, return an input port */
if (offset == 0x04/2 && sound_banks)
- return (readinputport(offset) & 0xbf) | (upd7759_0_busy_r(0) << 6);
+ return (readinputport(offset) & 0xbf) | (upd7759_0_busy_r(machine,0) << 6);
return readinputport(offset);
/* 'SEGA' protection */
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 51813122bad..d9f691b1752 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -988,7 +988,7 @@ WRITE8_HANDLER( sms_vdp_ctrl_w )
WRITE8_HANDLER( sms_sn76496_w )
{
- SN76496_0_w(0, data & 0xff);
+ SN76496_0_w(machine, 0, data & 0xff);
}
static void draw_tile_line(int drawxpos, int tileline, UINT16 tiledata, UINT8* linebuf, struct sms_vdp* chip)
@@ -2153,7 +2153,7 @@ static WRITE8_HANDLER( systeme_bank_w )
static WRITE8_HANDLER( sms_sn76496_2_w )
{
- SN76496_1_w(0, data & 0xff);
+ SN76496_1_w(machine, 0, data & 0xff);
}
static void init_ports_systeme(void)
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index c04b2b51533..98ad4af3fb3 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -201,11 +201,11 @@ static offs_t decrypt_offset(offs_t offset)
}
static WRITE8_HANDLER( mainram_w ) { mainram[decrypt_offset(offset)] = data; }
-static WRITE8_HANDLER( vidram_w ) { segag80r_videoram_w(decrypt_offset(offset), data); }
-static WRITE8_HANDLER( monsterb_vidram_w ) { monsterb_videoram_w(decrypt_offset(offset), data); }
-static WRITE8_HANDLER( pignewt_vidram_w ) { pignewt_videoram_w(decrypt_offset(offset), data); }
-static WRITE8_HANDLER( sindbadm_vidram_w ) { sindbadm_videoram_w(decrypt_offset(offset), data); }
-static WRITE8_HANDLER( usb_ram_w ) { sega_usb_ram_w(decrypt_offset(offset), data); }
+static WRITE8_HANDLER( vidram_w ) { segag80r_videoram_w(machine, decrypt_offset(offset), data); }
+static WRITE8_HANDLER( monsterb_vidram_w ) { monsterb_videoram_w(machine, decrypt_offset(offset), data); }
+static WRITE8_HANDLER( pignewt_vidram_w ) { pignewt_videoram_w(machine, decrypt_offset(offset), data); }
+static WRITE8_HANDLER( sindbadm_vidram_w ) { sindbadm_videoram_w(machine, decrypt_offset(offset), data); }
+static WRITE8_HANDLER( usb_ram_w ) { sega_usb_ram_w(machine, decrypt_offset(offset), data); }
@@ -302,8 +302,8 @@ static WRITE8_HANDLER( coin_count_w )
static WRITE8_HANDLER( sindbadm_soundport_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(50));
}
@@ -318,13 +318,13 @@ static WRITE8_HANDLER( sindbadm_misc_w )
/* the data lines are flipped */
static WRITE8_HANDLER( sindbadm_SN76496_0_w )
{
- SN76496_0_w(offset, BITSWAP8(data, 0,1,2,3,4,5,6,7));
+ SN76496_0_w(machine, offset, BITSWAP8(data, 0,1,2,3,4,5,6,7));
}
static WRITE8_HANDLER( sindbadm_SN76496_1_w )
{
- SN76496_1_w(offset, BITSWAP8(data, 0,1,2,3,4,5,6,7));
+ SN76496_1_w(machine, offset, BITSWAP8(data, 0,1,2,3,4,5,6,7));
}
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index b0e78342fa6..bb9b90af590 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -230,7 +230,7 @@ static offs_t decrypt_offset(offs_t offset)
}
static WRITE8_HANDLER( mainram_w ) { mainram[decrypt_offset(offset)] = data; }
-static WRITE8_HANDLER( usb_ram_w ) { sega_usb_ram_w(decrypt_offset(offset), data); }
+static WRITE8_HANDLER( usb_ram_w ) { sega_usb_ram_w(machine, decrypt_offset(offset), data); }
static WRITE8_HANDLER( vectorram_w ) { vectorram[decrypt_offset(offset)] = data; }
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 3091d7ec696..c3328a6a7a3 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -138,7 +138,7 @@ static INTERRUPT_GEN( hangon_irq )
static TIMER_CALLBACK( delayed_ppi8255_w )
{
- ppi8255_0_w(param >> 8, param & 0xff);
+ ppi8255_0_w(machine, param >> 8, param & 0xff);
}
@@ -147,20 +147,20 @@ static READ16_HANDLER( hangon_io_r )
switch (offset & 0x3020/2)
{
case 0x0000/2: /* PPI @ 4B */
- return ppi8255_0_r(offset & 3);
+ return ppi8255_0_r(machine, offset & 3);
case 0x1000/2: /* Input ports and DIP switches */
return readinputport(offset & 3);
case 0x3000/2: /* PPI @ 4C */
- return ppi8255_1_r(offset & 3);
+ return ppi8255_1_r(machine, offset & 3);
case 0x3020/2: /* ADC0804 data output */
return readinputport(4 + adc_select);
}
logerror("%06X:hangon_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -176,7 +176,7 @@ static WRITE16_HANDLER( hangon_io_w )
return;
case 0x3000/2: /* PPI @ 4C */
- ppi8255_1_w(offset & 3, data & 0xff);
+ ppi8255_1_w(machine, offset & 3, data & 0xff);
return;
case 0x3020/2: /* ADC0804 */
@@ -192,21 +192,21 @@ static READ16_HANDLER( sharrier_io_r )
switch (offset & 0x0030/2)
{
case 0x0000/2:
- return ppi8255_0_r(offset & 3);
+ return ppi8255_0_r(machine, offset & 3);
case 0x0010/2: /* Input ports and DIP switches */
return readinputport(offset & 3);
case 0x0020/2: /* PPI @ 4C */
if (offset == 2) return 0;
- return ppi8255_1_r(offset & 3);
+ return ppi8255_1_r(machine, offset & 3);
case 0x0030/2: /* ADC0804 data output */
return readinputport(4 + adc_select);
}
logerror("%06X:sharrier_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -222,7 +222,7 @@ static WRITE16_HANDLER( sharrier_io_w )
return;
case 0x0020/2: /* PPI @ 4C */
- ppi8255_1_w(offset & 3, data & 0xff);
+ ppi8255_1_w(machine, offset & 3, data & 0xff);
return;
case 0x0030/2: /* ADC0804 */
@@ -347,7 +347,7 @@ static READ8_HANDLER( sound_data_r )
{
/* assert ACK */
ppi8255_set_portC(0, 0x00);
- return soundlatch_r(offset);
+ return soundlatch_r(machine, offset);
}
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 85483594bd7..f32460037fe 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -43,8 +43,8 @@ static UINT8 adc_select;
static UINT8 irq2_state;
static UINT8 vblank_irq_state;
-static read16_handler custom_io_r;
-static write16_handler custom_io_w;
+static read16_machine_func custom_io_r;
+static write16_machine_func custom_io_w;
static const UINT8 *custom_map;
@@ -122,7 +122,7 @@ static const struct segaic16_memory_map_entry outrun_info[] =
static TIMER_CALLBACK( delayed_sound_data_w )
{
- soundlatch_w(0, param);
+ soundlatch_w(machine, 0, param);
cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, ASSERT_LINE);
}
@@ -135,8 +135,8 @@ static void sound_data_w(UINT8 data)
static READ8_HANDLER( sound_data_r )
{
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
- return soundlatch_r(offset);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
+ return soundlatch_r(machine,offset);
}
@@ -348,7 +348,7 @@ static WRITE8_HANDLER( video_control_w )
*/
segaic16_set_display_enable(data & 0x20);
adc_select = (data >> 2) & 7;
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
@@ -362,9 +362,9 @@ static WRITE8_HANDLER( video_control_w )
static READ16_HANDLER( misc_io_r )
{
if (custom_io_r)
- return custom_io_r(offset, mem_mask);
+ return custom_io_r(machine, offset, mem_mask);
logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -372,7 +372,7 @@ static WRITE16_HANDLER( misc_io_w )
{
if (custom_io_w)
{
- custom_io_w(offset, data, mem_mask);
+ custom_io_w(machine, offset, data, mem_mask);
return;
}
logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff);
@@ -385,7 +385,7 @@ static READ16_HANDLER( outrun_custom_io_r )
switch (offset & 0x70/2)
{
case 0x00/2:
- return ppi8255_0_r(offset & 3);
+ return ppi8255_0_r(machine, offset & 3);
case 0x10/2:
return readinputport(offset & 3);
@@ -397,11 +397,11 @@ static READ16_HANDLER( outrun_custom_io_r )
}
case 0x60/2:
- return watchdog_reset_r(0);
+ return watchdog_reset_r(machine,0);
}
logerror("%06X:outrun_custom_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -412,7 +412,7 @@ static WRITE16_HANDLER( outrun_custom_io_w )
{
case 0x00/2:
if (ACCESSING_LSB)
- ppi8255_0_w(offset & 3, data);
+ ppi8255_0_w(machine, offset & 3, data);
return;
case 0x20/2:
@@ -431,11 +431,11 @@ static WRITE16_HANDLER( outrun_custom_io_w )
return;
case 0x60/2:
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
return;
case 0x70/2:
- segaic16_sprites_draw_0_w(offset, data, mem_mask);
+ segaic16_sprites_draw_0_w(machine, offset, data, mem_mask);
return;
}
logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff);
@@ -460,7 +460,7 @@ static READ16_HANDLER( shangon_custom_io_r )
}
}
logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -482,11 +482,11 @@ static WRITE16_HANDLER( shangon_custom_io_w )
/* Output port:
D0: Sound section reset (1= normal operation, 0= reset)
*/
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
return;
case 0x3000/2:
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
return;
case 0x3020/2:
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index cf1193afc17..e20cd35f8a1 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -163,10 +163,10 @@ static UINT16 *workram;
static UINT8 video_control;
static UINT8 mj_input_num;
-static read16_handler custom_io_r;
-static write16_handler custom_io_w;
+static read16_machine_func custom_io_r;
+static write16_machine_func custom_io_w;
static void (*lamp_changed_w)(UINT8 changed, UINT8 newval);
-static void (*i8751_vblank_hook)(void);
+static void (*i8751_vblank_hook)(running_machine *machine);
static UINT8 n7751_command;
static UINT32 n7751_rom_address;
@@ -266,7 +266,7 @@ static MACHINE_RESET( system16a )
static TIMER_CALLBACK( delayed_ppi8255_w )
{
- ppi8255_0_w(param >> 8, param & 0xff);
+ ppi8255_0_w(machine, param >> 8, param & 0xff);
}
@@ -276,7 +276,7 @@ static READ16_HANDLER( standard_io_r )
switch (offset & (0x3000/2))
{
case 0x0000/2:
- return ppi8255_0_r(offset & 3);
+ return ppi8255_0_r(machine, offset & 3);
case 0x1000/2:
return readinputport(offset & 3);
@@ -308,18 +308,18 @@ static WRITE16_HANDLER( standard_io_w )
static READ16_HANDLER( misc_io_r )
{
if (custom_io_r)
- return (*custom_io_r)(offset, mem_mask);
+ return (*custom_io_r)(machine, offset, mem_mask);
else
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
static WRITE16_HANDLER( misc_io_w )
{
if (custom_io_w)
- (*custom_io_w)(offset, data, mem_mask);
+ (*custom_io_w)(machine, offset, data, mem_mask);
else
- standard_io_w(offset, data, mem_mask);
+ standard_io_w(machine, offset, data, mem_mask);
}
@@ -397,7 +397,7 @@ static READ8_HANDLER( sound_data_r )
{
/* assert ACK */
ppi8255_set_portC(0, 0x00);
- return soundlatch_r(offset);
+ return soundlatch_r(machine, offset);
}
@@ -491,7 +491,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
{
/* if we have a fake 8751 handler, call it on VBLANK */
if (i8751_vblank_hook != NULL)
- (*i8751_vblank_hook)();
+ (*i8751_vblank_hook)(machine);
}
@@ -502,7 +502,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
*
*************************************/
-static void bodyslam_i8751_sim(void)
+static void bodyslam_i8751_sim(running_machine *machine)
{
UINT8 flag = workram[0x200/2] >> 8;
UINT8 tick = workram[0x200/2] & 0xff;
@@ -510,7 +510,7 @@ static void bodyslam_i8751_sim(void)
UINT8 min = workram[0x202/2] & 0xff;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* out of time? set the flag */
if (tick == 0 && sec == 0 && min == 0)
@@ -547,18 +547,18 @@ static void bodyslam_i8751_sim(void)
}
-static void quartet_i8751_sim(void)
+static void quartet_i8751_sim(running_machine *machine)
{
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* X scroll values */
- segaic16_textram_0_w(0xff8/2, workram[0x0d14/2], 0);
- segaic16_textram_0_w(0xffa/2, workram[0x0d18/2], 0);
+ segaic16_textram_0_w(machine, 0xff8/2, workram[0x0d14/2], 0);
+ segaic16_textram_0_w(machine, 0xffa/2, workram[0x0d18/2], 0);
/* page values */
- segaic16_textram_0_w(0xe9e/2, workram[0x0d1c/2], 0);
- segaic16_textram_0_w(0xe9c/2, workram[0x0d1e/2], 0);
+ segaic16_textram_0_w(machine, 0xe9e/2, workram[0x0d1c/2], 0);
+ segaic16_textram_0_w(machine, 0xe9c/2, workram[0x0d1e/2], 0);
}
@@ -606,7 +606,7 @@ static READ16_HANDLER( aceattaa_custom_io_r )
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
@@ -690,7 +690,7 @@ static READ16_HANDLER( mjleague_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
/*************************************
@@ -702,7 +702,6 @@ static READ16_HANDLER( mjleague_custom_io_r )
static READ16_HANDLER( pshot16a_custom_io_r )
{
static int read_port = 0;
-
switch (offset & (0x3000/2))
{
case 0x1000/2:
@@ -725,7 +724,7 @@ static READ16_HANDLER( pshot16a_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
/*************************************
@@ -746,7 +745,7 @@ static READ16_HANDLER( sdi_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
@@ -760,7 +759,6 @@ static READ16_HANDLER( sdi_custom_io_r )
static READ16_HANDLER( sjryuko_custom_io_r )
{
static const char *const portname[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5" };
-
switch (offset & (0x3000/2))
{
case 0x1000/2:
@@ -776,7 +774,7 @@ static READ16_HANDLER( sjryuko_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index adeffa70aef..c2236a92365 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -893,14 +893,14 @@ static int atomicp_sound_rate;
static UINT8 has_sound_cpu;
-static read16_handler custom_io_r;
-static write16_handler custom_io_w;
+static read16_machine_func custom_io_r;
+static write16_machine_func custom_io_w;
static UINT8 disable_screen_blanking;
static UINT8 mj_input_num;
static UINT8 hwc_input_value;
-static void (*i8751_vblank_hook)(void);
+static void (*i8751_vblank_hook)(running_machine *machine);
static const UINT8 *i8751_initial_config;
@@ -1022,7 +1022,7 @@ static void sound_w(UINT8 data)
{
if (has_sound_cpu)
{
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(Machine, 0, data & 0xff);
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
}
}
@@ -1126,7 +1126,7 @@ static READ16_HANDLER( standard_io_r )
return readinputport(4 + (offset & 1));
}
logerror("%06X:standard_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -1163,18 +1163,18 @@ static WRITE16_HANDLER( standard_io_w )
static READ16_HANDLER( misc_io_r )
{
if (custom_io_r)
- return (*custom_io_r)(offset, mem_mask);
+ return (*custom_io_r)(machine, offset, mem_mask);
else
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
static WRITE16_HANDLER( misc_io_w )
{
if (custom_io_w)
- (*custom_io_w)(offset, data, mem_mask);
+ (*custom_io_w)(machine, offset, data, mem_mask);
else
- standard_io_w(offset, data, mem_mask);
+ standard_io_w(machine, offset, data, mem_mask);
}
@@ -1199,13 +1199,13 @@ static READ16_HANDLER( rom_5797_bank_math_r )
{
case 0x0000/2:
/* multiply registers */
- return segaic16_multiply_0_r(offset & 3, mem_mask);
+ return segaic16_multiply_0_r(machine, offset & 3, mem_mask);
case 0x1000/2:
/* compare registers */
- return segaic16_compare_timer_0_r(offset & 7, mem_mask);
+ return segaic16_compare_timer_0_r(machine, offset & 7, mem_mask);
}
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -1216,12 +1216,12 @@ static WRITE16_HANDLER( rom_5797_bank_math_w )
{
case 0x0000/2:
/* multiply registers */
- segaic16_multiply_0_w(offset & 3, data, mem_mask);
+ segaic16_multiply_0_w(machine, offset & 3, data, mem_mask);
break;
case 0x1000/2:
/* compare registers */
- segaic16_compare_timer_0_w(offset & 7, data, mem_mask);
+ segaic16_compare_timer_0_w(machine, offset & 7, data, mem_mask);
break;
case 0x2000/2:
@@ -1235,14 +1235,14 @@ static WRITE16_HANDLER( rom_5797_bank_math_w )
static READ16_HANDLER( unknown_rgn2_r )
{
logerror("Region 2: read from %04X\n", offset * 2);
- return segaic16_compare_timer_1_r(offset & 7, mem_mask);
+ return segaic16_compare_timer_1_r(machine, offset & 7, mem_mask);
}
static WRITE16_HANDLER( unknown_rgn2_w )
{
logerror("Region 2: write to %04X = %04X & %04X\n", offset * 2, data, mem_mask ^ 0xffff);
- segaic16_compare_timer_1_w(offset & 7, data, mem_mask);
+ segaic16_compare_timer_1_w(machine, offset & 7, data, mem_mask);
}
@@ -1349,7 +1349,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
{
/* if we have a fake 8751 handler, call it on VBLANK */
if (i8751_vblank_hook != NULL)
- (*i8751_vblank_hook)();
+ (*i8751_vblank_hook)(machine);
}
@@ -1360,21 +1360,21 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
*
*************************************/
-static void altbeast_common_i8751_sim(offs_t soundoffs, offs_t inputoffs)
+static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs, offs_t inputoffs)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* set tile banks */
- rom_5704_bank_w(1, workram[0x3094/2] & 0x00ff, 0xff00);
+ rom_5704_bank_w(machine, 1, workram[0x3094/2] & 0x00ff, 0xff00);
/* process any new sound data */
temp = workram[soundoffs];
if ((temp & 0xff00) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp >> 8);
+ segaic16_memory_mapper_w(machine, 0x03, temp >> 8);
workram[soundoffs] = temp & 0x00ff;
}
@@ -1382,40 +1382,40 @@ static void altbeast_common_i8751_sim(offs_t soundoffs, offs_t inputoffs)
workram[inputoffs] = ~readinputport(0) << 8;
}
-static void altbeasj_i8751_sim(void)
+static void altbeasj_i8751_sim(running_machine *machine)
{
- altbeast_common_i8751_sim(0x30d4/2, 0x30d0/2);
+ altbeast_common_i8751_sim(machine, 0x30d4/2, 0x30d0/2);
}
-static void altbeas5_i8751_sim(void)
+static void altbeas5_i8751_sim(running_machine *machine)
{
- altbeast_common_i8751_sim(0x3098/2, 0x3096/2);
+ altbeast_common_i8751_sim(machine, 0x3098/2, 0x3096/2);
}
-static void altbeast_i8751_sim(void)
+static void altbeast_i8751_sim(running_machine *machine)
{
- altbeast_common_i8751_sim(0x30c4/2, 0x30c2/2);
+ altbeast_common_i8751_sim(machine, 0x30c4/2, 0x30c2/2);
}
-static void ddux_i8751_sim(void)
+static void ddux_i8751_sim(running_machine *machine)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* process any new sound data */
temp = workram[0x0bd0/2];
if ((temp & 0xff00) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp >> 8);
+ segaic16_memory_mapper_w(machine, 0x03, temp >> 8);
workram[0x0bd0/2] = temp & 0x00ff;
}
}
-static void goldnaxe_i8751_init(void)
+static void goldnaxe_i8751_init(running_machine *machine)
{
static const UINT8 memory_control_5704[0x10] =
{ 0x02,0x00, 0x02,0x08, 0x00,0x1f, 0x00,0xff, 0x00,0x20, 0x01,0x10, 0x00,0x14, 0x00,0xc4 };
@@ -1433,12 +1433,12 @@ static void goldnaxe_i8751_init(void)
}
}
-static void goldnaxe_i8751_sim(void)
+static void goldnaxe_i8751_sim(running_machine *machine)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* they periodically clear the data at 2cd8,2cda,2cdc,2cde and expect the MCU to fill it in */
if (workram[0x2cd8/2] == 0 && workram[0x2cda/2] == 0 && workram[0x2cdc/2] == 0 && workram[0x2cde/2] == 0)
@@ -1453,7 +1453,7 @@ static void goldnaxe_i8751_sim(void)
temp = workram[0x2cfc/2];
if ((temp & 0xff00) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp >> 8);
+ segaic16_memory_mapper_w(machine, 0x03, temp >> 8);
workram[0x2cfc/2] = temp & 0x00ff;
}
@@ -1463,18 +1463,18 @@ static void goldnaxe_i8751_sim(void)
}
-static void tturf_i8751_sim(void)
+static void tturf_i8751_sim(running_machine *machine)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* process any new sound data */
temp = workram[0x01d0/2];
if ((temp & 0xff00) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp);
+ segaic16_memory_mapper_w(machine, 0x03, temp);
workram[0x01d0/2] = temp & 0x00ff;
}
@@ -1485,35 +1485,35 @@ static void tturf_i8751_sim(void)
}
-static void wb3_i8751_sim(void)
+static void wb3_i8751_sim(running_machine *machine)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* process any new sound data */
temp = workram[0x0008/2];
if ((temp & 0x00ff) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp >> 8);
+ segaic16_memory_mapper_w(machine, 0x03, temp >> 8);
workram[0x0008/2] = temp & 0xff00;
}
}
-static void wrestwar_i8751_sim(void)
+static void wrestwar_i8751_sim(running_machine *machine)
{
UINT16 temp;
/* signal a VBLANK to the main CPU */
- cpunum_set_input_line(Machine, 0, 4, HOLD_LINE);
+ cpunum_set_input_line(machine, 0, 4, HOLD_LINE);
/* process any new sound data */
temp = workram[0x208e/2];
if ((temp & 0xff00) != 0x0000)
{
- segaic16_memory_mapper_w(0x03, temp);
+ segaic16_memory_mapper_w(machine, 0x03, temp);
workram[0x208e/2] = temp & 0x00ff;
}
@@ -1534,8 +1534,8 @@ static WRITE16_HANDLER( atomicp_sound_w )
if (ACCESSING_MSB)
switch (offset & 1)
{
- case 0: YM2413_register_port_0_w(0, data >> 8); break;
- case 1: YM2413_data_port_0_w(0, data >> 8); break;
+ case 0: YM2413_register_port_0_w(machine, 0, data >> 8); break;
+ case 1: YM2413_data_port_0_w(machine, 0, data >> 8); break;
}
}
@@ -1565,7 +1565,7 @@ static READ16_HANDLER( dunkshot_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
@@ -1592,14 +1592,13 @@ static READ16_HANDLER( hwchamp_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
static WRITE16_HANDLER( hwchamp_custom_io_w )
{
static const char *const portname[4] = { "MONITOR", "LEFT", "RIGHT", "DUMMY" };
-
switch (offset & (0x3000/2))
{
case 0x3000/2:
@@ -1620,7 +1619,7 @@ static WRITE16_HANDLER( hwchamp_custom_io_w )
}
break;
}
- standard_io_w(offset, data, mem_mask);
+ standard_io_w(machine, offset, data, mem_mask);
}
@@ -1645,7 +1644,7 @@ static READ16_HANDLER( passshtj_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
@@ -1670,7 +1669,7 @@ static READ16_HANDLER( sdi_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
@@ -1684,7 +1683,6 @@ static READ16_HANDLER( sdi_custom_io_r )
static READ16_HANDLER( sjryuko_custom_io_r )
{
static const char *const portname[] = { "MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5" };
-
switch (offset & (0x3000/2))
{
case 0x1000/2:
@@ -1700,14 +1698,13 @@ static READ16_HANDLER( sjryuko_custom_io_r )
}
break;
}
- return standard_io_r(offset, mem_mask);
+ return standard_io_r(machine, offset, mem_mask);
}
static WRITE16_HANDLER( sjryuko_custom_io_w )
{
static UINT8 last_val;
-
switch (offset & (0x3000/2))
{
case 0x0000/2:
@@ -1715,7 +1712,7 @@ static WRITE16_HANDLER( sjryuko_custom_io_w )
mj_input_num = (mj_input_num + 1) % 6;
break;
}
- standard_io_w(offset, data, mem_mask);
+ standard_io_w(machine, offset, data, mem_mask);
}
@@ -6166,7 +6163,7 @@ static DRIVER_INIT( exctleag_5358 )
static DRIVER_INIT( goldnaxe_5704 )
{
DRIVER_INIT_CALL(generic_5704);
- goldnaxe_i8751_init();
+ goldnaxe_i8751_init(machine);
i8751_vblank_hook = goldnaxe_i8751_sim;
}
@@ -6174,7 +6171,7 @@ static DRIVER_INIT( goldnaxe_5704 )
static DRIVER_INIT( goldnaxe_5797 )
{
DRIVER_INIT_CALL(generic_5797);
- goldnaxe_i8751_init();
+ goldnaxe_i8751_init(machine);
i8751_vblank_hook = goldnaxe_i8751_sim;
}
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index cb0466c6514..9fa515608bb 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -61,8 +61,8 @@ static UINT8 rom_board;
static UINT8 misc_io_data[0x10];
static UINT8 mcu_data;
-static read16_handler custom_io_r;
-static write16_handler custom_io_w;
+static read16_machine_func custom_io_r;
+static write16_machine_func custom_io_w;
static UINT8 wwally_last_x[3], wwally_last_y[3];
static UINT8 lghost_value, lghost_select;
@@ -149,7 +149,7 @@ static const struct segaic16_memory_map_entry *const region_info_list[] =
static void sound_w(UINT8 data)
{
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(Machine, 0, data & 0xff);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -326,16 +326,16 @@ static READ16_HANDLER( misc_io_r )
/* I/O chip */
case 0x0000/2:
case 0x1000/2:
- return io_chip_r(offset, mem_mask);
+ return io_chip_r(machine, offset, mem_mask);
/* video control latch */
case 0x2000/2:
return readinputport(4 + (offset & 1));
}
if (custom_io_r)
- return custom_io_r(offset, mem_mask);
+ return custom_io_r(machine, offset, mem_mask);
logerror("%06X:misc_io_r - unknown read access to address %04X\n", activecpu_get_pc(), offset * 2);
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -349,7 +349,7 @@ static WRITE16_HANDLER( misc_io_w )
case 0x1000/2:
if (ACCESSING_LSB)
{
- io_chip_w(offset, data, mem_mask);
+ io_chip_w(machine, offset, data, mem_mask);
return;
}
break;
@@ -365,7 +365,7 @@ static WRITE16_HANDLER( misc_io_w )
}
if (custom_io_w)
{
- custom_io_w(offset, data, mem_mask);
+ custom_io_w(machine, offset, data, mem_mask);
return;
}
logerror("%06X:misc_io_w - unknown write access to address %04X = %04X & %04X\n", activecpu_get_pc(), offset * 2, data, mem_mask ^ 0xffff);
@@ -427,7 +427,7 @@ static READ16_HANDLER( ddcrew_custom_io_r )
case 0x3024/2:
return readinputportbytag("P34START");
}
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -451,7 +451,7 @@ static READ16_HANDLER( lghost_custom_io_r )
lghost_value <<= 1;
return result;
}
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
@@ -511,7 +511,7 @@ static READ16_HANDLER( wwally_custom_io_r )
case 0x3014/2:
return (readinputportbytag("TRACKY3") - wwally_last_y[2]) & 0xff;
}
- return segaic16_open_bus_r(0,0);
+ return segaic16_open_bus_r(machine,0,0);
}
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index d6edf873659..aafb45e6228 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -506,7 +506,7 @@ static WRITE16_HANDLER( fdc_ctrl_w )
// I/O Mappers
-static UINT8 hotrod_io_r(int port)
+static UINT8 hotrod_io_r(running_machine *machine, int port)
{
switch(port) {
case 0:
@@ -529,7 +529,7 @@ static UINT8 hotrod_io_r(int port)
return 0x00;
}
-static UINT8 dcclub_io_r(int port)
+static UINT8 dcclub_io_r(running_machine *machine, int port)
{
switch(port) {
case 0: {
@@ -556,7 +556,7 @@ static UINT8 dcclub_io_r(int port)
static int cur_input_line;
-static UINT8 mahmajn_io_r(int port)
+static UINT8 mahmajn_io_r(running_machine *machine, int port)
{
switch(port) {
case 0:
@@ -579,7 +579,7 @@ static UINT8 mahmajn_io_r(int port)
return 0x00;
}
-static UINT8 gground_io_r(int port)
+static UINT8 gground_io_r(running_machine *machine, int port)
{
switch(port) {
case 0:
@@ -602,7 +602,7 @@ static UINT8 gground_io_r(int port)
return 0x00;
}
-static void mahmajn_io_w(int port, UINT8 data)
+static void mahmajn_io_w(running_machine *machine, int port, UINT8 data)
{
switch(port) {
case 3:
@@ -610,20 +610,20 @@ static void mahmajn_io_w(int port, UINT8 data)
cur_input_line = (cur_input_line + 1) & 7;
break;
case 7: // DAC
- DAC_0_signed_data_w(0, data);
+ DAC_0_signed_data_w(machine, 0, data);
break;
default:
fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);
}
}
-static void hotrod_io_w(int port, UINT8 data)
+static void hotrod_io_w(running_machine *machine, int port, UINT8 data)
{
switch(port) {
case 3: // Lamps
break;
case 7: // DAC
- DAC_0_signed_data_w(0, data);
+ DAC_0_signed_data_w(machine,0, data);
break;
default:
fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);
@@ -746,19 +746,19 @@ static WRITE16_HANDLER( curbank_w )
static READ16_HANDLER( ym_status_r )
{
- return YM2151_status_port_0_r(0);
+ return YM2151_status_port_0_r(machine, 0);
}
static WRITE16_HANDLER( ym_register_w )
{
if(ACCESSING_LSB)
- YM2151_register_port_0_w(0, data);
+ YM2151_register_port_0_w(machine, 0, data);
}
static WRITE16_HANDLER( ym_data_w )
{
if(ACCESSING_LSB)
- YM2151_data_port_0_w(0, data);
+ YM2151_data_port_0_w(machine, 0, data);
}
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 21d493d68d2..bbe6168b62b 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -359,8 +359,8 @@ static UINT16 sound_bank;
/* I/O chips and custom I/O */
static UINT8 misc_io_data[2][0x10];
-static read16_handler custom_io_r[2];
-static write16_handler custom_io_w[2];
+static read16_machine_func custom_io_r[2];
+static write16_machine_func custom_io_w[2];
static UINT8 analog_bank;
static UINT8 analog_value[4];
static UINT8 sonic_last[6];
@@ -752,7 +752,7 @@ static WRITE32_HANDLER( io_chip_1_w )
static READ16_HANDLER( io_expansion_r )
{
if (custom_io_r[0])
- return (*custom_io_r[0])(offset, mem_mask);
+ return (*custom_io_r[0])(machine, offset, mem_mask);
else
logerror("%06X:io_expansion_r(%X)\n", activecpu_get_pc(), offset);
return 0xffff;
@@ -766,7 +766,7 @@ static WRITE16_HANDLER( io_expansion_w )
return;
if (custom_io_w[0])
- (*custom_io_w[0])(offset, data, mem_mask);
+ (*custom_io_w[0])(machine, offset, data, mem_mask);
else
logerror("%06X:io_expansion_w(%X) = %02X\n", activecpu_get_pc(), offset, data & 0xff);
}
@@ -775,8 +775,8 @@ static WRITE16_HANDLER( io_expansion_w )
static READ32_HANDLER( io_expansion_0_r )
{
if (custom_io_r[0])
- return (*custom_io_r[0])(offset*2+0, mem_mask) |
- ((*custom_io_r[0])(offset*2+1, mem_mask >> 16) << 16);
+ return (*custom_io_r[0])(machine, offset*2+0, mem_mask) |
+ ((*custom_io_r[0])(machine, offset*2+1, mem_mask >> 16) << 16);
else
logerror("%06X:io_expansion_r(%X)\n", activecpu_get_pc(), offset);
return 0xffffffff;
@@ -789,14 +789,14 @@ static WRITE32_HANDLER( io_expansion_0_w )
if ((mem_mask & 0x000000ff) != 0x000000ff)
{
if (custom_io_w[0])
- (*custom_io_w[0])(offset*2+0, data, mem_mask);
+ (*custom_io_w[0])(machine, offset*2+0, data, mem_mask);
else
logerror("%06X:io_expansion_w(%X) = %02X\n", activecpu_get_pc(), offset, data & 0xff);
}
if ((mem_mask & 0x00ff0000) != 0x00ff0000)
{
if (custom_io_w[0])
- (*custom_io_w[0])(offset*2+1, data >> 16, mem_mask >> 16);
+ (*custom_io_w[0])(machine, offset*2+1, data >> 16, mem_mask >> 16);
else
logerror("%06X:io_expansion_w(%X) = %02X\n", activecpu_get_pc(), offset, data & 0xff);
}
@@ -806,8 +806,8 @@ static WRITE32_HANDLER( io_expansion_0_w )
static READ32_HANDLER( io_expansion_1_r )
{
if (custom_io_r[1])
- return (*custom_io_r[1])(offset*2+0, mem_mask) |
- ((*custom_io_r[1])(offset*2+1, mem_mask >> 16) << 16);
+ return (*custom_io_r[1])(machine, offset*2+0, mem_mask) |
+ ((*custom_io_r[1])(machine, offset*2+1, mem_mask >> 16) << 16);
else
logerror("%06X:io_expansion_r(%X)\n", activecpu_get_pc(), offset);
return 0xffffffff;
@@ -820,14 +820,14 @@ static WRITE32_HANDLER( io_expansion_1_w )
if ((mem_mask & 0x000000ff) != 0x000000ff)
{
if (custom_io_w[1])
- (*custom_io_w[1])(offset*2+0, data, mem_mask);
+ (*custom_io_w[1])(machine, offset*2+0, data, mem_mask);
else
logerror("%06X:io_expansion_w(%X) = %02X\n", activecpu_get_pc(), offset, data & 0xff);
}
if ((mem_mask & 0x00ff0000) != 0x00ff0000)
{
if (custom_io_w[1])
- (*custom_io_w[1])(offset*2+1, data >> 16, mem_mask >> 16);
+ (*custom_io_w[1])(machine, offset*2+1, data >> 16, mem_mask >> 16);
else
logerror("%06X:io_expansion_w(%X) = %02X\n", activecpu_get_pc(), offset, data & 0xff);
}
@@ -3772,7 +3772,7 @@ ROM_END
*
*************************************/
-static void segas32_common_init(read16_handler custom_r, write16_handler custom_w, const UINT8 *default_eeprom)
+static void segas32_common_init(read16_machine_func custom_r, write16_machine_func custom_w, const UINT8 *default_eeprom)
{
/* reset the custom handlers and other pointers */
custom_io_r[0] = custom_r;
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index a07144994fb..82e6abe6de7 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -172,7 +172,7 @@ static void timer_ack_callback(void)
static TIMER_CALLBACK( delayed_sound_data_w )
{
- soundlatch_w(0, param);
+ soundlatch_w(machine, 0, param);
cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, ASSERT_LINE);
}
@@ -191,8 +191,8 @@ static void sound_cpu_irq(int state)
static READ8_HANDLER( sound_data_r )
{
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
- return soundlatch_r(offset);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, CLEAR_LINE);
+ return soundlatch_r(machine, offset);
}
@@ -350,7 +350,7 @@ static WRITE16_HANDLER( iochip_0_w )
D1: (CONT) - affects sprite hardware
D0: Sound section reset (1= normal operation, 0= reset)
*/
- if (((oldval ^ data) & 0x40) && !(data & 0x40)) watchdog_reset_w(0,0);
+ if (((oldval ^ data) & 0x40) && !(data & 0x40)) watchdog_reset_w(machine,0,0);
segaic16_set_display_enable(data & 0x20);
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
return;
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 004c07ecc0a..c0baf8a1c40 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -210,7 +210,7 @@ static void sound_cpu_irq(int state)
static TIMER_CALLBACK( delayed_sound_data_w )
{
- soundlatch_w(0, param);
+ soundlatch_w(machine, 0, param);
cpunum_set_input_line(machine, 3, INPUT_LINE_NMI, ASSERT_LINE);
}
@@ -224,8 +224,8 @@ static WRITE16_HANDLER( sound_data_w )
static READ8_HANDLER( sound_data_r )
{
- cpunum_set_input_line(Machine, 3, INPUT_LINE_NMI, CLEAR_LINE);
- return soundlatch_r(offset);
+ cpunum_set_input_line(machine, 3, INPUT_LINE_NMI, CLEAR_LINE);
+ return soundlatch_r(machine,offset);
}
@@ -314,7 +314,7 @@ static WRITE16_HANDLER( io_chip_w )
D1-D0 = ADC0-1
*/
segaic16_set_display_enable(data & 0x80);
- if (((old ^ data) & 0x20) && !(data & 0x20)) watchdog_reset_w(0,0);
+ if (((old ^ data) & 0x20) && !(data & 0x20)) watchdog_reset_w(machine,0,0);
cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data & 0x04) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 6c4563e78d4..76c6ba23d8a 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -853,14 +853,14 @@ static READ32_HANDLER( spi_unknown_r )
static WRITE32_HANDLER( ds2404_reset_w )
{
if( ACCESSING_LSB32 ) {
- DS2404_1W_reset_w(offset, data);
+ DS2404_1W_reset_w(machine, offset, data);
}
}
static READ32_HANDLER( ds2404_data_r )
{
if( ACCESSING_LSB32 ) {
- return DS2404_data_r(offset);
+ return DS2404_data_r(machine, offset);
}
return 0;
}
@@ -868,14 +868,14 @@ static READ32_HANDLER( ds2404_data_r )
static WRITE32_HANDLER( ds2404_data_w )
{
if( ACCESSING_LSB32 ) {
- DS2404_data_w(offset, data);
+ DS2404_data_w(machine, offset, data);
}
}
static WRITE32_HANDLER( ds2404_clk_w )
{
if( ACCESSING_LSB32 ) {
- DS2404_clk_w(offset, data);
+ DS2404_clk_w(machine, offset, data);
}
}
@@ -938,25 +938,25 @@ static READ32_HANDLER( spi_controls2_r )
static READ32_HANDLER( spi_6295_0_r )
{
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
}
static READ32_HANDLER( spi_6295_1_r )
{
- return OKIM6295_status_1_r(0);
+ return OKIM6295_status_1_r(machine, 0);
}
static WRITE32_HANDLER( spi_6295_0_w )
{
if( ACCESSING_LSB32 ) {
- OKIM6295_data_0_w(0, data & 0xff);
+ OKIM6295_data_0_w(machine, 0, data & 0xff);
}
}
static WRITE32_HANDLER( spi_6295_1_w )
{
if( ACCESSING_LSB32 ) {
- OKIM6295_data_1_w(0, data & 0xff);
+ OKIM6295_data_1_w(machine, 0, data & 0xff);
}
}
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 7537a905610..fa2c773b2f1 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1491,7 +1491,6 @@ static WRITE16_HANDLER( sharedram_68000_w )
static WRITE16_HANDLER( sub_ctrl_w )
{
static int old_data = 0;
-
switch(offset)
{
case 0/2: // bit 0: reset sub cpu?
@@ -1507,11 +1506,11 @@ static WRITE16_HANDLER( sub_ctrl_w )
break;
case 4/2: // not sure
- if (ACCESSING_LSB) soundlatch_w(0, data & 0xff);
+ if (ACCESSING_LSB) soundlatch_w(machine, 0, data & 0xff);
break;
case 6/2: // not sure
- if (ACCESSING_LSB) soundlatch2_w(0, data & 0xff);
+ if (ACCESSING_LSB) soundlatch2_w(machine, 0, data & 0xff);
break;
}
@@ -1680,8 +1679,8 @@ static WRITE16_HANDLER( calibr50_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_word_w(0,data,mem_mask);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_word_w(machine,0,data,mem_mask);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other cpu to reply
}
}
@@ -2438,7 +2437,7 @@ static WRITE16_HANDLER( msgundam_vregs_w )
case 1: offset = 2; break;
case 2: offset = 1; break;
}
- seta_vregs_w(offset,data,mem_mask);
+ seta_vregs_w(machine,offset,data,mem_mask);
}
/* Mirror RAM is necessary or startup, to clear Work RAM after the test */
@@ -2595,7 +2594,7 @@ static WRITE16_HANDLER( kiwame_nvram_w )
static READ16_HANDLER( kiwame_input_r )
{
- int row_select = kiwame_nvram_r( 0x10a/2,0 ) & 0x1f;
+ int row_select = kiwame_nvram_r( machine,0x10a/2,0 ) & 0x1f;
int i;
for(i = 0; i < 5; i++)
@@ -2763,8 +2762,8 @@ static WRITE16_HANDLER( utoukond_soundlatch_w )
{
if (ACCESSING_LSB)
{
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
- soundlatch_w(0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
}
}
@@ -2817,7 +2816,7 @@ static WRITE8_HANDLER( sub_bankswitch_w )
static WRITE8_HANDLER( sub_bankswitch_lockout_w )
{
- sub_bankswitch_w(offset,data);
+ sub_bankswitch_w(machine,offset,data);
seta_coin_lockout_w(data);
}
@@ -2931,7 +2930,7 @@ ADDRESS_MAP_END
static WRITE8_HANDLER( calibr50_soundlatch2_w )
{
- soundlatch2_w(0,data);
+ soundlatch2_w(machine,0,data);
cpu_spinuntil_time(ATTOTIME_IN_USEC(50)); // Allow the other cpu to reply
}
@@ -3065,8 +3064,8 @@ ADDRESS_MAP_END
Crazy Fight
***************************************************************************/
-static WRITE16_HANDLER( YM3812_control_port_0_lsb_w ) { if (ACCESSING_LSB) YM3812_control_port_0_w(0, data & 0xff); }
-static WRITE16_HANDLER( YM3812_write_port_0_lsb_w ) { if (ACCESSING_LSB) YM3812_write_port_0_w(0, data & 0xff); }
+static WRITE16_HANDLER( YM3812_control_port_0_lsb_w ) { if (ACCESSING_LSB) YM3812_control_port_0_w(machine, 0, data & 0xff); }
+static WRITE16_HANDLER( YM3812_write_port_0_lsb_w ) { if (ACCESSING_LSB) YM3812_write_port_0_w(machine, 0, data & 0xff); }
static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 8731f406236..1b3e0940cf1 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -53,8 +53,8 @@ static WRITE16_HANDLER( soundcmd_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
@@ -123,8 +123,8 @@ static WRITE16_HANDLER( protection_w )
program_write_word(0xffc00c, 0xc0);
program_write_word(0xffc00e, 0);
- sf_fg_scroll_w(0, d1, 0);
- sf_bg_scroll_w(0, d2, 0);
+ sf_fg_scroll_w(machine, 0, d1, 0);
+ sf_fg_scroll_w(machine, 0, d2, 0);
break;
}
case 4:
@@ -144,7 +144,7 @@ static WRITE16_HANDLER( protection_w )
}
program_write_word(0xffc682, d1);
program_write_word(0xffc00e, off);
- sf_bg_scroll_w(0, d1, 0);
+ sf_fg_scroll_w(machine, 0, d1, 0);
}
break;
}
@@ -166,12 +166,12 @@ static const int scale[8] = { 0x00, 0x40, 0xe0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe };
static READ16_HANDLER( button1_r )
{
- return (scale[input_port_7_r(0)]<<8)|scale[input_port_5_r(0)];
+ return (scale[input_port_7_r(machine,0)]<<8)|scale[input_port_5_r(machine,0)];
}
static READ16_HANDLER( button2_r )
{
- return (scale[input_port_8_r(0)]<<8)|scale[input_port_6_r(0)];
+ return (scale[input_port_8_r(machine,0)]<<8)|scale[input_port_6_r(machine,0)];
}
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 29251a41f51..6ca66a06101 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -61,16 +61,16 @@ GFXDECODE_END
static WRITE8_HANDLER( sgladiat_soundlatch_w )
{
snk_sound_busy_bit = 0x20;
- soundlatch_w( offset, data );
+ soundlatch_w( machine, offset, data );
/* trigger NMI on sound CPU */
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE); // safer because NMI can be lost in rare occations
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE); // safer because NMI can be lost in rare occations
}
static READ8_HANDLER( sgladiat_soundlatch_r )
{
snk_sound_busy_bit = 0;
- return(soundlatch_r(0));
+ return(soundlatch_r(machine,0));
}
static READ8_HANDLER( sgladiat_sound_nmi_ack_r )
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 777efa7d087..38765bc0d23 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -212,8 +212,8 @@ static WRITE16_HANDLER ( shadfrce_sound_brt_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(1,data >> 8);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data >> 8);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
else
{
@@ -221,7 +221,7 @@ static WRITE16_HANDLER ( shadfrce_sound_brt_w )
double brt = (data & 0xff) / 255.0;
for (i = 0; i < 0x4000; i++)
- palette_set_brightness(Machine,i,brt);
+ palette_set_brightness(machine,i,brt);
}
}
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 37af87006b5..0caa357151d 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -105,8 +105,8 @@ static WRITE16_HANDLER( heberpop_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff); /* RST 38h */
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff); /* RST 38h */
}
}
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index d94812320e4..de8d260ad20 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -103,7 +103,7 @@ static WRITE8_HANDLER( shangkid_sound_enable_w )
static WRITE8_HANDLER( shangkid_bbx_AY8910_control_w )
{
bbx_AY8910_control = data;
- AY8910_control_port_0_w( offset, data );
+ AY8910_control_port_0_w( machine, offset, data );
}
static WRITE8_HANDLER( chinhero_bbx_AY8910_write_w )
@@ -124,7 +124,7 @@ static WRITE8_HANDLER( chinhero_bbx_AY8910_write_w )
break;
default:
- AY8910_write_port_0_w( offset, data );
+ AY8910_write_port_0_w( machine, offset, data );
break;
}
}
@@ -149,7 +149,7 @@ static WRITE8_HANDLER( shangkid_bbx_AY8910_write_w )
break;
default:
- AY8910_write_port_0_w( offset, data );
+ AY8910_write_port_0_w( machine, offset, data );
break;
}
}
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index dfe6c29887a..c5111210954 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -20,18 +20,18 @@ extern VIDEO_UPDATE( sichuan2 );
static READ8_HANDLER( sichuan2_dsw1_r )
{
- int ret = input_port_3_r(0);
+ int ret = input_port_3_r(machine, 0);
/* Based on the coin mode fill in the upper bits */
- if (input_port_4_r(0) & 0x04)
+ if (input_port_4_r(machine, 0) & 0x04)
{
/* Mode 1 */
- ret |= (input_port_5_r(0) << 4);
+ ret |= (input_port_5_r(machine, 0) << 4);
}
else
{
/* Mode 2 */
- ret |= (input_port_5_r(0) & 0xf0);
+ ret |= (input_port_5_r(machine, 0) & 0xf0);
}
return ret;
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index f32ed2b4597..7862790bf9d 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -61,8 +61,8 @@ static WRITE8_HANDLER( shootout_bankswitch_w )
static WRITE8_HANDLER( sound_cpu_command_w )
{
- soundlatch_w( offset, data );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w( machine, offset, data );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
static WRITE8_HANDLER( shootout_flipscreen_w )
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index feddb5f3c91..f4a7ed1ff33 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -221,7 +221,7 @@ static WRITE8_HANDLER ( cpu_shared_ctrl_main_w )
static WRITE8_HANDLER( shougi_watchdog_reset_w )
{
- watchdog_reset_w(0,data);
+ watchdog_reset_w(machine,0,data);
}
static WRITE8_HANDLER( shougi_mcu_halt_off_w )
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 1ef88978c15..58dc98e952e 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -102,14 +102,14 @@ static READ16_HANDLER( leta_r )
static READ16_HANDLER( adpcm_r )
{
- return OKIM6295_status_0_r(offset) | 0xff00;
+ return OKIM6295_status_0_r(machine, offset) | 0xff00;
}
static WRITE16_HANDLER( adpcm_w )
{
if (ACCESSING_LSB)
- OKIM6295_data_0_w(offset, data & 0xff);
+ OKIM6295_data_0_w(machine, offset, data & 0xff);
}
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 1946ccb16a8..d451fac3d98 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -33,8 +33,8 @@ static int i8751_return;
static WRITE8_HANDLER( sound_cpu_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static READ8_HANDLER( sidepckt_i8751_r )
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index d031e3e26da..c3ce4e070df 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -161,7 +161,7 @@ static READ32_HANDLER(io32_1_r)
static READ32_HANDLER(silk_6295_0_r)
{
- return OKIM6295_status_0_r(0)<<16;
+ return OKIM6295_status_0_r(machine, 0)<<16;
}
static WRITE32_HANDLER(silk_6295_0_w)
@@ -169,13 +169,13 @@ static WRITE32_HANDLER(silk_6295_0_w)
if (!(mem_mask & 0x00ff0000))
{
logerror("OKI0: write %x mem_mask %8x\n", data>>16, mem_mask);
- OKIM6295_data_0_w(0, (data>>16) & 0xff);
+ OKIM6295_data_0_w(machine, 0, (data>>16) & 0xff);
}
}
static READ32_HANDLER(silk_6295_1_r)
{
- return OKIM6295_status_1_r(0)<<16;
+ return OKIM6295_status_1_r(machine, 0)<<16;
}
static WRITE32_HANDLER(silk_6295_1_w)
@@ -183,20 +183,20 @@ static WRITE32_HANDLER(silk_6295_1_w)
if (!(mem_mask & 0x00ff0000))
{
logerror("OKI1: write %x mem_mask %8x\n", data>>16, mem_mask);
- OKIM6295_data_1_w(0, (data>>16) & 0xff);
+ OKIM6295_data_1_w(machine, 0, (data>>16) & 0xff);
}
}
static READ32_HANDLER(silk_ym_r)
{
- return YM2151_status_port_0_r(0)<<16;
+ return YM2151_status_port_0_r(machine, 0)<<16;
}
static WRITE32_HANDLER(silk_ym_regport_w)
{
if (!(mem_mask & 0x00ff0000))
{
- YM2151_register_port_0_w(0, (data>>16) & 0xff);
+ YM2151_register_port_0_w(machine, 0, (data>>16) & 0xff);
}
}
@@ -204,7 +204,7 @@ static WRITE32_HANDLER(silk_ym_dataport_w)
{
if (!(mem_mask & 0x00ff0000))
{
- YM2151_data_port_0_w(0, (data>>16) & 0xff);
+ YM2151_data_port_0_w(machine, 0, (data>>16) & 0xff);
}
}
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index e400054efe1..1890ad62b04 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -193,22 +193,22 @@ static WRITE32_HANDLER( simpl156_eeprom_w )
static READ32_HANDLER( oki_r )
{
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
}
static WRITE32_HANDLER( oki_w )
{
- OKIM6295_data_0_w(0, data & 0xff);
+ OKIM6295_data_0_w(machine, 0, data & 0xff);
}
static READ32_HANDLER( oki2_r )
{
- return OKIM6295_status_1_r(0);
+ return OKIM6295_status_1_r(machine, 0);
}
static WRITE32_HANDLER( oki2_w )
{
- OKIM6295_data_1_w(0, data & 0xff);
+ OKIM6295_data_1_w(machine, 0, data & 0xff);
}
/* we need to throw away bits for all ram accesses as the devices are connected as 16-bit */
@@ -292,7 +292,7 @@ static WRITE32_HANDLER( simpl156_pf1_data_w )
data &=0x0000ffff;
mem_mask &=0x0000ffff;
- deco16_pf1_data_w(offset,data,mem_mask);
+ deco16_pf1_data_w(machine,offset,data,mem_mask);
}
static READ32_HANDLER( simpl156_pf2_data_r )
@@ -305,7 +305,7 @@ static WRITE32_HANDLER( simpl156_pf2_data_w )
{
data &=0x0000ffff;
mem_mask &=0x0000ffff;
- deco16_pf2_data_w(offset,data,mem_mask);
+ deco16_pf2_data_w(machine,offset,data,mem_mask);
}
/* Memory Map controled by PALs */
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 82fc7e34e2a..338b668b3d6 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -145,11 +145,11 @@ static WRITE8_HANDLER( skydiver_nmion_w )
static INTERRUPT_GEN( skydiver_interrupt )
{
/* Convert range data to divide value and write to sound */
- discrete_sound_w(SKYDIVER_RANGE_DATA, (0x01 << (~skydiver_videoram[0x394] & 0x07)) & 0xff); // Range 0-2
+ discrete_sound_w(machine, SKYDIVER_RANGE_DATA, (0x01 << (~skydiver_videoram[0x394] & 0x07)) & 0xff); // Range 0-2
- discrete_sound_w(SKYDIVER_RANGE3_EN, skydiver_videoram[0x394] & 0x08); // Range 3 - note disable
- discrete_sound_w(SKYDIVER_NOTE_DATA, ~skydiver_videoram[0x395] & 0xff); // Note - freq
- discrete_sound_w(SKYDIVER_NOISE_DATA, skydiver_videoram[0x396] & 0x0f); // NAM - Noise Amplitude
+ discrete_sound_w(machine, SKYDIVER_RANGE3_EN, skydiver_videoram[0x394] & 0x08); // Range 3 - note disable
+ discrete_sound_w(machine, SKYDIVER_NOTE_DATA, ~skydiver_videoram[0x395] & 0xff); // Note - freq
+ discrete_sound_w(machine, SKYDIVER_NOISE_DATA, skydiver_videoram[0x396] & 0x0f); // NAM - Noise Amplitude
if (skydiver_nmion)
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
@@ -165,12 +165,12 @@ static INTERRUPT_GEN( skydiver_interrupt )
static WRITE8_HANDLER( skydiver_sound_enable_w )
{
- discrete_sound_w(SKYDIVER_SOUND_EN, offset);
+ discrete_sound_w(machine, SKYDIVER_SOUND_EN, offset);
}
static WRITE8_HANDLER( skydiver_whistle_w )
{
- discrete_sound_w(SKYDIVER_WHISTLE1_EN + (offset >> 1), offset & 0x01);
+ discrete_sound_w(machine, SKYDIVER_WHISTLE1_EN + (offset >> 1), offset & 0x01);
}
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index bec0275e94f..d56bd9ef512 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -341,7 +341,7 @@ ADDRESS_MAP_END
static READ8_HANDLER(tigerh_status_r)
{
- return (slapfight_port_00_r(0)&0xf9)| ((tigerh_mcu_status_r(0)));
+ return (slapfight_port_00_r(machine,0)&0xf9)| ((tigerh_mcu_status_r(machine,0)));
}
static ADDRESS_MAP_START( tigerh_readport, ADDRESS_SPACE_IO, 8 )
@@ -834,7 +834,7 @@ static const struct AY8910interface ay8910_interface_2 =
static VIDEO_EOF( perfrman )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
static MACHINE_DRIVER_START( perfrman )
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 76bb09e28a6..cda4a7198f9 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -202,11 +202,11 @@ static READ16_HANDLER( slapshot_service_input_r )
switch (offset)
{
case 0x03:
- return ((input_port_3_word_r(0,0) & 0xef) |
- (input_port_5_word_r(0,0) & 0x10)) << 8; /* IN3 + service switch */
+ return ((input_port_3_word_r(machine,0,0) & 0xef) |
+ (input_port_5_word_r(machine,0,0) & 0x10)) << 8; /* IN3 + service switch */
default:
- return TC0640FIO_r(offset) << 8;
+ return TC0640FIO_r(machine,offset) << 8;
}
}
@@ -248,9 +248,9 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( slapshot_msb_sound_w )
{
if (offset == 0)
- taitosound_port_w (0,(data >> 8) & 0xff);
+ taitosound_port_w (machine,0,(data >> 8) & 0xff);
else if (offset == 1)
- taitosound_comm_w (0,(data >> 8) & 0xff);
+ taitosound_comm_w (machine,0,(data >> 8) & 0xff);
#ifdef MAME_DEBUG
if (data & 0xff)
@@ -261,7 +261,7 @@ static WRITE16_HANDLER( slapshot_msb_sound_w )
static READ16_HANDLER( slapshot_msb_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff) << 8);
+ return ((taitosound_comm_r (machine, 0) & 0xff) << 8);
else return 0;
}
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 0ca6cf0381e..c92aca14357 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -385,8 +385,8 @@ static WRITE16_HANDLER(io_data_w)
static WRITE16_HANDLER(sound_w)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, I8051_INT0_LINE, HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, I8051_INT0_LINE, HOLD_LINE);
}
static ADDRESS_MAP_START( sliver_map, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 4861e0e5704..0e3a1e20236 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -316,11 +316,11 @@ static int snk_rot( int which ){
return value;
}
-static int snk_input_port_r( int which ){
+static int snk_input_port_r( running_machine *machine, int which ){
switch( snk_io[which] ){
case SNK_INP0:
{
- int value = input_port_0_r( 0 );
+ int value = input_port_0_r( machine,0 );
if( (snk_sound_register & 0x04) == 0 ) value &= ~snk_sound_busy_bit;
return value;
}
@@ -328,17 +328,17 @@ static int snk_input_port_r( int which ){
case SNK_ROT_PLAYER1: return snk_rot( 0 );
case SNK_ROT_PLAYER2: return snk_rot( 1 );
- case SNK_INP1: return input_port_1_r(0);
- case SNK_INP2: return input_port_2_r(0);
- case SNK_INP3: return input_port_3_r(0);
- case SNK_INP4: return input_port_4_r(0);
- case SNK_INP5: return input_port_5_r(0);
- case SNK_INP6: return input_port_6_r(0);
- case SNK_INP7: return input_port_7_r(0);
- case SNK_INP8: return input_port_8_r(0);
- case SNK_INP9: return input_port_9_r(0);
- case SNK_INP10: return input_port_10_r(0);
- case SNK_INP11: return input_port_11_r(0);
+ case SNK_INP1: return input_port_1_r(machine,0);
+ case SNK_INP2: return input_port_2_r(machine,0);
+ case SNK_INP3: return input_port_3_r(machine,0);
+ case SNK_INP4: return input_port_4_r(machine,0);
+ case SNK_INP5: return input_port_5_r(machine,0);
+ case SNK_INP6: return input_port_6_r(machine,0);
+ case SNK_INP7: return input_port_7_r(machine,0);
+ case SNK_INP8: return input_port_8_r(machine,0);
+ case SNK_INP9: return input_port_9_r(machine,0);
+ case SNK_INP10: return input_port_10_r(machine,0);
+ case SNK_INP11: return input_port_11_r(machine,0);
default:
logerror("read from unmapped input port:%d\n", which );
@@ -384,11 +384,11 @@ static const struct YM3812interface ym3812_interface = {
static WRITE8_HANDLER( snk_soundlatch_w ){
snk_sound_register |= 0x08 | 0x04;
- soundlatch_w( offset, data );
+ soundlatch_w( machine, offset, data );
}
static READ8_HANDLER( snk_soundlatch_clear_r ){ /* TNK3 */
- soundlatch_w( 0, 0 );
+ soundlatch_w( machine, 0, 0 );
snk_sound_register = 0;
return 0x00;
}
@@ -455,21 +455,21 @@ ADDRESS_MAP_END
static READ8_HANDLER( cpuA_io_r ){
switch( offset ){
- case 0x000: return snk_input_port_r( 0 ); // coin input, player start
- case 0x100: return snk_input_port_r( 1 ); // joy1
- case 0x180: return snk_input_port_r( 2 ); // joy2
- case 0x200: return snk_input_port_r( 3 ); // joy3
- case 0x280: return snk_input_port_r( 4 ); // joy4
- case 0x300: return snk_input_port_r( 5 ); // aim1
- case 0x380: return snk_input_port_r( 6 ); // aim2
- case 0x400: return snk_input_port_r( 7 ); // aim3
- case 0x480: return snk_input_port_r( 8 ); // aim4
- case 0x500: return snk_input_port_r( 9 ); // unused by tdfever
- case 0x580: return snk_input_port_r( 10 ); // dsw
- case 0x600: return snk_input_port_r( 11 ); // dsw
- case 0x080: return snk_input_port_r( 12 ); // player start (types C and D in 'fsoccer')
-
- case 0x700: return(snk_cpuB_nmi_trigger_r(0));
+ case 0x000: return snk_input_port_r( machine,0 ); // coin input, player start
+ case 0x100: return snk_input_port_r( machine,1 ); // joy1
+ case 0x180: return snk_input_port_r( machine,2 ); // joy2
+ case 0x200: return snk_input_port_r( machine,3 ); // joy3
+ case 0x280: return snk_input_port_r( machine,4 ); // joy4
+ case 0x300: return snk_input_port_r( machine,5 ); // aim1
+ case 0x380: return snk_input_port_r( machine,6 ); // aim2
+ case 0x400: return snk_input_port_r( machine,7 ); // aim3
+ case 0x480: return snk_input_port_r( machine,8 ); // aim4
+ case 0x500: return snk_input_port_r( machine,9 ); // unused by tdfever
+ case 0x580: return snk_input_port_r( machine,10 ); // dsw
+ case 0x600: return snk_input_port_r( machine,11 ); // dsw
+ case 0x080: return snk_input_port_r( machine,12 ); // player start (types C and D in 'fsoccer')
+
+ case 0x700: return(snk_cpuB_nmi_trigger_r(machine,0));
/* "Hard Flags" */
case 0xe00:
@@ -490,11 +490,11 @@ static WRITE8_HANDLER( cpuA_io_w ){
case 0x400: /* most games */
case 0x500: /* tdfever */
- snk_soundlatch_w( 0, data );
+ snk_soundlatch_w( machine, 0, data );
break;
case 0x700:
- snk_cpuA_nmi_ack_w(0, 0);
+ snk_cpuA_nmi_ack_w(machine, 0, 0);
break;
default:
@@ -506,7 +506,7 @@ static WRITE8_HANDLER( cpuA_io_w ){
static READ8_HANDLER( cpuB_io_r ){
switch( offset ){
case 0x000:
- case 0x700: return(snk_cpuA_nmi_trigger_r(0));
+ case 0x700: return(snk_cpuA_nmi_trigger_r(machine, 0));
/* "Hard Flags" they are needed here, otherwise ikarijp/b doesn't work right */
case 0xe00:
@@ -524,7 +524,7 @@ static WRITE8_HANDLER( cpuB_io_w )
{
io_ram[offset] = data;
- if (offset==0 || offset==0x700) snk_cpuB_nmi_ack_w(0, 0);
+ if (offset==0 || offset==0x700) snk_cpuB_nmi_ack_w(machine, 0, 0);
}
/********************** Tnk3, Athena, Fighting Golf ********************/
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index 814c2dcd43b..8dddc621e67 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -127,8 +127,8 @@ static WRITE16_HANDLER( protection_w )
static WRITE16_HANDLER( sound_w )
{
- soundlatch_w(0,(data>>8)&0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,(data>>8)&0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
/*******************************************************************************/
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index f02f6108ec6..d2a7ea99860 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -111,7 +111,7 @@ static INTERRUPT_GEN( snowbros_interrupt )
static INTERRUPT_GEN( snowbro3_interrupt )
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
cpunum_set_input_line(machine, 0, cpu_getiloops() + 2, HOLD_LINE); /* IRQs 4, 3, and 2 */
@@ -119,8 +119,8 @@ static INTERRUPT_GEN( snowbro3_interrupt )
{
if ((status&0x08)==0x00)
{
- OKIM6295_data_0_w(0,0x80|sb3_music);
- OKIM6295_data_0_w(0,0x00|0x82);
+ OKIM6295_data_0_w(machine,0,0x80|sb3_music);
+ OKIM6295_data_0_w(machine,0,0x00|0x82);
}
}
@@ -128,7 +128,7 @@ static INTERRUPT_GEN( snowbro3_interrupt )
{
if ((status&0x08)==0x08)
{
- OKIM6295_data_0_w(0,0x40); /* Stop playing music */
+ OKIM6295_data_0_w(machine,0,0x40); /* Stop playing music */
}
}
@@ -139,7 +139,7 @@ static INTERRUPT_GEN( snowbro3_interrupt )
static READ16_HANDLER( snowbros_68000_sound_r )
{
- return soundlatch_r(offset);
+ return soundlatch_r(machine,offset);
}
@@ -147,14 +147,14 @@ static WRITE16_HANDLER( snowbros_68000_sound_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
static WRITE16_HANDLER( semicom_soundcmd_w )
{
- if (ACCESSING_LSB) soundlatch_w(0,data & 0xff);
+ if (ACCESSING_LSB) soundlatch_w(machine,0,data & 0xff);
}
@@ -289,8 +289,8 @@ static WRITE16_HANDLER( twinadv_68000_sound_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
@@ -453,24 +453,24 @@ static void sb3_play_music(int data)
}
}
-static void sb3_play_sound (int data)
+static void sb3_play_sound (running_machine *machine, int data)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
if ((status&0x01)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x12);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x12);
}
else if ((status&0x02)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x22);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x22);
}
else if ((status&0x04)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x42);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x42);
}
@@ -481,7 +481,7 @@ static WRITE16_HANDLER( sb3_sound_w )
if (data == 0x00fe)
{
sb3_music_is_playing = 0;
- OKIM6295_data_0_w(0,0x78); /* Stop sounds */
+ OKIM6295_data_0_w(machine,0,0x78); /* Stop sounds */
}
else /* the alternating 0x00-0x2f or 0x30-0x5f might be something to do with the channels */
{
@@ -489,7 +489,7 @@ static WRITE16_HANDLER( sb3_sound_w )
if (data <= 0x21)
{
- sb3_play_sound(data);
+ sb3_play_sound(machine, data);
}
if (data>=0x22 && data<=0x31)
@@ -499,7 +499,7 @@ static WRITE16_HANDLER( sb3_sound_w )
if ((data>=0x30) && (data<=0x51))
{
- sb3_play_sound(data-0x30);
+ sb3_play_sound(machine, data-0x30);
}
if (data>=0x52 && data<=0x5f)
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index 0dcb36e44f4..bc529f7fb07 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -24,8 +24,8 @@ extern VIDEO_UPDATE( solomon );
static WRITE8_HANDLER( solomon_sh_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
/* this is checked on the title screen and when you reach certain scores in the game
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index da4be1bb145..c8252b60f98 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -208,9 +208,9 @@ static MACHINE_START( spacefb )
static MACHINE_RESET( spacefb )
{
/* the 3 output ports are cleared on reset */
- spacefb_port_0_w(0, 0);
- spacefb_port_1_w(0, 0);
- spacefb_port_2_w(0, 0);
+ spacefb_port_0_w(machine, 0, 0);
+ spacefb_port_1_w(machine, 0, 0);
+ spacefb_port_2_w(machine, 0, 0);
start_interrupt_timer();
}
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index c713881c0cd..16a4b3d2cb0 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -139,8 +139,8 @@ static WRITE16_HANDLER( soundcommand_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index aa607700acb..e9e5ac3af20 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -61,9 +61,9 @@ static WRITE8_HANDLER( spcforce_SN76496_select_w )
{
spcforce_SN76496_select = data;
- if (~data & 0x40) SN76496_0_w(0, spcforce_SN76496_latch);
- if (~data & 0x20) SN76496_1_w(0, spcforce_SN76496_latch);
- if (~data & 0x10) SN76496_2_w(0, spcforce_SN76496_latch);
+ if (~data & 0x40) SN76496_0_w(machine, 0, spcforce_SN76496_latch);
+ if (~data & 0x20) SN76496_1_w(machine, 0, spcforce_SN76496_latch);
+ if (~data & 0x10) SN76496_2_w(machine, 0, spcforce_SN76496_latch);
}
static READ8_HANDLER( spcforce_t0_r )
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index d8e0ee89e64..a7d8659a43a 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -46,8 +46,8 @@ static int adpcm_pos[2],adpcm_end[2],adpcm_idle[2];
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,M6809_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,M6809_IRQ_LINE,HOLD_LINE);
}
static WRITE8_HANDLER( spd_adpcm_w )
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index ebcea52dc84..004e6c16ef3 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -103,8 +103,8 @@ static WRITE8_HANDLER(speedspn_banked_rom_change)
static WRITE8_HANDLER(speedspn_sound_w)
{
- soundlatch_w(1,data);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,1,data);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
static WRITE8_HANDLER( oki_banking_w )
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index bb229a27183..67be4092f76 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -273,13 +273,13 @@ static INTERRUPT_GEN( update_pia_1 )
/* update the different PIA pins from the input ports */
/* CA1 - copy of PA1 (COIN1) */
- pia_1_ca1_w(0, input_port_0_r(0) & 0x02);
+ pia_1_ca1_w(machine, 0, input_port_0_r(machine, 0) & 0x02);
/* CA2 - copy of PA0 (SERVICE1) */
- pia_1_ca2_w(0, input_port_0_r(0) & 0x01);
+ pia_1_ca2_w(machine, 0, input_port_0_r(machine, 0) & 0x01);
/* CB1 - (crosshatch) */
- pia_1_cb1_w(0, input_port_5_r(0));
+ pia_1_cb1_w(machine, 0, input_port_5_r(machine, 0));
/* CB2 - NOT CONNECTED */
}
@@ -345,7 +345,7 @@ static const pia6821_interface pia_4_intf =
static void ic60_74123_output_changed(int output)
{
- pia_2_ca1_w(0, output);
+ pia_2_ca1_w(Machine, 0, output);
}
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 9378c48a9c9..6d060119365 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -69,16 +69,16 @@ VIDEO_UPDATE( funystrp );
static WRITE16_HANDLER( splash_sh_irqtrigger_w )
{
if (ACCESSING_LSB){
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
}
static WRITE16_HANDLER( roldf_sh_irqtrigger_w )
{
if (ACCESSING_LSB){
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
// give the z80 time to see it
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 03ff6866d4b..35eeb0f3034 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -103,9 +103,9 @@ static INTERRUPT_GEN( sprint2 )
}
}
- discrete_sound_w(SPRINT2_MOTORSND1_DATA, sprint2_video_ram[0x394] & 15); // also DOMINOS_FREQ_DATA
- discrete_sound_w(SPRINT2_MOTORSND2_DATA, sprint2_video_ram[0x395] & 15);
- discrete_sound_w(SPRINT2_CRASHSND_DATA, sprint2_video_ram[0x396] & 15); // also DOMINOS_AMP_DATA
+ discrete_sound_w(machine, SPRINT2_MOTORSND1_DATA, sprint2_video_ram[0x394] & 15); // also DOMINOS_FREQ_DATA
+ discrete_sound_w(machine, SPRINT2_MOTORSND2_DATA, sprint2_video_ram[0x395] & 15);
+ discrete_sound_w(machine, SPRINT2_CRASHSND_DATA, sprint2_video_ram[0x396] & 15); // also DOMINOS_AMP_DATA
/* interrupts and watchdog are disabled during service mode */
@@ -217,25 +217,25 @@ static WRITE8_HANDLER( sprint2_attract_w )
attract = offset & 1;
// also DOMINOS_ATTRACT_EN
- discrete_sound_w(SPRINT2_ATTRACT_EN, attract);
+ discrete_sound_w(machine, SPRINT2_ATTRACT_EN, attract);
}
static WRITE8_HANDLER( sprint2_noise_reset_w )
{
- discrete_sound_w(SPRINT2_NOISE_RESET, 0);
+ discrete_sound_w(machine, SPRINT2_NOISE_RESET, 0);
}
static WRITE8_HANDLER( sprint2_skid1_w )
{
// also DOMINOS_TUMBLE_EN
- discrete_sound_w(SPRINT2_SKIDSND1_EN, offset & 1);
+ discrete_sound_w(machine, SPRINT2_SKIDSND1_EN, offset & 1);
}
static WRITE8_HANDLER( sprint2_skid2_w )
{
- discrete_sound_w(SPRINT2_SKIDSND2_EN, offset & 1);
+ discrete_sound_w(machine, SPRINT2_SKIDSND2_EN, offset & 1);
}
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index eacca8ee326..80b9ef8ee58 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -200,25 +200,25 @@ static WRITE8_HANDLER( sprint4_lockout_w )
static WRITE8_HANDLER( sprint4_screech_1_w )
{
- discrete_sound_w(SPRINT4_SCREECH_EN_1, offset & 1);
+ discrete_sound_w(machine, SPRINT4_SCREECH_EN_1, offset & 1);
}
static WRITE8_HANDLER( sprint4_screech_2_w )
{
- discrete_sound_w(SPRINT4_SCREECH_EN_2, offset & 1);
+ discrete_sound_w(machine, SPRINT4_SCREECH_EN_2, offset & 1);
}
static WRITE8_HANDLER( sprint4_screech_3_w )
{
- discrete_sound_w(SPRINT4_SCREECH_EN_3, offset & 1);
+ discrete_sound_w(machine, SPRINT4_SCREECH_EN_3, offset & 1);
}
static WRITE8_HANDLER( sprint4_screech_4_w )
{
- discrete_sound_w(SPRINT4_SCREECH_EN_4, offset & 1);
+ discrete_sound_w(machine, SPRINT4_SCREECH_EN_4, offset & 1);
}
@@ -226,13 +226,13 @@ static WRITE8_HANDLER( sprint4_screech_4_w )
static WRITE8_HANDLER( sprint4_bang_w )
{
- discrete_sound_w(SPRINT4_BANG_DATA, data & 0x0f);
+ discrete_sound_w(machine, SPRINT4_BANG_DATA, data & 0x0f);
}
static WRITE8_HANDLER( sprint4_attract_w )
{
- discrete_sound_w(SPRINT4_ATTRACT_EN, data & 1);
+ discrete_sound_w(machine, SPRINT4_ATTRACT_EN, data & 1);
}
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index f378f648d5d..a02eac4bab0 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -68,7 +68,7 @@ static WRITE8_HANDLER( spy_bankedram1_w )
{
if (rambank & 1)
{
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
else if (rambank & 2)
{
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index c2b2f76d5ec..9c50aa34305 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -535,7 +535,7 @@ static WRITE16_HANDLER(tileram_w)
if (offset >= 0xfff00/2 && offset <= 0xfff1a/2 )
{
offset &=0x1f;
- srmp6_dma_w(offset,data,mem_mask);
+ srmp6_dma_w(machine,offset,data,mem_mask);
}
}
@@ -544,7 +544,7 @@ static WRITE16_HANDLER(paletteram_w)
INT8 r, g, b;
int brg = brightness - 0x60;
- paletteram16_xBBBBBGGGGGRRRRR_word_w(offset, data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset, data, mem_mask);
if(brg)
{
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 1f309e4e708..55024835584 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -53,7 +53,7 @@ static WRITE8_HANDLER( srumbler_bankswitch_w )
static MACHINE_RESET( srumbler )
{
/* initialize banked ROM pointers */
- srumbler_bankswitch_w(0,0);
+ srumbler_bankswitch_w(machine,0,0);
}
static INTERRUPT_GEN( srumbler_interrupt )
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 7ecf3adacca..6e5901bf983 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -335,7 +335,7 @@ static READ32_HANDLER(PS7500_IO_r)
return (PS7500_IO[IRQSTA]&PS7500_IO[IRQMSKA])|0x80;
case IOCR: //TODO: nINT1, OD[n] p.81
- return (input_port_0_r(0)&0x80)|0x34|3;
+ return (input_port_0_r(machine,0)&0x80)|0x34|3;
case VIDCR:
return (PS7500_IO[offset]|0x50)&0xfffffff0;
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index d25b01ea9dd..10cb2bb2744 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -89,8 +89,8 @@ static WRITE16_HANDLER( sshangha_protection16_w )
static WRITE16_HANDLER( sshangha_sound_w )
{
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
/* Protection/IO chip 146 */
@@ -142,7 +142,7 @@ static MACHINE_RESET( sshangha )
orientation when entering the "test mode"
(check the game code from 0x0006b8 to 0x0006f0).
I can't tell however if this is accurate or not. */
- sshangha_control_0_w(0, 0x10, 0xff00);
+ sshangha_control_0_w(machine, 0, 0x10, 0xff00);
}
/******************************************************************************/
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index b5c1e60960f..f688fc6254f 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -159,7 +159,7 @@ static WRITE8_HANDLER(c001_w)
static READ8_HANDLER(controls_r)
{
int data=7;
- switch(input_port_1_r(0)) //multiplexed
+ switch(input_port_1_r(machine,0)) //multiplexed
{
case 0x01: data=1; break;
case 0x02: data=2; break;
@@ -169,7 +169,7 @@ static READ8_HANDLER(controls_r)
case 0x20: data=6; break;
case 0x40: data=0; break;
}
- return (input_port_0_r(0)&(~0x1c))|(data<<2);
+ return (input_port_0_r(machine,0)&(~0x1c))|(data<<2);
}
static ADDRESS_MAP_START( ssingles_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index ad1fd1d7709..c7b4032d36e 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -243,7 +243,7 @@ static TIMER_CALLBACK( music_playback )
{
int pattern = 0;
- if ((OKIM6295_status_0_r(0) & 0x08) == 0)
+ if ((OKIM6295_status_0_r(machine,0) & 0x08) == 0)
{
if (sslam_bar != 0) {
sslam_bar += 1;
@@ -264,8 +264,8 @@ static TIMER_CALLBACK( music_playback )
}
if (pattern) {
logerror("Changing bar in music track to pattern %02x\n",pattern);
- OKIM6295_data_0_w(0,(0x80 | pattern));
- OKIM6295_data_0_w(0,0x81);
+ OKIM6295_data_0_w(machine,0,(0x80 | pattern));
+ OKIM6295_data_0_w(machine,0,0x81);
}
}
// {
@@ -275,9 +275,9 @@ static TIMER_CALLBACK( music_playback )
}
-static void sslam_play(int track, int data)
+static void sslam_play(running_machine *machine, int track, int data)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
if (data < 0x80) {
if (track) {
@@ -285,24 +285,24 @@ static void sslam_play(int track, int data)
sslam_track = data;
sslam_bar = 1;
if (status & 0x08)
- OKIM6295_data_0_w(0,0x40);
- OKIM6295_data_0_w(0,(0x80 | data));
- OKIM6295_data_0_w(0,0x81);
+ OKIM6295_data_0_w(machine,0,0x40);
+ OKIM6295_data_0_w(machine,0,(0x80 | data));
+ OKIM6295_data_0_w(machine,0,0x81);
timer_adjust_periodic(music_timer, ATTOTIME_IN_MSEC(4), 0, ATTOTIME_IN_HZ(250)); /* 250Hz for smooth sequencing */
}
}
else {
if ((status & 0x01) == 0) {
- OKIM6295_data_0_w(0,(0x80 | data));
- OKIM6295_data_0_w(0,0x11);
+ OKIM6295_data_0_w(machine,0,(0x80 | data));
+ OKIM6295_data_0_w(machine,0,0x11);
}
else if ((status & 0x02) == 0) {
- OKIM6295_data_0_w(0,(0x80 | data));
- OKIM6295_data_0_w(0,0x21);
+ OKIM6295_data_0_w(machine,0,(0x80 | data));
+ OKIM6295_data_0_w(machine,0,0x21);
}
else if ((status & 0x04) == 0) {
- OKIM6295_data_0_w(0,(0x80 | data));
- OKIM6295_data_0_w(0,0x41);
+ OKIM6295_data_0_w(machine,0,(0x80 | data));
+ OKIM6295_data_0_w(machine,0,0x41);
}
}
}
@@ -314,7 +314,7 @@ static void sslam_play(int track, int data)
sslam_bar = 0;
}
data &= 0x7f;
- OKIM6295_data_0_w(0,data);
+ OKIM6295_data_0_w(machine,0,data);
}
}
@@ -327,7 +327,7 @@ static WRITE16_HANDLER( sslam_snd_w )
if (data == 0xfe) {
/* This should reset the sound MCU and stop audio playback, but here, it */
/* chops the first coin insert. So let's only stop any playing melodies. */
- sslam_play(1, (0x80 | 0x40)); /* Stop playing the melody */
+ sslam_play(machine, 1, (0x80 | 0x40)); /* Stop playing the melody */
}
else {
logerror("Unknown command (%02x) sent to the Sound controller\n",data);
@@ -349,7 +349,7 @@ static WRITE16_HANDLER( sslam_snd_w )
// if (sslam_snd_bank != 1)
// OKIM6295_set_bank_base(0, (1 * 0x40000));
// sslam_snd_bank = 1;
- sslam_play(0, sslam_sound);
+ sslam_play(machine, 0, sslam_sound);
}
else if (sslam_sound >= 0x69) {
if (sslam_snd_bank != 2)
@@ -362,14 +362,14 @@ static WRITE16_HANDLER( sslam_snd_w )
case 0x6c: sslam_melody = 7; break;
default: sslam_melody = 0; sslam_bar = 0; break; /* Invalid */
}
- sslam_play(sslam_melody, sslam_sound);
+ sslam_play(machine, sslam_melody, sslam_sound);
}
else if (sslam_sound >= 0x65) {
if (sslam_snd_bank != 1)
OKIM6295_set_bank_base(0, (1 * 0x40000));
sslam_snd_bank = 1;
sslam_melody = 4;
- sslam_play(sslam_melody, sslam_sound);
+ sslam_play(machine, sslam_melody, sslam_sound);
}
else if (sslam_sound >= 0x60) {
if (sslam_snd_bank != 0)
@@ -382,10 +382,10 @@ static WRITE16_HANDLER( sslam_snd_w )
case 0x64: sslam_melody = 3; break;
default: sslam_melody = 0; sslam_bar = 0; break; /* Invalid */
}
- sslam_play(sslam_melody, sslam_sound);
+ sslam_play(machine, sslam_melody, sslam_sound);
}
else {
- sslam_play(0, sslam_sound);
+ sslam_play(machine, 0, sslam_sound);
}
}
}
@@ -395,8 +395,8 @@ static WRITE16_HANDLER( sslam_snd_w )
static WRITE16_HANDLER( powerbls_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,I8051_INT1_LINE,PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,I8051_INT1_LINE,PULSE_LINE);
}
/* Memory Maps */
@@ -454,10 +454,10 @@ static READ8_HANDLER( playmark_snd_command_r )
UINT8 data = 0;
if ((playmark_oki_control & 0x38) == 0x30) {
- data = soundlatch_r(0);
+ data = soundlatch_r(machine,0);
}
else if ((playmark_oki_control & 0x38) == 0x28) {
- data = (OKIM6295_status_0_r(0) & 0x0f);
+ data = (OKIM6295_status_0_r(machine,0) & 0x0f);
}
return data;
@@ -483,7 +483,7 @@ static WRITE8_HANDLER( playmark_snd_control_w )
if ((data & 0x38) == 0x18)
{
- OKIM6295_data_0_w(0, playmark_oki_command);
+ OKIM6295_data_0_w(machine, 0, playmark_oki_command);
}
// !(data & 0x80) -> sound enable
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index fafb595382b..d21371d5bc8 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -51,8 +51,8 @@ static INTERRUPT_GEN( ssozumo_interrupt )
static WRITE8_HANDLER( ssozumo_sh_command_w )
{
- soundlatch_w(offset, data);
- cpunum_set_input_line(Machine, 1, M6502_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine, offset, data);
+ cpunum_set_input_line(machine, 1, M6502_IRQ_LINE, HOLD_LINE);
}
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 0bc5e3cc977..fc9deff18e5 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -56,7 +56,7 @@ static MACHINE_RESET(ssrj)
static READ8_HANDLER(ssrj_wheel_r)
{
- int port= input_port_1_r(0) -0x80;
+ int port= input_port_1_r(machine,0) -0x80;
int retval=port-oldport;
oldport=port;
return retval;
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index b5579b00583..0747bb02c62 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -44,13 +44,13 @@ static READ8_HANDLER(mux_r)
xxxx - input port #2
xxxx - dip switches (2x8 bits) (multiplexed)
*/
- int retval=input_port_2_r(0)&0x0f;
+ int retval=input_port_2_r(machine,0)&0x0f;
switch(mux_port&0x30)
{
- case 0x00: retval|=((input_port_4_r(0)&1)<<4)|((input_port_4_r(0)&0x10)<<1)|((input_port_5_r(0)&1)<<6)|((input_port_5_r(0)&0x10)<<3);break;
- case 0x10: retval|=((input_port_4_r(0)&2)<<3)|((input_port_4_r(0)&0x20) )|((input_port_5_r(0)&2)<<5)|((input_port_5_r(0)&0x20)<<2);break;
- case 0x20: retval|=((input_port_4_r(0)&4)<<2)|((input_port_4_r(0)&0x40)>>1)|((input_port_5_r(0)&4)<<4)|((input_port_5_r(0)&0x40)<<1);break;
- case 0x30: retval|=((input_port_4_r(0)&8)<<1)|((input_port_4_r(0)&0x80)>>2)|((input_port_5_r(0)&8)<<3)|((input_port_5_r(0)&0x80) );break;
+ case 0x00: retval|=((input_port_4_r(machine,0)&1)<<4)|((input_port_4_r(machine,0)&0x10)<<1)|((input_port_5_r(machine,0)&1)<<6)|((input_port_5_r(machine,0)&0x10)<<3);break;
+ case 0x10: retval|=((input_port_4_r(machine,0)&2)<<3)|((input_port_4_r(machine,0)&0x20) )|((input_port_5_r(machine,0)&2)<<5)|((input_port_5_r(machine,0)&0x20)<<2);break;
+ case 0x20: retval|=((input_port_4_r(machine,0)&4)<<2)|((input_port_4_r(machine,0)&0x40)>>1)|((input_port_5_r(machine,0)&4)<<4)|((input_port_5_r(machine,0)&0x40)<<1);break;
+ case 0x30: retval|=((input_port_4_r(machine,0)&8)<<1)|((input_port_4_r(machine,0)&0x80)>>2)|((input_port_5_r(machine,0)&8)<<3)|((input_port_5_r(machine,0)&0x80) );break;
}
return retval;
}
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index a4ce422b41d..1abbc98cf04 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -52,8 +52,8 @@ static WRITE16_HANDLER( stadhero_control_w )
case 4: /* Interrupt ack (VBL - IRQ 5) */
break;
case 6: /* 6502 sound cpu */
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
break;
default:
logerror("CPU #0 PC %06x: warning - write %02x to unmapped memory address %06x\n",activecpu_get_pc(),data,0x30c010+offset);
@@ -82,10 +82,10 @@ static WRITE8_HANDLER( YM3812_w )
{
switch (offset) {
case 0:
- YM3812_control_port_0_w(0,data);
+ YM3812_control_port_0_w(machine,0,data);
break;
case 1:
- YM3812_write_port_0_w(0,data);
+ YM3812_write_port_0_w(machine,0,data);
break;
}
}
@@ -94,10 +94,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index 1554effead8..42fcf987bdf 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -50,7 +50,7 @@ starfira has one less rom in total than starfire but everything passes as
static UINT8 fireone_select;
-static read8_handler input_read;
+static read8_machine_func input_read;
@@ -67,8 +67,8 @@ static WRITE8_HANDLER( starfire_scratch_w )
{
switch (offset & 7)
{
- case 0: starfire_vidctrl_w(0, data); break;
- case 1: starfire_vidctrl1_w(0, data); break;
+ case 0: starfire_vidctrl_w(machine, 0, data); break;
+ case 1: starfire_vidctrl1_w(machine, 0, data); break;
case 2:
/* Sounds */
fireone_select = (data & 0x8) ? 0 : 1;
@@ -86,7 +86,7 @@ static READ8_HANDLER( starfire_scratch_r )
{
/* A11 selects input ports */
if (offset & 0x800)
- return (*input_read)(offset);
+ return (*input_read)(machine, offset);
/* convert to a videoram offset */
offset = (offset & 0x31f) | ((offset & 0xe0) << 5);
@@ -105,11 +105,11 @@ static READ8_HANDLER( starfire_input_r )
{
switch (offset & 15)
{
- case 0: return input_port_0_r(0);
- case 1: return input_port_1_r(0); /* Note: need to loopback sounds lengths on that one */
- case 5: return input_port_4_r(0);
- case 6: return input_port_2_r(0);
- case 7: return input_port_3_r(0);
+ case 0: return input_port_0_r(machine,0);
+ case 1: return input_port_1_r(machine,0); /* Note: need to loopback sounds lengths on that one */
+ case 5: return input_port_4_r(machine,0);
+ case 6: return input_port_2_r(machine,0);
+ case 7: return input_port_3_r(machine,0);
default: return 0xff;
}
}
@@ -132,10 +132,10 @@ static READ8_HANDLER( fireone_input_r )
switch (offset & 15)
{
- case 0: return input_port_0_r(0);
- case 1: return input_port_1_r(0);
+ case 0: return input_port_0_r(machine,0);
+ case 1: return input_port_1_r(machine,0);
case 2:
- temp = fireone_select ? input_port_2_r(0) : input_port_3_r(0);
+ temp = fireone_select ? input_port_2_r(machine,0) : input_port_3_r(machine,0);
temp = (temp & 0xc0) | fireone_paddle_map[temp & 0x3f];
return temp;
default: return 0xff;
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 0fcb8236e64..5ced02871e0 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -61,7 +61,7 @@ static MACHINE_RESET( starwars )
memcpy(slapstic_base, &slapstic_source[current_bank * 0x2000], 0x2000);
/* reset all the banks */
- starwars_out_w(4, 0);
+ starwars_out_w(machine, 4, 0);
}
/* reset the matrix processor */
@@ -136,7 +136,7 @@ static OPBASE_HANDLER( esb_setopbase )
/* if we're jumping into the slapstic region, tweak the new PC */
if ((address & 0xe000) == 0x8000)
{
- esb_slapstic_r(address & 0x1fff);
+ esb_slapstic_r(machine, address & 0x1fff);
/* make sure we catch the next branch as well */
catch_nextBranch();
@@ -147,7 +147,7 @@ static OPBASE_HANDLER( esb_setopbase )
else if ((prevpc & 0xe000) == 0x8000)
{
if (prevpc != 0x8080 && prevpc != 0x8090 && prevpc != 0x80a0 && prevpc != 0x80b0)
- esb_slapstic_r(prevpc & 0x1fff);
+ esb_slapstic_r(machine, prevpc & 0x1fff);
}
return address;
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index abbe0d41c7a..22d51968edb 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2036,14 +2036,14 @@ static READ32_HANDLER( stv_sh2_soundram_r )
static READ32_HANDLER( stv_scsp_regs_r32 )
{
offset <<= 1;
- return (SCSP_0_r(offset+1, 0xffff) | (SCSP_0_r(offset, 0xffff)<<16));
+ return (SCSP_0_r(machine, offset+1, 0xffff) | (SCSP_0_r(machine, offset, 0xffff)<<16));
}
static WRITE32_HANDLER( stv_scsp_regs_w32 )
{
offset <<= 1;
- SCSP_0_w(offset, data>>16, mem_mask >> 16);
- SCSP_0_w(offset+1, data, mem_mask);
+ SCSP_0_w(machine, offset, data>>16, mem_mask >> 16);
+ SCSP_0_w(machine, offset+1, data, mem_mask);
}
/* communication,SLAVE CPU acquires data from the MASTER CPU and triggers an irq. *
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index f326488fbf8..059ef751b70 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -53,7 +53,7 @@ static WRITE16_HANDLER( suna16_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w( 0, data & 0xff );
+ soundlatch_w( machine, 0, data & 0xff );
}
if (data & ~0xff) logerror("CPU#0 PC %06X - Sound latch unknown bits: %04X\n", activecpu_get_pc(), data);
}
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index ea0814a29df..7ffa69794b9 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -659,7 +659,7 @@ static WRITE8_HANDLER( brickzn_palettebank_w )
if (data & ~0x02) logerror("CPU #0 - PC %04X: unknown palettebank bits: %02X\n",activecpu_get_pc(),data);
/* Also used as soundlatch - depending on c0c0? */
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
}
/*
@@ -1736,7 +1736,7 @@ static INTERRUPT_GEN( hardhea2_interrupt )
static MACHINE_RESET( hardhea2 )
{
- hardhea2_rambank_0_w(0,0);
+ hardhea2_rambank_0_w(machine,0,0);
}
static MACHINE_DRIVER_START( hardhea2 )
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 83ea196b941..497a0d96e00 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -53,8 +53,8 @@ static READ16_HANDLER( supbtime_controls_r )
static WRITE16_HANDLER( sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
/******************************************************************************/
@@ -121,10 +121,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 553624d6272..e6afda14611 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -116,7 +116,7 @@ static READ32_HANDLER( superchs_input_r )
switch (offset)
{
case 0x00:
- return (input_port_0_word_r(0,0) << 16) | input_port_1_word_r(0,0) |
+ return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) |
(EEPROM_read_bit() << 7);
case 0x01:
@@ -145,7 +145,7 @@ static WRITE32_HANDLER( superchs_input_w )
{
if (ACCESSING_MSB32) /* $300000 is watchdog */
{
- watchdog_reset_w(0,data >> 24);
+ watchdog_reset(machine);
}
if (ACCESSING_LSB32)
@@ -177,12 +177,12 @@ static WRITE32_HANDLER( superchs_input_w )
static READ32_HANDLER( superchs_stick_r )
{
- int fake = input_port_6_word_r(0,0);
+ int fake = input_port_6_word_r(machine,0,0);
int accel;
if (!(fake &0x10)) /* Analogue steer (the real control method) */
{
- steer = input_port_2_word_r(0,0);
+ steer = input_port_2_word_r(machine,0,0);
}
else /* Digital steer, with smoothing - speed depends on how often stick_r is called */
{
@@ -207,13 +207,13 @@ static READ32_HANDLER( superchs_stick_r )
}
/* Accelerator is an analogue input but the game treats it as digital (on/off) */
- if (input_port_6_word_r(0,0) & 0x1) /* pressing B1 */
+ if (input_port_6_word_r(machine,0,0) & 0x1) /* pressing B1 */
accel = 0x0;
else
accel = 0xff;
/* Todo: Verify brake - and figure out other input */
- return (steer << 24) | (accel << 16) | (input_port_4_word_r(0,0) << 8) | input_port_5_word_r(0,0);
+ return (steer << 24) | (accel << 16) | (input_port_4_word_r(machine,0,0) << 8) | input_port_5_word_r(machine,0,0);
}
static WRITE32_HANDLER( superchs_stick_w )
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 7d6ab226de6..cef14a20d60 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -273,11 +273,11 @@ static VIDEO_UPDATE( supertnk )
static MACHINE_RESET( supertnk )
{
- supertnk_bankswitch_0_w(0, 0);
- supertnk_bankswitch_1_w(0, 0);
+ supertnk_bankswitch_0_w(machine, 0, 0);
+ supertnk_bankswitch_1_w(machine, 0, 0);
- supertnk_bitplane_select_0_w(0, 0);
- supertnk_bitplane_select_1_w(0, 0);
+ supertnk_bitplane_select_0_w(machine, 0, 0);
+ supertnk_bitplane_select_1_w(machine, 0, 0);
}
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index f9f2d31967a..8d82fdbcc0f 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -32,8 +32,8 @@ READ8_HANDLER( suprloco_control_r );
static WRITE8_HANDLER( suprloco_soundport_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
/* spin for a while to let the Z80 read the command (fixes hanging sound in Regulus) */
cpu_spinuntil_time(ATTOTIME_IN_USEC(50));
}
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 61ac4d084d1..686f76d9236 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -853,9 +853,9 @@ static WRITE32_HANDLER( skns_v3t_w )
static WRITE32_HANDLER( skns_ymz280_w )
{
if ((mem_mask & 0xff000000) == 0)
- YMZ280B_register_0_w(offset,(data >> 24) & 0xff);
+ YMZ280B_register_0_w(machine,offset,(data >> 24) & 0xff);
if ((mem_mask & 0x00ff0000) == 0)
- YMZ280B_data_0_w(offset,(data >> 16) & 0xff);
+ YMZ280B_data_0_w(machine,offset,(data >> 16) & 0xff);
}
static ADDRESS_MAP_START( skns_readmem, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index f14fc2a4216..e6d94ffe4fc 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -106,8 +106,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 42b063bcf5f..f1cf25e855e 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -39,7 +39,7 @@ static READ8_HANDLER( bankedram_r )
return paletteram[offset];
}
else if (videobank & 0x01)
- return K053245_r(offset);
+ return K053245_r(machine,offset);
else
return ram[offset];
}
@@ -49,12 +49,12 @@ static WRITE8_HANDLER( bankedram_w )
if (videobank & 0x02)
{
if (videobank & 0x04)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset + 0x0800,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset + 0x0800,data);
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
else if (videobank & 0x01)
- K053245_w(offset,data);
+ K053245_w(machine,offset,data);
else
ram[offset] = data;
}
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index fb839483586..a0c790d439b 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -97,26 +97,26 @@ static WRITE8_HANDLER( outport24_w )
static WRITE8_HANDLER( hvymetal_videomode_w )
{
memory_set_bank(1, ((data & 0x04)>>2) + ((data & 0x40)>>5));
- system1_videomode_w(0, data);
+ system1_videomode_w(machine, 0, data);
}
static WRITE8_HANDLER( brain_videomode_w )
{
memory_set_bank(1, ((data & 0x04)>>2) + ((data & 0x40)>>5));
- system1_videomode_w(0, data);
+ system1_videomode_w(machine, 0, data);
}
static WRITE8_HANDLER( chplft_videomode_w )
{
memory_set_bank(1, (data & 0x0c)>>2);
- system1_videomode_w(0, data);
+ system1_videomode_w(machine, 0, data);
}
static WRITE8_HANDLER( system1_soundport_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
/* spin for a while to let the Z80 read the command (fixes hanging sound in Regulus) */
cpu_spinuntil_time(ATTOTIME_IN_USEC(50));
}
@@ -4789,7 +4789,7 @@ static READ8_HANDLER( dakkochn_port_04_r )
static WRITE8_HANDLER( dakkochn_port_15_w )
{
dakkochn_control = data; // check if any control multiplex bits are in here!
- chplft_videomode_w(offset,data);
+ chplft_videomode_w(machine,offset,data);
}
static DRIVER_INIT( dakkochn )
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 15350c408dd..38a0f0f4ea7 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -411,8 +411,8 @@ static WRITE16_HANDLER( sound_command_w )
{
if( ACCESSING_LSB )
{
- soundlatch_w( 0,data&0xff );
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE );
+ soundlatch_w( machine,0,data&0xff );
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE );
}
}
@@ -420,8 +420,8 @@ static WRITE16_HANDLER( sound_command_nmi_w )
{
if( ACCESSING_LSB )
{
- soundlatch_w( 0,data&0xff );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w( machine,0,data&0xff );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
@@ -1205,7 +1205,7 @@ static READ16_HANDLER( ga_io_players_r ) {
}
static READ16_HANDLER( ga_io_service_r )
{
- return (input_port_2_word_r(0,0) << 8) | (sys16_workingram[0x2c96/2] & 0x00ff);
+ return (input_port_2_word_r(machine,0,0) << 8) | (sys16_workingram[0x2c96/2] & 0x00ff);
}
static ADDRESS_MAP_START( goldnaxe_readmem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1230,7 +1230,7 @@ static WRITE16_HANDLER( ga_sound_command_w )
COMBINE_DATA( &sys16_workingram[(0xecfc-0xc000)/2] );
if( ACCESSING_MSB )
{
- soundlatch_w( 0,data>>8 );
+ soundlatch_w( machine,0,data>>8 );
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE );
}
}
@@ -1400,7 +1400,7 @@ static int passht4b_io3_val;
static READ16_HANDLER( passht4b_service_r )
{
- UINT16 val=input_port_2_word_r(offset,0);
+ UINT16 val=input_port_2_word_r(machine,offset,0);
if(!(readinputport(0) & 0x40)) val&=0xef;
if(!(readinputport(1) & 0x40)) val&=0xdf;
if(!(readinputport(5) & 0x40)) val&=0xbf;
@@ -1908,11 +1908,11 @@ MACHINE_DRIVER_END
/***************************************************************************/
static READ16_HANDLER( tt_io_player1_r )
-{ return input_port_0_r( offset ) << 8; }
+{ return input_port_0_r( machine, offset ) << 8; }
static READ16_HANDLER( tt_io_player2_r )
-{ return input_port_1_r( offset ) << 8; }
+{ return input_port_1_r( machine, offset ) << 8; }
static READ16_HANDLER( tt_io_service_r )
-{ return input_port_2_r( offset ) << 8; }
+{ return input_port_2_r( machine, offset ) << 8; }
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index e5333bf816b..1200407f85e 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -195,8 +195,8 @@ static UINT8* shdancbl_soundbank_ptr = NULL; /* Pointer to currently selected p
static WRITE16_HANDLER( sound_command_irq_w ){
if( ACCESSING_LSB ){
- soundlatch_w( 0,data&0xff );
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE );
+ soundlatch_w( machine,0,data&0xff );
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE );
}
}
@@ -339,8 +339,8 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( sound_command_nmi_w ){
if( ACCESSING_LSB ){
- soundlatch_w( 0,data&0xff );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w( machine,0,data&0xff );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index e25459aa886..e51080959fb 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -46,8 +46,8 @@ extern VIDEO_UPDATE( tagteam );
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,M6502_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,M6502_IRQ_LINE,HOLD_LINE);
}
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index c29de1c63f9..c15ebfdcacd 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -41,26 +41,26 @@ static WRITE16_HANDLER( sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
static READ16_HANDLER( tail2nos_K051316_0_r )
{
- return K051316_0_r(offset);
+ return K051316_0_r(machine,offset);
}
static WRITE16_HANDLER( tail2nos_K051316_0_w )
{
if (ACCESSING_LSB)
- K051316_0_w(offset,data & 0xff);
+ K051316_0_w(machine,offset,data & 0xff);
}
static WRITE16_HANDLER( tail2nos_K051316_ctrl_0_w )
{
if (ACCESSING_LSB)
- K051316_ctrl_0_w(offset,data & 0xff);
+ K051316_ctrl_0_w(machine,offset,data & 0xff);
}
static WRITE8_HANDLER( sound_bankswitch_w )
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index e251e9270ee..f9f9765e298 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -328,35 +328,35 @@ static INTERRUPT_GEN( sbm_interrupt )//5
static READ16_HANDLER( tracky1_hi_r )
{
- return input_port_5_word_r(0,0);
+ return input_port_5_word_r(machine,0,0);
}
static READ16_HANDLER( tracky1_lo_r )
{
- return (input_port_5_word_r(0,0) & 0xff) <<8;
+ return (input_port_5_word_r(machine,0,0) & 0xff) <<8;
}
static READ16_HANDLER( trackx1_hi_r )
{
- return input_port_6_word_r(0,0);
+ return input_port_6_word_r(machine,0,0);
}
static READ16_HANDLER( trackx1_lo_r )
{
- return (input_port_6_word_r(0,0) & 0xff) <<8;
+ return (input_port_6_word_r(machine,0,0) & 0xff) <<8;
}
static READ16_HANDLER( tracky2_hi_r )
{
- return input_port_7_word_r(0,0);
+ return input_port_7_word_r(machine,0,0);
}
static READ16_HANDLER( tracky2_lo_r )
{
- return (input_port_7_word_r(0,0) & 0xff) <<8;
+ return (input_port_7_word_r(machine,0,0) & 0xff) <<8;
}
static READ16_HANDLER( trackx2_hi_r )
{
- return input_port_8_word_r(0,0);
+ return input_port_8_word_r(machine,0,0);
}
static READ16_HANDLER( trackx2_lo_r )
{
- return (input_port_8_word_r(0,0) & 0xff) <<8;
+ return (input_port_8_word_r(machine,0,0) & 0xff) <<8;
}
@@ -413,7 +413,7 @@ static READ16_HANDLER( eeprom_r )
int res;
res = (EEPROM_read_bit() & 0x01);
- res |= input_port_1_word_r(0,0) & 0xfe; /* coin inputs */
+ res |= input_port_1_word_r(machine,0,0) & 0xfe; /* coin inputs */
return res;
}
@@ -482,10 +482,10 @@ static READ16_HANDLER( pbobble_input_bypass_r )
switch (offset)
{
case 0x01:
- return eeprom_r(0,mem_mask) << 8;
+ return eeprom_r(machine,0,mem_mask) << 8;
default:
- return TC0640FIO_r( offset ) << 8;
+ return TC0640FIO_r( machine,offset ) << 8;
}
}
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index a0643d72d6b..139257b2a95 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -310,7 +310,7 @@ static INT32 yesnoj_dsw = 0;
static WRITE16_HANDLER( taitof2_watchdog_w )
{
- watchdog_reset_w(0,data);
+ watchdog_reset(machine);
}
static WRITE16_HANDLER( growl_coin_word_w ) /* what about coins 3&4 ?? */
@@ -359,10 +359,10 @@ static READ16_HANDLER( growl_dsw_r )
switch (offset)
{
case 0x00:
- return input_port_3_word_r(0,mem_mask); /* DSW A */
+ return input_port_3_word_r(machine,0,mem_mask); /* DSW A */
case 0x01:
- return input_port_4_word_r(0,mem_mask); /* DSW B */
+ return input_port_4_word_r(machine,0,mem_mask); /* DSW B */
}
logerror("CPU #0 PC %06x: warning - read unmapped dsw_r offset %06x\n",activecpu_get_pc(),offset);
@@ -375,13 +375,13 @@ static READ16_HANDLER( growl_input_r )
switch (offset)
{
case 0x00:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
case 0x01:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
case 0x02:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
}
@@ -395,28 +395,28 @@ static READ16_HANDLER( footchmp_input_r )
switch (offset)
{
case 0x00:
- return input_port_3_word_r(0,mem_mask); /* DSW A */
+ return input_port_3_word_r(machine,0,mem_mask); /* DSW A */
case 0x01:
- return input_port_4_word_r(0,mem_mask); /* DSW B */
+ return input_port_4_word_r(machine,0,mem_mask); /* DSW B */
case 0x02:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
// case 0x03:
// return (coin_word & ~mem_mask);
case 0x05:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
case 0x06:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
case 0x07:
- return input_port_5_word_r(0,mem_mask); /* IN3 */
+ return input_port_5_word_r(machine,0,mem_mask); /* IN3 */
case 0x08:
- return input_port_6_word_r(0,mem_mask); /* IN4 */
+ return input_port_6_word_r(machine,0,mem_mask); /* IN4 */
}
logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset);
@@ -429,25 +429,25 @@ static READ16_HANDLER( ninjak_input_r )
switch (offset)
{
case 0x00:
- return (input_port_3_word_r(0,0) << 8); /* DSW A */
+ return (input_port_3_word_r(machine,0,0) << 8); /* DSW A */
case 0x01:
- return (input_port_4_word_r(0,0) << 8); /* DSW B */
+ return (input_port_4_word_r(machine,0,0) << 8); /* DSW B */
case 0x02:
- return (input_port_0_word_r(0,0) << 8); /* IN 0 */
+ return (input_port_0_word_r(machine,0,0) << 8); /* IN 0 */
case 0x03:
- return (input_port_1_word_r(0,0) << 8); /* IN 1 */
+ return (input_port_1_word_r(machine,0,0) << 8); /* IN 1 */
case 0x04:
- return (input_port_5_word_r(0,0) << 8); /* IN 3 */
+ return (input_port_5_word_r(machine,0,0) << 8); /* IN 3 */
case 0x05:
- return (input_port_6_word_r(0,0) << 8); /* IN 4 */
+ return (input_port_6_word_r(machine,0,0) << 8); /* IN 4 */
case 0x06:
- return (input_port_2_word_r(0,0) << 8); /* IN 2 */
+ return (input_port_2_word_r(machine,0,0) << 8); /* IN 2 */
// case 0x07:
// return (coin_word & ~mem_mask);
@@ -466,13 +466,13 @@ static READ16_HANDLER( cameltry_paddle_r )
switch (offset)
{
case 0x00:
- curr = input_port_5_word_r(0,0); /* Paddle A */
+ curr = input_port_5_word_r(machine,0,0); /* Paddle A */
res = curr - last[0];
last[0] = curr;
return res;
case 0x02:
- curr = input_port_6_word_r(0,0); /* Paddle B */
+ curr = input_port_6_word_r(machine,0,0); /* Paddle B */
res = curr - last[1];
last[1] = curr;
return res;
@@ -488,10 +488,10 @@ static READ16_HANDLER( driftout_paddle_r )
switch (offset)
{
case 0x00:
- return input_port_5_word_r(0,mem_mask); /* Paddle A */
+ return input_port_5_word_r(machine,0,mem_mask); /* Paddle A */
case 0x01:
- return input_port_6_word_r(0,mem_mask); /* Paddle B */
+ return input_port_6_word_r(machine,0,mem_mask); /* Paddle B */
}
logerror("CPU #0 PC %06x: warning - read unmapped paddle offset %06x\n",activecpu_get_pc(),offset);
@@ -504,22 +504,22 @@ static READ16_HANDLER( deadconx_input_r )
switch (offset)
{
case 0x00:
- return input_port_3_word_r(0,mem_mask); /* DSW A */
+ return input_port_3_word_r(machine,0,mem_mask); /* DSW A */
case 0x01:
- return input_port_4_word_r(0,mem_mask); /* DSW B */
+ return input_port_4_word_r(machine,0,mem_mask); /* DSW B */
case 0x02:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
// case 0x03:
// return (coin_word & ~mem_mask);
case 0x05:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
case 0x06:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
}
logerror("CPU #0 PC %06x: warning - read unmapped input offset %06x\n",activecpu_get_pc(),offset);
@@ -533,12 +533,12 @@ static READ16_HANDLER( mjnquest_dsw_r )
{
case 0x00:
{
- return (input_port_5_word_r(0,0) << 8) + input_port_7_word_r(0,0); /* DSW A + coin */
+ return (input_port_5_word_r(machine,0,0) << 8) + input_port_7_word_r(machine,0,0); /* DSW A + coin */
}
case 0x01:
{
- return (input_port_6_word_r(0,0) << 8) + input_port_8_word_r(0,0); /* DSW B + coin */
+ return (input_port_6_word_r(machine,0,0) << 8) + input_port_8_word_r(machine,0,0); /* DSW B + coin */
}
}
@@ -552,19 +552,19 @@ static READ16_HANDLER( mjnquest_input_r )
switch (mjnquest_input)
{
case 0x01:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
case 0x02:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
case 0x04:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
case 0x08:
- return input_port_3_word_r(0,mem_mask); /* IN3 */
+ return input_port_3_word_r(machine,0,mem_mask); /* IN3 */
case 0x10:
- return input_port_4_word_r(0,mem_mask); /* IN4 */
+ return input_port_4_word_r(machine,0,mem_mask); /* IN4 */
}
@@ -583,10 +583,10 @@ static READ16_HANDLER( quizhq_input1_r )
switch (offset)
{
case 0x00:
- return input_port_4_word_r(0,mem_mask); /* DSW B */
+ return input_port_4_word_r(machine,0,mem_mask); /* DSW B */
case 0x01:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
}
logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset);
@@ -599,13 +599,13 @@ static READ16_HANDLER( quizhq_input2_r )
switch (offset)
{
case 0x00:
- return input_port_3_word_r(0,mem_mask); /* DSW A */
+ return input_port_3_word_r(machine,0,mem_mask); /* DSW A */
case 0x01:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
case 0x02:
- return input_port_2_word_r(0,mem_mask); /* IN2 */
+ return input_port_2_word_r(machine,0,mem_mask); /* IN2 */
}
logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset);
@@ -618,13 +618,13 @@ static READ16_HANDLER( yesnoj_input_r )
switch (offset)
{
case 0x00:
- return input_port_0_word_r(0,mem_mask); /* IN0 */
+ return input_port_0_word_r(machine,0,mem_mask); /* IN0 */
/* case 0x01 only used if "printer" DSW is on, and appears to
be printer status byte */
case 0x02:
- return input_port_1_word_r(0,mem_mask); /* IN1 */
+ return input_port_1_word_r(machine,0,mem_mask); /* IN1 */
}
logerror("CPU #0 PC %06x: warning - read unmapped input_r offset %06x\n",activecpu_get_pc(),offset);
@@ -642,11 +642,11 @@ static READ16_HANDLER( yesnoj_dsw_r )
if (yesnoj_dsw)
{
- return input_port_2_word_r(0,mem_mask);
+ return input_port_2_word_r(machine,0,mem_mask);
}
else
{
- return input_port_3_word_r(0,mem_mask);
+ return input_port_3_word_r(machine,0,mem_mask);
}
}
@@ -829,14 +829,14 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static READ16_HANDLER( taitof2_sound_r )
{
if (offset == 1)
- return (taitosound_comm16_lsb_r(0,mem_mask));
+ return (taitosound_comm16_lsb_r(machine,0,mem_mask));
else return 0;
}
static READ16_HANDLER( taitof2_msb_sound_r )
{
if (offset == 1)
- return (taitosound_comm16_msb_r(0,mem_mask));
+ return (taitosound_comm16_msb_r(machine,0,mem_mask));
else return 0;
}
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 1f903748a62..f6efc9ad760 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -86,7 +86,7 @@ static WRITE32_HANDLER( f3_control_w )
switch (offset)
{
case 0x00: /* Watchdog */
- watchdog_reset_w(0,0);
+ watchdog_reset(machine);
return;
case 0x01: /* Coin counters & lockouts */
if (ACCESSING_MSB32) {
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 81591d82f7a..062adac718c 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -200,7 +200,7 @@ static READ16_HANDLER( syvalion_input_bypass_r )
{
/* Bypass TC0220IOC controller for analog input */
- UINT8 port = TC0220IOC_port_r(0); /* read port number */
+ UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */
switch( port )
{
@@ -241,7 +241,7 @@ static READ16_HANDLER( syvalion_input_bypass_r )
return 0x00;
default:
- return TC0220IOC_portreg_r( offset );
+ return TC0220IOC_portreg_r( machine,offset );
}
}
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 5ad28e727fb..5291ad91984 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -107,10 +107,10 @@ static UINT8 *palette_ram;
static UINT8 *empty_ram;
static UINT8 *shared_ram;
-static read8_handler porte0_r;
-static read8_handler porte1_r;
-static read8_handler portf0_r;
-static read8_handler portf1_r;
+static read8_machine_func porte0_r;
+static read8_machine_func porte1_r;
+static read8_machine_func portf0_r;
+static read8_machine_func portf1_r;
static void palette_notifier(int addr)
{
@@ -446,26 +446,26 @@ static int extport;
static READ8_HANDLER( portA_r )
{
- if (extport == 0) return porte0_r(0);
- else return porte1_r(0);
+ if (extport == 0) return porte0_r(machine,0);
+ else return porte1_r(machine,0);
}
static READ8_HANDLER( portB_r )
{
- if (extport == 0) return portf0_r(0);
- else return portf1_r(0);
+ if (extport == 0) return portf0_r(machine,0);
+ else return portf1_r(machine,0);
}
static READ8_HANDLER( ym2203_data0_r )
{
extport = 0;
- return YM2203_read_port_0_r(offset);
+ return YM2203_read_port_0_r(machine,offset);
}
static READ8_HANDLER( ym2203_data1_r )
{
extport = 1;
- return YM2203_read_port_0_r(offset);
+ return YM2203_read_port_0_r(machine,offset);
}
static const UINT8 *mcu_reply;
@@ -533,15 +533,15 @@ static READ8_HANDLER( mux_r )
switch(mux_ctrl)
{
case 0:
- return input_port_0_r(0);
+ return input_port_0_r(machine,0);
case 1:
- return input_port_1_r(0);
+ return input_port_1_r(machine,0);
case 2:
- return input_port_2_r(0);
+ return input_port_2_r(machine,0);
case 3:
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
case 7:
- return input_port_4_r(0);
+ return input_port_4_r(machine,0);
default:
logerror("Mux read from unknown port %d (%04x)\n", mux_ctrl, activecpu_get_pc());
return 0xff;
@@ -553,7 +553,7 @@ static WRITE8_HANDLER( mux_w )
switch(mux_ctrl)
{
case 4:
- control2_w(0, data);
+ control2_w(machine,0, data);
break;
default:
logerror("Mux write to unknown port %d, %02x (%04x)\n", mux_ctrl, data, activecpu_get_pc());
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index a61ca895e86..11132f30c07 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1013,7 +1013,7 @@ static WRITE16_HANDLER( spacegun_output_bypass_w )
break;
default:
- TC0220IOC_w( offset,data ); /* might be a 510NIO ! */
+ TC0220IOC_w( machine,offset,data ); /* might be a 510NIO ! */
}
}
@@ -1026,14 +1026,14 @@ static READ16_HANDLER( contcirc_input_bypass_r )
{
/* Bypass TC0220IOC controller for analog input */
- UINT8 port = TC0220IOC_port_r(0); /* read port number */
+ UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */
int steer = 0;
- int fake = input_port_6_word_r(0,0);
+ int fake = input_port_6_word_r(machine,0,0);
if (!(fake &0x10)) /* Analogue steer (the real control method) */
{
/* center around zero and reduce span to 0xc0 */
- steer = ((input_port_5_word_r(0,0) - 0x80) * 0xc0) / 0x100;
+ steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0xc0) / 0x100;
}
else /* Digital steer */
@@ -1057,7 +1057,7 @@ static READ16_HANDLER( contcirc_input_bypass_r )
return steer >> 8;
default:
- return TC0220IOC_portreg_r( offset );
+ return TC0220IOC_portreg_r( machine,offset );
}
}
@@ -1066,14 +1066,14 @@ static READ16_HANDLER( chasehq_input_bypass_r )
{
/* Bypass TC0220IOC controller for extra inputs */
- UINT8 port = TC0220IOC_port_r(0); /* read port number */
+ UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */
int steer = 0;
- int fake = input_port_10_word_r(0,0);
+ int fake = input_port_10_word_r(machine,0,0);
if (!(fake &0x10)) /* Analogue steer (the real control method) */
{
/* center around zero */
- steer = input_port_9_word_r(0,0) - 0x80;
+ steer = input_port_9_word_r(machine,0,0) - 0x80;
}
else /* Digital steer */
{
@@ -1090,16 +1090,16 @@ static READ16_HANDLER( chasehq_input_bypass_r )
switch (port)
{
case 0x08:
- return input_port_5_word_r(0,mem_mask);
+ return input_port_5_word_r(machine,0,mem_mask);
case 0x09:
- return input_port_6_word_r(0,mem_mask);
+ return input_port_6_word_r(machine,0,mem_mask);
case 0x0a:
- return input_port_7_word_r(0,mem_mask);
+ return input_port_7_word_r(machine,0,mem_mask);
case 0x0b:
- return input_port_8_word_r(0,mem_mask);
+ return input_port_8_word_r(machine,0,mem_mask);
case 0x0c:
return steer &0xff;
@@ -1108,7 +1108,7 @@ static READ16_HANDLER( chasehq_input_bypass_r )
return steer >> 8;
default:
- return TC0220IOC_portreg_r( offset );
+ return TC0220IOC_portreg_r( machine, offset );
}
}
@@ -1118,16 +1118,16 @@ static READ16_HANDLER( bshark_stick_r )
switch (offset)
{
case 0x00:
- return input_port_5_word_r(0,mem_mask);
+ return input_port_5_word_r(machine,0,mem_mask);
case 0x01:
- return input_port_6_word_r(0,mem_mask);
+ return input_port_6_word_r(machine,0,mem_mask);
case 0x02:
- return input_port_7_word_r(0,mem_mask);
+ return input_port_7_word_r(machine,0,mem_mask);
case 0x03:
- return input_port_8_word_r(0,mem_mask);
+ return input_port_8_word_r(machine,0,mem_mask);
}
logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset);
@@ -1151,16 +1151,16 @@ static READ16_HANDLER( nightstr_stick_r )
switch (offset)
{
case 0x00:
- return nightstr_stick[(input_port_5_word_r(0,mem_mask) * 0x64) / 0x100];
+ return nightstr_stick[(input_port_5_word_r(machine,0,mem_mask) * 0x64) / 0x100];
case 0x01:
- return nightstr_stick[(input_port_6_word_r(0,mem_mask) * 0x64) / 0x100];
+ return nightstr_stick[(input_port_6_word_r(machine,0,mem_mask) * 0x64) / 0x100];
case 0x02:
- return input_port_7_word_r(0,mem_mask);
+ return input_port_7_word_r(machine,0,mem_mask);
case 0x03:
- return input_port_8_word_r(0,mem_mask);
+ return input_port_8_word_r(machine,0,mem_mask);
}
logerror("CPU #0 PC %06x: warning - read unmapped stick offset %06x\n",activecpu_get_pc(),offset);
@@ -1183,12 +1183,12 @@ static WRITE16_HANDLER( bshark_stick_w )
static READ16_HANDLER( sci_steer_input_r )
{
int steer = 0;
- int fake = input_port_6_word_r(0,0);
+ int fake = input_port_6_word_r(machine,0,0);
if (!(fake &0x10)) /* Analogue steer (the real control method) */
{
/* center around zero and reduce span to 0xc0 */
- steer = ((input_port_5_word_r(0,0) - 0x80) * 0xc0) / 0x100;
+ steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0xc0) / 0x100;
}
else /* Digital steer */
{
@@ -1225,7 +1225,7 @@ static READ16_HANDLER( spacegun_input_bypass_r )
return eeprom_r();
default:
- return TC0220IOC_r( offset ); /* might be a 510NIO ! */
+ return TC0220IOC_r( machine, offset ); /* might be a 510NIO ! */
}
}
@@ -1234,16 +1234,16 @@ static READ16_HANDLER( spacegun_lightgun_r )
switch (offset)
{
case 0x00:
- return input_port_5_word_r(0,mem_mask); /* P1X */
+ return input_port_5_word_r(machine,0,mem_mask); /* P1X */
case 0x01:
- return input_port_6_word_r(0,mem_mask); /* P1Y */
+ return input_port_6_word_r(machine,0,mem_mask); /* P1Y */
case 0x02:
- return input_port_7_word_r(0,mem_mask); /* P2X */
+ return input_port_7_word_r(machine,0,mem_mask); /* P2X */
case 0x03:
- return input_port_8_word_r(0,mem_mask); /* P2Y */
+ return input_port_8_word_r(machine,0,mem_mask); /* P2Y */
}
return 0x0;
@@ -1266,12 +1266,12 @@ static WRITE16_HANDLER( spacegun_lightgun_w )
static READ16_HANDLER( dblaxle_steer_input_r )
{
int steer = 0;
- int fake = input_port_6_word_r(0,0);
+ int fake = input_port_6_word_r(machine,0,0);
if (!(fake &0x10)) /* Analogue steer (the real control method) */
{
/* center around zero and reduce span to 0x80 */
- steer = ((input_port_5_word_r(0,0) - 0x80) * 0x80) / 0x100;
+ steer = ((input_port_5_word_r(machine,0,0) - 0x80) * 0x80) / 0x100;
}
else /* Digital steer */
{
@@ -1349,9 +1349,9 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( taitoz_sound_w )
{
if (offset == 0)
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
else if (offset == 1)
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
#ifdef MAME_DEBUG
// if (data & 0xff00)
@@ -1367,7 +1367,7 @@ static WRITE16_HANDLER( taitoz_sound_w )
static READ16_HANDLER( taitoz_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff));
+ return ((taitosound_comm_r (machine,0) & 0xff));
else return 0;
}
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 279c76edbc9..c0d2f4f896b 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -225,8 +225,8 @@ static WRITE8_HANDLER( taitosj_sndnmi_msk_w )
static WRITE8_HANDLER( taitosj_soundcommand_w )
{
- soundlatch_w(offset,data);
- if (!sndnmi_disable) cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ if (!sndnmi_disable) cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static UINT8 input_port_4_f0;
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 0e0d96d1c9c..10abe491e1c 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -86,22 +86,22 @@ static VIDEO_UPDATE(taitowlf)
static READ8_HANDLER(at_dma8237_1_r)
{
- return dma8237_1_r(offset / 2);
+ return dma8237_1_r(machine, offset / 2);
}
static WRITE8_HANDLER(at_dma8237_1_w)
{
- dma8237_1_w(offset / 2, data);
+ dma8237_1_w(machine, offset / 2, data);
}
static READ32_HANDLER(at32_dma8237_1_r)
{
- return read32le_with_read8_handler(at_dma8237_1_r, offset, mem_mask);
+ return read32le_with_read8_handler(at_dma8237_1_r, machine, offset, mem_mask);
}
static WRITE32_HANDLER(at32_dma8237_1_w)
{
- write32le_with_write8_handler(at_dma8237_1_w, offset, data, mem_mask);
+ write32le_with_write8_handler(at_dma8237_1_w, machine, offset, data, mem_mask);
}
@@ -269,23 +269,23 @@ static WRITE32_HANDLER( pnp_data_w )
static READ32_HANDLER( ide0_r )
{
- return ide_controller32_0_r(0x1f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x1f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( ide0_w )
{
- ide_controller32_0_w(0x1f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x1f0/4 + offset, data, mem_mask);
}
static READ32_HANDLER( fdc_r )
{
- return ide_controller32_0_r(0x3f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x3f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( fdc_w )
{
//mame_printf_debug("FDC: write %08X, %08X, %08X\n", data, offset, mem_mask);
- ide_controller32_0_w(0x3f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x3f0/4 + offset, data, mem_mask);
}
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index bb7b70f73dd..0ecde095677 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -41,22 +41,22 @@ static WRITE8_HANDLER( tank8_int_reset_w )
{
collision_index &= ~0x3f;
- cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
}
static WRITE8_HANDLER( tank8_crash_w )
{
- discrete_sound_w(TANK8_CRASH_EN, data);
+ discrete_sound_w(machine, TANK8_CRASH_EN, data);
}
static WRITE8_HANDLER( tank8_explosion_w )
{
- discrete_sound_w(TANK8_EXPLOSION_EN, data);
+ discrete_sound_w(machine, TANK8_EXPLOSION_EN, data);
}
static WRITE8_HANDLER( tank8_bugle_w )
{
- discrete_sound_w(TANK8_BUGLE_EN, data);
+ discrete_sound_w(machine, TANK8_BUGLE_EN, data);
}
static WRITE8_HANDLER( tank8_bug_w )
@@ -64,20 +64,20 @@ static WRITE8_HANDLER( tank8_bug_w )
/* D0 and D1 determine the on/off time off the square wave */
switch(data & 3) {
case 0:
- discrete_sound_w(TANK8_BUGLE_DATA1,8.0);
- discrete_sound_w(TANK8_BUGLE_DATA2,4.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA1,8.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA2,4.0);
break;
case 1:
- discrete_sound_w(TANK8_BUGLE_DATA1,8.0);
- discrete_sound_w(TANK8_BUGLE_DATA2,7.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA1,8.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA2,7.0);
break;
case 2:
- discrete_sound_w(TANK8_BUGLE_DATA1,8.0);
- discrete_sound_w(TANK8_BUGLE_DATA2,2.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA1,8.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA2,2.0);
break;
case 3:
- discrete_sound_w(TANK8_BUGLE_DATA1,16.0);
- discrete_sound_w(TANK8_BUGLE_DATA2,4.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA1,16.0);
+ discrete_sound_w(machine, TANK8_BUGLE_DATA2,4.0);
break;
}
@@ -85,12 +85,12 @@ static WRITE8_HANDLER( tank8_bug_w )
static WRITE8_HANDLER( tank8_attract_w )
{
- discrete_sound_w(TANK8_ATTRACT_EN, data);
+ discrete_sound_w(machine, TANK8_ATTRACT_EN, data);
}
static WRITE8_HANDLER( tank8_motor_w )
{
- discrete_sound_w(TANK8_MOTOR1_EN+offset, data);
+ discrete_sound_w(machine, TANK8_MOTOR1_EN+offset, data);
}
static ADDRESS_MAP_START( tank8_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 4a09e9abc4c..99630261910 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -91,7 +91,7 @@ static WRITE8_HANDLER( tankbust_e0xx_w )
switch (offset)
{
case 0: /* 0xe000 interrupt enable */
- interrupt_enable_w(0,data);
+ interrupt_enable_w(machine,0,data);
break;
case 1: /* 0xe001 (value 0 then 1) written right after the soundlatch_w */
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 803bd8c3402..1b67699c5de 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -94,8 +94,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(offset,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,offset,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
static ADDRESS_MAP_START( taotaido_readmem, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index cadb55444f9..644ea3faea0 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -170,8 +170,8 @@ static WRITE16_HANDLER(bigfight_a60000_w) { COMBINE_DATA(&bigfight_a60000[offset
static WRITE16_HANDLER(cyclwarr_sound_w)
{
- soundlatch_w(0, data >> 8);
- cpunum_set_input_line(Machine, 2, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data >> 8);
+ cpunum_set_input_line(machine, 2, INPUT_LINE_NMI, PULSE_LINE);
}
/***************************************************************************/
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 5c4f703387b..10cca766093 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -11,15 +11,15 @@ Taxi Driver (c) 1984 Graphic Techno
-static WRITE8_HANDLER( p2a_w ) { taxidrvr_spritectrl_w(0,data); }
-static WRITE8_HANDLER( p2b_w ) { taxidrvr_spritectrl_w(1,data); }
-static WRITE8_HANDLER( p2c_w ) { taxidrvr_spritectrl_w(2,data); }
-static WRITE8_HANDLER( p3a_w ) { taxidrvr_spritectrl_w(3,data); }
-static WRITE8_HANDLER( p3b_w ) { taxidrvr_spritectrl_w(4,data); }
-static WRITE8_HANDLER( p3c_w ) { taxidrvr_spritectrl_w(5,data); }
-static WRITE8_HANDLER( p4a_w ) { taxidrvr_spritectrl_w(6,data); }
-static WRITE8_HANDLER( p4b_w ) { taxidrvr_spritectrl_w(7,data); }
-static WRITE8_HANDLER( p4c_w ) { taxidrvr_spritectrl_w(8,data); }
+static WRITE8_HANDLER( p2a_w ) { taxidrvr_spritectrl_w(machine,0,data); }
+static WRITE8_HANDLER( p2b_w ) { taxidrvr_spritectrl_w(machine,1,data); }
+static WRITE8_HANDLER( p2c_w ) { taxidrvr_spritectrl_w(machine,2,data); }
+static WRITE8_HANDLER( p3a_w ) { taxidrvr_spritectrl_w(machine,3,data); }
+static WRITE8_HANDLER( p3b_w ) { taxidrvr_spritectrl_w(machine,4,data); }
+static WRITE8_HANDLER( p3c_w ) { taxidrvr_spritectrl_w(machine,5,data); }
+static WRITE8_HANDLER( p4a_w ) { taxidrvr_spritectrl_w(machine,6,data); }
+static WRITE8_HANDLER( p4b_w ) { taxidrvr_spritectrl_w(machine,7,data); }
+static WRITE8_HANDLER( p4c_w ) { taxidrvr_spritectrl_w(machine,8,data); }
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 6bca1cd6937..07e481ff114 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -86,8 +86,8 @@ static WRITE8_HANDLER( shared_w )
static WRITE8_HANDLER( tbowl_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE);
}
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 6ed91465efc..6f61a222022 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -79,8 +79,8 @@ static WRITE8_HANDLER( tecmo_bankswitch_w )
static WRITE8_HANDLER( tecmo_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
static int adpcm_pos,adpcm_end;
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index f32b73ca4c9..417a091bad6 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -62,8 +62,8 @@ static WRITE16_HANDLER( tecmo16_sound_command_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0x00,data & 0xff);
- cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,0x00,data & 0xff);
+ cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
}
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 230d5445826..1704c0e71e9 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -165,8 +165,8 @@ static WRITE8_HANDLER( tehkanwc_track_1_reset_w )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE);
}
static TIMER_CALLBACK( reset_callback )
@@ -176,7 +176,7 @@ static TIMER_CALLBACK( reset_callback )
static WRITE8_HANDLER( sound_answer_w )
{
- soundlatch2_w(0,data);
+ soundlatch2_w(machine,0,data);
/* in Gridiron, the sound CPU goes in a tight loop after the self test, */
/* probably waiting to be reset by a watchdog */
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index bb1d0fa35f5..3fa7d5df884 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -159,12 +159,12 @@ static READ16_HANDLER( horekid_IN2_r )
static WRITE16_HANDLER( amazon_sound_w )
{
- soundlatch_w(0,((data & 0x7f) << 1) | 1);
+ soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}
static READ8_HANDLER( soundlatch_clear_r )
{
- soundlatch_clear_w(0,0);
+ soundlatch_clear_w(machine,0,0);
return 0;
}
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index cfbbebf8a78..ae437e0f5fa 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -143,15 +143,15 @@ static WRITE16_HANDLER( rocknms_sub_systemregs_w )
static READ16_HANDLER( tetrisp2_sound_r )
{
- return YMZ280B_status_0_r(offset);
+ return YMZ280B_status_0_r(machine,offset);
}
static WRITE16_HANDLER( tetrisp2_sound_w )
{
if (ACCESSING_LSB)
{
- if (offset) YMZ280B_data_0_w (offset, data & 0xff);
- else YMZ280B_register_0_w (offset, data & 0xff);
+ if (offset) YMZ280B_data_0_w (machine, offset, data & 0xff);
+ else YMZ280B_register_0_w (machine, offset, data & 0xff);
}
}
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index dc7a9c5d45f..613da801115 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -44,8 +44,8 @@ static WRITE8_HANDLER( thedeep_nmi_w )
static WRITE8_HANDLER( thedeep_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static UINT8 protection_command, protection_data;
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 00d56e43ea8..df0c8d8fd6f 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -53,7 +53,7 @@ VIDEO_UPDATE( thief );
static INTERRUPT_GEN( thief_interrupt )
{
/* SLAM switch causes an NMI if it's pressed */
- if( (input_port_3_r(0) & 0x10) == 0 )
+ if( (input_port_3_r(machine,0) & 0x10) == 0 )
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
else
cpunum_set_input_line(machine, 0, 0, HOLD_LINE);
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index b74d44a38d4..83052f787a2 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -180,7 +180,7 @@ static READ16_HANDLER( thunderj_video_control_r )
if (cpu_readmem24bew_word(0x163482) > 0xfff)
mame_printf_debug("You're screwed!");*/
- return atarivc_r(offset,0);
+ return atarivc_r(machine,offset,0);
}
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index bd13bb85081..a8c515431cb 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -54,7 +54,7 @@ static READ8_HANDLER( scontra_bankedram_r )
static WRITE8_HANDLER( scontra_bankedram_w )
{
if (palette_selected)
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
else
ram[offset] = data;
}
@@ -96,7 +96,7 @@ static WRITE8_HANDLER( thunderx_bankedram_w )
logerror("%04x pmc internal ram %04x = %02x\n",activecpu_get_pc(),offset,data);
}
else
- paletteram_xBBBBBGGGGGRRRRR_be_w(offset,data);
+ paletteram_xBBBBBGGGGGRRRRR_be_w(machine,offset,data);
}
/*
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 831c16c6481..0150465b83f 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -160,7 +160,7 @@ static MACHINE_RESET( tiamc1 )
tiamc1_spriteram_n = video_ram + 0x3020;
tiamc1_spriteram_a = video_ram + 0x3030;
- tiamc1_bankswitch_w(0, 0);
+ tiamc1_bankswitch_w(machine, 0, 0);
state_save_register_global_pointer(video_ram, 0x3040);
}
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 2badf22333d..4748a01ae35 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -159,12 +159,12 @@ static MACHINE_RESET( tickee )
static READ8_HANDLER( port1_r )
{
- return input_port_1_r(offset) | (ticket_dispenser_0_r(0) >> 5) | (ticket_dispenser_1_r(0) >> 6);
+ return input_port_1_r(machine, offset) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6);
}
static READ8_HANDLER( port2_r )
{
- return input_port_3_r(offset) | (ticket_dispenser_0_r(0) >> 5) | (ticket_dispenser_1_r(0) >> 6);
+ return input_port_3_r(machine, offset) | (ticket_dispenser_0_r(machine, 0) >> 5) | (ticket_dispenser_1_r(machine, 0) >> 6);
}
@@ -190,8 +190,8 @@ static WRITE16_HANDLER( tickee_control_w )
if (offset == 3)
{
- ticket_dispenser_0_w(0, (data & 8) << 4);
- ticket_dispenser_1_w(0, (data & 4) << 5);
+ ticket_dispenser_0_w(machine, 0, (data & 8) << 4);
+ ticket_dispenser_1_w(machine, 0, (data & 4) << 5);
}
if (olddata != tickee_control[offset])
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index d9708f6ec27..8e506a21606 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -87,7 +87,7 @@ static const int f1dream_2450_lookup[32] = {
0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0, 0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0,
0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0, 0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0 };
-static void f1dream_protection_w(void)
+static void f1dream_protection_w(running_machine *machine)
{
int indx;
int value = 255;
@@ -146,20 +146,20 @@ static void f1dream_protection_w(void)
else if ((prevpc == 0x27f8) || (prevpc == 0x511a) || (prevpc == 0x5142) || (prevpc == 0x516a))
{
/* The main CPU stuffs the byte for the soundlatch into 0xfffffd.*/
- soundlatch_w(2,ram16[0x3ffc/2]);
+ soundlatch_w(machine,2,ram16[0x3ffc/2]);
}
}
static WRITE16_HANDLER( f1dream_control_w )
{
logerror("protection write, PC: %04x FFE1 Value:%01x\n",activecpu_get_pc(), ram16[0x3fe0/2]);
- f1dream_protection_w();
+ f1dream_protection_w(machine);
}
static WRITE16_HANDLER( tigeroad_soundcmd_w )
{
if (ACCESSING_MSB)
- soundlatch_w(offset,data >> 8);
+ soundlatch_w(machine,offset,data >> 8);
}
static WRITE8_HANDLER( msm5205_w )
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 1c9386ce9cf..39c3ceeeeb2 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -119,7 +119,7 @@ static READ16_HANDLER( K052109_word_noA12_r )
/* some games have the A12 line not connected, so the chip spans */
/* twice the memory range, with mirroring */
offset = ((offset & 0x3000) >> 1) | (offset & 0x07ff);
- return K052109_word_r(offset,mem_mask);
+ return K052109_word_r(machine,offset,mem_mask);
}
static WRITE16_HANDLER( K052109_word_noA12_w )
@@ -127,7 +127,7 @@ static WRITE16_HANDLER( K052109_word_noA12_w )
/* some games have the A12 line not connected, so the chip spans */
/* twice the memory range, with mirroring */
offset = ((offset & 0x3000) >> 1) | (offset & 0x07ff);
- K052109_word_w(offset,data,mem_mask);
+ K052109_word_w(machine,offset,data,mem_mask);
}
static WRITE16_HANDLER( punkshot_K052109_word_w )
@@ -135,9 +135,9 @@ static WRITE16_HANDLER( punkshot_K052109_word_w )
/* it seems that a word write is supposed to affect only the MSB. The */
/* "ROUND 1" text in punkshtj goes lost otherwise. */
if (ACCESSING_MSB)
- K052109_w(offset,(data >> 8) & 0xff);
+ K052109_w(machine,offset,(data >> 8) & 0xff);
else if (ACCESSING_LSB)
- K052109_w(offset + 0x2000,data & 0xff);
+ K052109_w(machine,offset + 0x2000,data & 0xff);
}
static WRITE16_HANDLER( punkshot_K052109_word_noA12_w )
@@ -145,7 +145,7 @@ static WRITE16_HANDLER( punkshot_K052109_word_noA12_w )
/* some games have the A12 line not connected, so the chip spans */
/* twice the memory range, with mirroring */
offset = ((offset & 0x3000) >> 1) | (offset & 0x07ff);
- punkshot_K052109_word_w(offset,data,mem_mask);
+ punkshot_K052109_word_w(machine,offset,data,mem_mask);
}
@@ -159,7 +159,7 @@ static READ16_HANDLER( K053245_scattered_word_r )
else
{
offset = ((offset & 0x000e) >> 1) | ((offset & 0x1fc0) >> 3);
- return K053245_word_r(offset,mem_mask);
+ return K053245_word_r(machine,offset,mem_mask);
}
}
@@ -170,7 +170,7 @@ static WRITE16_HANDLER( K053245_scattered_word_w )
if (!(offset & 0x0031))
{
offset = ((offset & 0x000e) >> 1) | ((offset & 0x1fc0) >> 3);
- K053245_word_w(offset,data,mem_mask);
+ K053245_word_w(machine,offset,data,mem_mask);
}
}
@@ -178,7 +178,7 @@ static READ16_HANDLER( K053244_word_noA1_r )
{
offset &= ~1; /* handle mirror address */
- return K053244_r(offset + 1) | (K053244_r(offset) << 8);
+ return K053244_r(machine,offset + 1) | (K053244_r(machine,offset) << 8);
}
static WRITE16_HANDLER( K053244_word_noA1_w )
@@ -186,9 +186,9 @@ static WRITE16_HANDLER( K053244_word_noA1_w )
offset &= ~1; /* handle mirror address */
if (ACCESSING_MSB)
- K053244_w(offset,(data >> 8) & 0xff);
+ K053244_w(machine,offset,(data >> 8) & 0xff);
if (ACCESSING_LSB)
- K053244_w(offset + 1,data & 0xff);
+ K053244_w(machine,offset + 1,data & 0xff);
}
static INTERRUPT_GEN(cuebrick_interrupt)
@@ -224,42 +224,42 @@ static INTERRUPT_GEN( lgtnfght_interrupt )
static WRITE16_HANDLER( tmnt_sound_command_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
static READ16_HANDLER( punkshot_sound_r )
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine,2 + offset);
}
static READ16_HANDLER( blswhstl_sound_r )
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine,2 + offset);
}
static READ16_HANDLER( glfgreat_sound_r )
{
/* If the sound CPU is running, read the status, otherwise
just make it pass the test */
- return K053260_0_r(2 + offset) << 8;
+ return K053260_0_r(machine,2 + offset) << 8;
}
static WRITE16_HANDLER( glfgreat_sound_w )
{
if (ACCESSING_MSB)
- K053260_0_w(offset, (data >> 8) & 0xff);
+ K053260_0_w(machine, offset, (data >> 8) & 0xff);
if (offset)
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static READ16_HANDLER( prmrsocr_sound_r )
{
- return soundlatch3_r(0);
+ return soundlatch3_r(machine,0);
}
static WRITE16_HANDLER( prmrsocr_sound_cmd_w )
@@ -267,14 +267,14 @@ static WRITE16_HANDLER( prmrsocr_sound_cmd_w )
if (ACCESSING_LSB)
{
data &= 0xff;
- if (offset == 0) soundlatch_w(0,data);
- else soundlatch2_w(0,data);
+ if (offset == 0) soundlatch_w(machine,0,data);
+ else soundlatch2_w(machine,0,data);
}
}
static WRITE16_HANDLER( prmrsocr_sound_irq_w )
{
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static WRITE8_HANDLER( prmrsocr_audio_bankswitch_w )
@@ -287,7 +287,7 @@ static WRITE8_HANDLER( prmrsocr_audio_bankswitch_w )
static READ16_HANDLER( tmnt2_sound_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine, 2 + offset);
}
static READ8_HANDLER( tmnt_sres_r )
@@ -410,7 +410,7 @@ static READ16_HANDLER( ssriders_protection_r )
data = -program_read_word(0x105818);
data = ((data / 8 - 4) & 0x1f) * 0x40;
data += ((program_read_word(0x105cb0) +
- 256*K052109_r(0x1a01) + K052109_r(0x1a00) - 6) / 8 + 12) & 0x3f;
+ 256*K052109_r(machine,0x1a01) + K052109_r(machine,0x1a00) - 6) / 8 + 12) & 0x3f;
return data;
default:
@@ -436,7 +436,7 @@ static WRITE16_HANDLER( ssriders_protection_w )
{
if ((program_read_word(0x180006 + 128*i) >> 8) == logical_pri)
{
- K053245_word_w(8*i,hardware_pri,0xff00);
+ K053245_word_w(machine,8*i,hardware_pri,0xff00);
hardware_pri++;
}
}
@@ -491,7 +491,7 @@ static READ16_HANDLER( blswhstl_coin_r )
/* bit 3 is service button */
/* bit 6 is ??? VBLANK? OBJMPX? */
- res = input_port_2_word_r(0,0);
+ res = input_port_2_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -507,7 +507,7 @@ static READ16_HANDLER( blswhstl_eeprom_r )
/* bit 0 is EEPROM data */
/* bit 1 is EEPROM ready */
- res = EEPROM_read_bit() | input_port_3_word_r(0,0);
+ res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0);
return res;
}
@@ -520,7 +520,7 @@ static READ16_HANDLER( ssriders_eeprom_r )
/* bit 1 is EEPROM ready */
/* bit 2 is VBLANK (???) */
/* bit 7 is service button */
- res = EEPROM_read_bit() | input_port_3_word_r(0,0);
+ res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -539,7 +539,7 @@ static READ16_HANDLER( sunsetbl_eeprom_r )
/* bit 1 is EEPROM ready */
/* bit 2 is VBLANK (???) */
/* bit 3 is service button */
- res = EEPROM_read_bit() | input_port_3_word_r(0,0);
+ res = EEPROM_read_bit() | input_port_3_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -598,7 +598,7 @@ static READ16_HANDLER( thndrx2_in0_r )
{
int res;
- res = input_port_0_word_r(0,0);
+ res = input_port_0_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -616,7 +616,7 @@ static READ16_HANDLER( thndrx2_eeprom_r )
/* bit 1 is EEPROM ready */
/* bit 3 is VBLANK (???) */
/* bit 7 is service button */
- res = (EEPROM_read_bit() << 8) | input_port_1_word_r(0,0);
+ res = (EEPROM_read_bit() << 8) | input_port_1_word_r(machine,0,0);
toggle ^= 0x0800;
return (res ^ toggle);
}
@@ -650,7 +650,7 @@ static READ16_HANDLER( prmrsocr_IN0_r )
/* bit 9 is service button */
int res;
- res = input_port_0_word_r(0,0);
+ res = input_port_0_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -663,14 +663,14 @@ static READ16_HANDLER( prmrsocr_eeprom_r )
{
/* bit 8 is EEPROM data */
/* bit 9 is EEPROM ready */
- return (EEPROM_read_bit() << 8) | input_port_1_word_r(0,0);
+ return (EEPROM_read_bit() << 8) | input_port_1_word_r(machine,0,0);
}
static WRITE16_HANDLER( prmrsocr_eeprom_w )
{
if (ACCESSING_LSB)
{
- prmrsocr_122000_w(offset,data,mem_mask);
+ prmrsocr_122000_w(machine,offset,data,mem_mask);
}
if (ACCESSING_MSB)
@@ -686,18 +686,18 @@ static WRITE16_HANDLER( prmrsocr_eeprom_w )
static READ16_HANDLER( cuebrick_snd_r )
{
- return YM2151_status_port_0_r(0)<<8;
+ return YM2151_status_port_0_r(machine,0)<<8;
}
static WRITE16_HANDLER( cuebrick_snd_w )
{
if (offset)
{
- YM2151_data_port_0_w(0, data>>8);
+ YM2151_data_port_0_w(machine, 0, data>>8);
}
else
{
- YM2151_register_port_0_w(0, data>>8);
+ YM2151_register_port_0_w(machine, 0, data>>8);
}
}
@@ -906,7 +906,7 @@ INLINE UINT32 tmnt2_get_word(UINT32 addr)
return(0);
}
-static void tmnt2_put_word(UINT32 addr, UINT16 data)
+static void tmnt2_put_word(running_machine *machine, UINT32 addr, UINT16 data)
{
UINT32 offs;
if (addr >= 0x180000/2 && addr <= 0x183fff/2)
@@ -916,7 +916,7 @@ static void tmnt2_put_word(UINT32 addr, UINT16 data)
if (!(offs & 0x0031))
{
offs = ((offs & 0x000e) >> 1) | ((offs & 0x1fc0) >> 3);
- K053245_word_w(offs, data, 0);
+ K053245_word_w(machine, offs, data, 0);
}
}
else if (addr >= 0x104000/2 && addr <= 0x107fff/2) sunset_104000[addr-0x104000/2] = data;
@@ -1031,11 +1031,11 @@ static WRITE16_HANDLER( tmnt2_1c0800_w )
xoffs += xmod;
yoffs += ymod;
- tmnt2_put_word(dst_addr + 0, attr1);
- tmnt2_put_word(dst_addr + 2, code);
- tmnt2_put_word(dst_addr + 4, (UINT32)yoffs);
- tmnt2_put_word(dst_addr + 6, (UINT32)xoffs);
- tmnt2_put_word(dst_addr + 12, attr2 | color);
+ tmnt2_put_word(machine, dst_addr + 0, attr1);
+ tmnt2_put_word(machine, dst_addr + 2, code);
+ tmnt2_put_word(machine, dst_addr + 4, (UINT32)yoffs);
+ tmnt2_put_word(machine, dst_addr + 6, (UINT32)xoffs);
+ tmnt2_put_word(machine, dst_addr + 12, attr2 | color);
}
#else // for reference; do not remove
static WRITE16_HANDLER( tmnt2_1c0800_w )
@@ -1295,11 +1295,11 @@ ADDRESS_MAP_END
static READ8_HANDLER( K054539_0_ctrl_r )
{
- return K054539_0_r(0x200+offset);
+ return K054539_0_r(machine,0x200+offset);
}
static WRITE8_HANDLER( K054539_0_ctrl_w )
{
- K054539_0_w(0x200+offset,data);
+ K054539_0_w(machine,0x200+offset,data);
}
static ADDRESS_MAP_START( prmrsocr_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -2399,8 +2399,8 @@ MACHINE_DRIVER_END
static MACHINE_RESET( tmnt )
{
/* the UPD7759 control flip-flops are cleared: /ST is 1, /RESET is 0 */
- upd7759_0_start_w(0, 0);
- upd7759_0_reset_w(0, 1);
+ upd7759_0_start_w(machine, 0, 0);
+ upd7759_0_reset_w(machine, 0, 1);
}
static MACHINE_DRIVER_START( tmnt )
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index b6168fdd8ba..dda94cd73cf 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -343,7 +343,7 @@ static WRITE8_HANDLER( kabukiz_sample_w )
{
// to avoid the write when the sound chip is initialized
if(data != 0xff)
- DAC_0_data_w(0, data );
+ DAC_0_data_w(machine, 0, data);
}
static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -435,8 +435,8 @@ ADDRESS_MAP_END
static WRITE8_HANDLER( tnzsb_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 2,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 2,0,HOLD_LINE,0xff);
}
static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 1161fc5b790..1d4913ac9cb 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -376,10 +376,10 @@ WRITE16_HANDLER( pipibibi_scroll_w );
/***************** Sound stuff *****************/
-void dogyuun_okisnd_w(int data);
-void kbash_okisnd_w(int data);
-void fixeight_okisnd_w(int data);
-void batsugun_okisnd_w(int data);
+void dogyuun_okisnd_w(running_machine *machine, int data);
+void kbash_okisnd_w(running_machine *machine, int data);
+void fixeight_okisnd_w(running_machine *machine, int data);
+void batsugun_okisnd_w(running_machine *machine, int data);
/***************************************************************************
@@ -655,7 +655,7 @@ static WRITE16_HANDLER( toaplan2_coin_word_w )
{
if (ACCESSING_LSB)
{
- toaplan2_coin_w(offset, data & 0xff);
+ toaplan2_coin_w(machine, offset, data & 0xff);
}
if (ACCESSING_MSB && (data & 0xff00) )
{
@@ -667,7 +667,7 @@ static WRITE16_HANDLER( shippumd_coin_word_w )
{
if (ACCESSING_LSB)
{
- toaplan2_coin_w(offset, data & 0xff);
+ toaplan2_coin_w(machine, offset, data & 0xff);
OKIM6295_set_bank_base(0, (((data & 0x10) >> 4) * 0x40000));
}
if (ACCESSING_MSB && (data & 0xff00) )
@@ -721,7 +721,7 @@ static READ16_HANDLER( c2map_port_6_r )
}
if (mcu_data == 0xff) mcu_data = 0x10;
else mcu_data = 0x00;
- return ( mcu_data | input_port_6_r(0) );
+ return ( mcu_data | input_port_6_r(machine,0) );
}
static READ16_HANDLER( pipibibi_z80_status_r )
@@ -741,7 +741,7 @@ static READ16_HANDLER( ghox_p1_h_analog_r )
{
INT8 value, new_value;
- new_value = input_port_7_r(0);
+ new_value = input_port_7_r(machine,0);
if (new_value == old_p1_paddle_h) return 0;
value = new_value - old_p1_paddle_h;
old_p1_paddle_h = new_value;
@@ -752,7 +752,7 @@ static READ16_HANDLER( ghox_p2_h_analog_r )
{
INT8 value, new_value;
- new_value = input_port_8_r(0);
+ new_value = input_port_8_r(machine,0);
if (new_value == old_p2_paddle_h) return 0;
value = new_value - old_p2_paddle_h;
old_p2_paddle_h = new_value;
@@ -886,7 +886,7 @@ static WRITE16_HANDLER( dogyuun_snd_cpu_w )
if (ACCESSING_LSB)
{
mcu_data = data;
- dogyuun_okisnd_w(data);
+ dogyuun_okisnd_w(machine, data);
}
logerror("PC:%06x Writing command (%04x) to the NEC V25+ secondary CPU port\n",activecpu_get_previouspc(),mcu_data);
}
@@ -905,7 +905,7 @@ static WRITE16_HANDLER( kbash_snd_cpu_w )
{
if (ACCESSING_LSB)
{
- kbash_okisnd_w(data);
+ kbash_okisnd_w(machine, data);
}
logerror("PC:%06x Writing Sound command (%04x) to the NEC V25+ secondary CPU\n",activecpu_get_previouspc(),data);
}
@@ -942,7 +942,7 @@ static WRITE16_HANDLER( fixeight_sec_cpu_w )
if (mcu_data & 0xff00)
{
mcu_data = (mcu_data & 0xff00) | (data & 0xff);
- fixeight_okisnd_w(data);
+ fixeight_okisnd_w(machine, data);
}
else if (mcu_data == 0xff00)
{
@@ -986,7 +986,7 @@ static WRITE16_HANDLER( batsugun_snd_cpu_w )
if (ACCESSING_LSB)
{
mcu_data = data;
- batsugun_okisnd_w(data);
+ batsugun_okisnd_w(machine, data);
}
logerror("PC:%06x Writing command (%04x) to the NEC V25+ secondary CPU port %02x\n",activecpu_get_previouspc(),mcu_data,(offset*2));
}
@@ -1050,8 +1050,8 @@ static WRITE16_HANDLER( bgaregga_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset, data & 0xff);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine, offset, data & 0xff);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
}
@@ -1097,26 +1097,26 @@ static WRITE8_HANDLER( bgaregga_bankswitch_w )
static WRITE8_HANDLER( raizing_okim6295_bankselect_0 )
{
- NMK112_okibank_w(0, data & 0x0f); // chip 0 bank 0
- NMK112_okibank_w(1, (data >> 4) & 0x0f); // chip 0 bank 1
+ NMK112_okibank_w(machine, 0, data & 0x0f); // chip 0 bank 0
+ NMK112_okibank_w(machine, 1, (data >> 4) & 0x0f); // chip 0 bank 1
}
static WRITE8_HANDLER( raizing_okim6295_bankselect_1 )
{
- NMK112_okibank_w(2, data & 0x0f); // chip 0 bank 2
- NMK112_okibank_w(3, (data >> 4) & 0x0f); // chip 0 bank 3
+ NMK112_okibank_w(machine, 2, data & 0x0f); // chip 0 bank 2
+ NMK112_okibank_w(machine, 3, (data >> 4) & 0x0f); // chip 0 bank 3
}
static WRITE8_HANDLER( raizing_okim6295_bankselect_2 )
{
- NMK112_okibank_w(4, data & 0x0f); // chip 1 bank 0
- NMK112_okibank_w(5, (data >> 4) & 0x0f); // chip 1 bank 1
+ NMK112_okibank_w(machine, 4, data & 0x0f); // chip 1 bank 0
+ NMK112_okibank_w(machine, 5, (data >> 4) & 0x0f); // chip 1 bank 1
}
static WRITE8_HANDLER( raizing_okim6295_bankselect_3 )
{
- NMK112_okibank_w(6, data & 0x0f); // chip 1 bank 2
- NMK112_okibank_w(7, (data >> 4) & 0x0f); // chip 1 bank 3
+ NMK112_okibank_w(machine, 6, data & 0x0f); // chip 1 bank 2
+ NMK112_okibank_w(machine, 7, (data >> 4) & 0x0f); // chip 1 bank 3
}
@@ -1178,8 +1178,8 @@ static WRITE16_HANDLER( batrider_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(offset, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
+ soundlatch_w(machine, offset, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
}
}
@@ -1188,8 +1188,8 @@ static WRITE16_HANDLER( batrider_soundlatch2_w )
{
if (ACCESSING_LSB)
{
- soundlatch2_w(offset, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
+ soundlatch2_w(machine, offset, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
}
}
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 3eea88bde01..ae9641f5072 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -61,8 +61,8 @@ WRITE16_HANDLER( toki_foreground_videoram16_w );
static WRITE16_HANDLER( tokib_soundcommand16_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( pip16_r )
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 2f2f607d8e4..c51257f7043 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -330,7 +330,7 @@ static INTERRUPT_GEN( topspeed_cpub_interrupt )
static READ16_HANDLER( topspeed_input_bypass_r )
{
- UINT8 port = TC0220IOC_port_r(0); /* read port number */
+ UINT8 port = TC0220IOC_port_r(machine,0); /* read port number */
int steer = 0;
int analogue_steer = readinputportbytag_safe(STEER_PORT_TAG,0x00);
int fake = readinputportbytag_safe(FAKE_PORT_TAG,0x00);
@@ -367,7 +367,7 @@ static READ16_HANDLER( topspeed_input_bypass_r )
return steer >> 8;
default:
- return TC0220IOC_portreg_r(offset);
+ return TC0220IOC_portreg_r(machine,offset);
}
}
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 779807026fe..07906fc2e1a 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -140,16 +140,16 @@ static UINT8 last = 0;
if (timer & 0x100) popmessage("watchdog!");
- if (last != (input_port_0_r(0) & 0x0f))
+ if (last != (input_port_0_r(machine, 0) & 0x0f))
{
- last = input_port_0_r(0) & 0x0f;
+ last = input_port_0_r(machine, 0) & 0x0f;
cpunum_set_input_line(machine, 0, 0, PULSE_LINE);
}
- pia_set_input_a(0, input_port_0_r(0) & 0x0f, 0);
+ pia_set_input_a(0, input_port_0_r(machine, 0) & 0x0f, 0);
- pia_set_input_ca1(0, input_port_0_r(0) & 0x10);
+ pia_set_input_ca1(0, input_port_0_r(machine, 0) & 0x10);
- pia_set_input_ca2(0, input_port_0_r(0) & 0x20);
+ pia_set_input_ca2(0, input_port_0_r(machine, 0) & 0x20);
}
static READ8_HANDLER( timer_r )
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 5fd01e85242..948651516f8 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -137,7 +137,7 @@ static READ8_HANDLER( toypop_sound_sharedram_r )
static WRITE8_HANDLER( toypop_sound_sharedram_w )
{
if (offset < 0x40)
- namco_15xx_w(offset,data);
+ namco_15xx_w(machine,offset,data);
else
namco_soundregs[offset] = data;
}
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 1c7a3bcb9c9..cb2a10413f7 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -36,7 +36,7 @@ void triplhnt_set_collision(int code)
}
-static void triplhnt_update_misc(int offset)
+static void triplhnt_update_misc(running_machine *machine, int offset)
{
UINT8 is_witch_hunt;
UINT8 bit = offset >> 1;
@@ -72,9 +72,9 @@ static void triplhnt_update_misc(int offset)
coin_lockout_w(0, !(triplhnt_misc_flags & 0x08));
coin_lockout_w(1, !(triplhnt_misc_flags & 0x08));
- discrete_sound_w(TRIPLHNT_SCREECH_EN, triplhnt_misc_flags & 0x04); // screech
- discrete_sound_w(TRIPLHNT_LAMP_EN, triplhnt_misc_flags & 0x02); // Lamp is used to reset noise
- discrete_sound_w(TRIPLHNT_BEAR_EN, triplhnt_misc_flags & 0x80); // bear
+ discrete_sound_w(machine, TRIPLHNT_SCREECH_EN, triplhnt_misc_flags & 0x04); // screech
+ discrete_sound_w(machine, TRIPLHNT_LAMP_EN, triplhnt_misc_flags & 0x02); // Lamp is used to reset noise
+ discrete_sound_w(machine, TRIPLHNT_BEAR_EN, triplhnt_misc_flags & 0x80); // bear
is_witch_hunt = readinputport(2) == 0x40;
bit = ~triplhnt_misc_flags & 0x40;
@@ -93,7 +93,7 @@ static void triplhnt_update_misc(int offset)
static WRITE8_HANDLER( triplhnt_misc_w )
{
- triplhnt_update_misc(offset);
+ triplhnt_update_misc(machine, offset);
}
@@ -107,16 +107,14 @@ static READ8_HANDLER( triplhnt_cmos_r )
static READ8_HANDLER( triplhnt_input_port_4_r )
{
- watchdog_reset_w(0, 0);
-
+ watchdog_reset_w(machine, 0, 0);
return readinputport(4);
}
static READ8_HANDLER( triplhnt_misc_r )
{
- triplhnt_update_misc(offset);
-
+ triplhnt_update_misc(machine, offset);
return readinputport(7) | triplhnt_hit_code;
}
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 3ef448da562..e889cf378d3 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -45,7 +45,7 @@ VIDEO_UPDATE( trucocl );
static WRITE8_HANDLER( irq_enable_w)
{
- interrupt_enable_w( 0, (~data) & 1 );
+ interrupt_enable_w( machine, 0, (~data) & 1 );
}
static int cur_dac_address = -1;
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index f8200faed62..f1566ae75ca 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -196,8 +196,8 @@ static MACHINE_RESET( trvquest )
static INTERRUPT_GEN( trvquest_interrupt )
{
- via_2_ca1_w(0,1);
- via_2_ca1_w(0,0);
+ via_2_ca1_w(machine,0,1);
+ via_2_ca1_w(machine,0,0);
}
static MACHINE_DRIVER_START( trvquest )
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index da6104a7e81..ea918f339db 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -35,13 +35,13 @@ static WRITE8_HANDLER( tryout_nmi_ack_w )
static WRITE8_HANDLER( tryout_sound_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1, 0, PULSE_LINE );
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1, 0, PULSE_LINE );
}
static WRITE8_HANDLER( tryout_sound_irq_ack_w )
{
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE );
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE );
}
static WRITE8_HANDLER( tryout_bankswitch_w )
@@ -183,7 +183,7 @@ GFXDECODE_END
static INTERRUPT_GEN( tryout_interrupt )
{
- if ((input_port_3_r(0) & 0x1c)!=0x1c)
+ if ((input_port_3_r(machine,0) & 0x1c)!=0x1c)
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index bcb9b088081..9d2dab6792f 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -384,8 +384,8 @@ static READ8_HANDLER( vsgongf_a100_r ){
}
static WRITE8_HANDLER( vsgongf_sound_command_w ){
- soundlatch_w( offset, data );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w( machine, offset, data );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
static ADDRESS_MAP_START( readmem_vsgongf, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 17ce26ba101..7af3bbbe129 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -146,10 +146,10 @@ static WRITE8_HANDLER( tubep_LS259_w )
//screen_flip_w(offset,data&1); /* bit 0 = screen flip, active high */
break;
case 6:
- tubep_background_romselect_w(offset,data); /* bit0 = 0->select roms: B1,B3,B5; bit0 = 1->select roms: B2,B4,B6 */
+ tubep_background_romselect_w(machine,offset,data); /* bit0 = 0->select roms: B1,B3,B5; bit0 = 1->select roms: B2,B4,B6 */
break;
case 7:
- tubep_colorproms_A4_line_w(offset,data); /* bit0 = line A4 (color proms address) state */
+ tubep_colorproms_A4_line_w(machine,offset,data); /* bit0 = line A4 (color proms address) state */
break;
default:
break;
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 107aae11797..4df4a7aef02 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -316,16 +316,14 @@ UINT16* suprtrio_control;
static WRITE16_HANDLER( tumblepb_oki_w )
{
-
-
if (mem_mask==0x0000)
{
- OKIM6295_data_0_w(0,data&0xff);
+ OKIM6295_data_0_w(machine,0,data&0xff);
//printf("tumbleb_oki_w %04x %04x\n",data,mem_mask);
}
else
{
- OKIM6295_data_0_w(0,(data>>8)&0xff);
+ OKIM6295_data_0_w(machine,0,(data>>8)&0xff);
//printf("tumbleb_oki_w %04x %04x\n",data,mem_mask);
}
/* STUFF IN OTHER BYTE TOO..*/
@@ -339,15 +337,15 @@ static READ16_HANDLER( tumblepb_prot_r )
#ifdef UNUSED_FUNCTION
static WRITE16_HANDLER( tumblepb_sound_w )
{
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
#endif
static WRITE16_HANDLER( jumppop_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE );
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE );
}
/******************************************************************************/
@@ -444,16 +442,16 @@ static int tumblep_music_command;
static int tumblep_music_bank;
static int tumbleb2_music_is_playing;
-static void tumbleb2_playmusic(void)
+static void tumbleb2_playmusic(running_machine *machine)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
if (tumbleb2_music_is_playing)
{
if ((status&0x08)==0x00)
{
- OKIM6295_data_0_w(0,0x80|tumblep_music_command);
- OKIM6295_data_0_w(0,0x00|0x82);
+ OKIM6295_data_0_w(machine,0,0x80|tumblep_music_command);
+ OKIM6295_data_0_w(machine,0,0x00|0x82);
}
}
}
@@ -462,7 +460,7 @@ static void tumbleb2_playmusic(void)
static INTERRUPT_GEN( tumbleb2_interrupt )
{
cpunum_set_input_line(machine, 0, 6, HOLD_LINE);
- tumbleb2_playmusic();
+ tumbleb2_playmusic(machine);
}
static const int tumbleb_sound_lookup[256] = {
@@ -492,24 +490,24 @@ static void tumbleb2_set_music_bank(int bank)
memcpy(&oki[0x38000], &oki[0x80000+0x38000+0x8000*bank],0x8000);
}
-static void tumbleb2_play_sound (int data)
+static void tumbleb2_play_sound (running_machine *machine, int data)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
if ((status&0x01)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x12);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x12);
}
else if ((status&0x02)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x22);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x22);
}
else if ((status&0x04)==0x00)
{
- OKIM6295_data_0_w(0,0x80|data);
- OKIM6295_data_0_w(0,0x00|0x42);
+ OKIM6295_data_0_w(machine,0,0x80|data);
+ OKIM6295_data_0_w(machine,0,0x00|0x42);
}
}
@@ -525,15 +523,15 @@ static void tumbleb2_play_sound (int data)
// bank 7 = how to play?
// bank 8 = boss???
-static void process_tumbleb2_music_command(int data)
+static void process_tumbleb2_music_command(running_machine *machine, int data)
{
- int status = OKIM6295_status_0_r(0);
+ int status = OKIM6295_status_0_r(machine,0);
if (data == 1) // stop?
{
if ((status&0x08)==0x08)
{
- OKIM6295_data_0_w(0,0x40); /* Stop playing music */
+ OKIM6295_data_0_w(machine,0,0x40); /* Stop playing music */
tumbleb2_music_is_playing = 0;
}
}
@@ -542,7 +540,7 @@ static void process_tumbleb2_music_command(int data)
if (tumbleb2_music_is_playing != data)
{
tumbleb2_music_is_playing = data;
- OKIM6295_data_0_w(0,0x40); // stop the current music
+ OKIM6295_data_0_w(machine,0,0x40); // stop the current music
switch (data)
{
case 0x04: // map screen
@@ -616,7 +614,7 @@ static void process_tumbleb2_music_command(int data)
break;
}
tumbleb2_set_music_bank(tumblep_music_bank);
- tumbleb2_playmusic();
+ tumbleb2_playmusic(machine);
}
@@ -638,11 +636,11 @@ static WRITE16_HANDLER(tumbleb2_soundmcu_w)
}
else if (sound == -2)
{
- process_tumbleb2_music_command(data);
+ process_tumbleb2_music_command(machine, data);
}
else
{
- tumbleb2_play_sound(sound);
+ tumbleb2_play_sound(machine, sound);
}
}
@@ -768,8 +766,8 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( jumpkids_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
@@ -851,7 +849,7 @@ static WRITE16_HANDLER( semicom_soundcmd_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
// needed for Super Trio which reads the sound with polling
// cpu_spinuntil_time(ATTOTIME_IN_USEC(100));
cpu_boost_interleave(attotime_zero, ATTOTIME_IN_USEC(20));
@@ -896,8 +894,8 @@ ADDRESS_MAP_END
static READ8_HANDLER(jumppop_z80latch_r)
{
- cpunum_set_input_line(Machine, 1, 0, CLEAR_LINE);
- return soundlatch_r(0);
+ cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
+ return soundlatch_r(machine, 0);
}
static ADDRESS_MAP_START( jumppop_sound_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 0ca658ffeab..021d7753609 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -72,15 +72,15 @@ static READ16_HANDLER( tumblep_prot_r )
static WRITE16_HANDLER( tumblep_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
#ifdef UNUSED_FUNCTION
static WRITE16_HANDLER( jumppop_sound_w )
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE );
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, 0, ASSERT_LINE );
}
#endif
@@ -140,10 +140,10 @@ static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index 6d4be3d64fa..55adc6ff47f 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -639,7 +639,7 @@ static READ8_HANDLER( buckrog_port_3_r )
static TIMER_CALLBACK( delayed_ppi8255_w )
{
- ppi8255_0_w(param >> 8, param & 0xff);
+ ppi8255_0_w(machine, param >> 8, param & 0xff);
}
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index f90b1bebe9e..cc163492b60 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -139,7 +139,7 @@ static READ16_HANDLER( twin16_gfx_rom2_r )
static WRITE16_HANDLER( sound_command_w )
{
COMBINE_DATA(&twin16_sound_command);
- soundlatch_w( 0, twin16_sound_command&0xff );
+ soundlatch_w( machine, 0, twin16_sound_command&0xff );
}
static READ16_HANDLER( twin16_sprite_status_r )
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index a1acefdc4e7..d3ab1a38aba 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -24,82 +24,82 @@ VIDEO_UPDATE( ultraman );
static READ16_HANDLER( ultraman_K051937_r )
{
- return K051937_r(offset);
+ return K051937_r(machine, offset);
}
static READ16_HANDLER( ultraman_K051960_r )
{
- return K051960_r(offset);
+ return K051960_r(machine, offset);
}
static READ16_HANDLER( ultraman_K051316_0_r )
{
- return K051316_0_r(offset);
+ return K051316_0_r(machine, offset);
}
static READ16_HANDLER( ultraman_K051316_1_r )
{
- return K051316_1_r(offset);
+ return K051316_1_r(machine, offset);
}
static READ16_HANDLER( ultraman_K051316_2_r )
{
- return K051316_2_r(offset);
+ return K051316_2_r(machine, offset);
}
static WRITE16_HANDLER( ultraman_K051316_0_w )
{
if (ACCESSING_LSB)
- K051316_0_w(offset, data & 0xff);
+ K051316_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_1_w )
{
if (ACCESSING_LSB)
- K051316_1_w(offset, data & 0xff);
+ K051316_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_2_w )
{
if (ACCESSING_LSB)
- K051316_2_w(offset, data & 0xff);
+ K051316_2_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_0_w )
{
if (ACCESSING_LSB)
- K051316_ctrl_0_w(offset, data & 0xff);
+ K051316_ctrl_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_1_w )
{
if (ACCESSING_LSB)
- K051316_ctrl_1_w(offset, data & 0xff);
+ K051316_ctrl_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_2_w )
{
if (ACCESSING_LSB)
- K051316_ctrl_2_w(offset, data & 0xff);
+ K051316_ctrl_2_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051937_w )
{
if (ACCESSING_LSB)
- K051937_w(offset, data & 0xff);
+ K051937_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051960_w )
{
if (ACCESSING_LSB)
- K051960_w(offset, data & 0xff);
+ K051960_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( sound_cmd_w )
{
if (ACCESSING_LSB)
- soundlatch_w(0,data & 0xff);
+ soundlatch_w(machine,0,data & 0xff);
}
static WRITE16_HANDLER( sound_irq_trigger_w )
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 97b9fdd725f..c6a3cd418d1 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -133,19 +133,19 @@ static WRITE8_HANDLER( ultratnk_lockout_w )
static WRITE8_HANDLER( ultratnk_fire_1_w )
{
- discrete_sound_w(ULTRATNK_FIRE_EN_1, offset & 1);
+ discrete_sound_w(machine, ULTRATNK_FIRE_EN_1, offset & 1);
}
static WRITE8_HANDLER( ultratnk_fire_2_w )
{
- discrete_sound_w(ULTRATNK_FIRE_EN_2, offset & 1);
+ discrete_sound_w(machine, ULTRATNK_FIRE_EN_2, offset & 1);
}
static WRITE8_HANDLER( ultratnk_attract_w )
{
- discrete_sound_w(ULTRATNK_ATTRACT_EN, data & 1);
+ discrete_sound_w(machine, ULTRATNK_ATTRACT_EN, data & 1);
}
static WRITE8_HANDLER( ultratnk_explosion_w )
{
- discrete_sound_w(ULTRATNK_EXPLOSION_DATA, data & 15);
+ discrete_sound_w(machine, ULTRATNK_EXPLOSION_DATA, data & 15);
}
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index f6847d9d56b..78223c6606c 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -137,11 +137,11 @@ static READ16_HANDLER(sound_r)
if (ACCESSING_MSB16)
{
- r |= K054539_0_r(reg+0) << 8;
+ r |= K054539_0_r(machine, reg+0) << 8;
}
if (ACCESSING_LSB16)
{
- r |= K054539_0_r(reg+1) << 0;
+ r |= K054539_0_r(machine, reg+1) << 0;
}
return r;
@@ -153,11 +153,11 @@ static WRITE16_HANDLER(sound_w)
if (ACCESSING_MSB16)
{
- K054539_0_w(reg+0, (data >> 8) & 0xff);
+ K054539_0_w(machine, reg+0, (data >> 8) & 0xff);
}
if (ACCESSING_LSB16)
{
- K054539_0_w(reg+1, (data >> 0) & 0xff);
+ K054539_0_w(machine, reg+1, (data >> 0) & 0xff);
}
}
@@ -167,11 +167,11 @@ static READ16_HANDLER(K056800_68k_r)
if (!(mem_mask & 0xff00))
{
- r |= K056800_sound_r((offset*2)+0, 0xffff) << 8;
+ r |= K056800_sound_r(machine, (offset*2)+0, 0xffff) << 8;
}
if (!(mem_mask & 0x00ff))
{
- r |= K056800_sound_r((offset*2)+1, 0xffff) << 0;
+ r |= K056800_sound_r(machine, (offset*2)+1, 0xffff) << 0;
}
return r;
@@ -181,11 +181,11 @@ static WRITE16_HANDLER(K056800_68k_w)
{
if (!(mem_mask & 0xff00))
{
- K056800_sound_w((offset*2)+0, (data >> 8) & 0xff, 0xffff);
+ K056800_sound_w(machine, (offset*2)+0, (data >> 8) & 0xff, 0xffff);
}
if (!(mem_mask & 0x00ff))
{
- K056800_sound_w((offset*2)+1, (data >> 0) & 0xff, 0xffff);
+ K056800_sound_w(machine, (offset*2)+1, (data >> 0) & 0xff, 0xffff);
}
}
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index b9445e4ac6f..c3f48e8f2f6 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -222,13 +222,13 @@ static READ32_HANDLER( undrfire_input_r )
{
case 0x00:
{
- return (input_port_0_word_r(0,0) << 16) | input_port_1_word_r(0,0) |
+ return (input_port_0_word_r(machine,0,0) << 16) | input_port_1_word_r(machine,0,0) |
(EEPROM_read_bit() << 7) | frame_counter;
}
case 0x01:
{
- return input_port_2_word_r(0,0) | (coin_word << 16);
+ return input_port_2_word_r(machine,0,0) | (coin_word << 16);
}
}
@@ -243,7 +243,7 @@ static WRITE32_HANDLER( undrfire_input_w )
{
if (ACCESSING_MSB32) /* $500000 is watchdog */
{
- watchdog_reset_w(0,data >> 24);
+ watchdog_reset(machine);
}
if (ACCESSING_LSB32)
@@ -313,8 +313,8 @@ static READ32_HANDLER( undrfire_lightgun_r )
case 0x00: /* P1 */
{
- x = input_port_3_word_r(0,0) << 6;
- y = input_port_4_word_r(0,0) << 6;
+ x = input_port_3_word_r(machine,0,0) << 6;
+ y = input_port_4_word_r(machine,0,0) << 6;
return ((x << 24) &0xff000000) | ((x << 8) &0xff0000)
| ((y << 8) &0xff00) | ((y >> 8) &0xff) ;
@@ -322,8 +322,8 @@ static READ32_HANDLER( undrfire_lightgun_r )
case 0x01: /* P2 */
{
- x = input_port_5_word_r(0,0) << 6;
- y = input_port_6_word_r(0,0) << 6;
+ x = input_port_5_word_r(machine,0,0) << 6;
+ y = input_port_6_word_r(machine,0,0) << 6;
return ((x << 24) &0xff000000) | ((x << 8) &0xff0000)
| ((y << 8) &0xff00) | ((y >> 8) &0xff) ;
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 5e9065e8380..eeecdebe7d4 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -37,9 +37,9 @@ Year + Game PCB Notes
***************************************************************************/
-static READ16_HANDLER ( YM3812_status_port_0_msb_r ) { return YM3812_status_port_0_r(0) << 8; }
-static WRITE16_HANDLER( YM3812_register_port_0_msb_w ) { if (ACCESSING_MSB) YM3812_control_port_0_w(0,data >> 8); }
-static WRITE16_HANDLER( YM3812_data_port_0_msb_w ) { if (ACCESSING_MSB) YM3812_write_port_0_w(0,data >> 8); }
+static READ16_HANDLER ( YM3812_status_port_0_msb_r ) { return YM3812_status_port_0_r(machine,0) << 8; }
+static WRITE16_HANDLER( YM3812_register_port_0_msb_w ) { if (ACCESSING_MSB) YM3812_control_port_0_w(machine,0,data >> 8); }
+static WRITE16_HANDLER( YM3812_data_port_0_msb_w ) { if (ACCESSING_MSB) YM3812_write_port_0_w(machine,0,data >> 8); }
/*
@@ -219,19 +219,19 @@ static READ32_HANDLER( zeropnt2_dsw1_r ) { return (readinputportbytag("DSW1")
static READ32_HANDLER( zeropnt2_dsw2_r ) { return (readinputportbytag("DSW2") << 16) | 0xffff; }
static READ32_HANDLER( zeropnt2_buttons_r ) { return ((readinputportbytag("IN7") | ((EEPROM_read_bit() & 0x01) << 7)) << 16) | 0xffff; }
-static READ32_HANDLER( zeropnt2_gunx_0_msb_r ) { return (unico_gunx_0_msb_r(0,0)-0x0800) << 16; }
-static READ32_HANDLER( zeropnt2_guny_0_msb_r ) { return (unico_guny_0_msb_r(0,0)+0x0800) << 16; }
-static READ32_HANDLER( zeropnt2_gunx_1_msb_r ) { return (unico_gunx_1_msb_r(0,0)-0x0800) << 16; }
-static READ32_HANDLER( zeropnt2_guny_1_msb_r ) { return (unico_guny_1_msb_r(0,0)+0x0800) << 16; }
+static READ32_HANDLER( zeropnt2_gunx_0_msb_r ) { return (unico_gunx_0_msb_r(machine,0,0)-0x0800) << 16; }
+static READ32_HANDLER( zeropnt2_guny_0_msb_r ) { return (unico_guny_0_msb_r(machine,0,0)+0x0800) << 16; }
+static READ32_HANDLER( zeropnt2_gunx_1_msb_r ) { return (unico_gunx_1_msb_r(machine,0,0)-0x0800) << 16; }
+static READ32_HANDLER( zeropnt2_guny_1_msb_r ) { return (unico_guny_1_msb_r(machine,0,0)+0x0800) << 16; }
-static READ32_HANDLER ( zeropnt2_oki0_r ) { return OKIM6295_status_0_r(0) << 16; }
-static READ32_HANDLER ( zeropnt2_oki1_r ) { return OKIM6295_status_1_r(0) << 16; }
-static WRITE32_HANDLER( zeropnt2_oki0_w ) { if ((mem_mask & 0x00ff0000) == 0) OKIM6295_data_0_w(0,(data >> 16) & 0xff); }
-static WRITE32_HANDLER( zeropnt2_oki1_w ) { if ((mem_mask & 0x00ff0000) == 0) OKIM6295_data_1_w(0,(data >> 16) & 0xff); }
+static READ32_HANDLER ( zeropnt2_oki0_r ) { return OKIM6295_status_0_r(machine,0) << 16; }
+static READ32_HANDLER ( zeropnt2_oki1_r ) { return OKIM6295_status_1_r(machine,0) << 16; }
+static WRITE32_HANDLER( zeropnt2_oki0_w ) { if ((mem_mask & 0x00ff0000) == 0) OKIM6295_data_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_oki1_w ) { if ((mem_mask & 0x00ff0000) == 0) OKIM6295_data_1_w(machine,0,(data >> 16) & 0xff); }
-static READ32_HANDLER( zeropnt2_ym2151_status_r ) { return YM2151_status_port_0_r(0) << 16; }
-static WRITE32_HANDLER( zeropnt2_ym2151_reg_w ) { if ((mem_mask & 0x00ff0000) == 0) YM2151_register_port_0_w(0,(data >> 16) & 0xff); }
-static WRITE32_HANDLER( zeropnt2_ym2151_data_w ) { if ((mem_mask & 0x00ff0000) == 0) YM2151_data_port_0_w(0,(data >> 16) & 0xff); }
+static READ32_HANDLER( zeropnt2_ym2151_status_r ) { return YM2151_status_port_0_r(machine,0) << 16; }
+static WRITE32_HANDLER( zeropnt2_ym2151_reg_w ) { if ((mem_mask & 0x00ff0000) == 0) YM2151_register_port_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_ym2151_data_w ) { if ((mem_mask & 0x00ff0000) == 0) YM2151_data_port_0_w(machine,0,(data >> 16) & 0xff); }
static WRITE32_HANDLER( zeropnt2_sound_bank_w )
{
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 72e60f4bd12..48982edd28a 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -48,7 +48,7 @@ static UINT8 *finalgdr_backupram;
static READ16_HANDLER( oki_r )
{
if(offset)
- return OKIM6295_status_0_r(0);
+ return OKIM6295_status_0_r(machine, 0);
else
return 0;
}
@@ -56,23 +56,23 @@ static READ16_HANDLER( oki_r )
static WRITE16_HANDLER( oki_w )
{
if(offset)
- OKIM6295_data_0_w(0, data);
+ OKIM6295_data_0_w(machine, 0, data);
}
static READ32_HANDLER( oki32_r )
{
- return OKIM6295_status_0_r(0) << 8;
+ return OKIM6295_status_0_r(machine, 0) << 8;
}
static WRITE32_HANDLER( oki32_w )
{
- OKIM6295_data_0_w(0, (data >> 8) & 0xff);
+ OKIM6295_data_0_w(machine, 0, (data >> 8) & 0xff);
}
static READ16_HANDLER( ym2151_status_r )
{
if(offset)
- return YM2151_status_port_0_r(0);
+ return YM2151_status_port_0_r(machine, 0);
else
return 0;
}
@@ -80,28 +80,28 @@ static READ16_HANDLER( ym2151_status_r )
static WRITE16_HANDLER( ym2151_data_w )
{
if(offset)
- YM2151_data_port_0_w(0, data);
+ YM2151_data_port_0_w(machine, 0, data);
}
static WRITE16_HANDLER( ym2151_register_w )
{
if(offset)
- YM2151_register_port_0_w(0, data);
+ YM2151_register_port_0_w(machine, 0, data);
}
static READ32_HANDLER( ym2151_status32_r )
{
- return YM2151_status_port_0_r(0) << 8;
+ return YM2151_status_port_0_r(machine, 0) << 8;
}
static WRITE32_HANDLER( ym2151_data32_w )
{
- YM2151_data_port_0_w(0, (data >> 8) & 0xff);
+ YM2151_data_port_0_w(machine, 0, (data >> 8) & 0xff);
}
static WRITE32_HANDLER( ym2151_register32_w )
{
- YM2151_register_port_0_w(0, (data >> 8) & 0xff);
+ YM2151_register_port_0_w(machine, 0, (data >> 8) & 0xff);
}
static READ16_HANDLER( eeprom_r )
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 72074691840..ec85bedcebe 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -29,8 +29,8 @@ static WRITE16_HANDLER( vaportra_sound_w )
{
/* Force synchronisation between CPUs with fake timer */
timer_call_after_resynch(NULL, 0, NULL);
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1,0,ASSERT_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1,0,ASSERT_LINE);
}
static READ16_HANDLER( vaportra_control_r )
@@ -93,18 +93,18 @@ ADDRESS_MAP_END
static READ8_HANDLER( vaportra_soundlatch_r )
{
- cpunum_set_input_line(Machine, 1,0,CLEAR_LINE);
- return soundlatch_r(offset);
+ cpunum_set_input_line(machine, 1,0,CLEAR_LINE);
+ return soundlatch_r(machine, offset);
}
static WRITE8_HANDLER( YM2151_w )
{
switch (offset) {
case 0:
- YM2151_register_port_0_w(0,data);
+ YM2151_register_port_0_w(machine,0,data);
break;
case 1:
- YM2151_data_port_0_w(0,data);
+ YM2151_data_port_0_w(machine,0,data);
break;
}
}
@@ -113,10 +113,10 @@ static WRITE8_HANDLER( YM2203_w )
{
switch (offset) {
case 0:
- YM2203_control_port_0_w(0,data);
+ YM2203_control_port_0_w(machine,0,data);
break;
case 1:
- YM2203_write_port_0_w(0,data);
+ YM2203_write_port_0_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 04a5842a7f8..90e9d0e47b9 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -143,8 +143,8 @@ static WRITE8_HANDLER( vb_bankswitch_w )
static WRITE8_HANDLER( cpu_sound_command_w ) {
- soundlatch_w( offset, data );
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w( machine, offset, data );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index 4b8006d0c19..f0f99e6240d 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -26,20 +26,20 @@ static WRITE32_HANDLER( vega_vram_w )
switch(mem_mask)
{
case 0:
- vega_vram_w(offset,data,0x00ffffff);
- vega_vram_w(offset,data,0xff00ffff);
- vega_vram_w(offset,data,0xffff00ff);
- vega_vram_w(offset,data,0xffffff00);
+ vega_vram_w(machine,offset,data,0x00ffffff);
+ vega_vram_w(machine,offset,data,0xff00ffff);
+ vega_vram_w(machine,offset,data,0xffff00ff);
+ vega_vram_w(machine,offset,data,0xffffff00);
return;
case 0x0000ffff:
- vega_vram_w(offset,data,0x00ffffff);
- vega_vram_w(offset,data,0xff00ffff);
+ vega_vram_w(machine,offset,data,0x00ffffff);
+ vega_vram_w(machine,offset,data,0xff00ffff);
return;
case 0xffff0000:
- vega_vram_w(offset,data,0xffff00ff);
- vega_vram_w(offset,data,0xffffff00);
+ vega_vram_w(machine,offset,data,0xffff00ff);
+ vega_vram_w(machine,offset,data,0xffffff00);
return;
default:
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 67f07a39fd9..721d1f4842f 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -484,8 +484,8 @@ static struct dynamic_address
{
offs_t start;
offs_t end;
- read32_handler read;
- write32_handler write;
+ read32_machine_func read;
+ write32_machine_func write;
const char * rdname;
const char * wrname;
} dynamic[MAX_DYNAMIC_ADDRESSES];
@@ -1086,7 +1086,7 @@ static READ32_HANDLER( nile_r )
case NREG_BAR7:
case NREG_BAR8:
case NREG_BARB:
- result = pci_bridge_r(offset & 0x3f, mem_mask);
+ result = pci_bridge_r(machine, offset & 0x3f, mem_mask);
break;
}
@@ -1235,7 +1235,7 @@ static WRITE32_HANDLER( nile_w )
case NREG_BAR7:
case NREG_BAR8:
case NREG_BARB:
- pci_bridge_w(offset & 0x3f, data, mem_mask);
+ pci_bridge_w(machine, offset & 0x3f, data, mem_mask);
break;
case NREG_DCS2:
@@ -1482,25 +1482,25 @@ static WRITE32_HANDLER( asic_fifo_w )
static READ32_HANDLER( ide_main_r )
{
- return ide_controller32_0_r(0x1f0/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x1f0/4 + offset, mem_mask);
}
static WRITE32_HANDLER( ide_main_w )
{
- ide_controller32_0_w(0x1f0/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x1f0/4 + offset, data, mem_mask);
}
static READ32_HANDLER( ide_alt_r )
{
- return ide_controller32_0_r(0x3f4/4 + offset, mem_mask);
+ return ide_controller32_0_r(machine, 0x3f4/4 + offset, mem_mask);
}
static WRITE32_HANDLER( ide_alt_w )
{
- ide_controller32_0_w(0x3f4/4 + offset, data, mem_mask);
+ ide_controller32_0_w(machine, 0x3f4/4 + offset, data, mem_mask);
}
@@ -1508,9 +1508,9 @@ static READ32_HANDLER( ethernet_r )
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= smc91c94_r(offset * 2 + 0, mem_mask);
+ result |= smc91c94_r(machine, offset * 2 + 0, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= smc91c94_r(offset * 2 + 1, mem_mask >> 16) << 16;
+ result |= smc91c94_r(machine, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@@ -1518,9 +1518,9 @@ static READ32_HANDLER( ethernet_r )
static WRITE32_HANDLER( ethernet_w )
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- smc91c94_w(offset * 2 + 0, data, mem_mask);
+ smc91c94_w(machine, offset * 2 + 0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- smc91c94_w(offset * 2 + 1, data >> 16, mem_mask >> 16);
+ smc91c94_w(machine, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@@ -1539,7 +1539,7 @@ static WRITE32_HANDLER( dcs3_fifo_full_w )
#define add_dynamic_address(s,e,r,w) _add_dynamic_address(s,e,r,w,#r,#w)
-INLINE void _add_dynamic_address(offs_t start, offs_t end, read32_handler read, write32_handler write, const char *rdname, const char *wrname)
+INLINE void _add_dynamic_address(offs_t start, offs_t end, read32_machine_func read, write32_machine_func write, const char *rdname, const char *wrname)
{
dynamic[dynamic_count].start = start;
dynamic[dynamic_count].end = end;
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 1cc1c1b46a3..885754163fd 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -188,15 +188,15 @@ static WRITE8_HANDLER( vendetta_eeprom_w )
/********************************************/
-static READ8_HANDLER( vendetta_K052109_r ) { return K052109_r( offset + 0x2000 ); }
-//static WRITE8_HANDLER( vendetta_K052109_w ) { K052109_w( offset + 0x2000, data ); }
+static READ8_HANDLER( vendetta_K052109_r ) { return K052109_r( machine, offset + 0x2000 ); }
+//static WRITE8_HANDLER( vendetta_K052109_w ) { K052109_w( machine, offset + 0x2000, data ); }
static WRITE8_HANDLER( vendetta_K052109_w ) {
// *************************************************************************************
// * Escape Kids uses 052109's mirrored Tilemap ROM bank selector, but only during *
// * Tilemap MASK-ROM Test (0x1d80<->0x3d80, 0x1e00<->0x3e00, 0x1f00<->0x3f00) *
// *************************************************************************************
- if ( ( offset == 0x1d80 ) || ( offset == 0x1e00 ) || ( offset == 0x1f00 ) ) K052109_w( offset, data );
- K052109_w( offset + 0x2000, data );
+ if ( ( offset == 0x1d80 ) || ( offset == 0x1e00 ) || ( offset == 0x1f00 ) ) K052109_w( machine, offset, data );
+ K052109_w( machine, offset + 0x2000, data );
}
static offs_t video_banking_base;
@@ -240,25 +240,25 @@ static TIMER_CALLBACK( z80_nmi_callback )
static WRITE8_HANDLER( z80_arm_nmi_w )
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, CLEAR_LINE );
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, CLEAR_LINE );
timer_set( ATTOTIME_IN_USEC( 25 ), NULL, 0, z80_nmi_callback );
}
static WRITE8_HANDLER( z80_irq_w )
{
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff );
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff );
}
static READ8_HANDLER( vendetta_sound_interrupt_r )
{
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff );
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff );
return 0x00;
}
static READ8_HANDLER( vendetta_sound_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine, 2 + offset);
}
/********************************************/
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 7976e3957cf..04347cf990a 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -271,8 +271,8 @@ static READ8_HANDLER( depthch_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x08) ret = input_port_1_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine, 0);
+ if (offset & 0x08) ret = input_port_1_r(machine, 0);
return ret;
}
@@ -281,7 +281,7 @@ static READ8_HANDLER( depthch_io_r )
static WRITE8_HANDLER( depthch_io_w )
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x04) depthch_audio_w(0, data);
+ if (offset & 0x04) depthch_audio_w(machine, 0, data);
}
@@ -353,8 +353,8 @@ static READ8_HANDLER( safari_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x08) ret = input_port_1_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine,0);
+ if (offset & 0x08) ret = input_port_1_r(machine,0);
return ret;
}
@@ -437,8 +437,8 @@ static READ8_HANDLER( frogs_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x08) ret = input_port_1_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine,0);
+ if (offset & 0x08) ret = input_port_1_r(machine,0);
return ret;
}
@@ -447,7 +447,7 @@ static READ8_HANDLER( frogs_io_r )
static WRITE8_HANDLER( frogs_io_w )
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x02) frogs_audio_w(0, data);
+ if (offset & 0x02) frogs_audio_w(machine, 0, data);
}
@@ -545,8 +545,8 @@ static READ8_HANDLER( headon_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x08) ret = input_port_1_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine,0);
+ if (offset & 0x08) ret = input_port_1_r(machine,0);
return ret;
}
@@ -556,9 +556,9 @@ static READ8_HANDLER( sspaceat_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x04) ret = input_port_1_r(0);
- if (offset & 0x08) ret = input_port_2_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine, 0);
+ if (offset & 0x04) ret = input_port_1_r(machine, 0);
+ if (offset & 0x08) ret = input_port_2_r(machine, 0);
return ret;
}
@@ -567,7 +567,7 @@ static READ8_HANDLER( sspaceat_io_r )
static WRITE8_HANDLER( headon_io_w )
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x02) headon_audio_w(0, data);
+ if (offset & 0x02) headon_audio_w(machine, 0, data);
if (offset & 0x04) /* vicdual_palette_bank_w(0, data) */; /* not written to */
}
@@ -745,10 +745,10 @@ static READ8_HANDLER( headon2_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine, 0);
if (offset & 0x02) /* schematics show this as in input port, but never read from */
- if (offset & 0x04) ret = input_port_1_r(0);
- if (offset & 0x08) ret = input_port_2_r(0);
+ if (offset & 0x04) ret = input_port_1_r(machine, 0);
+ if (offset & 0x08) ret = input_port_2_r(machine, 0);
if (offset & 0x12) logerror("********* Read from port %x\n", offset);
return ret;
@@ -758,8 +758,8 @@ static READ8_HANDLER( headon2_io_r )
static WRITE8_HANDLER( headon2_io_w )
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x02) headon_audio_w(0, data);
- if (offset & 0x04) vicdual_palette_bank_w(0, data);
+ if (offset & 0x02) headon_audio_w(machine, 0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(machine, 0, data);
if (offset & 0x08) ;/* schematics show this as going into a shifer circuit, but never written to */
if (offset & 0x10) ;/* schematics show this as going to an edge connector, but never written to */
if (offset & 0x18) logerror("********* Write to port %x\n", offset);
@@ -772,7 +772,7 @@ static WRITE8_HANDLER( digger_io_w )
if (offset & 0x02) /* digger_audio_1_w(0, data) */;
if (offset & 0x04)
{
- vicdual_palette_bank_w(0, data & 0x03);
+ vicdual_palette_bank_w(machine, 0, data & 0x03);
/* digger_audio_2_w(0, data & 0xfc) */;
}
@@ -963,71 +963,71 @@ MACHINE_DRIVER_END
static WRITE8_HANDLER( invho2_io_w )
{
- if (offset & 0x01) invho2_audio_w(0, data);
- if (offset & 0x02) invinco_audio_w(0, data);
+ if (offset & 0x01) invho2_audio_w(machine, 0, data);
+ if (offset & 0x02) invinco_audio_w(machine, 0, data);
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
static WRITE8_HANDLER( invds_io_w )
{
- if (offset & 0x01) invinco_audio_w(0, data);
+ if (offset & 0x01) invinco_audio_w(machine, 0, data);
if (offset & 0x02) /* deepscan_audio_w(0, data) */;
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
static WRITE8_HANDLER( sspacaho_io_w )
{
- if (offset & 0x01) invho2_audio_w(0, data);
- if (offset & 0x02) /* sspaceatt_audio_w(0, data) */;
+ if (offset & 0x01) invho2_audio_w(machine, 0, data);
+ if (offset & 0x02) /* sspaceatt_audio_w(machine, 0, data) */;
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
static WRITE8_HANDLER( tranqgun_io_w )
{
- if (offset & 0x01) /* tranqgun_audio_w(0, data) */;
- if (offset & 0x02) vicdual_palette_bank_w(0, data);
+ if (offset & 0x01) /* tranqgun_audio_w(machine, 0, data) */;
+ if (offset & 0x02) vicdual_palette_bank_w(machine, 0, data);
if (offset & 0x08) assert_coin_status();
}
static WRITE8_HANDLER( spacetrk_io_w )
{
- if (offset & 0x01) /* spacetrk_audio_w(0, data) */;
- if (offset & 0x02) /* spacetrk_audio_w(0, data) */;
+ if (offset & 0x01) /* spacetrk_audio_w(machine, 0, data) */;
+ if (offset & 0x02) /* spacetrk_audio_w(machine, 0, data) */;
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
static WRITE8_HANDLER( carnival_io_w )
{
- if (offset & 0x01) carnival_audio_1_w(0, data);
- if (offset & 0x02) carnival_audio_2_w(0, data);
+ if (offset & 0x01) carnival_audio_1_w(machine, 0, data);
+ if (offset & 0x02) carnival_audio_2_w(machine, 0, data);
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
static WRITE8_HANDLER( brdrline_io_w )
{
- if (offset & 0x01) /* brdrline_audio_w(0, data) */;
- if (offset & 0x02) vicdual_palette_bank_w(0, data);
+ if (offset & 0x01) /* brdrline_audio_w(machine, 0, data) */;
+ if (offset & 0x02) vicdual_palette_bank_w(machine, 0, data);
if (offset & 0x08) assert_coin_status();
}
static WRITE8_HANDLER( pulsar_io_w )
{
- if (offset & 0x01) pulsar_audio_1_w(0, data);
- if (offset & 0x02) pulsar_audio_2_w(0, data);
+ if (offset & 0x01) pulsar_audio_1_w(machine, 0, data);
+ if (offset & 0x02) pulsar_audio_2_w(machine, 0, data);
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
@@ -1037,7 +1037,7 @@ static WRITE8_HANDLER( heiankyo_io_w )
if (offset & 0x02)
{
- vicdual_palette_bank_w(0, data & 0x03);
+ vicdual_palette_bank_w(machine, 0, data & 0x03);
/* heiankyo_audio_2_w(0, data & 0xfc) */;
}
@@ -1050,7 +1050,7 @@ static WRITE8_HANDLER( alphaho_io_w )
if (offset & 0x01) /* headon_audio_w(0, data) */;
if (offset & 0x02) /* alphaf_audio_w(0, data) */;
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
@@ -1992,7 +1992,7 @@ static WRITE8_HANDLER( samurai_io_w )
{
if (offset & 0x02) /* samurai_audio_w(0, data) */;
if (offset & 0x08) assert_coin_status();
- if (offset & 0x40) vicdual_palette_bank_w(0, data);
+ if (offset & 0x40) vicdual_palette_bank_w(machine, 0, data);
}
@@ -2099,8 +2099,8 @@ static READ8_HANDLER( nsub_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x08) ret = input_port_1_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine,0);
+ if (offset & 0x08) ret = input_port_1_r(machine,0);
return ret;
}
@@ -2110,7 +2110,7 @@ static WRITE8_HANDLER( nsub_io_w )
{
if (offset & 0x01) assert_coin_status();
if (offset & 0x02) /* nsub_audio_w(0, data) */;
- if (offset & 0x04) vicdual_palette_bank_w(0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(machine, 0, data);
}
@@ -2194,9 +2194,9 @@ static READ8_HANDLER( invinco_io_r )
{
UINT8 ret = 0;
- if (offset & 0x01) ret = input_port_0_r(0);
- if (offset & 0x02) ret = input_port_1_r(0);
- if (offset & 0x08) ret = input_port_2_r(0);
+ if (offset & 0x01) ret = input_port_0_r(machine,0);
+ if (offset & 0x02) ret = input_port_1_r(machine,0);
+ if (offset & 0x08) ret = input_port_2_r(machine,0);
return ret;
}
@@ -2205,8 +2205,8 @@ static READ8_HANDLER( invinco_io_r )
static WRITE8_HANDLER( invinco_io_w )
{
if (offset & 0x01) assert_coin_status();
- if (offset & 0x02) invinco_audio_w(0, data);
- if (offset & 0x04) vicdual_palette_bank_w(0, data);
+ if (offset & 0x02) invinco_audio_w(machine, 0, data);
+ if (offset & 0x04) vicdual_palette_bank_w(machine, 0, data);
}
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 13947ec5eab..852ef73e420 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -72,8 +72,8 @@ static MACHINE_RESET( videopin )
/* both output latches are cleared on reset */
- videopin_out1_w(0, 0);
- videopin_out2_w(0, 0);
+ videopin_out1_w(machine, 0, 0);
+ videopin_out2_w(machine, 0, 0);
}
@@ -134,7 +134,7 @@ static WRITE8_HANDLER( videopin_led_w )
if (i == 7)
set_led_status(0, data & 8); /* start button */
- cpunum_set_input_line(Machine, 0, 0, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, 0, CLEAR_LINE);
}
@@ -152,12 +152,12 @@ static WRITE8_HANDLER( videopin_out1_w )
mask = ~data & 0x10;
if (mask)
- cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE);
coin_lockout_global_w(~data & 0x08);
/* Convert octave data to divide value and write to sound */
- discrete_sound_w(VIDEOPIN_OCTAVE_DATA, (0x01 << (~data & 0x07)) & 0xfe);
+ discrete_sound_w(machine, VIDEOPIN_OCTAVE_DATA, (0x01 << (~data & 0x07)) & 0xfe);
}
@@ -174,17 +174,17 @@ static WRITE8_HANDLER( videopin_out2_w )
coin_counter_w(0, data & 0x10);
- discrete_sound_w(VIDEOPIN_BELL_EN, data & 0x40); // Bell
- discrete_sound_w(VIDEOPIN_BONG_EN, data & 0x20); // Bong
- discrete_sound_w(VIDEOPIN_ATTRACT_EN, data & 0x80); // Attract
- discrete_sound_w(VIDEOPIN_VOL_DATA, data & 0x07); // Vol0,1,2
+ discrete_sound_w(machine, VIDEOPIN_BELL_EN, data & 0x40); // Bell
+ discrete_sound_w(machine, VIDEOPIN_BONG_EN, data & 0x20); // Bong
+ discrete_sound_w(machine, VIDEOPIN_ATTRACT_EN, data & 0x80); // Attract
+ discrete_sound_w(machine, VIDEOPIN_VOL_DATA, data & 0x07); // Vol0,1,2
}
static WRITE8_HANDLER( videopin_note_dvsr_w )
{
/* note data */
- discrete_sound_w(VIDEOPIN_NOTE_DATA, ~data &0xff);
+ discrete_sound_w(machine, VIDEOPIN_NOTE_DATA, ~data &0xff);
}
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 869faac3d17..7d7a7574d42 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -81,22 +81,22 @@ static void mpc8240_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
static READ64_HANDLER( pci_config_addr_r )
{
- return pci_64be_r(0, U64(0x00000000ffffffff));
+ return pci_64be_r(machine, 0, U64(0x00000000ffffffff));
}
static WRITE64_HANDLER( pci_config_addr_w )
{
- pci_64be_w(0, data, U64(0x00000000ffffffff));
+ pci_64be_w(machine, 0, data, U64(0x00000000ffffffff));
}
static READ64_HANDLER( pci_config_data_r )
{
- return pci_64be_r(1, U64(0xffffffff00000000)) << 32;
+ return pci_64be_r(machine, 1, U64(0xffffffff00000000)) << 32;
}
static WRITE64_HANDLER( pci_config_data_w )
{
- pci_64be_w(1, data >> 32, U64(0xffffffff00000000));
+ pci_64be_w(machine, 1, data >> 32, U64(0xffffffff00000000));
}
@@ -153,11 +153,11 @@ static WRITE32_HANDLER( epic_w )
static READ64_HANDLER(epic_64be_r)
{
- return read64be_with_32le_handler(epic_r, offset, mem_mask);
+ return read64be_with_32le_handler(epic_r, machine, offset, mem_mask);
}
static WRITE64_HANDLER(epic_64be_w)
{
- write64be_with_32le_handler(epic_w, offset, data, mem_mask);
+ write64be_with_32le_handler(epic_w, machine, offset, data, mem_mask);
}
@@ -529,32 +529,32 @@ static void voodoo3_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
static READ64_HANDLER(voodoo3_io_r)
{
- return read64be_with_32le_handler(banshee_io_0_r, offset, mem_mask);
+ return read64be_with_32le_handler(banshee_io_0_r, machine, offset, mem_mask);
}
static WRITE64_HANDLER(voodoo3_io_w)
{
// printf("voodoo3_io_w: %08X%08X, %08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data), offset, activecpu_get_pc());
- write64be_with_32le_handler(banshee_io_0_w, offset, data, mem_mask);
+ write64be_with_32le_handler(banshee_io_0_w, machine, offset, data, mem_mask);
}
static READ64_HANDLER(voodoo3_r)
{
- return read64be_with_32le_handler(banshee_0_r, offset, mem_mask);
+ return read64be_with_32le_handler(banshee_0_r, machine, offset, mem_mask);
}
static WRITE64_HANDLER(voodoo3_w)
{
// printf("voodoo3_w: %08X%08X, %08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data), offset, activecpu_get_pc());
- write64be_with_32le_handler(banshee_0_w, offset, data, mem_mask);
+ write64be_with_32le_handler(banshee_0_w, machine, offset, data, mem_mask);
}
static READ64_HANDLER(voodoo3_lfb_r)
{
- return read64be_with_32le_handler(banshee_fb_0_r, offset, mem_mask);
+ return read64be_with_32le_handler(banshee_fb_0_r, machine, offset, mem_mask);
}
static WRITE64_HANDLER(voodoo3_lfb_w)
{
// printf("voodoo3_lfb_w: %08X%08X, %08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data), offset, activecpu_get_pc());
- write64be_with_32le_handler(banshee_fb_0_w, offset, data, mem_mask);
+ write64be_with_32le_handler(banshee_fb_0_w, machine, offset, data, mem_mask);
}
@@ -565,11 +565,11 @@ static READ64_HANDLER(m48t58_r)
if ((mem_mask & U64(0xffffffff00000000)) != U64(0xffffffff00000000))
{
- r |= (UINT64)timekeeper_0_32be_r((offset * 2) + 0, (UINT32)(mem_mask >> 32)) << 32;
+ r |= (UINT64)timekeeper_0_32be_r(machine, (offset * 2) + 0, (UINT32)(mem_mask >> 32)) << 32;
}
if ((mem_mask & U64(0x00000000ffffffff)) != U64(0x00000000ffffffff))
{
- r |= timekeeper_0_32be_r((offset * 2) + 1, (UINT32)(mem_mask));
+ r |= timekeeper_0_32be_r(machine, (offset * 2) + 1, (UINT32)(mem_mask));
}
return r;
@@ -579,11 +579,11 @@ static WRITE64_HANDLER(m48t58_w)
{
if (!(mem_mask & U64(0xffffffff00000000)))
{
- timekeeper_0_32be_w((offset * 2) + 0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
+ timekeeper_0_32be_w(machine, (offset * 2) + 0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
}
if (!(mem_mask & U64(0x00000000ffffffff)))
{
- timekeeper_0_32be_w((offset * 2) + 1, (UINT32)(data), (UINT32)(mem_mask));
+ timekeeper_0_32be_w(machine, (offset * 2) + 1, (UINT32)(data), (UINT32)(mem_mask));
}
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 80803b13c43..7b641760fd8 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -208,7 +208,7 @@ static WRITE16_HANDLER( vmetal_es8712_w )
16 002a 000e 0083 00ee 000f 0069 0069 0e832a-0f69ee
*/
- ES8712_data_0_lsb_w(offset, data, mem_mask);
+ ES8712_data_0_lsb_w(machine, offset, data, mem_mask);
logerror("PC:%06x - Writing %04x to ES8712 offset %02x\n",activecpu_get_previouspc(),data,offset);
}
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 07287c521b2..263bf64e664 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -240,32 +240,32 @@ static WRITE8_HANDLER( vsnes_coin_counter_1_w )
static READ8_HANDLER( psg_4015_r )
{
- return NESPSG_0_r(0x15);
+ return NESPSG_0_r(machine, 0x15);
}
static WRITE8_HANDLER( psg_4015_w )
{
- NESPSG_0_w(0x15, data);
+ NESPSG_0_w(machine, 0x15, data);
}
static WRITE8_HANDLER( psg_4017_w )
{
- NESPSG_0_w(0x17, data);
+ NESPSG_0_w(machine, 0x17, data);
}
static READ8_HANDLER( psg1_4015_r )
{
- return NESPSG_1_r(0x15);
+ return NESPSG_1_r(machine, 0x15);
}
static WRITE8_HANDLER( psg1_4015_w )
{
- NESPSG_1_w(0x15, data);
+ NESPSG_1_w(machine, 0x15, data);
}
static WRITE8_HANDLER( psg1_4017_w )
{
- NESPSG_1_w(0x17, data);
+ NESPSG_1_w(machine, 0x17, data);
}
static ADDRESS_MAP_START( vsnes_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index bdd4ffe9e10..266f9676947 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -174,8 +174,8 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
void wardner_restore_bank(void)
{
- wardner_ramrom_bank_sw(0,1); /* Dummy value to ensure restoration */
- wardner_ramrom_bank_sw(0,wardner_membank);
+ wardner_ramrom_bank_sw(Machine,0,1); /* Dummy value to ensure restoration */
+ wardner_ramrom_bank_sw(Machine,0,wardner_membank);
}
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index b06054195b4..3000e9851b8 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -176,7 +176,7 @@ static WRITE8_HANDLER( geebee_out6_w )
/* n.c. */
break;
case 3:
- geebee_sound_w(0,data);
+ geebee_sound_w(machine,0,data);
break;
}
}
@@ -255,10 +255,10 @@ static WRITE8_HANDLER( warpwarp_out0_w )
warpwarp_ball_v = data;
break;
case 2:
- warpwarp_sound_w(0,data);
+ warpwarp_sound_w(machine,0,data);
break;
case 3:
- watchdog_reset_w(0,data);
+ watchdog_reset_w(machine,0,data);
break;
}
}
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 4610519373e..ee00bb3aaa3 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -181,15 +181,15 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( warriorb_sound_w )
{
if (offset == 0)
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
else if (offset == 1)
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
}
static READ16_HANDLER( warriorb_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff));
+ return ((taitosound_comm_r (machine,0) & 0xff));
else return 0;
}
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index a34b9d542f2..c5b7ba1ee52 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -110,8 +110,8 @@ static WRITE8_HANDLER( wc90_bankswitch1_w )
static WRITE8_HANDLER( wc90_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 2,INPUT_LINE_NMI,PULSE_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 2,INPUT_LINE_NMI,PULSE_LINE);
}
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 3c442670234..f72219a5aa4 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -129,8 +129,8 @@ static WRITE8_HANDLER( wc90b_bankswitch1_w )
static WRITE8_HANDLER( wc90b_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 2,0,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 2,0,HOLD_LINE);
}
static WRITE8_HANDLER( adpcm_control_w )
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index b988ca1c38e..a4ad904efea 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -408,9 +408,9 @@ static READ16_HANDLER( selected_ip_r )
{
switch ( (wecleman_selected_ip >> 5) & 3 )
{ // From WEC Le Mans Schems:
- case 0: return input_port_4_r(offset); // Accel - Schems: Accelevr
+ case 0: return input_port_4_r(machine, offset); // Accel - Schems: Accelevr
case 1: return ~0; // ????? - Schems: Not Used
- case 2: return input_port_5_r(offset); // Wheel - Schems: Handlevr
+ case 2: return input_port_5_r(machine, offset); // Wheel - Schems: Handlevr
case 3: return ~0; // Table - Schems: Turnvr
default: return ~0;
@@ -563,32 +563,32 @@ ADDRESS_MAP_END
static READ16_HANDLER( hotchase_K051316_0_r )
{
- return K051316_0_r(offset) & 0xff;
+ return K051316_0_r(machine, offset) & 0xff;
}
static READ16_HANDLER( hotchase_K051316_1_r )
{
- return K051316_1_r(offset) & 0xff;
+ return K051316_1_r(machine, offset) & 0xff;
}
static WRITE16_HANDLER( hotchase_K051316_0_w )
{
- if (ACCESSING_LSB) K051316_0_w(offset, data & 0xff);
+ if (ACCESSING_LSB) K051316_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_1_w )
{
- if (ACCESSING_LSB) K051316_1_w(offset, data & 0xff);
+ if (ACCESSING_LSB) K051316_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_ctrl_0_w )
{
- if (ACCESSING_LSB) K051316_ctrl_0_w(offset, data & 0xff);
+ if (ACCESSING_LSB) K051316_ctrl_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_ctrl_1_w )
{
- if (ACCESSING_LSB) K051316_ctrl_1_w(offset, data & 0xff);
+ if (ACCESSING_LSB) K051316_ctrl_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_soundlatch_w );
@@ -651,8 +651,8 @@ WRITE16_HANDLER( wecleman_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xFF);
- cpunum_set_input_line(Machine, 2,0, HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xFF);
+ cpunum_set_input_line(machine, 2,0, HOLD_LINE);
}
}
@@ -719,8 +719,8 @@ static WRITE16_HANDLER( hotchase_soundlatch_w )
{
if (ACCESSING_LSB)
{
- soundlatch_w(0,data & 0xFF);
- cpunum_set_input_line(Machine, 2,M6809_IRQ_LINE, HOLD_LINE);
+ soundlatch_w(machine,0,data & 0xFF);
+ cpunum_set_input_line(machine, 2,M6809_IRQ_LINE, HOLD_LINE);
}
}
@@ -791,11 +791,11 @@ static WRITE8_HANDLER( hotchase_sound_control_w )
#define HOTCHASE_K007232_RW(_chip_) \
static READ8_HANDLER( hotchase_K007232_##_chip_##_r ) \
{ \
- return K007232_read_port_##_chip_##_r(offset ^ 1); \
+ return K007232_read_port_##_chip_##_r(machine, offset ^ 1); \
} \
static WRITE8_HANDLER( hotchase_K007232_##_chip_##_w ) \
{ \
- K007232_write_port_##_chip_##_w(offset ^ 1, data); \
+ K007232_write_port_##_chip_##_w(machine, offset ^ 1, data); \
} \
/* 3 x K007232 */
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 1ebcb9efbc7..0f134561121 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -347,8 +347,8 @@ static WRITE16_HANDLER( sound_command_w )
if (ACCESSING_LSB)
{
pending_command = 1;
- soundlatch_w(0, data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index bf113a34106..9ea63643593 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -636,15 +636,15 @@ static WRITE8_HANDLER( sound_bankswitch_w )
static WRITE16_HANDLER( wgp_sound_w )
{
if (offset == 0)
- taitosound_port_w (0, data & 0xff);
+ taitosound_port_w (machine, 0, data & 0xff);
else if (offset == 1)
- taitosound_comm_w (0, data & 0xff);
+ taitosound_comm_w (machine, 0, data & 0xff);
}
static READ16_HANDLER( wgp_sound_r )
{
if (offset == 1)
- return ((taitosound_comm_r (0) & 0xff));
+ return ((taitosound_comm_r (machine, 0) & 0xff));
else return 0;
}
diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c
index 3a2f1ad3a9c..ea3765fc546 100644
--- a/src/mame/drivers/wilytowr.c
+++ b/src/mame/drivers/wilytowr.c
@@ -229,13 +229,13 @@ static WRITE8_HANDLER( snddata_w )
{
int num_ays = (sndti_exists(SOUND_AY8910, 1)) ? 2 : 1;
if ((p2 & 0xf0) == 0xe0)
- AY8910_control_port_0_w(0,offset);
+ AY8910_control_port_0_w(machine,0,offset);
else if ((p2 & 0xf0) == 0xa0)
- AY8910_write_port_0_w(0,offset);
+ AY8910_write_port_0_w(machine,0,offset);
else if (num_ays == 2 && (p1 & 0xe0) == 0x60)
- AY8910_control_port_1_w(0,offset);
+ AY8910_control_port_1_w(machine,0,offset);
else if (num_ays == 2 && (p1 & 0xe0) == 0x40)
- AY8910_write_port_1_w(0,offset);
+ AY8910_write_port_1_w(machine,0,offset);
else // if ((p2 & 0xf0) != 0x70)
/* the port address is the data, while the data seems to be control bits */
logerror("%04x: snddata_w ctrl = %02x, p1 = %02x, p2 = %02x, data = %02x\n",activecpu_get_pc(),data,p1,p2,offset);
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index d0bbf8038b1..0c39c48a84e 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -321,7 +321,7 @@ static READ8_HANDLER(read_a00x)
case 0x02: return reg_a002;
case 0x04: return readinputportbytag("A004");
case 0x05: return readinputportbytag("A005");
- case 0x0c: return input_port_0_r(0); // stats / reset
+ case 0x0c: return input_port_0_r(machine,0); // stats / reset
case 0x0e: return readinputportbytag("A00E");// coin/reset
}
@@ -331,11 +331,11 @@ static READ8_HANDLER(read_a00x)
switch(reg_a002&0x3f)
{
case 0x3b:
- return input_port_2_r(0);//bet10 / pay out
+ return input_port_2_r(machine,0);//bet10 / pay out
case 0x3e:
- return input_port_3_r(0);//TODO : trace f564
+ return input_port_3_r(machine,0);//TODO : trace f564
case 0x3d:
- return input_port_4_r(0);
+ return input_port_4_r(machine,0);
default:
logerror("A000 read with mux=0x%02x\n",reg_a002&0x3f);
}
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index defbc96f21a..a4a153bdb2d 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -187,24 +187,23 @@ VIDEO_UPDATE( kungfut );
static WRITE8_HANDLER( sound_command_w )
{
static int dsc0=1, dsc1=1;
-
switch (offset)
{
// 0x90 triggers a jump to non-existant address(development system?) and must be filtered
case 0x00:
- if (data != 0x90) soundlatch_w(0, data);
+ if (data != 0x90) soundlatch_w(machine, 0, data);
break;
// explosion sound trigger(analog?)
case 0x08:
- discrete_sound_w(STINGER_BOOM_EN1, dsc1);
- discrete_sound_w(STINGER_BOOM_EN2, dsc1^=1);
+ discrete_sound_w(machine, STINGER_BOOM_EN1, dsc1);
+ discrete_sound_w(machine, STINGER_BOOM_EN2, dsc1^=1);
break;
// player shot sound trigger(analog?)
case 0x0a:
- discrete_sound_w(STINGER_SHOT_EN1, dsc0);
- discrete_sound_w(STINGER_SHOT_EN2, dsc0^=1);
+ discrete_sound_w(machine, STINGER_SHOT_EN1, dsc0);
+ discrete_sound_w(machine, STINGER_SHOT_EN2, dsc0^=1);
break;
}
}
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 61c1aa9f373..48734169cd5 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -144,8 +144,8 @@ static WRITE16_HANDLER ( wwfsstar_scrollwrite )
static WRITE16_HANDLER ( wwfsstar_soundwrite )
{
- soundlatch_w(1,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
static WRITE16_HANDLER( wwfsstar_flipscreen_w )
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index b3c7fda06c8..70a67e3da0d 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -128,7 +128,7 @@ static READ16_HANDLER( wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_r )
static WRITE16_HANDLER( wwfwfest_paletteram16_xxxxBBBBGGGGRRRR_word_w )
{
offset = (offset & 0x000f) | (offset & 0x7fc0) >> 2;
- paletteram16_xxxxBBBBGGGGRRRR_word_w (offset, data, mem_mask);
+ paletteram16_xxxxBBBBGGGGRRRR_word_w (machine, offset, data, mem_mask);
}
/*- Priority Control -*/
@@ -199,8 +199,8 @@ static WRITE8_HANDLER( oki_bankswitch_w )
static WRITE16_HANDLER ( wwfwfest_soundwrite )
{
- soundlatch_w(1,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE );
+ soundlatch_w(machine,1,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
}
/*******************************************************************************
@@ -393,7 +393,7 @@ static const struct YM2151interface ym2151_interface =
static VIDEO_EOF( wwfwfest )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
/*******************************************************************************
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 97d498cb12b..e45a49358e5 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -199,8 +199,8 @@ static WRITE8_HANDLER( xainCPUB_bankswitch_w )
static WRITE8_HANDLER( xain_sound_command_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line(Machine, 2,M6809_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line(machine, 2,M6809_IRQ_LINE,HOLD_LINE);
}
static WRITE8_HANDLER( xain_main_irq_w )
@@ -446,8 +446,8 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_START( xsleena )
{
/* initialize the bank pointers */
- xainCPUA_bankswitch_w(0,0);
- xainCPUB_bankswitch_w(0,0);
+ xainCPUA_bankswitch_w(machine,0,0);
+ xainCPUB_bankswitch_w(machine,0,0);
}
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 2cfa2f889cd..cf9f607a092 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -207,7 +207,7 @@ static READ16_HANDLER( control1_r )
/* bit 0 is EEPROM data */
/* bit 1 is EEPROM ready */
/* bit 3 is service button */
- res = EEPROM_read_bit() | input_port_1_r(0);
+ res = EEPROM_read_bit() | input_port_1_r(machine, 0);
if (init_eeprom_count)
{
@@ -256,9 +256,9 @@ static WRITE16_HANDLER( sound_cmd1_w )
{
// anyone knows why 0x1a keeps lurking the sound queue in the world version???
if (xexex_strip0x1a)
- if (soundlatch2_r(0)==1 && data==0x1a) return;
+ if (soundlatch2_r(machine, 0)==1 && data==0x1a) return;
- soundlatch_w(0, data & 0xff);
+ soundlatch_w(machine, 0, data & 0xff);
}
}
@@ -266,18 +266,18 @@ static WRITE16_HANDLER( sound_cmd2_w )
{
if (ACCESSING_LSB)
{
- soundlatch2_w(0, data & 0xff);
+ soundlatch2_w(machine, 0, data & 0xff);
}
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( sound_status_r )
{
- return soundlatch3_r(0);
+ return soundlatch3_r(machine, 0);
}
static void reset_sound_region(void)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 69827247a2c..04f4b42851a 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -76,7 +76,7 @@ logerror("%06x eeprom_r\n",activecpu_get_pc());
/* bit 6 is EEPROM data */
/* bit 7 is EEPROM ready */
/* bit 14 is service button */
- res = (EEPROM_read_bit() << 6) | input_port_2_word_r(0,0);
+ res = (EEPROM_read_bit() << 6) | input_port_2_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -93,7 +93,7 @@ logerror("%06x xmen6p_eeprom_r\n",activecpu_get_pc());
/* bit 6 is EEPROM data */
/* bit 7 is EEPROM ready */
/* bit 14 is service button */
- res = (EEPROM_read_bit() << 6) | input_port_2_word_r(0,0);
+ res = (EEPROM_read_bit() << 6) | input_port_2_word_r(machine,0,0);
if (init_eeprom_count)
{
init_eeprom_count--;
@@ -129,20 +129,20 @@ logerror("%06x: write %04x to 108000\n",activecpu_get_pc(),data);
static READ16_HANDLER( sound_status_r )
{
- return soundlatch2_r(0);
+ return soundlatch2_r(machine,0);
}
static WRITE16_HANDLER( sound_cmd_w )
{
if (ACCESSING_LSB) {
data &= 0xff;
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
}
static WRITE16_HANDLER( sound_irq_w )
{
- cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
}
//int xmen_irqenabled;
@@ -151,7 +151,7 @@ static WRITE16_HANDLER( xmen_18fa00_w )
{
if(ACCESSING_LSB) {
/* bit 2 is interrupt enable */
- interrupt_enable_w(0,data & 0x04);
+ interrupt_enable_w(machine,0,data & 0x04);
// xmen_irqenabled = data;
}
}
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index bc80194e9c9..2bc1862c626 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -148,7 +148,7 @@ static WRITE16_HANDLER( bit_controls_w )
switch (offset)
{
case 7:
- ticket_dispenser_w(0, data << 7);
+ ticket_dispenser_w(machine, 0, data << 7);
break;
case 8:
@@ -208,7 +208,7 @@ static WRITE16_HANDLER( bit_controls_w )
static READ16_HANDLER( port0_r )
{
int result = readinputport(0);
- result ^= ticket_dispenser_r(0) >> 3;
+ result ^= ticket_dispenser_r(machine,0) >> 3;
return result;
}
@@ -222,7 +222,7 @@ static READ16_HANDLER( analogx_r )
static READ16_HANDLER( analogy_watchdog_r )
{
/* doubles as a watchdog address */
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
return (readinputportbytag("ANALOGY") << 8) | 0x00ff;
}
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 91de54d553b..81ae82b0918 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -158,8 +158,8 @@ number 0 on each voice. That sample is 00000-00000.
*/
if ((data&0xff)!=0x3a)
{
- soundlatch_w(0,data & 0xff);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine,0,data & 0xff);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
}
}
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index e652c51d48e..f5ed8bcc121 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -60,7 +60,7 @@ static MACHINE_RESET( yunsung8 )
yunsung8_videoram_0 = RAM + 0x0000; // Ram is banked
yunsung8_videoram_1 = RAM + 0x2000;
- yunsung8_videobank_w(0,0);
+ yunsung8_videobank_w(machine,0,0);
}
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 9f297815739..ee5c59a13a0 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -108,9 +108,9 @@ static int active_8910,port0a,acs;
static READ8_HANDLER( zaccaria_port0a_r )
{
if (active_8910 == 0)
- return AY8910_read_port_0_r(0);
+ return AY8910_read_port_0_r(machine,0);
else
- return AY8910_read_port_1_r(0);
+ return AY8910_read_port_1_r(machine,0);
}
static WRITE8_HANDLER( zaccaria_port0a_w )
@@ -128,9 +128,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
{
/* bit 0 goes to the 8910 #0 BC1 pin */
if (last & 0x01)
- AY8910_control_port_0_w(0,port0a);
+ AY8910_control_port_0_w(machine,0,port0a);
else
- AY8910_write_port_0_w(0,port0a);
+ AY8910_write_port_0_w(machine,0,port0a);
}
else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02)
{
@@ -143,9 +143,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
{
/* bit 2 goes to the 8910 #1 BC1 pin */
if (last & 0x04)
- AY8910_control_port_1_w(0,port0a);
+ AY8910_control_port_1_w(machine,0,port0a);
else
- AY8910_write_port_1_w(0,port0a);
+ AY8910_write_port_1_w(machine,0,port0a);
}
else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08)
{
@@ -161,7 +161,7 @@ static INTERRUPT_GEN( zaccaria_cb1_toggle )
{
static int toggle;
- pia_0_cb1_w(0,toggle & 1);
+ pia_0_cb1_w(machine,0,toggle & 1);
toggle ^= 1;
}
@@ -171,7 +171,7 @@ static int port1a,port1b;
static READ8_HANDLER( zaccaria_port1a_r )
{
- if (~port1b & 1) return tms5220_status_r(0);
+ if (~port1b & 1) return tms5220_status_r(machine,0);
else return port1a;
}
@@ -187,7 +187,7 @@ static WRITE8_HANDLER( zaccaria_port1b_w )
// bit 0 = /RS
// bit 1 = /WS
- if (~data & 2) tms5220_data_w(0,port1a);
+ if (~data & 2) tms5220_data_w(machine,0,port1a);
// bit 3 = "ACS" (goes, inverted, to input port 6 bit 3)
acs = ~data & 0x08;
@@ -210,7 +210,7 @@ return counter;
static void tms5220_irq_handler(int state)
{
- pia_1_cb1_w(0,state ? 0 : 1);
+ pia_1_cb1_w(Machine,0,state ? 0 : 1);
}
@@ -257,14 +257,14 @@ static MACHINE_RESET( zaccaria )
static WRITE8_HANDLER( sound_command_w )
{
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 2,0,(data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 2,0,(data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
}
static WRITE8_HANDLER( sound1_command_w )
{
- pia_0_ca1_w(0,data & 0x80);
- soundlatch2_w(0,data);
+ pia_0_ca1_w(machine,0,data & 0x80);
+ soundlatch2_w(machine,0,data);
}
static WRITE8_HANDLER( mc1408_data_w )
@@ -300,7 +300,7 @@ static READ8_HANDLER( zaccaria_prot2_r )
switch (offset)
{
case 0:
- return (input_port_6_r(0) & 0x07) | (acs & 0x08); /* bits 4 and 5 must be 0 in Jack Rabbit */
+ return (input_port_6_r(machine,0) & 0x07) | (acs & 0x08); /* bits 4 and 5 must be 0 in Jack Rabbit */
case 2:
return 0x10; /* Jack Rabbit */
@@ -324,7 +324,7 @@ static WRITE8_HANDLER( coin_w )
static WRITE8_HANDLER( nmienable_w )
{
- interrupt_enable_w(0,data & 1);
+ interrupt_enable_w(machine,0,data & 1);
}
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 556b80dcf1e..66d993bc73a 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -61,8 +61,8 @@ static WRITE16_HANDLER( zerozone_sound_w )
{
if (ACCESSING_MSB)
{
- soundlatch_w(offset,data >> 8);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data >> 8);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
}
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index b17647dd293..59fd2409006 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -624,8 +624,8 @@ static INTERRUPT_GEN( qsound_interrupt )
static WRITE32_HANDLER( zn_qsound_w )
{
- soundlatch_w(0, data);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ soundlatch_w(machine, 0, data);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
static DRIVER_INIT( coh1000c )
@@ -1197,18 +1197,18 @@ static WRITE8_HANDLER( fx1a_sound_bankswitch_w )
static READ32_HANDLER( taitofx1a_ymsound_r )
{
- return taitosound_comm_r(0)<<16;
+ return taitosound_comm_r(machine, 0)<<16;
}
static WRITE32_HANDLER( taitofx1a_ymsound_w )
{
if (mem_mask == 0xffff0000)
{
- taitosound_port_w(0, data&0xff);
+ taitosound_port_w(machine, 0, data&0xff);
}
else
{
- taitosound_comm_w(0, (data>>16)&0xff);
+ taitosound_comm_w(machine, 0, (data>>16)&0xff);
}
}
@@ -1705,7 +1705,7 @@ static void atpsx_dma_read( UINT32 n_address, INT32 n_size )
n_size <<= 2;
while( n_size > 0 )
{
- psxwritebyte( n_address, ide_controller32_0_r( 0x1f0 / 4, 0xffffff00 ) );
+ psxwritebyte( n_address, ide_controller32_0_r( Machine, 0x1f0 / 4, 0xffffff00 ) );
n_address++;
n_size--;
}
@@ -1899,7 +1899,7 @@ Notes:
static WRITE32_HANDLER( coh1002e_bank_w )
{
- znsecsel_w( offset, data, mem_mask );
+ znsecsel_w( machine, offset, data, mem_mask );
memory_set_bankptr( 1, memory_region( REGION_USER2 ) + ( ( data & 3 ) * 0x800000 ) );
}
@@ -1907,9 +1907,9 @@ static WRITE32_HANDLER( coh1002e_bank_w )
static WRITE32_HANDLER( coh1002e_latch_w )
{
if (offset)
- cpunum_set_input_line(Machine, 1, 2, HOLD_LINE); // irq 2 on the 68k
+ cpunum_set_input_line(machine, 1, 2, HOLD_LINE); // irq 2 on the 68k
else
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
}
static DRIVER_INIT( coh1002e )
@@ -1929,17 +1929,17 @@ static MACHINE_RESET( coh1002e )
static READ16_HANDLER( psarc_ymf_r )
{
- return YMF271_0_r(0);
+ return YMF271_0_r(machine,0);
}
static WRITE16_HANDLER( psarc_ymf_w )
{
- YMF271_0_w(offset, data);
+ YMF271_0_w(machine, offset, data);
}
static READ16_HANDLER( psarc_latch_r )
{
- return soundlatch_r(0);
+ return soundlatch_r(machine,0);
}
static ADDRESS_MAP_START( psarc_snd_map, ADDRESS_SPACE_PROGRAM, 16 )
@@ -2664,7 +2664,7 @@ static READ32_HANDLER( cbaj_z80_r )
cbaj_to_r3k &= ~2;
- return soundlatch2_r(0) | ready<<24;
+ return soundlatch2_r(machine,0) | ready<<24;
}
static WRITE32_HANDLER( cbaj_z80_w )
@@ -2698,7 +2698,7 @@ static READ8_HANDLER( cbaj_z80_latch_r )
static WRITE8_HANDLER( cbaj_z80_latch_w )
{
cbaj_to_r3k |= 2;
- soundlatch2_w(0, data);
+ soundlatch2_w(machine, 0, data);
}
static READ8_HANDLER( cbaj_z80_ready_r )
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index e00d44cffa3..05e2a1b27c7 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -358,9 +358,9 @@ static READ16_HANDLER( dual539_r )
UINT16 ret = 0;
if (ACCESSING_LSB16)
- ret |= K054539_1_r(offset);
+ ret |= K054539_1_r(machine, offset);
if (ACCESSING_MSB16)
- ret |= K054539_0_r(offset)<<8;
+ ret |= K054539_0_r(machine, offset)<<8;
return ret;
}
@@ -368,9 +368,9 @@ static READ16_HANDLER( dual539_r )
static WRITE16_HANDLER( dual539_w )
{
if (ACCESSING_LSB16)
- K054539_1_w(offset, data);
+ K054539_1_w(machine, offset, data);
if (ACCESSING_MSB16)
- K054539_0_w(offset, data>>8);
+ K054539_0_w(machine, offset, data>>8);
}
static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index d3b4fd3b15f..2de55287cbe 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -412,7 +412,7 @@ VIDEO_UPDATE( amiga );
UINT32 amiga_gethvpos(void);
void copper_setpc(UINT32 pc);
void amiga_set_genlock_color(UINT16 color);
-void amiga_render_scanline(bitmap_t *bitmap, int scanline);
+void amiga_render_scanline(running_machine *machine, bitmap_t *bitmap, int scanline);
void amiga_sprite_dma_reset(int which);
void amiga_sprite_enable_comparitor(int which, int enable);
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index dfcf23aa692..bdc043e1545 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -10,12 +10,12 @@ Crazy Ballooon
/*----------- defined in audio/crbaloon.c -----------*/
-void crbaloon_audio_set_music_freq(UINT8 freq);
-void crbaloon_audio_set_music_enable(int enabled);
+void crbaloon_audio_set_music_freq(running_machine *machine, UINT8 freq);
+void crbaloon_audio_set_music_enable(running_machine *machine, int enabled);
void crbaloon_audio_set_explosion_enable(int enabled);
void crbaloon_audio_set_breath_enable(int enabled);
void crbaloon_audio_set_appear_enable(int enabled);
-void crbaloon_audio_set_laugh_enable(int enabled);
+void crbaloon_audio_set_laugh_enable(running_machine *machine, int enabled);
MACHINE_DRIVER_EXTERN( crbaloon_audio );
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index 46e402a247c..2575ea36d9f 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -93,7 +93,7 @@ WRITE8_HANDLER( zzzap_audio_1_w );
WRITE8_HANDLER( zzzap_audio_2_w );
MACHINE_DRIVER_EXTERN( maze_audio );
-void maze_write_discrete(UINT8 maze_tone_timing_state);
+void maze_write_discrete(running_machine *machine, UINT8 maze_tone_timing_state);
MACHINE_DRIVER_EXTERN( boothill_audio );
WRITE8_HANDLER( boothill_audio_w );
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 95f13d819eb..2a7ad953f86 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -11,8 +11,8 @@ extern UINT16 *system24temp_sys16_shared_ram;
READ16_HANDLER( system24temp_sys16_shared_ram_r );
WRITE16_HANDLER( system24temp_sys16_shared_ram_w );
-void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(int port),
- void (*io_w)(int port, UINT8 data),
+void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(running_machine *machine, int port),
+ void (*io_w)(running_machine *machine, int port, UINT8 data),
void (*cnt_w)(UINT8 data),
READ16_HANDLER ((*iod_r)),
WRITE16_HANDLER((*iod_w)));
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index 1049bdf02eb..bd4c21105d4 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -140,23 +140,23 @@ WRITE8_HANDLER( ajax_ls138_f10_w )
switch ((offset & 0x01c0) >> 6){
case 0x00: /* NSFIRQ + AFR */
if (offset)
- watchdog_reset_w(0, data);
+ watchdog_reset_w(machine, 0, data);
else{
if (firq_enable) /* Cause interrupt on slave CPU */
- cpunum_set_input_line(Machine, 1, M6809_FIRQ_LINE, HOLD_LINE);
+ cpunum_set_input_line(machine, 1, M6809_FIRQ_LINE, HOLD_LINE);
}
break;
case 0x01: /* Cause interrupt on audio CPU */
- cpunum_set_input_line(Machine, 2, 0, HOLD_LINE);
+ cpunum_set_input_line(machine, 2, 0, HOLD_LINE);
break;
case 0x02: /* Sound command number */
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
break;
case 0x03: /* Bankswitch + coin counters + priority*/
- ajax_bankswitch_w(0, data);
+ ajax_bankswitch_w(machine, 0, data);
break;
case 0x05: /* Lamps + Joystick vibration + Control panel quaking */
- ajax_lamps_w(0, data);
+ ajax_lamps_w(machine, 0, data);
break;
default:
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index d59365c473d..1040082d3c6 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -320,7 +320,7 @@ static void amiga_m68k_reset(void)
}
else
{
- amiga_cia_w(0x1001/2, 1, 0);
+ amiga_cia_w(Machine, 0x1001/2, 1, 0);
}
if (activecpu_get_pc() < 0x80000)
@@ -345,7 +345,7 @@ MACHINE_RESET( amiga )
}
else
{
- amiga_cia_w(0x1001/2, 1, 0);
+ amiga_cia_w(machine, 0x1001/2, 1, 0);
}
/* call the system-specific callback */
@@ -372,7 +372,7 @@ static TIMER_CALLBACK( scanline_callback )
if (scanline == 0)
{
/* signal VBLANK IRQ */
- amiga_custom_w(REG_INTREQ, 0x8000 | INTENA_VERTB, 0);
+ amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_VERTB, 0);
/* clock the first CIA TOD */
cia_clock_tod(0);
@@ -387,7 +387,7 @@ static TIMER_CALLBACK( scanline_callback )
/* render up to this scanline */
if (scanline < machine->screen[0].visarea.min_y)
- amiga_render_scanline(NULL, scanline);
+ amiga_render_scanline(machine, NULL, scanline);
else
video_screen_update_partial(0, scanline);
@@ -984,7 +984,7 @@ static TIMER_CALLBACK( amiga_blitter_proc )
CUSTOM_REG(REG_DMACON) &= ~0x4000;
/* signal an interrupt */
- amiga_custom_w(REG_INTREQ, 0x8000 | INTENA_BLIT, 0);
+ amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_BLIT, 0);
/* reset the blitter timer */
timer_reset( amiga_blitter_timer, attotime_never);
@@ -1137,13 +1137,13 @@ WRITE16_HANDLER( amiga_cia_w )
static void amiga_cia_0_irq(int state)
{
- amiga_custom_w(REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0);
+ amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0);
}
static void amiga_cia_1_irq(int state)
{
- amiga_custom_w(REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0);
+ amiga_custom_w(Machine, REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0);
}
@@ -1288,7 +1288,7 @@ static TIMER_CALLBACK( finish_serial_write )
CUSTOM_REG(REG_SERDATR) |= 0x3000;
/* signal an interrupt */
- amiga_custom_w(REG_INTREQ, 0x8000 | INTENA_TBE, 0);
+ amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_TBE, 0);
}
@@ -1524,7 +1524,7 @@ void amiga_serial_in_w(UINT16 data)
}
/* signal an interrupt */
- amiga_custom_w(REG_INTREQ, 0x8000 | INTENA_RBF, 0);
+ amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_RBF, 0);
}
diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c
index 4d27facdefa..b6135157b25 100644
--- a/src/mame/machine/arkanoid.c
+++ b/src/mame/machine/arkanoid.c
@@ -121,7 +121,7 @@ WRITE8_HANDLER( arkanoid_68705_ddrC_w )
READ8_HANDLER( arkanoid_68705_input_0_r )
{
- int res = input_port_0_r(offset) & 0x3f;
+ int res = input_port_0_r(machine,offset) & 0x3f;
/* bit 0x40 comes from the sticky bit */
if (!z80write) res |= 0x40;
@@ -136,11 +136,11 @@ READ8_HANDLER( arkanoid_input_2_r )
{
if (arkanoid_paddle_select)
{
- arkanoid_paddle_value = input_port_3_r(offset);
+ arkanoid_paddle_value = input_port_3_r(machine,offset);
}
else
{
- arkanoid_paddle_value = input_port_2_r(offset);
+ arkanoid_paddle_value = input_port_2_r(machine,offset);
}
return arkanoid_paddle_value;
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 01a3033c36f..5f477c5d9a1 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -158,7 +158,7 @@ void asic65_reset(int state)
else if (!state && asic65_reset_state)
{
if (asic65_command != -1)
- asic65_data_w(1, asic65_command, 0);
+ asic65_data_w(Machine, 1, asic65_command, 0);
}
/* update the state */
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index 4365bb8a8cf..ae265c3cb28 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -170,8 +170,8 @@ WRITE8_HANDLER( astdelux_led_w )
MACHINE_RESET( asteroid )
{
- asteroid_bank_switch_w (0,0);
- avgdvg_reset_w (0,0);
+ asteroid_bank_switch_w(machine,0,0);
+ avgdvg_reset_w(machine,0,0);
}
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index aabbb8dfa80..d3023e57c65 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -129,8 +129,8 @@ static const pia6821_interface a800xl_pia_interface =
void a600xl_mmu(UINT8 new_mmu)
{
- read8_handler rbank2;
- write8_handler wbank2;
+ read8_machine_func rbank2;
+ write8_machine_func wbank2;
/* check if self-test ROM changed */
if ( new_mmu & 0x80 )
@@ -153,8 +153,8 @@ void a600xl_mmu(UINT8 new_mmu)
void a800xl_mmu(UINT8 new_mmu)
{
- read8_handler rbank1, rbank2, rbank3, rbank4;
- write8_handler wbank1, wbank2, wbank3, wbank4;
+ read8_machine_func rbank1, rbank2, rbank3, rbank4;
+ write8_machine_func wbank1, wbank2, wbank3, wbank4;
UINT8 *base1, *base2, *base3, *base4;
/* check if memory C000-FFFF changed */
@@ -697,7 +697,7 @@ static void a800_setbank(int n)
static void pokey_reset(running_machine *machine)
{
- pokey1_w(15,0);
+ pokey1_w(machine,15,0);
}
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index 33608b951cb..9ae5716cf7a 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -20,10 +20,10 @@ WRITE8_HANDLER( atarifb_out1_w )
{
CTRLD = data;
- discrete_sound_w(ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
- discrete_sound_w(ATARIFB_HIT_EN, data & 0x02); // Hit
- discrete_sound_w(ATARIFB_ATTRACT_EN, data & 0x10); // Attract
- discrete_sound_w(ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
+ discrete_sound_w(machine, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
+ discrete_sound_w(machine, ATARIFB_HIT_EN, data & 0x02); // Hit
+ discrete_sound_w(machine, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
+ discrete_sound_w(machine, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
}
@@ -31,10 +31,10 @@ WRITE8_HANDLER( atarifb4_out1_w )
{
CTRLD = data;
- discrete_sound_w(ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
- discrete_sound_w(ATARIFB_HIT_EN, data & 0x02); // Hit
- discrete_sound_w(ATARIFB_ATTRACT_EN, data & 0x10); // Attract
- discrete_sound_w(ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
+ discrete_sound_w(machine, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
+ discrete_sound_w(machine, ATARIFB_HIT_EN, data & 0x02); // Hit
+ discrete_sound_w(machine, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
+ discrete_sound_w(machine, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
coin_counter_w (1, data & 0x80);
}
@@ -44,22 +44,22 @@ WRITE8_HANDLER( abaseb_out1_w )
{
CTRLD = data;
- discrete_sound_w(ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
- discrete_sound_w(ATARIFB_HIT_EN, data & 0x02); // Hit
- discrete_sound_w(ATARIFB_ATTRACT_EN, data & 0x10); // Attract
- discrete_sound_w(ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
+ discrete_sound_w(machine, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
+ discrete_sound_w(machine, ATARIFB_HIT_EN, data & 0x02); // Hit
+ discrete_sound_w(machine, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
+ discrete_sound_w(machine, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
if (data & 0x80)
{
/* Invert video */
- palette_set_color(Machine,1,MAKE_RGB(0x00,0x00,0x00)); /* black */
- palette_set_color(Machine,0,MAKE_RGB(0xff,0xff,0xff)); /* white */
+ palette_set_color(machine,1,MAKE_RGB(0x00,0x00,0x00)); /* black */
+ palette_set_color(machine,0,MAKE_RGB(0xff,0xff,0xff)); /* white */
}
else
{
/* Regular video */
- palette_set_color(Machine,0,MAKE_RGB(0x00,0x00,0x00)); /* black */
- palette_set_color(Machine,1,MAKE_RGB(0xff,0xff,0xff)); /* white */
+ palette_set_color(machine,0,MAKE_RGB(0x00,0x00,0x00)); /* black */
+ palette_set_color(machine,1,MAKE_RGB(0xff,0xff,0xff)); /* white */
}
}
@@ -76,10 +76,10 @@ WRITE8_HANDLER( soccer_out1_w )
/* bit 5-6 = trackball CTRL bits */
/* bit 7 = Rule LED */
- discrete_sound_w(ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
- discrete_sound_w(ATARIFB_HIT_EN, data & 0x02); // Hit
- discrete_sound_w(ATARIFB_ATTRACT_EN, data & 0x10); // Attract
- discrete_sound_w(ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
+ discrete_sound_w(machine, ATARIFB_WHISTLE_EN, data & 0x01); // Whistle
+ discrete_sound_w(machine, ATARIFB_HIT_EN, data & 0x02); // Hit
+ discrete_sound_w(machine, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
+ discrete_sound_w(machine, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
// set_led_status(0,data & 0x10); // !!!!!!!!!! Is this correct????
set_led_status(1,data & 0x80);
@@ -88,7 +88,7 @@ WRITE8_HANDLER( soccer_out1_w )
WRITE8_HANDLER( atarifb_out2_w )
{
- discrete_sound_w(ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
+ discrete_sound_w(machine, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
coin_counter_w (0, data & 0x10);
}
@@ -96,7 +96,7 @@ WRITE8_HANDLER( atarifb_out2_w )
WRITE8_HANDLER( soccer_out2_w )
{
- discrete_sound_w(ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
+ discrete_sound_w(machine, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd
coin_counter_w (0, data & 0x10);
coin_counter_w (1, data & 0x20);
@@ -152,7 +152,7 @@ READ8_HANDLER( atarifb_in0_r )
(sign_x_2 >> 6) |
(sign_y_1 >> 5) |
(sign_x_1 >> 4) |
- input_port_0_r(offset);
+ input_port_0_r(machine, offset);
return val;
}
else
@@ -184,7 +184,7 @@ READ8_HANDLER( atarifb_in2_r )
{
if ((CTRLD & 0x20)==0x00)
{
- return input_port_1_r(offset);
+ return input_port_1_r(machine, offset);
}
else
{
@@ -282,7 +282,7 @@ READ8_HANDLER( atarifb4_in2_r )
{
if ((CTRLD & 0x40)==0x00)
{
- return input_port_2_r(offset);
+ return input_port_2_r(machine, offset);
}
else if ((CTRLD & 0x60) == 0x60)
/* LD1 and LD2 both high, return Team 2 right player (player 3) */
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index c653e8b7556..80fd9b9b5a9 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -114,7 +114,7 @@ static void atarigen_set_vol(running_machine *machine, int volume, sound_type ty
static TIMER_CALLBACK( scanline_timer_callback );
-static void atarivc_common_w(int scrnum, offs_t offset, UINT16 newword);
+static void atarivc_common_w(running_machine *machine, int scrnum, offs_t offset, UINT16 newword);
static TIMER_CALLBACK( unhalt_cpu );
@@ -656,21 +656,21 @@ WRITE32_HANDLER( atarigen_sound_upper32_w )
READ16_HANDLER( atarigen_sound_r )
{
atarigen_sound_to_cpu_ready = 0;
- atarigen_sound_int_ack_w(0, 0, 0);
+ atarigen_sound_int_ack_w(machine, 0, 0, 0);
return atarigen_sound_to_cpu | 0xff00;
}
READ16_HANDLER( atarigen_sound_upper_r )
{
atarigen_sound_to_cpu_ready = 0;
- atarigen_sound_int_ack_w(0, 0, 0);
+ atarigen_sound_int_ack_w(machine, 0, 0, 0);
return (atarigen_sound_to_cpu << 8) | 0x00ff;
}
READ32_HANDLER( atarigen_sound_upper32_r )
{
atarigen_sound_to_cpu_ready = 0;
- atarigen_sound_int_ack32_w(0, 0, 0);
+ atarigen_sound_int_ack32_w(machine, 0, 0, 0);
return (atarigen_sound_to_cpu << 24) | 0x00ffffff;
}
@@ -731,7 +731,7 @@ static TIMER_CALLBACK( delayed_sound_reset )
/* reset the sound write state */
atarigen_sound_to_cpu_ready = 0;
- atarigen_sound_int_ack_w(0, 0, 0);
+ atarigen_sound_int_ack_w(machine, 0, 0, 0);
/* allocate a high frequency timer until a response is generated */
/* the main CPU is *very* sensistive to the timing of the response */
@@ -899,7 +899,7 @@ static TIMER_CALLBACK( atarivc_eof_update )
/* echo all the commands to the video controller */
for (i = 0; i < 0x1c; i++)
if (atarivc_eof_data[i])
- atarivc_common_w(scrnum, i, atarivc_eof_data[i]);
+ atarivc_common_w(machine, scrnum, i, atarivc_eof_data[i]);
/* update the scroll positions */
atarimo_set_xscroll(0, atarivc_state.mo_xscroll);
@@ -969,7 +969,7 @@ WRITE16_HANDLER( atarivc_w )
int newword = oldword;
COMBINE_DATA(&newword);
- atarivc_common_w(0, offset, newword); /* need to support scrnum */
+ atarivc_common_w(machine, 0, offset, newword); /* need to support scrnum */
}
@@ -979,7 +979,7 @@ WRITE16_HANDLER( atarivc_w )
write.
---------------------------------------------------------------*/
-static void atarivc_common_w(int scrnum, offs_t offset, UINT16 newword)
+static void atarivc_common_w(running_machine *machine, int scrnum, offs_t offset, UINT16 newword)
{
int oldword = atarivc_data[offset];
atarivc_data[offset] = newword;
@@ -1070,7 +1070,7 @@ static void atarivc_common_w(int scrnum, offs_t offset, UINT16 newword)
/* scanline IRQ ack here */
case 0x1e:
- atarigen_scanline_int_ack_w(0, 0, 0);
+ atarigen_scanline_int_ack_w(machine, 0, 0, 0);
break;
/* log anything else */
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index d23e8219b1f..4d87ff20069 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -218,14 +218,14 @@ UINT8 line;
MACHINE_RESET( bagman )
{
- bagman_pal16r6_w(0,1); /*pin 2*/
- bagman_pal16r6_w(1,1); /*pin 3*/
- bagman_pal16r6_w(2,1); /*pin 4*/
- bagman_pal16r6_w(3,1); /*pin 5*/
- bagman_pal16r6_w(4,1); /*pin 6*/
- bagman_pal16r6_w(5,1); /*pin 7*/
- bagman_pal16r6_w(6,1); /*pin 8*/
- bagman_pal16r6_w(7,1); /*pin 9*/
+ bagman_pal16r6_w(machine,0,1); /*pin 2*/
+ bagman_pal16r6_w(machine,1,1); /*pin 3*/
+ bagman_pal16r6_w(machine,2,1); /*pin 4*/
+ bagman_pal16r6_w(machine,3,1); /*pin 5*/
+ bagman_pal16r6_w(machine,4,1); /*pin 6*/
+ bagman_pal16r6_w(machine,5,1); /*pin 7*/
+ bagman_pal16r6_w(machine,6,1); /*pin 8*/
+ bagman_pal16r6_w(machine,7,1); /*pin 9*/
update_pal();
}
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 046a7d538b2..75b7d626c0d 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -177,8 +177,8 @@ MACHINE_RESET( balsente )
grudge_steering_result = 0;
/* reset the 6850 chips */
- balsente_m6850_w(0, 3);
- balsente_m6850_sound_w(0, 3);
+ balsente_m6850_w(machine, 0, 3);
+ balsente_m6850_sound_w(machine, 0, 3);
/* reset the noise generator */
memset(noise_position, 0, sizeof(noise_position));
@@ -1101,8 +1101,8 @@ WRITE8_HANDLER( balsente_dac_data_w )
if ((chip_select & 0x3f) != 0x3f)
{
UINT8 temp = chip_select;
- balsente_chip_select_w(0, 0x3f);
- balsente_chip_select_w(0, temp);
+ balsente_chip_select_w(machine, 0, 0x3f);
+ balsente_chip_select_w(machine, 0, temp);
}
}
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index 8d98210f0bc..30ef0c206d3 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -70,13 +70,13 @@ static WRITE8_HANDLER( b_via_0_pa_w )
switch (data & 0x03)
{
case 0:
- pbus = input_port_0_r(0);
+ pbus = input_port_0_r(machine,0);
break;
case 1:
- pbus = input_port_1_r(0) | (input_port_2_r(0) << 4);
+ pbus = input_port_1_r(machine,0) | (input_port_2_r(machine,0) << 4);
break;
case 2:
- pbus = input_port_3_r(0);
+ pbus = input_port_3_r(machine,0);
break;
case 3:
pbus = 0xff;
diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c
index 41acfba14cb..bdb7fe98ad9 100644
--- a/src/mame/machine/bsktball.c
+++ b/src/mame/machine/bsktball.c
@@ -73,10 +73,10 @@ READ8_HANDLER( bsktball_in0_r )
int p2_vert;
int temp;
- p1_horiz = input_port_0_r(offset);
- p1_vert = input_port_1_r(offset);
- p2_horiz = input_port_2_r(offset);
- p2_vert = input_port_3_r(offset);
+ p1_horiz = input_port_0_r(machine, offset);
+ p1_vert = input_port_1_r(machine, offset);
+ p2_horiz = input_port_2_r(machine, offset);
+ p2_vert = input_port_3_r(machine, offset);
/* Set direction bits */
@@ -146,7 +146,7 @@ READ8_HANDLER( bsktball_in0_r )
}
else
{
- temp = input_port_4_r(offset) & 0x0F;
+ temp = input_port_4_r(machine, offset) & 0x0F;
/* Remap button 1 back to the Start button */
/* NOTE: This is an ADDED feature, not a part of the original hardware! */
temp = (temp) & (temp>>2);
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index cc490905393..7b625270aef 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -105,7 +105,7 @@ static TIMER_CALLBACK( nmi_callback )
WRITE8_HANDLER( bublbobl_sound_command_w )
{
- soundlatch_w(offset,data);
+ soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, data,nmi_callback);
}
diff --git a/src/mame/machine/copsnrob.c b/src/mame/machine/copsnrob.c
index ed5b3f78b61..18fe165e12b 100644
--- a/src/mame/machine/copsnrob.c
+++ b/src/mame/machine/copsnrob.c
@@ -25,19 +25,20 @@ READ8_HANDLER( copsnrob_gun_position_r )
default:
case 0x00:
current_car_image = copsnrob_carimage[0];
- keys = input_port_4_r(0);
+ keys = input_port_4_r(machine,0);
break;
case 0x04:
current_car_image = copsnrob_carimage[1];
- keys = input_port_5_r(0);
+ keys = input_port_5_r(machine,0);
break;
case 0x08:
current_car_image = copsnrob_carimage[2];
- keys = input_port_6_r(0);
+ keys = input_port_6_r(machine,0);
break;
case 0x0c:
current_car_image = copsnrob_carimage[3];
- keys = input_port_7_r(0);
+ keys = input_port_7_r(machine,0);
+ break;
}
if (current_car_image < 7)
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index e47353e90d6..2a411acd275 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "deprecat.h"
#include "includes/amiga.h"
#include "cdrom.h"
#include "coreutil.h"
@@ -360,7 +361,7 @@ static void akiko_set_cd_status( UINT32 status )
#if LOG_AKIKO_CD
logerror( "Akiko CD IRQ\n" );
#endif
- amiga_custom_w(REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
+ amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
}
}
diff --git a/src/mame/machine/daikaiju.c b/src/mame/machine/daikaiju.c
index 9c53b800e34..c5f8a0c088f 100644
--- a/src/mame/machine/daikaiju.c
+++ b/src/mame/machine/daikaiju.c
@@ -339,7 +339,7 @@ READ8_HANDLER( daikaiju_mcu_r )
READ8_HANDLER( daikaiju_mcu_status_r )
{
- int res = input_port_3_r(0);
+ int res = input_port_3_r(machine,0);
res^=mame_rand(Machine)&3;
res |=((lsasquad_sound_pending & 0x02)^2)<<3; //inverted flag
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index 6ff0d07f322..4ae12887173 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -842,7 +842,7 @@ READ64_HANDLER( dc_aica_reg_r )
// mame_printf_verbose("AICA REG: [%08x] read %llx, mask %llx\n", 0x700000+reg*4, (UINT64)offset, mem_mask);
- return (UINT64) AICA_0_r(offset*2, 0x0000)<<shift;
+ return (UINT64) AICA_0_r(machine, offset*2, 0x0000)<<shift;
}
WRITE64_HANDLER( dc_aica_reg_w )
@@ -868,18 +868,18 @@ WRITE64_HANDLER( dc_aica_reg_w )
}
}
- AICA_0_w(offset*2, dat, shift ? ((mem_mask>>32)&0xffff) : (mem_mask & 0xffff));
+ AICA_0_w(machine, offset*2, dat, shift ? ((mem_mask>>32)&0xffff) : (mem_mask & 0xffff));
// mame_printf_verbose("AICA REG: [%08x=%x] write %llx to %x, mask %llx\n", 0x700000+reg*4, dat, data, offset, mem_mask);
}
READ32_HANDLER( dc_arm_aica_r )
{
- return AICA_0_r(offset*2, 0x0000);
+ return AICA_0_r(machine, offset*2, 0x0000);
}
WRITE32_HANDLER( dc_arm_aica_w )
{
- AICA_0_w(offset*2, data, mem_mask&0xffff);
+ AICA_0_w(machine, offset*2, data, mem_mask&0xffff);
}
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index 08d5dd0baf5..ad5a9f5ea6c 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -168,14 +168,14 @@ WRITE16_HANDLER( slyspy_240000_w )
{
switch (slyspy_state) {
case 0x3:
- dec0_pf1_data_w(offset,data,mem_mask);
+ dec0_pf1_data_w(machine,offset,data,mem_mask);
return;
case 0x2:
- dec0_pf2_data_w(offset,data,mem_mask);
+ dec0_pf2_data_w(machine,offset,data,mem_mask);
return;
case 0x0:
- if (offset<0x8) dec0_pf2_control_0_w(offset,data,mem_mask);
- else if (offset<0x10) dec0_pf2_control_1_w(offset-0x8,data,mem_mask);
+ if (offset<0x8) dec0_pf2_control_0_w(machine,offset,data,mem_mask);
+ else if (offset<0x10) dec0_pf2_control_1_w(machine,offset-0x8,data,mem_mask);
return;
}
logerror("Wrote to 240000 %02x at %04x %04x (Trap %02x)\n",offset,activecpu_get_pc(),data,slyspy_state);
@@ -185,7 +185,7 @@ WRITE16_HANDLER( slyspy_242000_w )
{
switch (slyspy_state) {
case 0x2: /* Trap A */
- dec0_pf1_data_w(offset,data,mem_mask);
+ dec0_pf1_data_w(machine,offset,data,mem_mask);
return;
case 0x0: /* Trap C */
if (offset<0x40) COMBINE_DATA(&dec0_pf2_colscroll[offset]);
@@ -199,7 +199,7 @@ WRITE16_HANDLER( slyspy_246000_w )
{
switch (slyspy_state) {
case 0x0:
- dec0_pf2_data_w(offset,data,mem_mask);
+ dec0_pf2_data_w(machine,offset,data,mem_mask);
return;
}
logerror("Wrote to 246000 %02x at %04x %04x (Trap %02x)\n",offset,activecpu_get_pc(),data,slyspy_state);
@@ -209,14 +209,14 @@ WRITE16_HANDLER( slyspy_248000_w )
{
switch (slyspy_state) {
case 0x1:
- dec0_pf1_data_w(offset,data,mem_mask);
+ dec0_pf1_data_w(machine,offset,data,mem_mask);
return;
case 0x3:
- dec0_pf2_data_w(offset,data,mem_mask);
+ dec0_pf2_data_w(machine,offset,data,mem_mask);
return;
case 0x0:
- if (offset<0x8) dec0_pf1_control_0_w(offset,data,mem_mask);
- else if (offset<0x10) dec0_pf1_control_1_w(offset-0x8,data,mem_mask);
+ if (offset<0x8) dec0_pf1_control_0_w(machine,offset,data,mem_mask);
+ else if (offset<0x10) dec0_pf1_control_1_w(machine,offset-0x8,data,mem_mask);
return;
}
logerror("Wrote to 248000 %02x at %04x %04x (Trap %02x)\n",offset,activecpu_get_pc(),data,slyspy_state);
@@ -226,7 +226,7 @@ WRITE16_HANDLER( slyspy_24c000_w )
{
switch (slyspy_state) {
case 0x1: /* Trap 9 */
- dec0_pf2_data_w(offset,data,mem_mask);
+ dec0_pf2_data_w(machine,offset,data,mem_mask);
return;
case 0x0: /* Trap C */
if (offset<0x40) COMBINE_DATA(&dec0_pf1_colscroll[offset]);
@@ -241,7 +241,7 @@ WRITE16_HANDLER( slyspy_24e000_w )
switch (slyspy_state) {
case 0x2:
case 0x0:
- dec0_pf1_data_w(offset,data,mem_mask);
+ dec0_pf1_data_w(machine,offset,data,mem_mask);
return;
}
logerror("Wrote to 24e000 %02x at %04x %04x (Trap %02x)\n",offset,activecpu_get_pc(),data,slyspy_state);
diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c
index ae6945bac74..6cb4253b94e 100644
--- a/src/mame/machine/decocass.c
+++ b/src/mame/machine/decocass.c
@@ -28,8 +28,8 @@ static UINT8 crc16_msb;
static UINT8 tape_crc16_lsb[256];
static UINT8 tape_crc16_msb[256];
-static read8_handler decocass_dongle_r;
-static write8_handler decocass_dongle_w;
+static read8_machine_func decocass_dongle_r;
+static write8_machine_func decocass_dongle_w;
static UINT8 decocass_reset;
static UINT8 i8041_p1;
@@ -104,16 +104,16 @@ WRITE8_HANDLER( decocass_coin_counter_w )
WRITE8_HANDLER( decocass_sound_command_w )
{
LOG(2,("CPU #%d sound command -> $%02x\n", cpu_getactivecpu(), data));
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
decocass_sound_ack |= 0x80;
/* remove snd cpu data ack bit. i don't see it in the schems, but... */
decocass_sound_ack &= ~0x40;
- cpunum_set_input_line(Machine, 1, M6502_IRQ_LINE, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, M6502_IRQ_LINE, ASSERT_LINE);
}
READ8_HANDLER( decocass_sound_data_r )
{
- UINT8 data = soundlatch2_r(0);
+ UINT8 data = soundlatch2_r(machine, 0);
LOG(2,("CPU #%d sound data <- $%02x\n", cpu_getactivecpu(), data));
return data;
}
@@ -128,13 +128,13 @@ READ8_HANDLER( decocass_sound_ack_r )
WRITE8_HANDLER( decocass_sound_data_w )
{
LOG(2,("CPU #%d sound data -> $%02x\n", cpu_getactivecpu(), data));
- soundlatch2_w(0, data);
+ soundlatch2_w(machine, 0, data);
decocass_sound_ack |= 0x40;
}
READ8_HANDLER( decocass_sound_command_r )
{
- UINT8 data = soundlatch_r(0);
+ UINT8 data = soundlatch_r(machine, 0);
LOG(4,("CPU #%d sound command <- $%02x\n", cpu_getactivecpu(), data));
cpunum_set_input_line(Machine, 1, M6502_IRQ_LINE, CLEAR_LINE);
decocass_sound_ack &= ~0x80;
@@ -176,16 +176,16 @@ WRITE8_HANDLER( decocass_sound_data_ack_reset_w )
WRITE8_HANDLER( decocass_nmi_reset_w )
{
- cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE );
+ cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE );
}
WRITE8_HANDLER( decocass_quadrature_decoder_reset_w )
{
/* just latch the analog controls here */
- decocass_quadrature_decoder[0] = input_port_3_r(0);
- decocass_quadrature_decoder[1] = input_port_4_r(0);
- decocass_quadrature_decoder[2] = input_port_5_r(0);
- decocass_quadrature_decoder[3] = input_port_6_r(0);
+ decocass_quadrature_decoder[0] = input_port_3_r(machine, 0);
+ decocass_quadrature_decoder[1] = input_port_4_r(machine, 0);
+ decocass_quadrature_decoder[2] = input_port_5_r(machine, 0);
+ decocass_quadrature_decoder[3] = input_port_6_r(machine, 0);
}
WRITE8_HANDLER( decocass_adc_w )
@@ -1525,7 +1525,7 @@ READ8_HANDLER( decocass_e5xx_r )
else
{
if (decocass_dongle_r)
- data = (*decocass_dongle_r)(offset);
+ data = (*decocass_dongle_r)(machine, offset);
else
data = 0xff;
}
@@ -1536,7 +1536,7 @@ WRITE8_HANDLER( decocass_e5xx_w )
{
if (decocass_dongle_w)
{
- (*decocass_dongle_w)(offset, data);
+ (*decocass_dongle_w)(machine, offset, data);
return;
}
@@ -1581,7 +1581,7 @@ WRITE8_HANDLER( decocass_de0091_w )
{
/* don't allow writes to the ROMs */
if (!de0091_enable)
- decocass_charram_w(offset, data);
+ decocass_charram_w(machine, offset, data);
}
/***************************************************************************
diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c
index 376b0281519..39299ce7696 100644
--- a/src/mame/machine/decoprot.c
+++ b/src/mame/machine/decoprot.c
@@ -110,8 +110,8 @@ void decoprot_reset(void)
WRITE16_HANDLER( deco16_104_prot_w ) /* Wizard Fire */
{
if (offset==(0x150/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
@@ -228,8 +228,8 @@ READ16_HANDLER( deco16_104_prot_r ) /* Wizard Fire */
WRITE16_HANDLER( deco16_60_prot_w ) /* Edward Randy */
{
if (offset==(0x64/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
COMBINE_DATA(&deco16_prot_ram[offset]);
@@ -417,8 +417,8 @@ static int mutantf_port_0e_hack=0, mutantf_port_6a_hack=0,mutantf_port_e8_hack=0
WRITE16_HANDLER( deco16_66_prot_w ) /* Mutant Fighter */
{
if (offset==(0x64/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
@@ -603,8 +603,8 @@ READ16_HANDLER( deco16_66_prot_r ) /* Mutant Fighter */
WRITE16_HANDLER( deco16_104_cninja_prot_w )
{
if (offset==(0xa8/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
@@ -665,8 +665,8 @@ WRITE16_HANDLER( deco16_146_funkyjet_prot_w )
COMBINE_DATA(&deco16_prot_ram[offset]);
if (offset == (0x10a >> 1)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
}
@@ -778,15 +778,14 @@ WRITE16_HANDLER( deco16_104_rohga_prot_w )
There doesn't appear to be any way to detect what bank is currently selected - it
seems game code must maintain this state (if it matters).
*/
-
if (decoprot_buffer_ram_selected)
COMBINE_DATA(&decoprot_buffer_ram[offset]);
else
COMBINE_DATA(&deco16_prot_ram[offset]);
if (offset==(0xa8/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
@@ -1214,10 +1213,9 @@ static WRITE16_HANDLER( deco16_146_core_prot_w )
const int sndport=0x260;
const int xorport=0x340;
const int maskport=0x6c0;
-
if (writeport==sndport) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
@@ -1644,7 +1642,7 @@ WRITE32_HANDLER( deco16_146_fghthist_prot_w )
decoprot_last_write=addr;
decoprot_last_write_val=data>>16;
- deco16_146_core_prot_w(addr, data>>16, mem_mask>>16);
+ deco16_146_core_prot_w(machine, addr, data>>16, mem_mask>>16);
}
READ32_HANDLER( deco16_146_fghthist_prot_r )
@@ -1669,7 +1667,7 @@ READ32_HANDLER( deco16_146_fghthist_prot_r )
}
decoprot_last_write=-1;
- val=deco16_146_core_prot_r(addr, mem_mask>>16);
+ val=deco16_146_core_prot_r(machine, addr, mem_mask>>16);
if (addr!=0x7b6 && addr!=0x1c && addr!=0x1e0 && addr!=0x1d4
&& addr!=0x2c4 && addr!=0x7a4 && addr!=0x30 // confirmed
@@ -1716,15 +1714,13 @@ READ32_HANDLER( deco16_146_fghthist_prot_r )
WRITE16_HANDLER( deco16_146_nitroball_prot_w )
{
UINT16 addr=BITSWAP16(offset<<1, 0, 0, 0, 0, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-
- deco16_146_core_prot_w(addr, data, mem_mask);
+ deco16_146_core_prot_w(machine, addr, data, mem_mask);
}
READ16_HANDLER( deco16_146_nitroball_prot_r )
{
UINT16 addr=BITSWAP16(offset<<1, 0, 0, 0, 0, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
-
- return deco16_146_core_prot_r(addr, mem_mask);
+ return deco16_146_core_prot_r(machine, addr, mem_mask);
}
/**********************************************************************************/
@@ -1733,9 +1729,9 @@ READ16_HANDLER( dietgo_104_prot_r )
{
switch (offset * 2)
{
- case 0x298: return input_port_0_word_r(0, 0);
- case 0x342: return input_port_1_word_r(0, 0);
- case 0x506: return input_port_2_word_r(0, 0);
+ case 0x298: return input_port_0_word_r(machine, 0, 0);
+ case 0x342: return input_port_1_word_r(machine, 0, 0);
+ case 0x506: return input_port_2_word_r(machine, 0, 0);
}
logerror("Protection PC %06x: warning - read unmapped memory address %04x\n",activecpu_get_pc(),offset<<1);
@@ -1746,8 +1742,8 @@ READ16_HANDLER( dietgo_104_prot_r )
WRITE16_HANDLER( dietgo_104_prot_w )
{
if (offset==(0x380/2)) {
- soundlatch_w(0,data&0xff);
- cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
+ soundlatch_w(machine,0,data&0xff);
+ cpunum_set_input_line(machine, 1,0,HOLD_LINE);
return;
}
logerror("Protection PC %06x: warning - write unmapped memory address %04x %04x\n",activecpu_get_pc(),offset<<1,data);
@@ -1758,12 +1754,11 @@ WRITE16_HANDLER( dietgo_104_prot_w )
READ16_HANDLER( deco16_104_pktgaldx_prot_r )
{
const UINT16* prot_ram=deco16_prot_ram;
-
switch (offset * 2)
{
- case 0x5b2: return input_port_0_word_r(0, 0);
- case 0x44c: return input_port_1_word_r(0, 0);
- case 0x042: return input_port_2_word_r(0, 0);
+ case 0x5b2: return input_port_0_word_r(machine, 0, 0);
+ case 0x44c: return input_port_1_word_r(machine, 0, 0);
+ case 0x042: return input_port_2_word_r(machine, 0, 0);
case 0x510: return DECO_PORT(0);
case 0x51a: return DECO_PORT(2);
diff --git a/src/mame/machine/equites.c b/src/mame/machine/equites.c
index ff06aaf74df..ca4cae687f0 100644
--- a/src/mame/machine/equites.c
+++ b/src/mame/machine/equites.c
@@ -329,17 +329,17 @@ READ16_HANDLER(equites_8404_r)
WRITE8_HANDLER(equites_5232_w)
{
if (offset < 0x08 && data) data |= 0x80; // gets around a current 5232 emulation restriction
- MSM5232_0_w(offset, data);
+ MSM5232_0_w(machine, offset, data);
}
WRITE8_HANDLER(equites_8910control_w)
{
- AY8910_control_port_0_w(0, data);
+ AY8910_control_port_0_w(machine, 0, data);
}
WRITE8_HANDLER(equites_8910data_w)
{
- AY8910_write_port_0_w(0, data);
+ AY8910_write_port_0_w(machine, 0, data);
}
static WRITE8_HANDLER(equites_8910porta_w)
diff --git a/src/mame/machine/galaxian.c b/src/mame/machine/galaxian.c
index 7c6c9693c54..f19ea83f87b 100644
--- a/src/mame/machine/galaxian.c
+++ b/src/mame/machine/galaxian.c
@@ -271,7 +271,7 @@ WRITE8_HANDLER( kingball_sound1_w )
WRITE8_HANDLER( kingball_sound2_w )
{
kingball_sound = (kingball_sound & ~0x02) | (data << 1);
- soundlatch_w (0, kingball_sound | 0xf0);
+ soundlatch_w (machine, 0, kingball_sound | 0xf0);
}
@@ -313,7 +313,7 @@ static READ8_HANDLER( azurian_IN2_r )
WRITE8_HANDLER( _4in1_bank_w )
{
_4in1_bank = data & 0x03;
- galaxian_gfxbank_w(0, _4in1_bank);
+ galaxian_gfxbank_w(machine, 0, _4in1_bank);
memory_set_bank(1, _4in1_bank);
}
@@ -334,7 +334,7 @@ static void gmgalax_select_game(int game)
memory_set_bank(1, game);
- galaxian_gfxbank_w(0, gmgalax_selected_game);
+ galaxian_gfxbank_w(Machine, 0, gmgalax_selected_game);
}
READ8_HANDLER( gmgalax_input_port_0_r )
@@ -520,7 +520,7 @@ DRIVER_INIT( 4in1 )
/* games are banked at 0x0000 - 0x3fff */
memory_configure_bank(1, 0, 4, &RAM[0x10000], 0x4000);
- _4in1_bank_w(0, 0); /* set the initial CPU bank */
+ _4in1_bank_w(machine, 0, 0); /* set the initial CPU bank */
state_save_register_global(_4in1_bank);
}
@@ -544,20 +544,20 @@ DRIVER_INIT( gmgalax )
state_save_register_global(gmgalax_selected_game);
- gmgalax_select_game(input_port_6_r(0) & 0x01);
+ gmgalax_select_game(input_port_6_r(machine, 0) & 0x01);
}
INTERRUPT_GEN( gmgalax_vh_interrupt )
{
// reset the cpu if the selected game changed
- int new_game = input_port_6_r(0) & 0x01;
+ int new_game = input_port_6_r(machine, 0) & 0x01;
if (gmgalax_selected_game != new_game)
{
gmgalax_select_game(new_game);
/* Ghost Muncher never clears this */
- galaxian_stars_enable_w(0, 0);
+ galaxian_stars_enable_w(machine, 0, 0);
cpunum_set_input_line(machine, 0, INPUT_LINE_RESET, ASSERT_LINE);
}
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index d2fd711f73b..e3ecf4db0c7 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -737,10 +737,10 @@ WRITE16_HANDLER( hdgsp_io_w )
}
/* detect changes to HEBLNK and HSBLNK and force an update before they change */
- if ((offset == REG_HEBLNK || offset == REG_HSBLNK) && data != tms34010_io_register_r(offset, 0))
+ if ((offset == REG_HEBLNK || offset == REG_HSBLNK) && data != tms34010_io_register_r(machine, offset, 0))
video_screen_update_partial(0, video_screen_get_vpos(0) - 1);
- tms34010_io_register_w(offset, data, mem_mask);
+ tms34010_io_register_w(machine, offset, data, mem_mask);
}
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index 8938b850155..1f8f25ef38b 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -209,8 +209,8 @@ MACHINE_RESET( irobot )
/* set an initial timer to go off on scanline 0 */
timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 0, scanline_callback);
- irobot_rom_banksel_w(0,0);
- irobot_out0_w(0,0);
+ irobot_rom_banksel_w(machine,0,0);
+ irobot_out0_w(machine,0,0);
irobot_combase = comRAM[0];
irobot_combase_mb = comRAM[1];
irobot_outx = 0;
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 934f60e8829..a358d326002 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -51,7 +51,7 @@ READ16_HANDLER(galpanib_calc_r) /* Simulation of the CALC1 MCU */
switch (offset)
{
case 0x00/2: // watchdog
- return watchdog_reset_r(0);
+ return watchdog_reset_r(machine,0);
case 0x02/2: // unknown (yet!), used by *MANY* games !!!
//popmessage("unknown collision reg");
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index 81b6878260f..6fe0451b0a7 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -146,22 +146,22 @@ READ8_HANDLER( tms57002_data_r )
READ16_HANDLER( tms57002_data_word_r )
{
- return(tms57002_data_r(0));
+ return(tms57002_data_r(machine,0));
}
READ16_HANDLER( tms57002_status_word_r )
{
- return(tms57002_status_r(0));
+ return(tms57002_status_r(machine,0));
}
WRITE16_HANDLER( tms57002_control_word_w )
{
- tms57002_control_w(0, data);
+ tms57002_control_w(machine, 0, data);
}
WRITE16_HANDLER( tms57002_data_word_w )
{
- tms57002_data_w(0, data);
+ tms57002_data_w(machine, 0, data);
}
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index 561de59ef39..ca93c91f8de 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -560,7 +560,7 @@ WRITE32_HANDLER(nwk_fifo_0_w)
}
else
{
- voodoo_0_w(offset ^ 0x80000, data, mem_mask);
+ voodoo_0_w(machine, offset ^ 0x80000, data, mem_mask);
}
}
@@ -577,7 +577,7 @@ WRITE32_HANDLER(nwk_fifo_1_w)
}
else
{
- voodoo_1_w(offset ^ 0x80000, data, mem_mask);
+ voodoo_1_w(machine, offset ^ 0x80000, data, mem_mask);
}
}
@@ -589,7 +589,7 @@ READ32_HANDLER(nwk_voodoo_0_r)
}
else
{
- return voodoo_0_r(offset, mem_mask);
+ return voodoo_0_r(machine, offset, mem_mask);
}
}
@@ -601,7 +601,7 @@ READ32_HANDLER(nwk_voodoo_1_r)
}
else
{
- return voodoo_1_r(offset, mem_mask);
+ return voodoo_1_r(machine, offset, mem_mask);
}
}
@@ -618,7 +618,7 @@ WRITE32_HANDLER(nwk_voodoo_0_w)
}
else
{
- voodoo_0_w(offset, data, mem_mask);
+ voodoo_0_w(machine, offset, data, mem_mask);
}
}
@@ -635,7 +635,7 @@ WRITE32_HANDLER(nwk_voodoo_1_w)
}
else
{
- voodoo_1_w(offset, data, mem_mask);
+ voodoo_1_w(machine, offset, data, mem_mask);
}
}
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index a846168d45a..c7fbaf4dbb4 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -372,7 +372,7 @@ MACHINE_RESET( leland )
/* reset globals */
leland_gfx_control = 0x00;
- leland_sound_port_w(0, 0xff);
+ leland_sound_port_w(machine, 0, 0xff);
wcol_enable = 0;
dangerz_x = 512;
@@ -515,7 +515,7 @@ WRITE8_HANDLER( leland_master_alt_bankswitch_w )
(*leland_update_master_bank)();
/* sound control is in the rest */
- leland_80186_control_w(offset, data);
+ leland_80186_control_w(machine, offset, data);
}
@@ -1156,12 +1156,12 @@ READ8_HANDLER( leland_master_input_r )
case 0x02: /* /GIN2 */
case 0x12:
- cpunum_set_input_line(Machine, 0, INPUT_LINE_NMI, CLEAR_LINE);
+ cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, CLEAR_LINE);
break;
case 0x03: /* /IGID */
case 0x13:
- result = AY8910_read_port_0_r(offset);
+ result = AY8910_read_port_0_r(machine, offset);
break;
case 0x10: /* /GIN0 */
@@ -1187,10 +1187,10 @@ WRITE8_HANDLER( leland_master_output_w )
switch (offset)
{
case 0x09: /* /MCONT */
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
wcol_enable = (data & 0x02);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
- cpunum_set_input_line(Machine, 1, 0, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, 0, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
if (LOG_EEPROM) logerror("%04X:EE write %d%d%d\n", safe_activecpu_get_pc(),
(data >> 6) & 1, (data >> 5) & 1, (data >> 4) & 1);
@@ -1200,18 +1200,18 @@ WRITE8_HANDLER( leland_master_output_w )
break;
case 0x0a: /* /OGIA */
- AY8910_control_port_0_w(0, data);
+ AY8910_control_port_0_w(machine, 0, data);
break;
case 0x0b: /* /OGID */
- AY8910_write_port_0_w(0, data);
+ AY8910_write_port_0_w(machine, 0, data);
break;
case 0x0c: /* /BKXL */
case 0x0d: /* /BKXH */
case 0x0e: /* /BKYL */
case 0x0f: /* /BKYH */
- leland_scroll_w(offset - 0x0c, data);
+ leland_scroll_w(machine, offset - 0x0c, data);
break;
default:
@@ -1253,7 +1253,7 @@ WRITE8_HANDLER( ataxx_master_output_w )
case 0x01: /* /BKXH */
case 0x02: /* /BKYL */
case 0x03: /* /BKYH */
- leland_scroll_w(offset, data);
+ leland_scroll_w(machine, offset, data);
break;
case 0x04: /* /MBNK */
@@ -1265,9 +1265,9 @@ WRITE8_HANDLER( ataxx_master_output_w )
break;
case 0x05: /* /SLV0 */
- cpunum_set_input_line(Machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, (data & 0x04) ? CLEAR_LINE : ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
break;
case 0x08: /* */
@@ -1291,7 +1291,7 @@ WRITE8_HANDLER( ataxx_master_output_w )
WRITE8_HANDLER( leland_gated_paletteram_w )
{
if (wcol_enable)
- paletteram_BBGGGRRR_w(offset, data);
+ paletteram_BBGGGRRR_w(machine, offset, data);
}
@@ -1306,9 +1306,9 @@ READ8_HANDLER( leland_gated_paletteram_r )
WRITE8_HANDLER( ataxx_paletteram_and_misc_w )
{
if (wcol_enable)
- paletteram_xxxxRRRRGGGGBBBB_le_w(offset, data);
+ paletteram_xxxxRRRRGGGGBBBB_le_w(machine, offset, data);
else if (offset == 0x7f8 || offset == 0x7f9)
- leland_master_video_addr_w(offset - 0x7f8, data);
+ leland_master_video_addr_w(machine, offset - 0x7f8, data);
else if (offset == 0x7fc)
{
xrom1_addr = (xrom1_addr & 0xff00) | (data & 0x00ff);
@@ -1371,7 +1371,7 @@ READ8_HANDLER( leland_sound_port_r )
WRITE8_HANDLER( leland_sound_port_w )
{
/* update the graphics banking */
- leland_gfx_port_w(0, data);
+ leland_gfx_port_w(machine, 0, data);
/* set the new value */
leland_gfx_control = data;
diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c
index e36e6a5d2cc..545bb2607e1 100644
--- a/src/mame/machine/lsasquad.c
+++ b/src/mame/machine/lsasquad.c
@@ -181,7 +181,7 @@ READ8_HANDLER( lsasquad_mcu_r )
READ8_HANDLER( lsasquad_mcu_status_r )
{
- int res = input_port_3_r(0);
+ int res = input_port_3_r(machine,0);
/* bit 0 = when 1, mcu is ready to receive data from main cpu */
/* bit 1 = when 0, mcu has sent data to the main cpu */
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index d43dcef186e..f7c2400b09a 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -424,15 +424,15 @@ INTERRUPT_GEN( mcr_interrupt )
{
/* CTC line 2 is connected to VBLANK, which is once every 1/2 frame */
/* for the 30Hz interlaced display */
- z80ctc_0_trg2_w(0, 1);
- z80ctc_0_trg2_w(0, 0);
+ z80ctc_0_trg2_w(machine, 0, 1);
+ z80ctc_0_trg2_w(machine, 0, 0);
/* CTC line 3 is connected to 493, which is signalled once every */
/* frame at 30Hz */
if (cpu_getiloops() == 0)
{
- z80ctc_0_trg3_w(0, 1);
- z80ctc_0_trg3_w(0, 0);
+ z80ctc_0_trg3_w(machine, 0, 1);
+ z80ctc_0_trg3_w(machine, 0, 0);
}
}
@@ -443,8 +443,8 @@ INTERRUPT_GEN( mcr_ipu_interrupt )
/* frame at 30Hz */
if (cpu_getiloops() == 0)
{
- z80ctc_1_trg3_w(0, 1);
- z80ctc_1_trg3_w(0, 0);
+ z80ctc_1_trg3_w(machine, 0, 1);
+ z80ctc_1_trg3_w(machine, 0, 0);
}
}
@@ -585,7 +585,7 @@ WRITE8_HANDLER( mcr_scroll_value_w )
WRITE8_HANDLER( zwackery_pia_2_w )
{
/* bit 7 is the watchdog */
- if (!(data & 0x80)) watchdog_reset_w(offset, data);
+ if (!(data & 0x80)) watchdog_reset_w(machine, offset, data);
/* bits 5 and 6 control hflip/vflip */
/* bits 3 and 4 control coin counters? */
@@ -601,7 +601,7 @@ WRITE8_HANDLER( zwackery_pia_3_w )
WRITE8_HANDLER( zwackery_ca2_w )
{
- csdeluxe_data_w(offset, (data << 4) | zwackery_sound_data);
+ csdeluxe_data_w(machine, offset, (data << 4) | zwackery_sound_data);
}
@@ -614,13 +614,13 @@ static void zwackery_pia_irq(int state)
static TIMER_CALLBACK( zwackery_493_off_callback )
{
- pia_2_ca1_w(0, 0);
+ pia_2_ca1_w(machine, 0, 0);
}
static TIMER_CALLBACK( zwackery_493_callback )
{
- pia_2_ca1_w(0, 1);
+ pia_2_ca1_w(machine, 0, 1);
timer_set(video_screen_get_scan_period(0), NULL, 0, zwackery_493_off_callback);
}
@@ -903,26 +903,26 @@ static READ16_HANDLER( mcr68_6840_r_common )
WRITE16_HANDLER( mcr68_6840_upper_w )
{
if (ACCESSING_MSB)
- mcr68_6840_w_common(offset, (data >> 8) & 0xff);
+ mcr68_6840_w_common(machine, offset, (data >> 8) & 0xff);
}
WRITE16_HANDLER( mcr68_6840_lower_w )
{
if (ACCESSING_LSB)
- mcr68_6840_w_common(offset, data & 0xff);
+ mcr68_6840_w_common(machine, offset, data & 0xff);
}
READ16_HANDLER( mcr68_6840_upper_r )
{
- return (mcr68_6840_r_common(offset,0) << 8) | 0x00ff;
+ return (mcr68_6840_r_common(machine,offset,0) << 8) | 0x00ff;
}
READ16_HANDLER( mcr68_6840_lower_r )
{
- return mcr68_6840_r_common(offset,0) | 0xff00;
+ return mcr68_6840_r_common(machine,offset,0) | 0xff00;
}
@@ -1023,5 +1023,5 @@ READ8_HANDLER( mcr_ipu_watchdog_r )
WRITE8_HANDLER( mcr_ipu_watchdog_w )
{
- mcr_ipu_watchdog_r(0);
+ mcr_ipu_watchdog_r(machine,0);
}
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 3da1dff83c6..9434342fe20 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -92,8 +92,8 @@ MACHINE_RESET( mhavoc )
memory_configure_bank(2, 0, 4, memory_region(REGION_CPU1) + 0x10000, 0x2000);
/* reset RAM/ROM banks to 0 */
- mhavoc_ram_banksel_w(0, 0);
- mhavoc_rom_banksel_w(0, 0);
+ mhavoc_ram_banksel_w(machine, 0, 0);
+ mhavoc_rom_banksel_w(machine, 0, 0);
/* reset alpha comm status */
alpha_data = 0;
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index b1d66e923c1..bcbcff8a047 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -853,9 +853,9 @@ READ32_HANDLER( midway_ioasic_packed_r )
{
UINT32 result = 0;
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- result |= midway_ioasic_r(offset*2, 0xffff0000) & 0xffff;
+ result |= midway_ioasic_r(machine, offset*2, 0xffff0000) & 0xffff;
if ((mem_mask & 0xffff0000) != 0xffff0000)
- result |= (midway_ioasic_r(offset*2+1, 0xffff0000) & 0xffff) << 16;
+ result |= (midway_ioasic_r(machine, offset*2+1, 0xffff0000) & 0xffff) << 16;
return result;
}
@@ -949,9 +949,9 @@ READ32_HANDLER( midway_ioasic_r )
WRITE32_HANDLER( midway_ioasic_packed_w )
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- midway_ioasic_w(offset*2, data & 0xffff, 0xffff0000);
+ midway_ioasic_w(machine, offset*2, data & 0xffff, 0xffff0000);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- midway_ioasic_w(offset*2+1, data >> 16, 0xffff0000);
+ midway_ioasic_w(machine, offset*2+1, data >> 16, 0xffff0000);
}
@@ -1075,11 +1075,11 @@ READ32_HANDLER( midway_ide_asic_r )
/* offset 0 is a special case */
if (offset == 0)
- result = ide_controller32_0_r(ideoffs, 0xffff0000);
+ result = ide_controller32_0_r(machine, ideoffs, 0xffff0000);
/* everything else is byte-sized */
else
- result = ide_controller32_0_r(ideoffs, ~(0xff << shift)) >> shift;
+ result = ide_controller32_0_r(machine, ideoffs, ~(0xff << shift)) >> shift;
return result;
}
@@ -1092,9 +1092,9 @@ WRITE32_HANDLER( midway_ide_asic_w )
/* offset 0 is a special case */
if (offset == 0)
- ide_controller32_0_w(ideoffs, data, 0xffff0000);
+ ide_controller32_0_w(machine, ideoffs, data, 0xffff0000);
/* everything else is byte-sized */
else
- ide_controller32_0_w(ideoffs, data << shift, ~(0xff << shift));
+ ide_controller32_0_w(machine, ideoffs, data << shift, ~(0xff << shift));
}
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index ca8882533eb..99309a3feeb 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -191,7 +191,7 @@ READ16_HANDLER( midwunit_io_r )
return readinputport(offset);
case 4:
- return (midway_serial_pic_status_r() << 12) | midwunit_sound_state_r(0,0);
+ return (midway_serial_pic_status_r() << 12) | midwunit_sound_state_r(machine,0,0);
default:
logerror("%08X:Unknown I/O read from %d\n", activecpu_get_pc(), offset);
@@ -281,7 +281,7 @@ READ16_HANDLER( midxunit_uart_r )
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midwunit_sound_state_r(0, 0);
+ int temp = midwunit_sound_state_r(machine, 0, 0);
result |= (temp & 0x800) >> 9;
result |= (~temp & 0x400) >> 10;
timer_call_after_resynch(NULL, 0, 0);
@@ -296,7 +296,7 @@ READ16_HANDLER( midxunit_uart_r )
/* non-loopback case: read from the DCS system */
else
- result = midwunit_sound_r(0, 0);
+ result = midwunit_sound_r(machine, 0, 0);
break;
case 5: /* register 5 seems to be like 3, but with in/out swapped */
@@ -308,7 +308,7 @@ READ16_HANDLER( midxunit_uart_r )
/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
else
{
- int temp = midwunit_sound_state_r(0, 0);
+ int temp = midwunit_sound_state_r(machine, 0, 0);
result |= (temp & 0x800) >> 11;
result |= (~temp & 0x400) >> 8;
timer_call_after_resynch(NULL, 0, 0);
@@ -344,7 +344,7 @@ WRITE16_HANDLER( midxunit_uart_w )
/* non-loopback case: send to the DCS system */
else
- midwunit_sound_w(0, data, mem_mask);
+ midwunit_sound_w(machine, 0, data, mem_mask);
break;
case 5: /* register 5 write seems to reset things */
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index ff18d428564..a7b3d138de9 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -463,7 +463,7 @@ DRIVER_INIT( mkyawdim )
/********************** Terminator 2 **********************/
-static void term2_init_common(write16_handler hack_w)
+static void term2_init_common(write16_machine_func hack_w)
{
/* protection */
static const struct protection_data term2_protection_data =
@@ -579,7 +579,7 @@ WRITE16_HANDLER( midyunit_sound_w )
break;
case SOUND_YAWDIM:
- soundlatch_w(0, data);
+ soundlatch_w(machine, 0, data);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
break;
}
diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c
index 15435b2845b..675c78a022e 100644
--- a/src/mame/machine/namcoio.c
+++ b/src/mame/machine/namcoio.c
@@ -146,8 +146,8 @@ TODO:
struct namcoio
{
INT32 type;
- read8_handler in[4];
- write8_handler out[2];
+ read8_machine_func in[4];
+ write8_machine_func out[2];
INT32 reset;
INT32 lastcoins,lastbuttons;
INT32 credits;
@@ -165,8 +165,8 @@ static emu_timer *nmi_timer[MAX_06XX];
static READ8_HANDLER( nop_r ) { return 0x0f; }
static WRITE8_HANDLER( nop_w ) { }
-#define READ_PORT(n) (io[chip].in[n](0) & 0x0f)
-#define WRITE_PORT(n,d) io[chip].out[n](0,(d) & 0x0f)
+#define READ_PORT(m,n) (io[chip].in[n](m,0) & 0x0f)
+#define WRITE_PORT(m,n,d) io[chip].out[n](m,0,(d) & 0x0f)
@@ -184,7 +184,7 @@ commands:
07: nop
*/
-static void namcoio_51XX_write(int chip,int data)
+static void namcoio_51XX_write(running_machine *machine,int chip,int data)
{
data &= 0x07;
@@ -282,7 +282,7 @@ static const int joy_map[16] =
{ 0xf, 0xe, 0xd, 0x5, 0xc, 0x9, 0x7, 0x6, 0xb, 0x3, 0xa, 0x4, 0x1, 0x2, 0x0, 0x8 };
-static UINT8 namcoio_51XX_read(int chip)
+static UINT8 namcoio_51XX_read(running_machine *machine, int chip)
{
LOG(("%04x: custom 51XX read\n",activecpu_get_pc()));
@@ -291,8 +291,8 @@ static UINT8 namcoio_51XX_read(int chip)
switch ((io[chip].in_count++) % 3)
{
default:
- case 0: return READ_PORT(0) | (READ_PORT(1) << 4);
- case 1: return READ_PORT(2) | (READ_PORT(3) << 4);
+ case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4);
+ case 1: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4);
case 2: return 0; // nothing?
}
}
@@ -305,7 +305,7 @@ static UINT8 namcoio_51XX_read(int chip)
{
int in,toggle;
- in = ~(READ_PORT(0) | (READ_PORT(1) << 4));
+ in = ~(READ_PORT(machine,0) | (READ_PORT(machine,1) << 4));
toggle = in ^ io[chip].lastcoins;
io[chip].lastcoins = in;
@@ -313,17 +313,17 @@ static UINT8 namcoio_51XX_read(int chip)
{
if (io[chip].credits >= 99)
{
- WRITE_PORT(1,1); // coin lockout
+ WRITE_PORT(machine,1,1); // coin lockout
}
else
{
- WRITE_PORT(1,0); // coin lockout
+ WRITE_PORT(machine,1,0); // coin lockout
/* check if the user inserted a coin */
if (toggle & in & 0x10)
{
io[chip].coins[0]++;
- WRITE_PORT(0,0x04); // coin counter
- WRITE_PORT(0,0x0c);
+ WRITE_PORT(machine,0,0x04); // coin counter
+ WRITE_PORT(machine,0,0x0c);
if (io[chip].coins[0] >= io[chip].coins_per_cred[0])
{
io[chip].credits += io[chip].creds_per_coin[0];
@@ -333,8 +333,8 @@ static UINT8 namcoio_51XX_read(int chip)
if (toggle & in & 0x20)
{
io[chip].coins[1]++;
- WRITE_PORT(0,0x08); // coin counter
- WRITE_PORT(0,0x0c);
+ WRITE_PORT(machine,0,0x08); // coin counter
+ WRITE_PORT(machine,0,0x0c);
if (io[chip].coins[1] >= io[chip].coins_per_cred[1])
{
io[chip].credits += io[chip].creds_per_coin[1];
@@ -354,11 +354,11 @@ static UINT8 namcoio_51XX_read(int chip)
int on = (video_screen_get_frame_number(0) & 0x10) >> 4;
if (io[chip].credits >= 2)
- WRITE_PORT(0,0x0c | 3*on); // lamps
+ WRITE_PORT(machine,0,0x0c | 3*on); // lamps
else if (io[chip].credits >= 1)
- WRITE_PORT(0,0x0c | 2*on); // lamps
+ WRITE_PORT(machine,0,0x0c | 2*on); // lamps
else
- WRITE_PORT(0,0x0c); // lamps off
+ WRITE_PORT(machine,0,0x0c); // lamps off
/* check for 1 player start button */
if (toggle & in & 0x04)
@@ -367,7 +367,7 @@ static UINT8 namcoio_51XX_read(int chip)
{
io[chip].credits--;
io[chip].mode = 2;
- WRITE_PORT(0,0x0c); // lamps off
+ WRITE_PORT(machine,0,0x0c); // lamps off
}
}
/* check for 2 players start button */
@@ -377,7 +377,7 @@ static UINT8 namcoio_51XX_read(int chip)
{
io[chip].credits -= 2;
io[chip].mode = 2;
- WRITE_PORT(0,0x0c); // lamps off
+ WRITE_PORT(machine,0,0x0c); // lamps off
}
}
}
@@ -390,10 +390,10 @@ static UINT8 namcoio_51XX_read(int chip)
case 1:
{
- int joy = READ_PORT(2) & 0x0f;
+ int joy = READ_PORT(machine,2) & 0x0f;
int in,toggle;
- in = ~READ_PORT(0);
+ in = ~READ_PORT(machine,0);
toggle = in ^ io[chip].lastbuttons;
io[chip].lastbuttons = (io[chip].lastbuttons & 2) | (in & 1);
@@ -409,10 +409,10 @@ static UINT8 namcoio_51XX_read(int chip)
case 2:
{
- int joy = READ_PORT(3) & 0x0f;
+ int joy = READ_PORT(machine,3) & 0x0f;
int in,toggle;
- in = ~READ_PORT(0);
+ in = ~READ_PORT(machine,0);
toggle = in ^ io[chip].lastbuttons;
io[chip].lastbuttons = (io[chip].lastbuttons & 1) | (in & 2);
@@ -439,7 +439,7 @@ static UINT8 namcoio_ram[MAX_NAMCOIO * 16];
#define IORAM_WRITE(offset,data) {namcoio_ram[chip * 0x10 + (offset)] = (data) & 0x0f;}
-static void handle_coins(int chip,int swap)
+static void handle_coins(running_machine *machine,int chip,int swap)
{
int val,toggled;
int credit_add = 0;
@@ -448,7 +448,7 @@ static void handle_coins(int chip,int swap)
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- val = ~READ_PORT(0); // pins 38-41
+ val = ~READ_PORT(machine,0); // pins 38-41
toggled = val ^ io[chip].lastcoins;
io[chip].lastcoins = val;
@@ -480,7 +480,7 @@ static void handle_coins(int chip,int swap)
credit_add = 1;
}
- val = ~READ_PORT(3); // pins 30-33
+ val = ~READ_PORT(machine,3); // pins 30-33
toggled = val ^ io[chip].lastbuttons;
io[chip].lastbuttons = val;
@@ -504,17 +504,17 @@ static void handle_coins(int chip,int swap)
IORAM_WRITE(1 ^ swap, io[chip].credits % 10); // BCD credits
IORAM_WRITE(2 ^ swap, credit_add); // credit increment (coin inputs)
IORAM_WRITE(3 ^ swap, credit_sub); // credit decrement (start buttons)
- IORAM_WRITE(4, ~READ_PORT(1)); // pins 22-25
+ IORAM_WRITE(4, ~READ_PORT(machine,1)); // pins 22-25
button = ((val & 0x05) << 1) | (val & toggled & 0x05);
IORAM_WRITE(5, button); // pins 30 & 32 normal and impulse
- IORAM_WRITE(6, ~READ_PORT(2)); // pins 26-29
+ IORAM_WRITE(6, ~READ_PORT(machine,2)); // pins 26-29
button = (val & 0x0a) | ((val & toggled & 0x0a) >> 1);
IORAM_WRITE(7, button); // pins 31 & 33 normal and impulse
}
-static void namco_customio_56XX_run(int chip)
+static void namco_customio_56XX_run(running_machine *machine, int chip)
{
LOG(("execute 56XX %d mode %d\n",chip,IORAM_READ(8)));
@@ -524,15 +524,15 @@ static void namco_customio_56XX_run(int chip)
break;
case 1: // read switch inputs
- IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41
- IORAM_WRITE(1, ~READ_PORT(1)); // pins 22-25
- IORAM_WRITE(2, ~READ_PORT(2)); // pins 26-29
- IORAM_WRITE(3, ~READ_PORT(3)); // pins 30-33
+ IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41
+ IORAM_WRITE(1, ~READ_PORT(machine,1)); // pins 22-25
+ IORAM_WRITE(2, ~READ_PORT(machine,2)); // pins 26-29
+ IORAM_WRITE(3, ~READ_PORT(machine,3)); // pins 30-33
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- WRITE_PORT(0,IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus)
- WRITE_PORT(1,IORAM_READ(10)); // output to pins 17-20 (gaplus)
+ WRITE_PORT(machine,0,IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus)
+ WRITE_PORT(machine,1,IORAM_READ(10)); // output to pins 17-20 (gaplus)
break;
case 2: // initialize coinage settings
@@ -547,7 +547,7 @@ static void namco_customio_56XX_run(int chip)
case 4: // druaga, digdug chip #1: read dip switches and inputs
// superpac chip #0: process coin and start inputs, read switch inputs
- handle_coins(chip,0);
+ handle_coins(machine,chip,0);
break;
case 7: // bootup check (liblrabl only)
@@ -575,16 +575,16 @@ static void namco_customio_56XX_run(int chip)
break;
case 9: // read dip switches and inputs
- WRITE_PORT(0,0); // set pin 13 = 0
- IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41, pin 13 = 0
- IORAM_WRITE(2, ~READ_PORT(1)); // pins 22-25, pin 13 = 0
- IORAM_WRITE(4, ~READ_PORT(2)); // pins 26-29, pin 13 = 0
- IORAM_WRITE(6, ~READ_PORT(3)); // pins 30-33, pin 13 = 0
- WRITE_PORT(0,1); // set pin 13 = 1
- IORAM_WRITE(1, ~READ_PORT(0)); // pins 38-41, pin 13 = 1
- IORAM_WRITE(3, ~READ_PORT(1)); // pins 22-25, pin 13 = 1
- IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29, pin 13 = 1
- IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33, pin 13 = 1
+ WRITE_PORT(machine,0,0); // set pin 13 = 0
+ IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0
+ IORAM_WRITE(2, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 0
+ IORAM_WRITE(4, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 0
+ IORAM_WRITE(6, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 0
+ WRITE_PORT(machine,0,1); // set pin 13 = 1
+ IORAM_WRITE(1, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 1
+ IORAM_WRITE(3, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 1
+ IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 1
+ IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 1
break;
default:
@@ -594,7 +594,7 @@ static void namco_customio_56XX_run(int chip)
-static void namco_customio_59XX_run(int chip)
+static void namco_customio_59XX_run(running_machine *machine, int chip)
{
LOG(("execute 59XX %d mode %d\n",chip,IORAM_READ(8)));
@@ -604,10 +604,10 @@ static void namco_customio_59XX_run(int chip)
break;
case 3: // pacnpal chip #1: read dip switches and inputs
- IORAM_WRITE(4, ~READ_PORT(0)); // pins 38-41, pin 13 = 0 ?
- IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29 ?
- IORAM_WRITE(6, ~READ_PORT(1)); // pins 22-25 ?
- IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33
+ IORAM_WRITE(4, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0 ?
+ IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29 ?
+ IORAM_WRITE(6, ~READ_PORT(machine,1)); // pins 22-25 ?
+ IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33
break;
default:
@@ -617,7 +617,7 @@ static void namco_customio_59XX_run(int chip)
-static void namco_customio_58XX_run(int chip)
+static void namco_customio_58XX_run(running_machine *machine, int chip)
{
LOG(("execute 58XX %d mode %d\n",chip,IORAM_READ(8)));
@@ -627,15 +627,15 @@ static void namco_customio_58XX_run(int chip)
break;
case 1: // read switch inputs
- IORAM_WRITE(4, ~READ_PORT(0)); // pins 38-41
- IORAM_WRITE(5, ~READ_PORT(1)); // pins 22-25
- IORAM_WRITE(6, ~READ_PORT(2)); // pins 26-29
- IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33
+ IORAM_WRITE(4, ~READ_PORT(machine,0)); // pins 38-41
+ IORAM_WRITE(5, ~READ_PORT(machine,1)); // pins 22-25
+ IORAM_WRITE(6, ~READ_PORT(machine,2)); // pins 26-29
+ IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- WRITE_PORT(0,IORAM_READ(9)); // output to pins 13-16 (toypop)
- WRITE_PORT(1,IORAM_READ(10)); // output to pins 17-20 (toypop)
+ WRITE_PORT(machine,0,IORAM_READ(9)); // output to pins 13-16 (toypop)
+ WRITE_PORT(machine,1,IORAM_READ(10)); // output to pins 17-20 (toypop)
break;
case 2: // initialize coinage settings
@@ -649,20 +649,20 @@ static void namco_customio_58XX_run(int chip)
break;
case 3: // process coin and start inputs, read switch inputs
- handle_coins(chip,2);
+ handle_coins(machine,chip,2);
break;
case 4: // read dip switches and inputs
- WRITE_PORT(0,0); // set pin 13 = 0
- IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41, pin 13 = 0
- IORAM_WRITE(2, ~READ_PORT(1)); // pins 22-25, pin 13 = 0
- IORAM_WRITE(4, ~READ_PORT(2)); // pins 26-29, pin 13 = 0
- IORAM_WRITE(6, ~READ_PORT(3)); // pins 30-33, pin 13 = 0
- WRITE_PORT(0,1); // set pin 13 = 1
- IORAM_WRITE(1, ~READ_PORT(0)); // pins 38-41, pin 13 = 1
- IORAM_WRITE(3, ~READ_PORT(1)); // pins 22-25, pin 13 = 1
- IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29, pin 13 = 1
- IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33, pin 13 = 1
+ WRITE_PORT(machine,0,0); // set pin 13 = 0
+ IORAM_WRITE(0, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 0
+ IORAM_WRITE(2, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 0
+ IORAM_WRITE(4, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 0
+ IORAM_WRITE(6, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 0
+ WRITE_PORT(machine,0,1); // set pin 13 = 1
+ IORAM_WRITE(1, ~READ_PORT(machine,0)); // pins 38-41, pin 13 = 1
+ IORAM_WRITE(3, ~READ_PORT(machine,1)); // pins 22-25, pin 13 = 1
+ IORAM_WRITE(5, ~READ_PORT(machine,2)); // pins 26-29, pin 13 = 1
+ IORAM_WRITE(7, ~READ_PORT(machine,3)); // pins 30-33, pin 13 = 1
break;
case 5: // bootup check
@@ -766,13 +766,13 @@ static TIMER_CALLBACK( namcoio_run )
switch (io[param].type)
{
case NAMCOIO_56XX:
- namco_customio_56XX_run(param);
+ namco_customio_56XX_run(machine, param);
break;
case NAMCOIO_58XX:
- namco_customio_58XX_run(param);
+ namco_customio_58XX_run(machine, param);
break;
case NAMCOIO_59XX:
- namco_customio_59XX_run(param);
+ namco_customio_59XX_run(machine, param);
break;
}
}
@@ -867,33 +867,33 @@ void namco_06xx_init(int chipnum, int cpu,
-static UINT8 namcoio_53XX_digdug_read(int chip)
+static UINT8 namcoio_53XX_digdug_read(running_machine *machine, int chip)
{
LOG(("%04x: custom 53XX read\n",activecpu_get_pc()));
switch ((io[chip].in_count++) % 2)
{
default:
- case 0: return READ_PORT(0) | (READ_PORT(1) << 4);
- case 1: return READ_PORT(2) | (READ_PORT(3) << 4);
+ case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4);
+ case 1: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4);
}
}
-static UINT8 namcoio_53XX_polepos_read(int chip)
+static UINT8 namcoio_53XX_polepos_read(running_machine *machine,int chip)
{
LOG(("%04x: custom 53XX read\n",activecpu_get_pc()));
switch ((io[chip].in_count++) % 8)
{
- case 0: return READ_PORT(0) | (READ_PORT(1) << 4); // steering
- case 4: return READ_PORT(2) | (READ_PORT(3) << 4); // dip switches
+ case 0: return READ_PORT(machine,0) | (READ_PORT(machine,1) << 4); // steering
+ case 4: return READ_PORT(machine,2) | (READ_PORT(machine,3) << 4); // dip switches
default: return 0xff; // polepos2 hangs if 0 is returned
}
}
-static UINT8 namco_06xx_data_read(int chipnum)
+static UINT8 namco_06xx_data_read(running_machine *machine, int chipnum)
{
LOG(("forwarding read to chip %d\n",chipnum%3));
@@ -901,9 +901,9 @@ static UINT8 namco_06xx_data_read(int chipnum)
{
case NAMCOIO_50XX: return namco_50xx_read();
case NAMCOIO_50XX_2: return namco_50xx_2_read();
- case NAMCOIO_51XX: return namcoio_51XX_read(chipnum);
- case NAMCOIO_53XX_DIGDUG: return namcoio_53XX_digdug_read(chipnum);
- case NAMCOIO_53XX_POLEPOS: return namcoio_53XX_polepos_read(chipnum);
+ case NAMCOIO_51XX: return namcoio_51XX_read(machine, chipnum);
+ case NAMCOIO_53XX_DIGDUG: return namcoio_53XX_digdug_read(machine, chipnum);
+ case NAMCOIO_53XX_POLEPOS: return namcoio_53XX_polepos_read(machine, chipnum);
default:
logerror("%04x: custom IO type %d unsupported read\n",activecpu_get_pc(),io[chipnum].type);
return 0xff;
@@ -911,7 +911,7 @@ static UINT8 namco_06xx_data_read(int chipnum)
}
-static void namco_06xx_data_write(int chipnum,UINT8 data)
+static void namco_06xx_data_write(running_machine *machine,int chipnum,UINT8 data)
{
LOG(("forwarding write to chip %d\n",chipnum%3));
@@ -919,7 +919,7 @@ static void namco_06xx_data_write(int chipnum,UINT8 data)
{
case NAMCOIO_50XX: namco_50xx_write(data); break;
case NAMCOIO_50XX_2: namco_50xx_2_write(data); break;
- case NAMCOIO_51XX: namcoio_51XX_write(chipnum,data); break;
+ case NAMCOIO_51XX: namcoio_51XX_write(machine,chipnum,data); break;
case NAMCOIO_52XX: namcoio_52XX_write(data); break;
case NAMCOIO_54XX: namco_54xx_write(data); break;
default:
@@ -944,7 +944,7 @@ static void namco_06xx_read_request(int chipnum)
}
-static UINT8 namco_06xx_data_r(int chip,int offset)
+static UINT8 namco_06xx_data_r(running_machine *machine,int chip,int offset)
{
LOG(("%04x: 06XX #%d read offset %d\n",activecpu_get_pc(),chip,offset));
@@ -956,10 +956,10 @@ static UINT8 namco_06xx_data_r(int chip,int offset)
switch (customio_command[chip] & 0xf)
{
- case 0x1: return namco_06xx_data_read(4*chip + 0); break;
- case 0x2: return namco_06xx_data_read(4*chip + 1); break;
- case 0x4: return namco_06xx_data_read(4*chip + 2); break;
- case 0x8: return namco_06xx_data_read(4*chip + 3); break;
+ case 0x1: return namco_06xx_data_read(machine, 4*chip + 0); break;
+ case 0x2: return namco_06xx_data_read(machine, 4*chip + 1); break;
+ case 0x4: return namco_06xx_data_read(machine, 4*chip + 2); break;
+ case 0x8: return namco_06xx_data_read(machine, 4*chip + 3); break;
default:
logerror("%04x: 06XX #%d read in unsupported mode %02x\n",activecpu_get_pc(),chip,customio_command[chip]);
return 0xff;
@@ -967,7 +967,7 @@ static UINT8 namco_06xx_data_r(int chip,int offset)
}
-static void namco_06xx_data_w(int chip,int offset,int data)
+static void namco_06xx_data_w(running_machine *machine,int chip,int offset,int data)
{
LOG(("%04x: 06XX #%d write offset %d = %02x\n",activecpu_get_pc(),chip,offset,data));
@@ -979,10 +979,10 @@ static void namco_06xx_data_w(int chip,int offset,int data)
switch (customio_command[chip] & 0xf)
{
- case 0x1: namco_06xx_data_write(4*chip + 0,data); break;
- case 0x2: namco_06xx_data_write(4*chip + 1,data); break;
- case 0x4: namco_06xx_data_write(4*chip + 2,data); break;
- case 0x8: namco_06xx_data_write(4*chip + 3,data); break;
+ case 0x1: namco_06xx_data_write(machine,4*chip + 0,data); break;
+ case 0x2: namco_06xx_data_write(machine,4*chip + 1,data); break;
+ case 0x4: namco_06xx_data_write(machine,4*chip + 2,data); break;
+ case 0x8: namco_06xx_data_write(machine,4*chip + 3,data); break;
default:
logerror("%04x: 06XX #%d write in unsupported mode %02x\n",activecpu_get_pc(),chip,customio_command[chip]);
break;
@@ -1034,10 +1034,10 @@ static void namco_06xx_ctrl_w(int chip,int data)
-READ8_HANDLER( namco_06xx_0_data_r ) { return namco_06xx_data_r(0,offset); }
-READ8_HANDLER( namco_06xx_1_data_r ) { return namco_06xx_data_r(1,offset); }
-WRITE8_HANDLER( namco_06xx_0_data_w ) { namco_06xx_data_w(0,offset,data); }
-WRITE8_HANDLER( namco_06xx_1_data_w ) { namco_06xx_data_w(1,offset,data); }
+READ8_HANDLER( namco_06xx_0_data_r ) { return namco_06xx_data_r(machine,0,offset); }
+READ8_HANDLER( namco_06xx_1_data_r ) { return namco_06xx_data_r(machine,1,offset); }
+WRITE8_HANDLER( namco_06xx_0_data_w ) { namco_06xx_data_w(machine,0,offset,data); }
+WRITE8_HANDLER( namco_06xx_1_data_w ) { namco_06xx_data_w(machine,1,offset,data); }
READ8_HANDLER( namco_06xx_0_ctrl_r ) { return namco_06xx_ctrl_r(0); }
READ8_HANDLER( namco_06xx_1_ctrl_r ) { return namco_06xx_ctrl_r(1); }
WRITE8_HANDLER( namco_06xx_0_ctrl_w ) { namco_06xx_ctrl_w(0,data); }
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 1bc59433fb1..b5515a57185 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -23,8 +23,8 @@ enum
struct namcoio_interface
{
- read8_handler in[4]; /* read handlers for ports A-D */
- write8_handler out[2]; /* write handlers for ports A-B */
+ read8_machine_func in[4]; /* read handlers for ports A-D */
+ write8_machine_func out[2]; /* write handlers for ports A-B */
};
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 340e1821e1d..055c54d3a40 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -32,8 +32,8 @@ static UINT8 *s1ram;
/* Bank handler definitions */
typedef struct
{
- read8_handler bank_handler_r;
- write8_handler bank_handler_w;
+ read8_machine_func bank_handler_r;
+ write8_machine_func bank_handler_w;
int bank_offset;
UINT8 *bank_pointer;
} bankhandler;
@@ -42,41 +42,41 @@ typedef struct
static bankhandler namcos1_bank_element[NAMCOS1_MAX_BANK];
static bankhandler namcos1_active_bank[16];
-static READ8_HANDLER( bank1_r ) { return (*namcos1_active_bank[0].bank_handler_r )(offset + namcos1_active_bank[0].bank_offset); }
-static READ8_HANDLER( bank2_r ) { return (*namcos1_active_bank[1].bank_handler_r )(offset + namcos1_active_bank[1].bank_offset); }
-static READ8_HANDLER( bank3_r ) { return (*namcos1_active_bank[2].bank_handler_r )(offset + namcos1_active_bank[2].bank_offset); }
-static READ8_HANDLER( bank4_r ) { return (*namcos1_active_bank[3].bank_handler_r )(offset + namcos1_active_bank[3].bank_offset); }
-static READ8_HANDLER( bank5_r ) { return (*namcos1_active_bank[4].bank_handler_r )(offset + namcos1_active_bank[4].bank_offset); }
-static READ8_HANDLER( bank6_r ) { return (*namcos1_active_bank[5].bank_handler_r )(offset + namcos1_active_bank[5].bank_offset); }
-static READ8_HANDLER( bank7_r ) { return (*namcos1_active_bank[6].bank_handler_r )(offset + namcos1_active_bank[6].bank_offset); }
-static READ8_HANDLER( bank8_r ) { return (*namcos1_active_bank[7].bank_handler_r )(offset + namcos1_active_bank[7].bank_offset); }
-static READ8_HANDLER( bank9_r ) { return (*namcos1_active_bank[8].bank_handler_r )(offset + namcos1_active_bank[8].bank_offset); }
-static READ8_HANDLER( bank10_r ) { return (*namcos1_active_bank[9].bank_handler_r )(offset + namcos1_active_bank[9].bank_offset); }
-static READ8_HANDLER( bank11_r ) { return (*namcos1_active_bank[10].bank_handler_r)(offset + namcos1_active_bank[10].bank_offset); }
-static READ8_HANDLER( bank12_r ) { return (*namcos1_active_bank[11].bank_handler_r)(offset + namcos1_active_bank[11].bank_offset); }
-static READ8_HANDLER( bank13_r ) { return (*namcos1_active_bank[12].bank_handler_r)(offset + namcos1_active_bank[12].bank_offset); }
-static READ8_HANDLER( bank14_r ) { return (*namcos1_active_bank[13].bank_handler_r)(offset + namcos1_active_bank[13].bank_offset); }
-static READ8_HANDLER( bank15_r ) { return (*namcos1_active_bank[14].bank_handler_r)(offset + namcos1_active_bank[14].bank_offset); }
-static READ8_HANDLER( bank16_r ) { return (*namcos1_active_bank[15].bank_handler_r)(offset + namcos1_active_bank[15].bank_offset); }
-
-static WRITE8_HANDLER( bank1_w ) { (*namcos1_active_bank[0].bank_handler_w )(offset + namcos1_active_bank[0].bank_offset, data); }
-static WRITE8_HANDLER( bank2_w ) { (*namcos1_active_bank[1].bank_handler_w )(offset + namcos1_active_bank[1].bank_offset, data); }
-static WRITE8_HANDLER( bank3_w ) { (*namcos1_active_bank[2].bank_handler_w )(offset + namcos1_active_bank[2].bank_offset, data); }
-static WRITE8_HANDLER( bank4_w ) { (*namcos1_active_bank[3].bank_handler_w )(offset + namcos1_active_bank[3].bank_offset, data); }
-static WRITE8_HANDLER( bank5_w ) { (*namcos1_active_bank[4].bank_handler_w )(offset + namcos1_active_bank[4].bank_offset, data); }
-static WRITE8_HANDLER( bank6_w ) { (*namcos1_active_bank[5].bank_handler_w )(offset + namcos1_active_bank[5].bank_offset, data); }
-static WRITE8_HANDLER( bank7_w ) { (*namcos1_active_bank[6].bank_handler_w )(offset + namcos1_active_bank[6].bank_offset, data); }
-static WRITE8_HANDLER( bank8_w ) { (*namcos1_active_bank[7].bank_handler_w )(offset + namcos1_active_bank[7].bank_offset, data); }
-static WRITE8_HANDLER( bank9_w ) { (*namcos1_active_bank[8].bank_handler_w )(offset + namcos1_active_bank[8].bank_offset, data); }
-static WRITE8_HANDLER( bank10_w ) { (*namcos1_active_bank[9].bank_handler_w )(offset + namcos1_active_bank[9].bank_offset, data); }
-static WRITE8_HANDLER( bank11_w ) { (*namcos1_active_bank[10].bank_handler_w)(offset + namcos1_active_bank[10].bank_offset, data); }
-static WRITE8_HANDLER( bank12_w ) { (*namcos1_active_bank[11].bank_handler_w)(offset + namcos1_active_bank[11].bank_offset, data); }
-static WRITE8_HANDLER( bank13_w ) { (*namcos1_active_bank[12].bank_handler_w)(offset + namcos1_active_bank[12].bank_offset, data); }
-static WRITE8_HANDLER( bank14_w ) { (*namcos1_active_bank[13].bank_handler_w)(offset + namcos1_active_bank[13].bank_offset, data); }
-static WRITE8_HANDLER( bank15_w ) { (*namcos1_active_bank[14].bank_handler_w)(offset + namcos1_active_bank[14].bank_offset, data); }
-static WRITE8_HANDLER( bank16_w ) { (*namcos1_active_bank[15].bank_handler_w)(offset + namcos1_active_bank[15].bank_offset, data); }
-
-static const read8_handler ram_bank_handler_r[16] =
+static READ8_HANDLER( bank1_r ) { return (*namcos1_active_bank[0].bank_handler_r )(machine, offset + namcos1_active_bank[0].bank_offset); }
+static READ8_HANDLER( bank2_r ) { return (*namcos1_active_bank[1].bank_handler_r )(machine, offset + namcos1_active_bank[1].bank_offset); }
+static READ8_HANDLER( bank3_r ) { return (*namcos1_active_bank[2].bank_handler_r )(machine, offset + namcos1_active_bank[2].bank_offset); }
+static READ8_HANDLER( bank4_r ) { return (*namcos1_active_bank[3].bank_handler_r )(machine, offset + namcos1_active_bank[3].bank_offset); }
+static READ8_HANDLER( bank5_r ) { return (*namcos1_active_bank[4].bank_handler_r )(machine, offset + namcos1_active_bank[4].bank_offset); }
+static READ8_HANDLER( bank6_r ) { return (*namcos1_active_bank[5].bank_handler_r )(machine, offset + namcos1_active_bank[5].bank_offset); }
+static READ8_HANDLER( bank7_r ) { return (*namcos1_active_bank[6].bank_handler_r )(machine, offset + namcos1_active_bank[6].bank_offset); }
+static READ8_HANDLER( bank8_r ) { return (*namcos1_active_bank[7].bank_handler_r )(machine, offset + namcos1_active_bank[7].bank_offset); }
+static READ8_HANDLER( bank9_r ) { return (*namcos1_active_bank[8].bank_handler_r )(machine, offset + namcos1_active_bank[8].bank_offset); }
+static READ8_HANDLER( bank10_r ) { return (*namcos1_active_bank[9].bank_handler_r )(machine, offset + namcos1_active_bank[9].bank_offset); }
+static READ8_HANDLER( bank11_r ) { return (*namcos1_active_bank[10].bank_handler_r)(machine, offset + namcos1_active_bank[10].bank_offset); }
+static READ8_HANDLER( bank12_r ) { return (*namcos1_active_bank[11].bank_handler_r)(machine, offset + namcos1_active_bank[11].bank_offset); }
+static READ8_HANDLER( bank13_r ) { return (*namcos1_active_bank[12].bank_handler_r)(machine, offset + namcos1_active_bank[12].bank_offset); }
+static READ8_HANDLER( bank14_r ) { return (*namcos1_active_bank[13].bank_handler_r)(machine, offset + namcos1_active_bank[13].bank_offset); }
+static READ8_HANDLER( bank15_r ) { return (*namcos1_active_bank[14].bank_handler_r)(machine, offset + namcos1_active_bank[14].bank_offset); }
+static READ8_HANDLER( bank16_r ) { return (*namcos1_active_bank[15].bank_handler_r)(machine, offset + namcos1_active_bank[15].bank_offset); }
+
+static WRITE8_HANDLER( bank1_w ) { (*namcos1_active_bank[0].bank_handler_w )(machine, offset + namcos1_active_bank[0].bank_offset, data); }
+static WRITE8_HANDLER( bank2_w ) { (*namcos1_active_bank[1].bank_handler_w )(machine, offset + namcos1_active_bank[1].bank_offset, data); }
+static WRITE8_HANDLER( bank3_w ) { (*namcos1_active_bank[2].bank_handler_w )(machine, offset + namcos1_active_bank[2].bank_offset, data); }
+static WRITE8_HANDLER( bank4_w ) { (*namcos1_active_bank[3].bank_handler_w )(machine, offset + namcos1_active_bank[3].bank_offset, data); }
+static WRITE8_HANDLER( bank5_w ) { (*namcos1_active_bank[4].bank_handler_w )(machine, offset + namcos1_active_bank[4].bank_offset, data); }
+static WRITE8_HANDLER( bank6_w ) { (*namcos1_active_bank[5].bank_handler_w )(machine, offset + namcos1_active_bank[5].bank_offset, data); }
+static WRITE8_HANDLER( bank7_w ) { (*namcos1_active_bank[6].bank_handler_w )(machine, offset + namcos1_active_bank[6].bank_offset, data); }
+static WRITE8_HANDLER( bank8_w ) { (*namcos1_active_bank[7].bank_handler_w )(machine, offset + namcos1_active_bank[7].bank_offset, data); }
+static WRITE8_HANDLER( bank9_w ) { (*namcos1_active_bank[8].bank_handler_w )(machine, offset + namcos1_active_bank[8].bank_offset, data); }
+static WRITE8_HANDLER( bank10_w ) { (*namcos1_active_bank[9].bank_handler_w )(machine, offset + namcos1_active_bank[9].bank_offset, data); }
+static WRITE8_HANDLER( bank11_w ) { (*namcos1_active_bank[10].bank_handler_w)(machine, offset + namcos1_active_bank[10].bank_offset, data); }
+static WRITE8_HANDLER( bank12_w ) { (*namcos1_active_bank[11].bank_handler_w)(machine, offset + namcos1_active_bank[11].bank_offset, data); }
+static WRITE8_HANDLER( bank13_w ) { (*namcos1_active_bank[12].bank_handler_w)(machine, offset + namcos1_active_bank[12].bank_offset, data); }
+static WRITE8_HANDLER( bank14_w ) { (*namcos1_active_bank[13].bank_handler_w)(machine, offset + namcos1_active_bank[13].bank_offset, data); }
+static WRITE8_HANDLER( bank15_w ) { (*namcos1_active_bank[14].bank_handler_w)(machine, offset + namcos1_active_bank[14].bank_offset, data); }
+static WRITE8_HANDLER( bank16_w ) { (*namcos1_active_bank[15].bank_handler_w)(machine, offset + namcos1_active_bank[15].bank_offset, data); }
+
+static const read8_machine_func ram_bank_handler_r[16] =
{
MRA8_BANK1 ,MRA8_BANK2 ,MRA8_BANK3 ,MRA8_BANK4 ,
MRA8_BANK5 ,MRA8_BANK6 ,MRA8_BANK7 ,MRA8_BANK8 ,
@@ -84,7 +84,7 @@ static const read8_handler ram_bank_handler_r[16] =
MRA8_BANK13,MRA8_BANK14,MRA8_BANK15,MRA8_BANK16
};
-static const write8_handler ram_bank_handler_w[16] =
+static const write8_machine_func ram_bank_handler_w[16] =
{
MWA8_BANK1 ,MWA8_BANK2 ,MWA8_BANK3 ,MWA8_BANK4 ,
MWA8_BANK5 ,MWA8_BANK6 ,MWA8_BANK7 ,MWA8_BANK8 ,
@@ -92,7 +92,7 @@ static const write8_handler ram_bank_handler_w[16] =
MWA8_BANK13,MWA8_BANK14,MWA8_BANK15,MWA8_BANK16
};
-static const read8_handler io_bank_handler_r[16] =
+static const read8_machine_func io_bank_handler_r[16] =
{
bank1_r, bank2_r, bank3_r, bank4_r,
bank5_r, bank6_r, bank7_r, bank8_r,
@@ -100,7 +100,7 @@ static const read8_handler io_bank_handler_r[16] =
bank13_r, bank14_r, bank15_r, bank16_r
};
-static const write8_handler io_bank_handler_w[16] =
+static const write8_machine_func io_bank_handler_w[16] =
{
bank1_w, bank2_w, bank3_w, bank4_w,
bank5_w, bank6_w, bank7_w, bank8_w,
@@ -599,7 +599,7 @@ WRITE8_HANDLER( namcos1_watchdog_w )
if (wdog == 7 || !namcos1_reset)
{
wdog = 0;
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
}
}
@@ -612,7 +612,7 @@ static READ8_HANDLER( soundram_r )
offset &= 0x3ff;
/* CUS 30 */
- return namcos1_cus30_r(offset);
+ return namcos1_cus30_r(machine,offset);
}
else
{
@@ -630,7 +630,7 @@ static WRITE8_HANDLER( soundram_w )
offset &= 0x3ff;
/* CUS 30 */
- namcos1_cus30_w(offset,data);
+ namcos1_cus30_w(machine,offset,data);
}
else
{
@@ -755,7 +755,7 @@ WRITE8_HANDLER( namcos1_subcpu_bank_w )
* *
*******************************************************************************/
-static void namcos1_install_bank(int start,int end,read8_handler hr,write8_handler hw,
+static void namcos1_install_bank(int start,int end,read8_machine_func hr,write8_machine_func hw,
int offset,UINT8 *pointer)
{
int i;
@@ -772,7 +772,7 @@ static void namcos1_install_bank(int start,int end,read8_handler hr,write8_handl
-static void namcos1_build_banks(read8_handler key_r,write8_handler key_w)
+static void namcos1_build_banks(read8_machine_func key_r,write8_machine_func key_w)
{
int i;
@@ -944,8 +944,8 @@ WRITE8_HANDLER( namcos1_mcu_patch_w )
struct namcos1_specific
{
/* keychip */
- read8_handler key_r;
- write8_handler key_w;
+ read8_machine_func key_r;
+ write8_machine_func key_w;
int key_id;
int key_reg1;
int key_reg2;
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 56ba190feb4..309d8e85b3c 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -105,7 +105,7 @@ MACHINE_RESET( namcos2 )
mFinalLapProtCount = 0;
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(0,0); /* Page in bank 0 */
+ namcos2_sound_bankselect_w(machine,0,0); /* Page in bank 0 */
cpunum_set_input_line(machine, CPU_SOUND, INPUT_LINE_RESET, ASSERT_LINE );
@@ -743,28 +743,28 @@ WRITE8_HANDLER( namcos2_mcu_analog_ctrl_w )
switch((data>>2)&0x07)
{
case 0:
- namcos2_mcu_analog_data=input_port_2_r(0);
+ namcos2_mcu_analog_data=input_port_2_r(machine,0);
break;
case 1:
- namcos2_mcu_analog_data=input_port_3_r(0);
+ namcos2_mcu_analog_data=input_port_3_r(machine,0);
break;
case 2:
- namcos2_mcu_analog_data=input_port_4_r(0);
+ namcos2_mcu_analog_data=input_port_4_r(machine,0);
break;
case 3:
- namcos2_mcu_analog_data=input_port_5_r(0);
+ namcos2_mcu_analog_data=input_port_5_r(machine,0);
break;
case 4:
- namcos2_mcu_analog_data=input_port_6_r(0);
+ namcos2_mcu_analog_data=input_port_6_r(machine,0);
break;
case 5:
- namcos2_mcu_analog_data=input_port_7_r(0);
+ namcos2_mcu_analog_data=input_port_7_r(machine,0);
break;
case 6:
- namcos2_mcu_analog_data=input_port_8_r(0);
+ namcos2_mcu_analog_data=input_port_8_r(machine,0);
break;
case 7:
- namcos2_mcu_analog_data=input_port_9_r(0);
+ namcos2_mcu_analog_data=input_port_9_r(machine,0);
break;
}
#if 0
@@ -820,14 +820,14 @@ READ8_HANDLER( namcos2_mcu_port_d_r )
int data=0;
/* Read/convert the bits one at a time */
- if(input_port_2_r(0)>threshold) data|=0x01;
- if(input_port_3_r(0)>threshold) data|=0x02;
- if(input_port_4_r(0)>threshold) data|=0x04;
- if(input_port_5_r(0)>threshold) data|=0x08;
- if(input_port_6_r(0)>threshold) data|=0x10;
- if(input_port_7_r(0)>threshold) data|=0x20;
- if(input_port_8_r(0)>threshold) data|=0x40;
- if(input_port_9_r(0)>threshold) data|=0x80;
+ if(input_port_2_r(machine,0)>threshold) data|=0x01;
+ if(input_port_3_r(machine,0)>threshold) data|=0x02;
+ if(input_port_4_r(machine,0)>threshold) data|=0x04;
+ if(input_port_5_r(machine,0)>threshold) data|=0x08;
+ if(input_port_6_r(machine,0)>threshold) data|=0x10;
+ if(input_port_7_r(machine,0)>threshold) data|=0x20;
+ if(input_port_8_r(machine,0)>threshold) data|=0x40;
+ if(input_port_9_r(machine,0)>threshold) data|=0x80;
/* Return the result */
return data;
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index b767c02697c..41ed443d9be 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -339,7 +339,7 @@ READ8_HANDLER( nb1413m3_sndrom_r )
WRITE8_HANDLER( nb1413m3_sndrombank1_w )
{
// if (data & 0x02) coin counter ?
- nb1413m3_outcoin_w(0, data); // (data & 0x04) >> 2;
+ nb1413m3_outcoin_w(machine, 0, data); // (data & 0x04) >> 2;
nb1413m3_nmi_enable = ((data & 0x20) >> 5);
nb1413m3_sndrombank1 = (((data & 0xc0) >> 5) | ((data & 0x10) >> 4));
}
@@ -381,14 +381,14 @@ READ8_HANDLER( nb1413m3_inputport0_r )
switch (nb1413m3_type)
{
case NB1413M3_PASTELG:
- return ((input_port_3_r(0) & 0xfe) | (nb1413m3_busyflag & 0x01));
+ return ((input_port_3_r(machine,0) & 0xfe) | (nb1413m3_busyflag & 0x01));
case NB1413M3_TAIWANMB:
- return ((input_port_3_r(0) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
+ return ((input_port_3_r(machine,0) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
case NB1413M3_HYHOO:
case NB1413M3_HYHOO2:
- return ((input_port_2_r(0) & 0xfe) | (nb1413m3_busyflag & 0x01));
+ return ((input_port_2_r(machine,0) & 0xfe) | (nb1413m3_busyflag & 0x01));
default:
- return ((input_port_2_r(0) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
+ return ((input_port_2_r(machine,0) & 0xfc) | ((nb1413m3_outcoin_flag & 0x01) << 1) | (nb1413m3_busyflag & 0x01));
}
}
@@ -537,7 +537,7 @@ READ8_HANDLER( nb1413m3_inputport3_r )
case NB1413M3_MAIKO:
case NB1413M3_MMAIKO:
case NB1413M3_HANAOJI:
- return ((input_port_13_r(0) & 0xfd) | ((nb1413m3_outcoin_flag & 0x01) << 1));
+ return ((input_port_13_r(machine,0) & 0xfd) | ((nb1413m3_outcoin_flag & 0x01) << 1));
break;
default:
return 0xff;
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index a4b0f28d273..c1b4fd1e760 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -212,9 +212,9 @@ D5 = SKID2
***************************************************************************/
WRITE8_HANDLER( nitedrvr_out0_w )
{
- discrete_sound_w(NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data
- discrete_sound_w(NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable
- discrete_sound_w(NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable
+ discrete_sound_w(machine, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data
+ discrete_sound_w(machine, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable
+ discrete_sound_w(machine, NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable
}
/***************************************************************************
@@ -232,8 +232,8 @@ WRITE8_HANDLER( nitedrvr_out1_w )
set_led_status(0,data & 0x10);
nitedrvr_crash_en = data & 0x01;
- discrete_sound_w(NITEDRVR_CRASH_EN, nitedrvr_crash_en); // Crash enable
- discrete_sound_w(NITEDRVR_ATTRACT_EN, data & 0x02); // Attract enable (sound disable)
+ discrete_sound_w(machine, NITEDRVR_CRASH_EN, nitedrvr_crash_en); // Crash enable
+ discrete_sound_w(machine, NITEDRVR_ATTRACT_EN, data & 0x02); // Attract enable (sound disable)
if (!nitedrvr_crash_en)
{
@@ -241,10 +241,10 @@ WRITE8_HANDLER( nitedrvr_out1_w )
nitedrvr_crash_data_en = 1;
nitedrvr_crash_data = 0x0f;
/* Invert video */
- palette_set_color(Machine,1,MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
- palette_set_color(Machine,0,MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
+ palette_set_color(machine,1,MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
+ palette_set_color(machine,0,MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
}
- discrete_sound_w(NITEDRVR_BANG_DATA, nitedrvr_crash_data_en ? nitedrvr_crash_data : 0); // Crash Volume
+ discrete_sound_w(machine, NITEDRVR_BANG_DATA, nitedrvr_crash_data_en ? nitedrvr_crash_data : 0); // Crash Volume
}
@@ -253,7 +253,7 @@ void nitedrvr_crash_toggle(running_machine *machine)
if (nitedrvr_crash_en && nitedrvr_crash_data_en)
{
nitedrvr_crash_data--;
- discrete_sound_w(NITEDRVR_BANG_DATA, nitedrvr_crash_data); // Crash Volume
+ discrete_sound_w(machine, NITEDRVR_BANG_DATA, nitedrvr_crash_data); // Crash Volume
if (!nitedrvr_crash_data) nitedrvr_crash_data_en = 0; // Done counting?
if (nitedrvr_crash_data & 0x01)
{
diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c
index 160505281fa..6cece610f83 100644
--- a/src/mame/machine/nmk004.c
+++ b/src/mame/machine/nmk004.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "deprecat.h"
#include "nmk004.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
@@ -133,7 +134,7 @@ static UINT16 read16(int address)
*****************************/
-static void oki_play_sample(int sample_no)
+static void oki_play_sample(running_machine *machine, int sample_no)
{
UINT16 table_start = (sample_no & 0x80) ? read16(SAMPLE_TABLE_1) : read16(SAMPLE_TABLE_0);
UINT8 byte1 = read8(table_start + 2 * (sample_no & 0x7f) + 0);
@@ -144,9 +145,9 @@ static void oki_play_sample(int sample_no)
{
// stop all channels
if (chip == 0)
- OKIM6295_data_0_w(0, 0x78 );
+ OKIM6295_data_0_w(machine, 0, 0x78 );
else
- OKIM6295_data_1_w(0, 0x78 );
+ OKIM6295_data_1_w(machine, 0, 0x78 );
}
else
{
@@ -161,9 +162,9 @@ static void oki_play_sample(int sample_no)
// stop channel
if (chip == 0)
- OKIM6295_data_0_w(0, (0x08 << ch) );
+ OKIM6295_data_0_w(machine, 0, (0x08 << ch) );
else
- OKIM6295_data_1_w(0, (0x08 << ch) );
+ OKIM6295_data_1_w(machine, 0, (0x08 << ch) );
if (sample != 0)
{
@@ -176,21 +177,21 @@ static void oki_play_sample(int sample_no)
if (chip == 0)
{
- OKIM6295_data_0_w(0, 0x80 | sample );
- OKIM6295_data_0_w(0, (0x10 << ch) | vol );
+ OKIM6295_data_0_w(machine, 0, 0x80 | sample );
+ OKIM6295_data_0_w(machine, 0, (0x10 << ch) | vol );
}
else
{
- OKIM6295_data_1_w(0, 0x80 | sample );
- OKIM6295_data_1_w(0, (0x10 << ch) | vol );
+ OKIM6295_data_1_w(machine, 0, 0x80 | sample );
+ OKIM6295_data_1_w(machine, 0, (0x10 << ch) | vol );
}
}
}
}
-static void oki_update_state(void)
+static void oki_update_state(running_machine *machine)
{
- NMK004_state.oki_playing = ((OKIM6295_status_1_r(0) & 0x0f) << 4) | (OKIM6295_status_0_r(0) & 0x0f);
+ NMK004_state.oki_playing = ((OKIM6295_status_1_r(machine, 0) & 0x0f) << 4) | (OKIM6295_status_0_r(machine, 0) & 0x0f);
}
@@ -201,7 +202,7 @@ static void oki_update_state(void)
*****************************/
-static void effects_update(int channel)
+static void effects_update(running_machine *machine, int channel)
{
struct effects_control *effects = &NMK004_state.effects_control[channel];
@@ -233,7 +234,7 @@ static void effects_update(int channel)
switch (token)
{
case 0xef: // play sample
- oki_play_sample(read8(effects->current++));
+ oki_play_sample(machine, read8(effects->current++));
break;
case 0xf6: // jump
@@ -308,7 +309,7 @@ static void effects_update(int channel)
*****************************/
-static void fm_update(int channel)
+static void fm_update(running_machine *machine, int channel)
{
struct fm_control *fm = &NMK004_state.fm_control[channel];
@@ -348,7 +349,7 @@ static void fm_update(int channel)
switch (token)
{
// case 0xef: // play sample
-// oki_play_sample(read8(fm->current++));
+// oki_play_sample(machine, read8(fm->current++));
// break;
case 0xf0: // slot (for keyon ym2203 command)
@@ -356,8 +357,8 @@ static void fm_update(int channel)
fm->slot = read8(fm->current++);
if (channel < 3 || !(NMK004_state.fm_control[channel-3].flags & FM_FLAG_ACTIVE))
{
- YM2203_control_port_0_w(0, 0x28); // keyon/off
- YM2203_write_port_0_w(0, channel % 3);
+ YM2203_control_port_0_w(machine, 0, 0x28); // keyon/off
+ YM2203_write_port_0_w(machine, 0, channel % 3);
}
break;
@@ -585,7 +586,7 @@ popmessage("%02x %02x%02x%02x%02x %02x %02x%02x%02x%02x %02x %02x%02x%02x%02x",
}
-static void fm_voices_update(void)
+static void fm_voices_update(running_machine *machine)
{
static const int ym2203_registers[0x18] =
{
@@ -605,8 +606,8 @@ static void fm_voices_update(void)
for (i = 0; i < 0x18; i++)
{
- YM2203_control_port_0_w(0, ym2203_registers[i] + channel);
- YM2203_write_port_0_w(0, fm1->voice_params[i]);
+ YM2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
+ YM2203_write_port_0_w(machine, 0, fm1->voice_params[i]);
}
}
@@ -618,8 +619,8 @@ static void fm_voices_update(void)
{
for (i = 0; i < 0x18; i++)
{
- YM2203_control_port_0_w(0, ym2203_registers[i] + channel);
- YM2203_write_port_0_w(0, fm2->voice_params[i]);
+ YM2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
+ YM2203_write_port_0_w(machine, 0, fm2->voice_params[i]);
}
}
}
@@ -627,25 +628,25 @@ static void fm_voices_update(void)
if (fm1->flags & FM_FLAG_ACTIVE)
{
- YM2203_control_port_0_w(0, 0xb0 + channel); // self-feedback
- YM2203_write_port_0_w(0, fm1->self_feedback);
+ YM2203_control_port_0_w(machine, 0, 0xb0 + channel); // self-feedback
+ YM2203_write_port_0_w(machine, 0, fm1->self_feedback);
- YM2203_control_port_0_w(0, 0xa4 + channel); // F-number
- YM2203_write_port_0_w(0, fm1->f_number >> 8);
+ YM2203_control_port_0_w(machine, 0, 0xa4 + channel); // F-number
+ YM2203_write_port_0_w(machine, 0, fm1->f_number >> 8);
- YM2203_control_port_0_w(0, 0xa0 + channel); // F-number
- YM2203_write_port_0_w(0, fm1->f_number & 0xff);
+ YM2203_control_port_0_w(machine, 0, 0xa0 + channel); // F-number
+ YM2203_write_port_0_w(machine, 0, fm1->f_number & 0xff);
}
else
{
- YM2203_control_port_0_w(0, 0xb0 + channel); // self-feedback
- YM2203_write_port_0_w(0, fm2->self_feedback);
+ YM2203_control_port_0_w(machine, 0, 0xb0 + channel); // self-feedback
+ YM2203_write_port_0_w(machine, 0, fm2->self_feedback);
- YM2203_control_port_0_w(0, 0xa4 + channel); // F-number
- YM2203_write_port_0_w(0, fm2->f_number >> 8);
+ YM2203_control_port_0_w(machine, 0, 0xa4 + channel); // F-number
+ YM2203_write_port_0_w(machine, 0, fm2->f_number >> 8);
- YM2203_control_port_0_w(0, 0xa0 + channel); // F-number
- YM2203_write_port_0_w(0, fm2->f_number & 0xff);
+ YM2203_control_port_0_w(machine, 0, 0xa0 + channel); // F-number
+ YM2203_write_port_0_w(machine, 0, fm2->f_number & 0xff);
}
@@ -654,8 +655,8 @@ static void fm_voices_update(void)
{
fm1->flags &= ~FM_FLAG_MUST_SEND_KEYON;
- YM2203_control_port_0_w(0, 0x28); // keyon/off
- YM2203_write_port_0_w(0, fm1->slot | channel);
+ YM2203_control_port_0_w(machine, 0, 0x28); // keyon/off
+ YM2203_write_port_0_w(machine, 0, fm1->slot | channel);
}
if (fm2->flags & FM_FLAG_MUST_SEND_KEYON)
@@ -664,8 +665,8 @@ static void fm_voices_update(void)
if (!(fm1->flags & FM_FLAG_ACTIVE))
{
- YM2203_control_port_0_w(0, 0x28); // keyon/off
- YM2203_write_port_0_w(0, fm2->slot | channel);
+ YM2203_control_port_0_w(machine, 0, 0x28); // keyon/off
+ YM2203_write_port_0_w(machine, 0, fm2->slot | channel);
}
}
}
@@ -679,7 +680,7 @@ static void fm_voices_update(void)
*****************************/
-static void psg_update(int channel)
+static void psg_update(running_machine *machine, int channel)
{
struct psg_control *psg = &NMK004_state.psg_control[channel];
@@ -703,11 +704,11 @@ static void psg_update(int channel)
psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED;
// enable noise, disable tone on this channel
- YM2203_control_port_0_w(0, 0x07);
- enable = YM2203_read_port_0_r(0);
+ YM2203_control_port_0_w(machine, 0, 0x07);
+ enable = YM2203_read_port_0_r(machine, 0);
enable |= (0x01 << channel); // disable tone
enable &= ~(0x08 << channel); // enable noise
- YM2203_write_port_0_w(0, enable);
+ YM2203_write_port_0_w(machine, 0, enable);
}
@@ -741,11 +742,11 @@ static void psg_update(int channel)
psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED;
// enable noise, disable tone on this channel
- YM2203_control_port_0_w(0, 0x07);
- enable = YM2203_read_port_0_r(0);
+ YM2203_control_port_0_w(machine, 0, 0x07);
+ enable = YM2203_read_port_0_r(machine, 0);
enable |= (0x01 << channel); // disable tone
enable &= ~(0x08 << channel); // enable noise
- YM2203_write_port_0_w(0, enable);
+ YM2203_write_port_0_w(machine, 0, enable);
break;
case 0xf2: // set volume shape
@@ -790,8 +791,8 @@ static void psg_update(int channel)
psg->volume_shape = 0;
// mute channel
- YM2203_control_port_0_w(0, 8 + channel);
- YM2203_write_port_0_w(0, 0);
+ YM2203_control_port_0_w(machine, 0, 8 + channel);
+ YM2203_write_port_0_w(machine, 0, 0);
return;
}
}
@@ -831,10 +832,10 @@ static void psg_update(int channel)
period >>= octave;
- YM2203_control_port_0_w(0, 2 * channel + 1);
- YM2203_write_port_0_w(0, (period & 0x0f00) >> 8);
- YM2203_control_port_0_w(0, 2 * channel + 0);
- YM2203_write_port_0_w(0, (period & 0x00ff));
+ YM2203_control_port_0_w(machine, 0, 2 * channel + 1);
+ YM2203_write_port_0_w(machine, 0, (period & 0x0f00) >> 8);
+ YM2203_control_port_0_w(machine, 0, 2 * channel + 0);
+ YM2203_write_port_0_w(machine, 0, (period & 0x00ff));
psg->note_period_hi_bits = (period & 0x0f00) >> 8;
}
@@ -847,15 +848,15 @@ static void psg_update(int channel)
psg->flags |= PSG_FLAG_NOISE_NOT_ENABLED;
// disable noise, enable tone on this channel
- YM2203_control_port_0_w(0, 0x07);
- enable = YM2203_read_port_0_r(0);
+ YM2203_control_port_0_w(machine, 0, 0x07);
+ enable = YM2203_read_port_0_r(machine, 0);
enable &= ~(0x01 << channel); // enable tone
enable |= (0x08 << channel); // disable noise
- YM2203_write_port_0_w(0, enable);
+ YM2203_write_port_0_w(machine, 0, enable);
}
- YM2203_control_port_0_w(0, 0x06); // noise period
- YM2203_write_port_0_w(0, psg->note);
+ YM2203_control_port_0_w(machine, 0, 0x06); // noise period
+ YM2203_write_port_0_w(machine, 0, psg->note);
psg->note_period_hi_bits = psg->note;
}
}
@@ -880,8 +881,8 @@ static void psg_update(int channel)
volume = 0;
// set volume
- YM2203_control_port_0_w(0, 8 + channel);
- YM2203_write_port_0_w(0, volume & 0x0f);
+ YM2203_control_port_0_w(machine, 0, 8 + channel);
+ YM2203_write_port_0_w(machine, 0, volume & 0x0f);
}
}
}
@@ -894,7 +895,7 @@ static void psg_update(int channel)
*****************************/
-static void get_command(void)
+static void get_command(running_machine *machine)
{
static const UINT8 from_main[] =
{
@@ -931,7 +932,7 @@ static void get_command(void)
if ((cmd_table & 0xff00) == 0)
{
- oki_play_sample(cmd_table);
+ oki_play_sample(machine, cmd_table);
}
else
{
@@ -979,19 +980,19 @@ static void get_command(void)
-static void update_music(void)
+static void update_music(running_machine *machine)
{
int channel;
for (channel = 0; channel < FM_CHANNELS; channel++)
- fm_update(channel);
- fm_voices_update();
+ fm_update(machine, channel);
+ fm_voices_update(machine);
for (channel = 0; channel < PSG_CHANNELS; channel++)
- psg_update(channel);
+ psg_update(machine, channel);
for (channel = 0; channel < EFFECTS_CHANNELS; channel++)
- effects_update(channel);
+ effects_update(machine, channel);
}
@@ -1002,17 +1003,17 @@ void NMK004_irq(int irq)
if (!irq) return;
- status = YM2203_status_port_0_r(0);
+ status = YM2203_status_port_0_r(Machine,0);
if (status & 1) // timer A expired
{
- oki_update_state();
- get_command();
- update_music();
+ oki_update_state(Machine);
+ get_command(Machine);
+ update_music(Machine);
// restart timer
- YM2203_control_port_0_w(0, 0x27);
- YM2203_write_port_0_w(0, 0x15);
+ YM2203_control_port_0_w(Machine, 0, 0x27);
+ YM2203_write_port_0_w(Machine, 0, 0x15);
}
}
@@ -1031,18 +1032,18 @@ static TIMER_CALLBACK( real_nmk004_init )
NMK004_state.rom = memory_region(REGION_CPU2);
- YM2203_control_port_0_w(0, 0x2f);
+ YM2203_control_port_0_w(machine, 0, 0x2f);
i = 0;
while (ym2203_init[i] != 0xff)
{
- YM2203_control_port_0_w(0, ym2203_init[i++]);
- YM2203_write_port_0_w(0, ym2203_init[i++]);
+ YM2203_control_port_0_w(machine, 0, ym2203_init[i++]);
+ YM2203_write_port_0_w(machine, 0, ym2203_init[i++]);
}
NMK004_state.oki_playing = 0;
- oki_play_sample(0);
+ oki_play_sample(machine, 0);
NMK004_state.protection_check = 0;
}
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index 67915b9c3d4..e802b2a3abd 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -56,6 +56,6 @@ WRITE16_HANDLER( NMK112_okibank_lsb_w )
{
if (ACCESSING_LSB)
{
- NMK112_okibank_w(offset, data & 0xff);
+ NMK112_okibank_w(machine, offset, data & 0xff);
}
}
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 8694a102c64..a4bda348771 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -264,8 +264,8 @@ WRITE8_HANDLER(pc_page_w)
-READ16_HANDLER(pc_page16le_r) { return read16le_with_read8_handler(pc_page_r, offset, mem_mask); }
-WRITE16_HANDLER(pc_page16le_w) { write16le_with_write8_handler(pc_page_w, offset, data, mem_mask); }
+READ16_HANDLER(pc_page16le_r) { return read16le_with_read8_handler(pc_page_r, machine, offset, mem_mask); }
+WRITE16_HANDLER(pc_page16le_w) { write16le_with_write8_handler(pc_page_w, machine, offset, data, mem_mask); }
@@ -319,14 +319,14 @@ WRITE8_HANDLER(at_page8_w)
READ32_HANDLER(at_page32_r)
{
- return read32le_with_read8_handler(at_page8_r, offset, mem_mask);
+ return read32le_with_read8_handler(at_page8_r, machine, offset, mem_mask);
}
WRITE32_HANDLER(at_page32_w)
{
- write32le_with_write8_handler(at_page8_w, offset, data, mem_mask);
+ write32le_with_write8_handler(at_page8_w, machine, offset, data, mem_mask);
}
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 7987b5c2dca..6464946b2da 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -44,8 +44,8 @@ MACHINE_RESET( pc10 )
/* reset the security chip */
RP5H01_enable_w( 0, 0 );
- RP5H01_0_reset_w( 0, 0 );
- RP5H01_0_reset_w( 0, 1 );
+ RP5H01_0_reset_w( machine, 0, 0 );
+ RP5H01_0_reset_w( machine, 0, 1 );
RP5H01_enable_w( 0, 1 );
/* reset the ppu */
@@ -142,10 +142,10 @@ READ8_HANDLER( pc10_prot_r )
/* we only support a single cart connected at slot 0 */
if ( cart_sel == 0 )
{
- RP5H01_0_enable_w( 0, 0 );
+ RP5H01_0_enable_w( machine, 0, 0 );
data |= ( ( ~RP5H01_counter_r( 0 ) ) << 4 ) & 0x10; /* D4 */
data |= ( ( RP5H01_data_r( 0 ) ) << 3 ) & 0x08; /* D3 */
- RP5H01_0_enable_w( 0, 1 );
+ RP5H01_0_enable_w( machine, 0, 1 );
}
return data;
}
@@ -155,18 +155,18 @@ WRITE8_HANDLER( pc10_prot_w )
/* we only support a single cart connected at slot 0 */
if ( cart_sel == 0 )
{
- RP5H01_0_enable_w( 0, 0 );
- RP5H01_0_test_w( 0, data & 0x10 ); /* D4 */
- RP5H01_0_clock_w( 0, data & 0x08 ); /* D3 */
- RP5H01_0_reset_w( 0, ~data & 0x01 ); /* D0 */
- RP5H01_0_enable_w( 0, 1 );
+ RP5H01_0_enable_w( machine, 0, 0 );
+ RP5H01_0_test_w( machine, 0, data & 0x10 ); /* D4 */
+ RP5H01_0_clock_w( machine, 0, data & 0x08 ); /* D3 */
+ RP5H01_0_reset_w( machine, 0, ~data & 0x01 ); /* D0 */
+ RP5H01_0_enable_w( machine, 0, 1 );
/* this thing gets dense at some point */
/* it wants to jump and execute an opcode at $ffff, wich */
/* is the actual protection memory area */
/* setting the whole 0x2000 region every time is a waste */
/* so we just set $ffff with the current value */
- memory_region( REGION_CPU1 )[0xffff] = pc10_prot_r(0);
+ memory_region( REGION_CPU1 )[0xffff] = pc10_prot_r(machine,0);
}
}
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 5045a61d17a..57451b87c63 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -263,13 +263,13 @@ MACHINE_START( slither )
static TIMER_CALLBACK( vblank_stop )
{
- pia_3_cb1_w(0, 0);
+ pia_3_cb1_w(machine, 0, 0);
}
INTERRUPT_GEN( qix_vblank_start )
{
- pia_3_cb1_w(0, 1);
+ pia_3_cb1_w(machine, 0, 1);
timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 0, vblank_stop);
}
@@ -285,7 +285,7 @@ WRITE8_HANDLER( zookeep_bankswitch_w )
{
memory_set_bank(1, (data >> 2) & 1);
/* not necessary, but technically correct */
- qix_palettebank_w(offset, data);
+ qix_palettebank_w(machine, offset, data);
}
@@ -364,7 +364,7 @@ READ8_HANDLER( qix_video_firq_ack_r )
static TIMER_CALLBACK( deferred_pia_4_porta_w )
{
- pia_4_porta_w(0, param);
+ pia_4_porta_w(machine, 0, param);
}
@@ -532,7 +532,7 @@ WRITE8_HANDLER( qix_68705_portC_w )
static TIMER_CALLBACK( pia_0_w_callback )
{
- pia_0_w(param >> 8, param & 0xff);
+ pia_0_w(machine, param >> 8, param & 0xff);
}
@@ -575,22 +575,22 @@ static WRITE8_HANDLER( slither_coinctl_w )
static WRITE8_HANDLER( slither_76489_0_w )
{
/* write to the sound chip */
- SN76496_0_w(0, data);
+ SN76496_0_w(machine, 0, data);
/* clock the ready line going back into CB1 */
- pia_1_cb1_w(0, 0);
- pia_1_cb1_w(0, 1);
+ pia_1_cb1_w(machine, 0, 0);
+ pia_1_cb1_w(machine, 0, 1);
}
static WRITE8_HANDLER( slither_76489_1_w )
{
/* write to the sound chip */
- SN76496_1_w(0, data);
+ SN76496_1_w(machine, 0, data);
/* clock the ready line going back into CB1 */
- pia_2_cb1_w(0, 0);
- pia_2_cb1_w(0, 1);
+ pia_2_cb1_w(machine, 0, 0);
+ pia_2_cb1_w(machine, 0, 1);
}
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 18b73e67f5e..f2bcf845c43 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -259,9 +259,9 @@ static READ8_HANDLER( cavelon_banksw_r )
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
- return ppi8255_0_r(offset - 0x0100);
+ return ppi8255_0_r(machine, offset - 0x0100);
else if ((offset >= 0x0200) && (offset <= 0x0203))
- return ppi8255_1_r(offset - 0x0200);
+ return ppi8255_1_r(machine, offset - 0x0200);
return 0xff;
}
@@ -271,9 +271,9 @@ static WRITE8_HANDLER( cavelon_banksw_w )
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
- ppi8255_0_w(offset - 0x0100, data);
+ ppi8255_0_w(machine, offset - 0x0100, data);
else if ((offset >= 0x0200) && (offset <= 0x0203))
- ppi8255_1_w(offset - 0x0200, data);
+ ppi8255_1_w(machine, offset - 0x0200, data);
}
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index 715f5d56ef2..6f48d5f0446 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -177,7 +177,7 @@ void segaic16_memory_mapper_set_decrypted(UINT8 *decrypted)
offs_t region_size = region_size_map[chip->regs[rgn->regbase] & 3];
offs_t region_base = (chip->regs[rgn->regbase + 1] << 16) & ~region_size;
offs_t region_start = region_base + (rgn->regoffs & region_size);
- read16_handler read = rgn->read;
+ read16_machine_func read = rgn->read;
int banknum = 0;
/* skip non-ROM regions */
@@ -343,8 +343,8 @@ static void update_memory_mapping(struct memory_mapper_chip *chip)
offs_t region_mirror = rgn->mirror & region_size;
offs_t region_start = region_base + (rgn->regoffs & region_size);
offs_t region_end = region_start + ((rgn->length - 1 < region_size) ? rgn->length - 1 : region_size);
- write16_handler write = rgn->write;
- read16_handler read = rgn->read;
+ write16_machine_func write = rgn->write;
+ read16_machine_func read = rgn->read;
int banknum = 0;
/* check for mapping to banks */
@@ -411,7 +411,7 @@ WRITE8_HANDLER( segaic16_memory_mapper_w )
READ16_HANDLER( segaic16_memory_mapper_lsb_r )
{
- return memory_mapper_r(&memory_mapper, offset, segaic16_open_bus_r(0,0));
+ return memory_mapper_r(&memory_mapper, offset, segaic16_open_bus_r(machine,0,0));
}
diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h
index 26f98e7cdc0..658ce167dee 100644
--- a/src/mame/machine/segaic16.h
+++ b/src/mame/machine/segaic16.h
@@ -15,8 +15,8 @@ struct segaic16_memory_map_entry
offs_t length; /* length in bytes of this entry */
offs_t mirror; /* maximal mirror values (will be truncated) */
offs_t romoffset; /* offset within REGION_CPU0, or ~0 for independent entries */
- read16_handler read; /* read handler */
- write16_handler write; /* write handler */
+ read16_machine_func read; /* read handler */
+ write16_machine_func write; /* write handler */
UINT16 ** base; /* pointer to memory base */
const char * name; /* friendly name for debugging */
};
diff --git a/src/mame/machine/segas24.c b/src/mame/machine/segas24.c
index b7d7227cdcd..c987bb53dda 100644
--- a/src/mame/machine/segas24.c
+++ b/src/mame/machine/segas24.c
@@ -24,15 +24,15 @@ WRITE16_HANDLER( system24temp_sys16_shared_ram_w )
range
*/
-static UINT8 (*system24temp_sys16_io_io_r)(int port);
-static void (*system24temp_sys16_io_io_w)(int port, UINT8 data);
+static UINT8 (*system24temp_sys16_io_io_r)(running_machine *machine, int port);
+static void (*system24temp_sys16_io_io_w)(running_machine *machine, int port, UINT8 data);
static void (*system24temp_sys16_io_cnt_w)(UINT8 data);
static READ16_HANDLER ((*system24temp_sys16_io_iod_r));
static WRITE16_HANDLER((*system24temp_sys16_io_iod_w));
static UINT8 system24temp_sys16_io_cnt, system24temp_sys16_io_dir;
-void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(int port),
- void (*io_w)(int port, UINT8 data),
+void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(running_machine *machine, int port),
+ void (*io_w)(running_machine *machine, int port, UINT8 data),
void (*cnt_w)(UINT8 data),
READ16_HANDLER ((*iod_r)),
WRITE16_HANDLER((*iod_w)))
@@ -50,7 +50,7 @@ READ16_HANDLER ( system24temp_sys16_io_r )
{
// logerror("IO read %02x (%d:%x)\n", offset, cpu_getactivecpu(), activecpu_get_pc());
if(offset < 8)
- return system24temp_sys16_io_io_r ? system24temp_sys16_io_io_r(offset) : 0xff;
+ return system24temp_sys16_io_io_r ? system24temp_sys16_io_io_r(machine,offset) : 0xff;
else if (offset < 0x20) {
switch(offset) {
case 0x8:
@@ -70,12 +70,12 @@ READ16_HANDLER ( system24temp_sys16_io_r )
return 0xff;
}
} else
- return system24temp_sys16_io_iod_r ? system24temp_sys16_io_iod_r(offset & 0x1f, mem_mask) : 0xff;
+ return system24temp_sys16_io_iod_r ? system24temp_sys16_io_iod_r(machine, offset & 0x1f, mem_mask) : 0xff;
}
READ32_HANDLER(system24temp_sys16_io_dword_r)
{
- return system24temp_sys16_io_r(2*offset, mem_mask)|(system24temp_sys16_io_r(2*offset+1, mem_mask>>16)<<16);
+ return system24temp_sys16_io_r(machine, 2*offset, mem_mask)|(system24temp_sys16_io_r(machine,2*offset+1, mem_mask>>16)<<16);
}
@@ -88,7 +88,7 @@ WRITE16_HANDLER( system24temp_sys16_io_w )
return;
}
if(system24temp_sys16_io_io_w)
- system24temp_sys16_io_io_w(offset, data);
+ system24temp_sys16_io_io_w(machine, offset, data);
} else if (offset < 0x20) {
switch(offset) {
case 0xe:
@@ -105,5 +105,5 @@ WRITE16_HANDLER( system24temp_sys16_io_w )
}
}
if(offset >= 0x20 && system24temp_sys16_io_iod_w)
- system24temp_sys16_io_iod_w(offset & 0x1f, data, mem_mask);
+ system24temp_sys16_io_iod_w(machine, offset & 0x1f, data, mem_mask);
}
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index eb7d3eeacd3..dd6ead18e43 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -102,13 +102,13 @@ WRITE8_HANDLER( simpsons_coin_counter_w )
READ8_HANDLER( simpsons_sound_interrupt_r )
{
- cpunum_set_input_line_and_vector(Machine, 1, 0, HOLD_LINE, 0xff );
+ cpunum_set_input_line_and_vector(machine, 1, 0, HOLD_LINE, 0xff );
return 0x00;
}
READ8_HANDLER( simpsons_sound_r )
{
- return K053260_0_r(2 + offset);
+ return K053260_0_r(machine, 2 + offset);
}
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index 1ce47ee93df..4865bf57eb0 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -77,13 +77,13 @@ WRITE8_HANDLER( slapfight_port_01_w )
/* Disable and clear hardware interrupt */
WRITE8_HANDLER( slapfight_port_06_w )
{
- interrupt_enable_w(0,0);
+ interrupt_enable_w(machine,0,0);
}
/* Enable hardware interrupt */
WRITE8_HANDLER( slapfight_port_07_w )
{
- interrupt_enable_w(0,1);
+ interrupt_enable_w(machine,0,1);
}
WRITE8_HANDLER( slapfight_port_08_w )
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 11e530fe4a5..ac47b2c281e 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -276,7 +276,7 @@ static TIMER_CALLBACK( snes_hblank_tick )
timer_adjust_oneshot(snes_scanline_timer, video_screen_get_time_until_pos(0, nextscan, 0), 0);
}
-static void snes_init_ram(void)
+static void snes_init_ram(running_machine *machine)
{
int i;
@@ -333,7 +333,7 @@ static void snes_init_ram(void)
timer_adjust_oneshot(snes_hblank_timer, video_screen_get_time_until_pos(0, ((snes_ram[STAT78] & 0x10) == SNES_NTSC) ? SNES_VTOTAL_NTSC-1 : SNES_VTOTAL_PAL-1, hblank_offset), 0);
// check if DSP1 is present (maybe not 100%?)
- has_dsp1 = ((snes_r_bank1(0xffd6) >= 3) && (snes_r_bank1(0xffd6) <= 5)) ? 1 : 0;
+ has_dsp1 = ((snes_r_bank1(machine,0xffd6) >= 3) && (snes_r_bank1(machine,0xffd6) <= 5)) ? 1 : 0;
// init frame counter so first line is 0
if( ATTOSECONDS_TO_HZ(Machine->screen[0].refresh) >= 59 )
@@ -376,7 +376,7 @@ MACHINE_START( snes )
MACHINE_RESET( snes )
{
- snes_init_ram();
+ snes_init_ram(machine);
/* Set STAT78 to NTSC or PAL */
if( ATTOSECONDS_TO_HZ(machine->screen[0].refresh) >= 59.0f )
@@ -449,7 +449,7 @@ READ8_HANDLER( snes_r_bank1 )
}
else if( address >= 0x2000 && address <= 0x5fff ) /* I/O */
{
- return snes_r_io( address );
+ return snes_r_io( machine, address );
}
else if( address >= 0x6000 && address <= 0x7fff ) /* Reserved */
{
@@ -499,7 +499,7 @@ READ8_HANDLER( snes_r_bank2 )
if( address <= 0x1fff ) /* Mirror of Low RAM */
return program_read_byte(0x7e0000 + address );
else if( address >= 0x2000 && address <= 0x5fff ) /* I/O */
- return snes_r_io( address );
+ return snes_r_io( machine, address );
else if( address >= 0x6000 && address <= 0x7fff )
{
if( snes_cart.mode == SNES_MODE_20 )
@@ -600,7 +600,7 @@ WRITE8_HANDLER( snes_w_bank1 )
if( address <= 0x1fff ) /* Mirror of Low RAM */
program_write_byte(0x7e0000 + address, data );
else if( address >= 0x2000 && address <= 0x5fff ) /* I/O */
- snes_w_io( address, data );
+ snes_w_io( machine, address, data );
else if( address >= 0x6000 && address <= 0x7fff ) /* Reserved */
if( snes_cart.mode == SNES_MODE_20 )
logerror( "Attempt to write to reserved address: %X\n", offset );
@@ -627,7 +627,7 @@ WRITE8_HANDLER( snes_w_bank2 )
if( address <= 0x1fff ) /* Mirror of Low RAM */
program_write_byte(0x7e0000 + address, data );
else if( address >= 0x2000 && address <= 0x5fff ) /* I/O */
- snes_w_io( address, data );
+ snes_w_io( machine, address, data );
else if( address >= 0x6000 && address <= 0x7fff )
{
if( snes_cart.mode == SNES_MODE_20 ) /* Reserved */
@@ -666,16 +666,16 @@ WRITE8_HANDLER( snes_w_bank4 )
if( snes_cart.mode == SNES_MODE_20 )
{
if( offset <= 0x2fffff )
- snes_w_bank1( offset, data );
+ snes_w_bank1( machine, offset, data );
else if( offset >= 0x300000 && offset <= 0x3fffff )
- snes_w_bank2( offset - 0x300000, data );
+ snes_w_bank2( machine, offset - 0x300000, data );
}
else /* MODE_21 */
{
if( offset <= 0x2fffff )
- snes_w_bank1( offset, data );
+ snes_w_bank1( machine, offset, data );
else if( offset >= 0x300000 && offset <= 0x3fffff )
- snes_w_bank2( offset - 0x300000, data );
+ snes_w_bank2( machine, offset - 0x300000, data );
else
logerror( "Attempt to write to ROM address: %X\n", offset );
}
@@ -1577,7 +1577,7 @@ DRIVER_INIT( snes )
}
/* Find the amount of sram */
- snes_cart.sram = snes_r_bank1(0x00ffd8);
+ snes_cart.sram = snes_r_bank1(machine,0x00ffd8);
if( snes_cart.sram > 0 )
{
snes_cart.sram = ((1 << (snes_cart.sram + 3)) / 8);
@@ -1617,7 +1617,7 @@ DRIVER_INIT( snes_hirom )
}
/* Find the amount of sram */
- snes_cart.sram = snes_r_bank1(0x00ffd8);
+ snes_cart.sram = snes_r_bank1(machine,0x00ffd8);
if( snes_cart.sram > 0 )
{
snes_cart.sram = ((1 << (snes_cart.sram + 3)) / 8);
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 26970349420..91c26a22db8 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -82,7 +82,7 @@ DRIVER_INIT( stfight )
MACHINE_RESET( stfight )
{
// initialise rom bank
- stfight_bank_w( 0, 0 );
+ stfight_bank_w( machine, 0, 0 );
}
// It's entirely possible that this bank is never switched out
diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c
index f0f2fa2073a..3063296242e 100644
--- a/src/mame/machine/subs.c
+++ b/src/mame/machine/subs.c
@@ -29,7 +29,7 @@ subs_interrupt
INTERRUPT_GEN( subs_interrupt )
{
/* only do NMI interrupt if not in TEST mode */
- if ((input_port_2_r(0) & 0x40)==0x40)
+ if ((input_port_2_r(machine, 0) & 0x40)==0x40)
cpunum_set_input_line(machine, 0,INPUT_LINE_NMI,PULSE_LINE);
}
@@ -40,13 +40,13 @@ When D7 is high, the steering wheel has moved.
If D6 is high, it moved left. If D6 is low, it moved right.
Be sure to keep returning a direction until steer_reset is called.
***************************************************************************/
-static int subs_steering_1(void)
+static int subs_steering_1(running_machine *machine)
{
static int last_val=0;
int this_val;
int delta;
- this_val=input_port_3_r(0);
+ this_val=input_port_3_r(machine, 0);
delta=this_val-last_val;
last_val=this_val;
@@ -69,13 +69,13 @@ static int subs_steering_1(void)
return subs_steering_val1;
}
-static int subs_steering_2(void)
+static int subs_steering_2(running_machine *machine)
{
static int last_val=0;
int this_val;
int delta;
- this_val=input_port_4_r(0);
+ this_val=input_port_4_r(machine,0);
delta=this_val-last_val;
last_val=this_val;
@@ -112,7 +112,7 @@ subs_control_r
***************************************************************************/
READ8_HANDLER( subs_control_r )
{
- int inport = input_port_1_r(offset);
+ int inport = input_port_1_r(machine, offset);
switch (offset & 0x07)
{
@@ -120,10 +120,10 @@ READ8_HANDLER( subs_control_r )
case 0x01: return ((inport & 0x02) << 6); /* diag hold */
case 0x02: return ((inport & 0x04) << 5); /* slam */
case 0x03: return ((inport & 0x08) << 4); /* spare */
- case 0x04: return ((subs_steering_1() & 0x40) << 1); /* steer dir 1 */
- case 0x05: return ((subs_steering_1() & 0x80) << 0); /* steer flag 1 */
- case 0x06: return ((subs_steering_2() & 0x40) << 1); /* steer dir 2 */
- case 0x07: return ((subs_steering_2() & 0x80) << 0); /* steer flag 2 */
+ case 0x04: return ((subs_steering_1(machine) & 0x40) << 1); /* steer dir 1 */
+ case 0x05: return ((subs_steering_1(machine) & 0x80) << 0); /* steer flag 1 */
+ case 0x06: return ((subs_steering_2(machine) & 0x40) << 1); /* steer dir 2 */
+ case 0x07: return ((subs_steering_2(machine) & 0x80) << 0); /* steer flag 2 */
}
return 0;
@@ -134,7 +134,7 @@ subs_coin_r
***************************************************************************/
READ8_HANDLER( subs_coin_r )
{
- int inport = input_port_2_r(offset);
+ int inport = input_port_2_r(machine, offset);
switch (offset & 0x07)
{
@@ -156,7 +156,7 @@ subs_options_r
***************************************************************************/
READ8_HANDLER( subs_options_r )
{
- int opts = input_port_0_r(offset);
+ int opts = input_port_0_r(machine, offset);
switch (offset & 0x03)
{
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index 0135c3129c5..6826fae0e1b 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -47,7 +47,7 @@ typedef struct TAITO8741_status{
UINT8 pending4a;
int serial_out;
int coins;
- read8_handler portHandler;
+ read8_machine_func portHandler;
}I8741;
static const struct TAITO8741interface *intf;
@@ -122,7 +122,7 @@ void TAITO8741_reset(int num)
}
/* 8741 update */
-static void taito8741_update(int num)
+static void taito8741_update(running_machine *machine, int num)
{
I8741 *st,*sst;
int next = num;
@@ -177,7 +177,7 @@ static void taito8741_update(int num)
else
{ /* port select */
st->parallelselect = data & 0x07;
- taito8741_hostdata_w(st,st->portHandler ? st->portHandler(st->parallelselect) : 0);
+ taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine,st->parallelselect) : 0);
}
}
}
@@ -188,7 +188,7 @@ static void taito8741_update(int num)
case -1: /* no command data */
break;
case 0x00: /* read from parallel port */
- taito8741_hostdata_w(st,st->portHandler ? st->portHandler(0) : 0 );
+ taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine,0) : 0 );
break;
case 0x01: /* read receive buffer 0 */
case 0x02: /* read receive buffer 1 */
@@ -201,7 +201,7 @@ static void taito8741_update(int num)
taito8741_hostdata_w(st,st->rxd[data-1]);
break;
case 0x08: /* latch received serial data */
- st->txd[0] = st->portHandler ? st->portHandler(0) : 0;
+ st->txd[0] = st->portHandler ? st->portHandler(machine,0) : 0;
if( sst )
{
timer_call_after_resynch(NULL, num, taito8741_serial_tx);
@@ -272,16 +272,16 @@ int TAITO8741_start(const struct TAITO8741interface *taito8741intf)
}
/* read status port */
-static int I8741_status_r(int num)
+static int I8741_status_r(running_machine *machine, int num)
{
I8741 *st = &taito8741[num];
- taito8741_update(num);
+ taito8741_update(machine, num);
LOG(("8741-%d ST Read %02x PC=%04x\n",num,st->status,activecpu_get_pc()));
return st->status;
}
/* read data port */
-static int I8741_data_r(int num)
+static int I8741_data_r(running_machine *machine, int num)
{
I8741 *st = &taito8741[num];
int ret = st->toData;
@@ -289,81 +289,81 @@ static int I8741_data_r(int num)
LOG(("8741-%d DATA Read %02x PC=%04x\n",num,ret,activecpu_get_pc()));
/* update chip */
- taito8741_update(num);
+ taito8741_update(machine, num);
switch( st->mode )
{
case TAITO8741_PORT: /* parallel data */
- taito8741_hostdata_w(st,st->portHandler ? st->portHandler(st->parallelselect) : 0);
+ taito8741_hostdata_w(st,st->portHandler ? st->portHandler(machine, st->parallelselect) : 0);
break;
}
return ret;
}
/* Write data port */
-static void I8741_data_w(int num, int data)
+static void I8741_data_w(running_machine *machine, int num, int data)
{
I8741 *st = &taito8741[num];
LOG(("8741-%d DATA Write %02x PC=%04x\n",num,data,activecpu_get_pc()));
st->fromData = data;
st->status |= 0x02;
/* update chip */
- taito8741_update(num);
+ taito8741_update(machine, num);
}
/* Write command port */
-static void I8741_command_w(int num, int data)
+static void I8741_command_w(running_machine *machine, int num, int data)
{
I8741 *st = &taito8741[num];
LOG(("8741-%d CMD Write %02x PC=%04x\n",num,data,activecpu_get_pc()));
st->fromCmd = data;
st->status |= 0x04;
/* update chip */
- taito8741_update(num);
+ taito8741_update(machine,num);
}
/* Write port handler */
WRITE8_HANDLER( TAITO8741_0_w )
{
- if(offset&1) I8741_command_w(0,data);
- else I8741_data_w(0,data);
+ if(offset&1) I8741_command_w(machine,0,data);
+ else I8741_data_w(machine,0,data);
}
WRITE8_HANDLER( TAITO8741_1_w )
{
- if(offset&1) I8741_command_w(1,data);
- else I8741_data_w(1,data);
+ if(offset&1) I8741_command_w(machine,1,data);
+ else I8741_data_w(machine,1,data);
}
WRITE8_HANDLER( TAITO8741_2_w )
{
- if(offset&1) I8741_command_w(2,data);
- else I8741_data_w(2,data);
+ if(offset&1) I8741_command_w(machine,2,data);
+ else I8741_data_w(machine,2,data);
}
WRITE8_HANDLER( TAITO8741_3_w )
{
- if(offset&1) I8741_command_w(3,data);
- else I8741_data_w(3,data);
+ if(offset&1) I8741_command_w(machine,3,data);
+ else I8741_data_w(machine,3,data);
}
/* Read port handler */
READ8_HANDLER( TAITO8741_0_r )
{
- if(offset&1) return I8741_status_r(0);
- return I8741_data_r(0);
+ if(offset&1) return I8741_status_r(machine,0);
+ return I8741_data_r(machine,0);
}
READ8_HANDLER( TAITO8741_1_r )
{
- if(offset&1) return I8741_status_r(1);
- return I8741_data_r(1);
+ if(offset&1) return I8741_status_r(machine,1);
+ return I8741_data_r(machine,1);
}
READ8_HANDLER( TAITO8741_2_r )
{
- if(offset&1) return I8741_status_r(2);
- return I8741_data_r(2);
+ if(offset&1) return I8741_status_r(machine,2);
+ return I8741_data_r(machine,2);
}
READ8_HANDLER( TAITO8741_3_r )
{
- if(offset&1) return I8741_status_r(3);
- return I8741_data_r(3);
+ if(offset&1) return I8741_status_r(machine,3);
+ return I8741_data_r(machine,3);
}
/****************************************************************************
@@ -389,7 +389,7 @@ typedef struct josvolly_8741_struct {
UINT8 rst;
- read8_handler initReadPort;
+ read8_machine_func initReadPort;
}JV8741;
static JV8741 i8741[4];
@@ -442,7 +442,7 @@ static void josvolly_8741_do(int num)
}
}
-static void josvolly_8741_w(int num,int offset,int data)
+static void josvolly_8741_w(running_machine *machine,int num,int offset,int data)
{
JV8741 *mcu = &i8741[num];
@@ -470,7 +470,7 @@ static void josvolly_8741_w(int num,int offset,int data)
break;
case 2:
#if 1
- mcu->rxd = input_port_4_r(0); /* DSW2 */
+ mcu->rxd = input_port_4_r(machine,0); /* DSW2 */
mcu->sts |= 0x01; /* RD ready */
#endif
break;
@@ -496,7 +496,7 @@ static void josvolly_8741_w(int num,int offset,int data)
{
if(josvolly_nmi_enable)
{
- cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
josvolly_nmi_enable = 0;
}
}
@@ -505,7 +505,7 @@ static void josvolly_8741_w(int num,int offset,int data)
josvolly_8741_do(num);
}
-static INT8 josvolly_8741_r(int num,int offset)
+static INT8 josvolly_8741_r(running_machine *machine,int num,int offset)
{
JV8741 *mcu = &i8741[num];
int ret;
@@ -513,7 +513,7 @@ static INT8 josvolly_8741_r(int num,int offset)
if(offset==1)
{
if(mcu->rst)
- mcu->rxd = (mcu->initReadPort)(0); /* port in */
+ mcu->rxd = (mcu->initReadPort)(machine,0); /* port in */
ret = mcu->sts;
LOG(("PC=%04X 8741[%d] SR %02X\n",activecpu_get_pc(),num,ret));
}
@@ -528,7 +528,7 @@ static INT8 josvolly_8741_r(int num,int offset)
return ret;
}
-WRITE8_HANDLER( josvolly_8741_0_w ){ josvolly_8741_w(0,offset,data); }
-READ8_HANDLER( josvolly_8741_0_r ) { return josvolly_8741_r(0,offset); }
-WRITE8_HANDLER( josvolly_8741_1_w ) { josvolly_8741_w(1,offset,data); }
-READ8_HANDLER( josvolly_8741_1_r ) { return josvolly_8741_r(1,offset); }
+WRITE8_HANDLER( josvolly_8741_0_w ){ josvolly_8741_w(machine,0,offset,data); }
+READ8_HANDLER( josvolly_8741_0_r ) { return josvolly_8741_r(machine,0,offset); }
+WRITE8_HANDLER( josvolly_8741_1_w ) { josvolly_8741_w(machine,1,offset,data); }
+READ8_HANDLER( josvolly_8741_1_r ) { return josvolly_8741_r(machine,1,offset); }
diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h
index 88d909d536e..e02eb0c4a4e 100644
--- a/src/mame/machine/tait8741.h
+++ b/src/mame/machine/tait8741.h
@@ -17,7 +17,7 @@ struct TAITO8741interface
int num;
int mode[MAX_TAITO8741]; /* program select */
int serial_connect[MAX_TAITO8741]; /* serial port connection */
- read8_handler portHandler_r[MAX_TAITO8741]; /* parallel port handler */
+ read8_machine_func portHandler_r[MAX_TAITO8741]; /* parallel port handler */
};
int TAITO8741_start(const struct TAITO8741interface *taito8741intf);
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index dec879331e9..9865bab7d5d 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -51,7 +51,7 @@ MACHINE_RESET( taitosj )
{
/* set the default ROM bank (many games only have one bank and */
/* never write to the bank selector register) */
- taitosj_bankswitch_w(0, 0);
+ taitosj_bankswitch_w(machine, 0, 0);
zaccept = 1;
@@ -311,11 +311,11 @@ WRITE8_HANDLER( alpine_protection_w )
WRITE8_HANDLER( alpinea_bankswitch_w )
{
- taitosj_bankswitch_w(offset, data);
+ taitosj_bankswitch_w(machine, offset, data);
protection_value = data >> 2;
}
READ8_HANDLER( alpine_port_2_r )
{
- return input_port_2_r(offset) | protection_value;
+ return input_port_2_r(machine,offset) | protection_value;
}
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 14ad9ef41f0..209c756785b 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -350,7 +350,7 @@ WRITE16_HANDLER( tatsumi_v30_68000_w )
// self-test in Tatsumi games. Needs fixed, but hack it here for now.
READ8_HANDLER(tatsumi_hack_ym2151_r)
{
- int r=YM2151_status_port_0_r(0);
+ int r=YM2151_status_port_0_r(machine,0);
if (activecpu_get_pc()==0x2aca || activecpu_get_pc()==0x29fe
|| activecpu_get_pc()==0xf9721
@@ -363,7 +363,7 @@ READ8_HANDLER(tatsumi_hack_ym2151_r)
// Mame really should emulate the OKI status reads even with Mame sound off.
READ8_HANDLER(tatsumi_hack_oki_r)
{
- int r=OKIM6295_status_0_r(0);
+ int r=OKIM6295_status_0_r(machine,0);
if (activecpu_get_pc()==0x2b70 || activecpu_get_pc()==0x2bb5
|| activecpu_get_pc()==0x2acc
diff --git a/src/mame/machine/ticket.c b/src/mame/machine/ticket.c
index 1a918a023c9..3725e80ae1c 100644
--- a/src/mame/machine/ticket.c
+++ b/src/mame/machine/ticket.c
@@ -66,7 +66,7 @@ void ticket_dispenser_init(int msec, int motoronhigh, int statusactivehigh)
***************************************************************************/
READ8_HANDLER( ticket_dispenser_r )
{
- return ticket_dispenser_0_r(offset);
+ return ticket_dispenser_0_r(machine, offset);
}
READ8_HANDLER( ticket_dispenser_0_r )
@@ -86,7 +86,7 @@ READ8_HANDLER( ticket_dispenser_1_r )
***************************************************************************/
WRITE8_HANDLER( ticket_dispenser_w )
{
- ticket_dispenser_0_w(offset, data);
+ ticket_dispenser_0_w(machine, offset, data);
}
WRITE8_HANDLER( ticket_dispenser_0_w )
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index e6a8de85da3..dd81affc68d 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -78,9 +78,9 @@ READ8_HANDLER( tnzs_port1_r )
switch (tnzs_input_select & 0x0f)
{
- case 0x0a: data = input_port_4_r(0); break;
- case 0x0c: data = input_port_2_r(0); break;
- case 0x0d: data = input_port_3_r(0); break;
+ case 0x0a: data = input_port_4_r(machine,0); break;
+ case 0x0c: data = input_port_2_r(machine,0); break;
+ case 0x0d: data = input_port_3_r(machine,0); break;
default: data = 0xff; break;
}
@@ -91,7 +91,7 @@ READ8_HANDLER( tnzs_port1_r )
READ8_HANDLER( tnzs_port2_r )
{
- int data = input_port_4_r(0);
+ int data = input_port_4_r(machine,0);
// logerror("I8742:%04x Read %02x from port 2\n", activecpu_get_previouspc(), data);
@@ -613,15 +613,15 @@ READ8_HANDLER( tnzs_mcu_r )
{
case MCU_TNZS:
case MCU_CHUKATAI:
- return mcu_tnzs_r(offset);
+ return mcu_tnzs_r(machine,offset);
break;
case MCU_ARKANOID:
- return mcu_arknoid2_r(offset);
+ return mcu_arknoid2_r(machine,offset);
break;
case MCU_EXTRMATN:
case MCU_DRTOPPEL:
case MCU_PLUMPOP:
- return mcu_extrmatn_r(offset);
+ return mcu_extrmatn_r(machine,offset);
break;
default:
return 0xff;
@@ -635,15 +635,15 @@ WRITE8_HANDLER( tnzs_mcu_w )
{
case MCU_TNZS:
case MCU_CHUKATAI:
- mcu_tnzs_w(offset,data);
+ mcu_tnzs_w(machine,offset,data);
break;
case MCU_ARKANOID:
- mcu_arknoid2_w(offset,data);
+ mcu_arknoid2_w(machine,offset,data);
break;
case MCU_EXTRMATN:
case MCU_DRTOPPEL:
case MCU_PLUMPOP:
- mcu_extrmatn_w(offset,data);
+ mcu_extrmatn_w(machine,offset,data);
break;
default:
break;
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index ad351c6e143..adaba53db7f 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -160,14 +160,14 @@ READ16_HANDLER( samesame_port_6_word_r )
{
/* Bit 0x80 is secondary CPU (HD647180) ready signal */
logerror("PC:%04x Warning !!! IO reading from $14000a\n",activecpu_get_previouspc());
- return (0x80 | input_port_6_word_r(0,0)) & 0xff;
+ return (0x80 | input_port_6_word_r(machine,0,0)) & 0xff;
}
READ16_HANDLER( vimana_input_port_5_word_r )
{
int data, p;
- p = input_port_5_word_r(0,0);
+ p = input_port_5_word_r(machine,0,0);
vimana_latch ^= p;
data = (vimana_latch & p );
@@ -283,7 +283,7 @@ WRITE16_HANDLER( samesame_coin_w )
{
if (ACCESSING_LSB)
{
- toaplan1_coin_w(offset, data & 0xff);
+ toaplan1_coin_w(machine, offset, data & 0xff);
}
if (ACCESSING_MSB && (data&0xff00))
{
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index e1b1ea8358d..9301c75461a 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -161,7 +161,7 @@ WRITE16_HANDLER( vertigo_wsot_w )
static TIMER_CALLBACK( sound_command_w )
{
- exidy440_sound_command = param;
+ *exidy440_sound_command = param;
exidy440_sound_command_ack = 0;
cpunum_set_input_line(machine, 1, INPUT_LINE_IRQ1, ASSERT_LINE);
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index bf896758d5e..7220e9f9dd4 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -280,7 +280,7 @@ static WRITE8_HANDLER( vsnormal_vrom_banking )
/* bit 1 ( data & 2 ) enables writes to extra ram, we ignore it */
/* move along */
- vsnes_in0_w( offset, data );
+ vsnes_in0_w( machine, offset, data );
}
/* Most games switch VROM Banks in controller 0 write */
@@ -295,14 +295,13 @@ static WRITE8_HANDLER( ppuRC2C05_protection )
{
/* This PPU has registers mapped at $2000 and $2001 inverted */
/* and no remapped color */
-
if ( offset == 0 )
{
- ppu2c0x_0_w( 1, data );
+ ppu2c0x_0_w( machine, 1, data );
return;
}
- ppu2c0x_0_w( 0, data );
+ ppu2c0x_0_w( machine, 0, data );
}
/**********************************************************************************/
@@ -498,7 +497,7 @@ DRIVER_INIT( hogalley )
static READ8_HANDLER( vsgshoe_security_r )
{
/* low part must be 0x1c */
- return ppu2c0x_0_r( 2 ) | 0x1c;
+ return ppu2c0x_0_r( machine, 2 ) | 0x1c;
}
static WRITE8_HANDLER( vsgshoe_gun_in0_w )
@@ -512,7 +511,7 @@ static WRITE8_HANDLER( vsgshoe_gun_in0_w )
memcpy (&memory_region( REGION_CPU1 )[0x08000], &memory_region( REGION_CPU1 )[addr], 0x2000);
}
- gun_in0_w(offset, data);
+ gun_in0_w(machine, offset, data);
}
DRIVER_INIT( vsgshoe )
@@ -773,7 +772,7 @@ DRIVER_INIT( cstlevna )
static READ8_HANDLER( topgun_security_r )
{
/* low part must be 0x1b */
- return ppu2c0x_0_r( 2 ) | 0x1b;
+ return ppu2c0x_0_r( machine, 2 ) | 0x1b;
}
DRIVER_INIT( topgun )
@@ -1212,7 +1211,7 @@ DRIVER_INIT( bnglngby )
static READ8_HANDLER( jajamaru_security_r )
{
/* low part must be 0x40 */
- return ppu2c0x_0_r( 2 ) | 0x40;
+ return ppu2c0x_0_r( machine, 2 ) | 0x40;
}
DRIVER_INIT( jajamaru )
@@ -1239,7 +1238,7 @@ DRIVER_INIT( jajamaru )
static READ8_HANDLER( mightybj_security_r )
{
/* low part must be 0x3d */
- return ppu2c0x_0_r( 2 ) | 0x3d;
+ return ppu2c0x_0_r( machine, 2 ) | 0x3d;
}
DRIVER_INIT( mightybj )
@@ -1267,9 +1266,9 @@ static WRITE8_HANDLER( vstennis_vrom_banking )
/* move along */
if ( cpu_getactivecpu() == 0 )
- vsnes_in0_w( offset, data );
+ vsnes_in0_w( machine, offset, data );
else
- vsnes_in0_1_w( offset, data );
+ vsnes_in0_1_w( machine, offset, data );
}
DRIVER_INIT( vstennis )
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 53ac68929f3..17838deed5f 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -268,7 +268,7 @@ static TIMER_CALLBACK( williams_va11_callback )
int scanline = param;
/* the IRQ signal comes into CB1, and is set to VA11 */
- pia_1_cb1_w(0, scanline & 0x20);
+ pia_1_cb1_w(machine, 0, scanline & 0x20);
/* set a timer for the next update */
scanline += 0x20;
@@ -280,14 +280,14 @@ static TIMER_CALLBACK( williams_va11_callback )
static TIMER_CALLBACK( williams_count240_off_callback )
{
/* the COUNT240 signal comes into CA1, and is set to the logical AND of VA10-VA13 */
- pia_1_ca1_w(0, 0);
+ pia_1_ca1_w(machine, 0, 0);
}
static TIMER_CALLBACK( williams_count240_callback )
{
/* the COUNT240 signal comes into CA1, and is set to the logical AND of VA10-VA13 */
- pia_1_ca1_w(0, 1);
+ pia_1_ca1_w(machine, 0, 1);
/* set a timer to turn it off once the scanline counter resets */
timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 0, williams_count240_off_callback);
@@ -396,8 +396,8 @@ static TIMER_CALLBACK( williams2_va11_callback )
int scanline = param;
/* the IRQ signal comes into CB1, and is set to VA11 */
- pia_0_cb1_w(0, scanline & 0x20);
- pia_1_ca1_w(0, scanline & 0x20);
+ pia_0_cb1_w(machine, 0, scanline & 0x20);
+ pia_1_ca1_w(machine, 0, scanline & 0x20);
/* set a timer for the next update */
scanline += 0x20;
@@ -409,14 +409,14 @@ static TIMER_CALLBACK( williams2_va11_callback )
static TIMER_CALLBACK( williams2_endscreen_off_callback )
{
/* the /ENDSCREEN signal comes into CA1 */
- pia_0_ca1_w(0, 1);
+ pia_0_ca1_w(machine, 0, 1);
}
static TIMER_CALLBACK( williams2_endscreen_callback )
{
/* the /ENDSCREEN signal comes into CA1 */
- pia_0_ca1_w(0, 0);
+ pia_0_ca1_w(machine, 0, 0);
/* set a timer to turn it off once the scanline counter resets */
timer_set(video_screen_get_time_until_pos(0, 8, 0), NULL, 0, williams2_endscreen_off_callback);
@@ -435,7 +435,7 @@ static TIMER_CALLBACK( williams2_endscreen_callback )
static void williams2_postload(void)
{
- williams2_bank_select_w(0, vram_bank);
+ williams2_bank_select_w(Machine, 0, vram_bank);
}
@@ -449,7 +449,7 @@ MACHINE_RESET( williams2 )
memory_configure_bank(1, 1, 4, memory_region(REGION_CPU1) + 0x10000, 0x10000);
/* make sure our banking is reset */
- williams2_bank_select_w(0, 0);
+ williams2_bank_select_w(machine, 0, 0);
/* set a timer to go off every 16 scanlines, to toggle the VA11 line and update the screen */
scanline_timer = timer_alloc(williams2_va11_callback, NULL);
@@ -526,8 +526,8 @@ WRITE8_HANDLER( williams2_bank_select_w )
static TIMER_CALLBACK( williams_deferred_snd_cmd_w )
{
- pia_2_portb_w(0, param);
- pia_2_cb1_w(0, (param == 0xff) ? 0 : 1);
+ pia_2_portb_w(machine, 0, param);
+ pia_2_cb1_w(machine, 0, (param == 0xff) ? 0 : 1);
}
WRITE8_HANDLER( williams_snd_cmd_w )
@@ -544,7 +544,7 @@ WRITE8_HANDLER( playball_snd_cmd_w )
static TIMER_CALLBACK( williams2_deferred_snd_cmd_w )
{
- pia_2_porta_w(0, param);
+ pia_2_porta_w(machine, 0, param);
}
static WRITE8_HANDLER( williams2_snd_cmd_w )
@@ -613,7 +613,7 @@ READ8_HANDLER( williams_49way_port_0_r )
READ8_HANDLER( williams_input_port_49way_0_5_r )
{
if (port_select)
- return williams_49way_port_0_r(0);
+ return williams_49way_port_0_r(machine,0);
else
return readinputport(5);
}
@@ -651,7 +651,7 @@ WRITE8_HANDLER( williams_watchdog_reset_w )
{
/* yes, the data bits are checked for this specific value */
if (data == 0x39)
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
}
@@ -659,7 +659,7 @@ WRITE8_HANDLER( williams2_watchdog_reset_w )
{
/* yes, the data bits are checked for this specific value */
if ((data & 0x3f) == 0x14)
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
}
@@ -713,7 +713,7 @@ WRITE8_HANDLER( williams2_7segment_w )
static void defender_postload(void)
{
- defender_bank_select_w(0, vram_bank);
+ defender_bank_select_w(Machine, 0, vram_bank);
}
@@ -723,7 +723,7 @@ MACHINE_RESET( defender )
/* configure the banking and make sure it is reset to 0 */
memory_configure_bank(1, 0, 9, &memory_region(REGION_CPU1)[0x10000], 0x1000);
- defender_bank_select_w(0, 0);
+ defender_bank_select_w(machine, 0, 0);
state_save_register_func_postload(defender_postload);
}
@@ -799,7 +799,7 @@ READ8_HANDLER( mayday_protection_r )
WRITE8_HANDLER( sinistar_vram_select_w )
{
/* low two bits are standard */
- williams_vram_select_w(offset, data);
+ williams_vram_select_w(machine, offset, data);
/* window enable from bit 2 (clips to 0x7400) */
williams_blitter_window_enable = data & 0x04;
@@ -866,7 +866,7 @@ WRITE8_HANDLER( blaster_bank_select_w )
static READ8_HANDLER( lottofun_input_port_0_r )
{
/* merge in the ticket dispenser status */
- return input_port_0_r(offset) | ticket_dispenser_r(offset);
+ return input_port_0_r(machine,offset) | ticket_dispenser_r(machine,offset);
}
@@ -880,7 +880,7 @@ static READ8_HANDLER( lottofun_input_port_0_r )
static READ8_HANDLER( tshoot_input_port_0_3_r )
{
/* merge in the gun inputs with the standard data */
- int data = williams_input_port_0_3_r(offset);
+ int data = williams_input_port_0_3_r(machine, offset);
int gun = (data & 0x3f) ^ ((data & 0x3f) >> 1);
return (data & 0xc0) | gun;
}
@@ -943,14 +943,14 @@ MACHINE_RESET( joust2 )
static TIMER_CALLBACK( joust2_deferred_snd_cmd_w )
{
- pia_2_porta_w(0, param & 0xff);
+ pia_2_porta_w(machine, 0, param & 0xff);
}
static WRITE8_HANDLER( joust2_pia_3_cb1_w )
{
joust2_current_sound_data = (joust2_current_sound_data & ~0x100) | ((data << 8) & 0x100);
- pia_3_cb1_w(offset, data);
+ pia_3_cb1_w(machine, offset, data);
}
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 343966af8fc..75c79d18e82 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -210,7 +210,7 @@ void copper_setpc(UINT32 pc)
}
-static int copper_execute_next(int xpos)
+static int copper_execute_next(running_machine *machine, int xpos)
{
int word0, word1;
@@ -224,7 +224,7 @@ static int copper_execute_next(int xpos)
if (LOG_COPPER)
logerror("%02X.%02X: Write to %s = %04x\n", last_scanline, xpos / 2, amiga_custom_names[copper_pending_offset & 0xff], copper_pending_data);
- amiga_custom_w(copper_pending_offset, copper_pending_data, 0);
+ amiga_custom_w(machine, copper_pending_offset, copper_pending_data, 0);
copper_pending_offset = 0;
}
@@ -607,7 +607,7 @@ INLINE int update_ham(int newpix)
*
*************************************/
-void amiga_render_scanline(bitmap_t *bitmap, int scanline)
+void amiga_render_scanline(running_machine *machine, bitmap_t *bitmap, int scanline)
{
UINT16 save_color0 = CUSTOM_REG(REG_COLOR00);
int ddf_start_pixel = 0, ddf_stop_pixel = 0;
@@ -659,7 +659,7 @@ void amiga_render_scanline(bitmap_t *bitmap, int scanline)
{
/* execute the next batch, restoring and re-saving color 0 around it */
CUSTOM_REG(REG_COLOR00) = save_color0;
- next_copper_x = copper_execute_next(x);
+ next_copper_x = copper_execute_next(machine, x);
save_color0 = CUSTOM_REG(REG_COLOR00);
if (genlock_color != 0xffff)
CUSTOM_REG(REG_COLOR00) = genlock_color;
@@ -984,7 +984,7 @@ VIDEO_UPDATE( amiga )
/* render each scanline in the visible region */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
- amiga_render_scanline(bitmap, y);
+ amiga_render_scanline(machine, bitmap, y);
return 0;
}
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index 9bf6bd1d6dd..eabd42c5459 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -21,7 +21,7 @@ static tilemap *bg_tilemap;
WRITE8_HANDLER( amspdwy_paletteram_w )
{
data ^= 0xff;
- paletteram_BBGGGRRR_w(offset,data);
+ paletteram_BBGGGRRR_w(machine,offset,data);
// paletteram_RRRGGGBB_w(offset,data);
}
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index b4779102ba3..0b412c00758 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -180,7 +180,7 @@ WRITE8_HANDLER( appoooh_bg_colorram_w )
WRITE8_HANDLER( appoooh_out_w )
{
/* bit 0 controls NMI */
- interrupt_enable_w(0,data & 0x01);
+ interrupt_enable_w(machine,0,data & 0x01);
/* bit 1 flip screen */
flip_screen_set(data & 0x02);
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index 1549763a70f..5d0adffa32b 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -351,5 +351,5 @@ VIDEO_UPDATE( armedf )
VIDEO_EOF( armedf )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index 2c6dde7b738..592cb0ab526 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -620,7 +620,7 @@ WRITE8_HANDLER( astrocade_data_chip_register_w )
case 0x17: /* noise volume register */
case 0x18: /* sound block transfer */
if (astrocade_video_config & AC_SOUND_PRESENT)
- astrocade_sound1_w(offset, data);
+ astrocade_sound1_w(machine, offset, data);
break;
case 0x19: /* expand register */
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index c0b986cb478..c1b12247401 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -1198,16 +1198,16 @@ static TIMER_CALLBACK( antic_scanline_render )
if( antic.w.dmactl & DMA_MISSILE )
{
antic.steal_cycles += 1;
- atari_gtia_w(0x11, RDPMGFXD(3*256));
+ atari_gtia_w(machine, 0x11, RDPMGFXD(3*256));
}
/* transport player data to GTIA ? */
if( antic.w.dmactl & DMA_PLAYER )
{
antic.steal_cycles += 4;
- atari_gtia_w(0x0d, RDPMGFXD(4*256));
- atari_gtia_w(0x0e, RDPMGFXD(5*256));
- atari_gtia_w(0x0f, RDPMGFXD(6*256));
- atari_gtia_w(0x10, RDPMGFXD(7*256));
+ atari_gtia_w(machine, 0x0d, RDPMGFXD(4*256));
+ atari_gtia_w(machine, 0x0e, RDPMGFXD(5*256));
+ atari_gtia_w(machine, 0x0f, RDPMGFXD(6*256));
+ atari_gtia_w(machine, 0x10, RDPMGFXD(7*256));
}
}
else
@@ -1217,17 +1217,17 @@ static TIMER_CALLBACK( antic_scanline_render )
{
if( (antic.scanline & 1) == 0 ) /* even line ? */
antic.steal_cycles += 1;
- atari_gtia_w(0x11, RDPMGFXS(3*128));
+ atari_gtia_w(machine, 0x11, RDPMGFXS(3*128));
}
/* transport player data to GTIA ? */
if( antic.w.dmactl & DMA_PLAYER )
{
if( (antic.scanline & 1) == 0 ) /* even line ? */
antic.steal_cycles += 4;
- atari_gtia_w(0x0d, RDPMGFXS(4*128));
- atari_gtia_w(0x0e, RDPMGFXS(5*128));
- atari_gtia_w(0x0f, RDPMGFXS(6*128));
- atari_gtia_w(0x10, RDPMGFXS(7*128));
+ atari_gtia_w(machine, 0x0d, RDPMGFXS(4*128));
+ atari_gtia_w(machine, 0x0e, RDPMGFXS(5*128));
+ atari_gtia_w(machine, 0x0f, RDPMGFXS(6*128));
+ atari_gtia_w(machine, 0x10, RDPMGFXS(7*128));
}
}
}
diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c
index eb79c97d8fd..848115cc959 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -380,7 +380,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
((offset & 0xc0) == 0x40 && (newword == 0xffff || oldword == 0xffff)))
{
/* if the timer is in the active bank, update the display list */
- atarimo_0_spriteram_w(offset, data, 0);
+ atarimo_0_spriteram_w(machine, offset, data, 0);
update_timers(video_screen_get_vpos(0));
}
@@ -393,7 +393,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
}
/* let the MO handler do the basic work */
- atarimo_0_spriteram_w(offset, data, 0);
+ atarimo_0_spriteram_w(machine, offset, data, 0);
}
@@ -407,7 +407,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
static TIMER_CALLBACK( int3off_callback )
{
/* clear the state */
- atarigen_scanline_int_ack_w(0, 0, 0);
+ atarigen_scanline_int_ack_w(machine, 0, 0, 0);
}
diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c
index 5431177c669..9576ab790ac 100644
--- a/src/mame/video/atarisy2.c
+++ b/src/mame/video/atarisy2.c
@@ -302,7 +302,7 @@ WRITE16_HANDLER( atarisy2_videoram_w )
/* force an update if the link of object 0 is about to change */
if (offs == 0x0c03)
video_screen_update_partial(0, video_screen_get_vpos(0));
- atarimo_0_spriteram_w(offs - 0x0c00, data, mem_mask);
+ atarimo_0_spriteram_w(machine, offs - 0x0c00, data, mem_mask);
}
/* playfieldram? */
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index 275eb0151ec..cb5cfbb6822 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -1242,7 +1242,7 @@ WRITE8_HANDLER( avgdvg_go_w )
WRITE16_HANDLER( avgdvg_go_word_w )
{
- avgdvg_go_w(offset, data);
+ avgdvg_go_w(machine, offset, data);
}
@@ -1260,12 +1260,12 @@ WRITE8_HANDLER( avgdvg_reset_w )
WRITE16_HANDLER( avgdvg_reset_word_w )
{
- avgdvg_reset_w (0,0);
+ avgdvg_reset_w (machine,0,0);
}
MACHINE_RESET( avgdvg )
{
- avgdvg_reset_w (0,0);
+ avgdvg_reset_w (machine,0,0);
}
diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c
index cbf40359fc1..56209b5a244 100644
--- a/src/mame/video/balsente.c
+++ b/src/mame/video/balsente.c
@@ -127,7 +127,7 @@ WRITE8_HANDLER( shrike_sprite_select_w )
sprite_data = sprite_bank[(data & 0x80 >> 7) ^ 1];
}
- shrike_shared_6809_w( 1, data );
+ shrike_shared_6809_w( machine, 1, data );
}
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index 43e70197bd2..6c8a2d353b5 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -124,7 +124,7 @@ WRITE8_HANDLER( bankp_out_w )
/* bits 2-3 unknown (2 is used) */
/* bit 4 controls NMI */
- interrupt_enable_w(0,(data & 0x10)>>4);
+ interrupt_enable_w(machine,0,(data & 0x10)>>4);
/* bit 5 controls screen flip */
flip_screen_set(data & 0x20);
diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c
index 6768228080e..f2772a0cf53 100644
--- a/src/mame/video/beezer.c
+++ b/src/mame/video/beezer.c
@@ -8,7 +8,7 @@ static int scanline=0;
INTERRUPT_GEN( beezer_interrupt )
{
scanline = (scanline + 1) % 0x80;
- via_0_ca2_w (0, scanline & 0x10);
+ via_0_ca2_w (machine, 0, scanline & 0x10);
if ((scanline & 0x78) == 0x78)
cpunum_set_input_line(machine, 0, M6809_FIRQ_LINE, ASSERT_LINE);
else
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index cdc52cb910d..b0c716fa36c 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -135,7 +135,7 @@ WRITE16_HANDLER( bionicc_paletteram_w )
when intensity is zero the colour is not reduced to pure black, (the sky should stay
at dark blue rather than absolute black) */
data = COMBINE_DATA(&paletteram16[offset]);
- paletteram16_RRRRGGGGBBBBIIII_word_w(offset,(data & 0xfff0) | ((data & 0x0007) << 1) | 1, 0);
+ paletteram16_RRRRGGGGBBBBIIII_word_w(machine,offset,(data & 0xfff0) | ((data & 0x0007) << 1) | 1, 0);
}
WRITE16_HANDLER( bionicc_scroll_w )
@@ -231,5 +231,5 @@ VIDEO_UPDATE( bionicc )
VIDEO_EOF( bionicc )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index c238ad6a67d..a3e81d613c7 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -245,5 +245,5 @@ VIDEO_UPDATE( blktiger )
VIDEO_EOF( blktiger )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c
index 9d7292fb3f1..5c3ad65bb83 100644
--- a/src/mame/video/blockade.c
+++ b/src/mame/video/blockade.c
@@ -8,7 +8,7 @@ WRITE8_HANDLER( blockade_videoram_w )
videoram[offset] = data;
tilemap_mark_tile_dirty(bg_tilemap, offset);
- if (input_port_3_r(0) & 0x80)
+ if (input_port_3_r(machine,0) & 0x80)
{
logerror("blockade_videoram_w: scanline %d\n", video_screen_get_vpos(0));
cpu_spinuntil_int();
diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c
index 7649ed6c5a8..d9d34d174b1 100644
--- a/src/mame/video/blstroid.c
+++ b/src/mame/video/blstroid.c
@@ -99,7 +99,7 @@ VIDEO_START( blstroid )
static TIMER_CALLBACK( irq_off )
{
/* clear the interrupt */
- atarigen_scanline_int_ack_w(0, 0, 0);
+ atarigen_scanline_int_ack_w(machine, 0, 0, 0);
}
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index 0bfc401c4f4..f5671a1b58a 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -64,7 +64,7 @@ WRITE8_HANDLER( bogeyman_colorram2_w )
WRITE8_HANDLER( bogeyman_paletteram_w )
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(offset, ~data);
+ paletteram_BBGGGRRR_w(machine, offset, ~data);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 85d48a67361..d85fdf8b8b8 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -156,7 +156,7 @@ VIDEO_START( bnj )
WRITE8_HANDLER( btime_paletteram_w )
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(offset,~data);
+ paletteram_BBGGGRRR_w(machine,offset,~data);
}
WRITE8_HANDLER( lnc_videoram_w )
@@ -210,7 +210,7 @@ WRITE8_HANDLER( lnc_mirrorvideoram_w )
y = offset % 32;
offset = 32 * y + x;
- lnc_videoram_w(offset,data);
+ lnc_videoram_w(machine,offset,data);
}
WRITE8_HANDLER( btime_mirrorcolorram_w )
@@ -289,8 +289,8 @@ WRITE8_HANDLER( bnj_video_control_w )
/* For now we just check 0x40 in DSW1, and ignore the write if we */
/* are in upright controls mode. */
- if (input_port_3_r(0) & 0x40) /* cocktail mode */
- btime_video_control_w(offset, data);
+ if (input_port_3_r(machine, 0) & 0x40) /* cocktail mode */
+ btime_video_control_w(machine, offset, data);
}
WRITE8_HANDLER( lnc_video_control_w )
@@ -299,14 +299,14 @@ WRITE8_HANDLER( lnc_video_control_w )
// figure out how NMI's are disabled by the sound processor
lnc_sound_interrupt_enabled = data & 0x08;
- bnj_video_control_w(offset, data & 0x01);
+ bnj_video_control_w(machine, offset, data & 0x01);
}
WRITE8_HANDLER( disco_video_control_w )
{
btime_palette = (data >> 2) & 0x03;
- if (!(input_port_3_r(0) & 0x40)) /* cocktail mode */
+ if (!(input_port_3_r(machine,0) & 0x40)) /* cocktail mode */
{
flip_screen_set(data & 0x01);
}
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index 7c1524dc369..f29e25029b5 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -149,13 +149,13 @@ WRITE16_HANDLER( btoads_scroll1_w )
WRITE16_HANDLER( btoads_paletteram_w )
{
- tlc34076_lsb_w(offset/2, data, mem_mask);
+ tlc34076_lsb_w(machine, offset/2, data, mem_mask);
}
READ16_HANDLER( btoads_paletteram_r )
{
- return tlc34076_lsb_r(offset/2, mem_mask);
+ return tlc34076_lsb_r(machine, offset/2, mem_mask);
}
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index 32fc5eb683d..766f4b3b2ce 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -67,7 +67,7 @@ WRITE8_HANDLER( capbowl_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(col, *capbowl_rowaddress, func, data);
+ tms34061_w(machine, col, *capbowl_rowaddress, func, data);
}
@@ -82,7 +82,7 @@ READ8_HANDLER( capbowl_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(col, *capbowl_rowaddress, func);
+ return tms34061_r(machine, col, *capbowl_rowaddress, func);
}
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index b03ffe4c8c0..9025d3269e1 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -443,7 +443,7 @@ VIDEO_UPDATE( centiped )
VIDEO_UPDATE( warlords )
{
- int upright_mode = input_port_0_r(0) & 0x80;
+ int upright_mode = input_port_0_r(machine, 0) & 0x80;
int offs;
/* if the cocktail/upright switch flipped, force refresh */
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index 4aa3c3c5316..1451c81dbe0 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -63,7 +63,7 @@ WRITE8_HANDLER( cheekyms_port_80_w )
*cheekyms_port_80 = data;
/* d2 - interrupt enable */
- interrupt_enable_w(offset, data & 0x04);
+ interrupt_enable_w(machine, offset, data & 0x04);
}
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index c993f113cfa..e72d248a46f 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -225,7 +225,7 @@ READ16_HANDLER( bigrun_vregs_r )
case 0x0004/2 : return readinputport(3); // Motor Limit Switches
case 0x0006/2 : return readinputport(4); // DSW 1 & 2
- case 0x0008/2 : return soundlatch2_word_r(0,0); // From sound cpu
+ case 0x0008/2 : return soundlatch2_word_r(machine,0,0); // From sound cpu
case 0x0010/2 :
switch (cischeat_ip_select & 0x3)
@@ -274,7 +274,7 @@ WRITE16_HANDLER( bigrun_vregs_w )
break;
case 0x000a/2 : // to sound cpu
- soundlatch_word_w(0,new_data,0);
+ soundlatch_word_w(machine,0,new_data,0);
break;
case 0x000c/2 : break; // ??
@@ -332,7 +332,7 @@ READ16_HANDLER( cischeat_vregs_r )
}
case 0x2200/2 : return readinputport(5); // DSW 3 (4 bits)
- case 0x2300/2 : return soundlatch2_r(0); // From sound cpu
+ case 0x2300/2 : return soundlatch2_r(machine,0); // From sound cpu
default: SHOW_READ_ERROR("vreg %04X read!",offset*2);
return megasys1_vregs[offset];
@@ -386,14 +386,14 @@ WRITE16_HANDLER( cischeat_vregs_w )
case 0x2208/2 : break; // watchdog reset
case 0x2300/2 : /* Sound CPU: reads latch during int 4, and stores command */
- soundlatch_word_w(0,new_data,0);
- cpunum_set_input_line(Machine, 3,4,HOLD_LINE);
+ soundlatch_word_w(machine,0,new_data,0);
+ cpunum_set_input_line(machine, 3,4,HOLD_LINE);
break;
/* Not sure about this one.. */
- case 0x2308/2 : cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
+ case 0x2308/2 : cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -422,7 +422,7 @@ READ16_HANDLER( f1gpstar_vregs_r )
(read_shift()<<5); // Buttons
case 0x0006/2 : return readinputport(3); // ? Read at boot only
- case 0x0008/2 : return soundlatch2_r(0); // From sound cpu
+ case 0x0008/2 : return soundlatch2_r(machine,0); // From sound cpu
case 0x000c/2 : return readinputport(4); // DSW 3
@@ -445,7 +445,7 @@ READ16_HANDLER( f1gpstr2_vregs_r )
return (f1gpstr2_ioready[0]&1) ? 0xff : 0xf0;
default:
- return f1gpstar_vregs_r(offset,mem_mask);
+ return f1gpstar_vregs_r(machine,offset,mem_mask);
}
}
@@ -464,7 +464,7 @@ READ16_HANDLER( wildplt_vregs_r )
case 0x0004/2 : return readinputport(1); // Buttons
- case 0x0008/2 : return soundlatch2_r(0); // From sound cpu
+ case 0x0008/2 : return soundlatch2_r(machine,0); // From sound cpu
case 0x0010/2 : // X, Y
return readinputport(2) | (readinputport(3)<<8);
@@ -505,8 +505,8 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000
case 0x0014/2 : break;
/* Usually written in sequence, but not always */
- case 0x0008/2 : soundlatch_word_w(0,new_data,0); break;
- case 0x0018/2 : cpunum_set_input_line(Machine, 3,4,HOLD_LINE); break;
+ case 0x0008/2 : soundlatch_word_w(machine,0,new_data,0); break;
+ case 0x0018/2 : cpunum_set_input_line(machine, 3,4,HOLD_LINE); break;
case 0x0010/2 : break;
@@ -526,9 +526,9 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000
case 0x2208/2 : break; // watchdog reset
/* Not sure about this one. Values: $10 then 0, $7 then 0 */
- case 0x2308/2 : cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
- cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
- cpunum_set_input_line(Machine, 3, INPUT_LINE_RESET, (new_data & 4) ? ASSERT_LINE : CLEAR_LINE );
+ case 0x2308/2 : cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (new_data & 1) ? ASSERT_LINE : CLEAR_LINE );
+ cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (new_data & 2) ? ASSERT_LINE : CLEAR_LINE );
+ cpunum_set_input_line(machine, 3, INPUT_LINE_RESET, (new_data & 4) ? ASSERT_LINE : CLEAR_LINE );
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -548,13 +548,14 @@ WRITE16_HANDLER( f1gpstr2_vregs_w )
case 0x0000/2 :
if (ACCESSING_LSB)
{
- cpunum_set_input_line(Machine, 4,4,(new_data & 4)?ASSERT_LINE:CLEAR_LINE);
- cpunum_set_input_line(Machine, 4,2,(new_data & 2)?ASSERT_LINE:CLEAR_LINE);
+ cpunum_set_input_line(machine, 4,4,(new_data & 4)?ASSERT_LINE:CLEAR_LINE);
+ cpunum_set_input_line(machine, 4,2,(new_data & 2)?ASSERT_LINE:CLEAR_LINE);
}
break;
default:
- f1gpstar_vregs_w(offset,data,mem_mask);
+ f1gpstar_vregs_w(machine,offset,data,mem_mask);
+ break;
}
}
@@ -583,7 +584,7 @@ WRITE16_HANDLER( scudhamm_vregs_w )
case 0x100/2+1 : MEGASYS1_VREG_SCROLL(2,y) break;
case 0x100/2+2 : megasys1_set_vreg_flag(2,new_data);break;
- case 0x208/2 : watchdog_reset_w(0,0); break;
+ case 0x208/2 : watchdog_reset_w(machine,0,0); break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
}
@@ -1349,9 +1350,9 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) )
#if 1
popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X",
scudhamm_motor_command,
- scudhamm_motor_pos_r(0,0),
- scudhamm_motor_status_r(0,0),
- scudhamm_analog_r(0,0) );
+ scudhamm_motor_pos_r(machine,0,0),
+ scudhamm_motor_status_r(machine,0,0),
+ scudhamm_analog_r(machine,0,0) );
#endif
}
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index ababb423dca..beb3decf4c1 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -340,8 +340,8 @@ WRITE8_HANDLER( combasc_vreg_w )
static WRITE8_HANDLER( combascb_sh_irqtrigger_w )
{
- soundlatch_w(offset,data);
- cpunum_set_input_line_and_vector(Machine, 1,0,HOLD_LINE,0xff);
+ soundlatch_w(machine,offset,data);
+ cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
}
static READ8_HANDLER( combascb_io_r )
@@ -440,7 +440,7 @@ MACHINE_RESET( combasc )
memset( combasc_page[1], 0x00, 0x2000 );
combasc_bank_select = -1;
- combasc_bankselect_w( 0,0 );
+ combasc_bankselect_w( machine,0,0 );
}
WRITE8_HANDLER( combasc_pf_control_w )
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index c9728bfcd8b..6d1c731175d 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -137,5 +137,5 @@ VIDEO_UPDATE( commando )
VIDEO_EOF( commando )
{
- buffer_spriteram_w(0, 0);
+ buffer_spriteram_w(machine, 0, 0);
}
diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c
index 9ca85fd0821..b0e665ae601 100644
--- a/src/mame/video/contra.c
+++ b/src/mame/video/contra.c
@@ -236,7 +236,7 @@ WRITE8_HANDLER( contra_K007121_ctrl_0_w )
if (offset == 7)
tilemap_set_flip(fg_tilemap,(data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- K007121_ctrl_0_w(offset,data);
+ K007121_ctrl_0_w(machine,offset,data);
}
WRITE8_HANDLER( contra_K007121_ctrl_1_w )
@@ -256,7 +256,7 @@ WRITE8_HANDLER( contra_K007121_ctrl_1_w )
if (offset == 7)
tilemap_set_flip(bg_tilemap,(data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- K007121_ctrl_1_w(offset,data);
+ K007121_ctrl_1_w(machine,offset,data);
}
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index fb3b6168ce1..624158dc388 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -537,7 +537,7 @@ READ16_HANDLER( cps1_output_r )
/* Pang 3 EEPROM interface */
if (cps1_game_config->kludge == 5 && offset == 0x7a/2)
- return cps1_eeprom_port_r(0,mem_mask);
+ return cps1_eeprom_port_r(machine,0,mem_mask);
return cps1_output[offset];
}
@@ -547,7 +547,7 @@ WRITE16_HANDLER( cps1_output_w )
/* Pang 3 EEPROM interface */
if (cps1_game_config->kludge == 5 && offset == 0x7a/2)
{
- cps1_eeprom_port_w(0,data,mem_mask);
+ cps1_eeprom_port_w(machine,0,data,mem_mask);
return;
}
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 166cdfb5b72..540dd4daf6e 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -215,6 +215,6 @@ popmessage("gfxctrl = %02x",gfxctrl);
VIDEO_EOF( crshrace )
{
- buffer_spriteram16_w(0,0,0);
- buffer_spriteram16_2_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
+ buffer_spriteram16_2_w(machine,0,0,0);
}
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index 66f58691879..00c69810647 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -251,7 +251,7 @@ WRITE16_HANDLER( darkseal_pf3_data_w )
WRITE16_HANDLER( darkseal_pf3b_data_w ) /* Mirror */
{
- darkseal_pf3_data_w(offset+0x800,data,mem_mask);
+ darkseal_pf3_data_w(machine,offset+0x800,data,mem_mask);
}
WRITE16_HANDLER( darkseal_control_0_w )
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 34410247f67..e3a63b7f8fc 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -611,8 +611,8 @@ WRITE8_HANDLER( dec0_pf3_control_8bit_w )
offset&=0xffe;
myword=buffer[offset] + (buffer[offset+1]<<8);
- if (offset<0x10) dec0_pf3_control_0_w(offset/2,myword,0);
- else dec0_pf3_control_1_w((offset-0x10)/2,myword,0);
+ if (offset<0x10) dec0_pf3_control_0_w(machine,offset/2,myword,0);
+ else dec0_pf3_control_1_w(machine,(offset-0x10)/2,myword,0);
}
WRITE8_HANDLER( dec0_pf3_data_8bit_w )
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index c925466fd91..44b7b6dc5d8 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -608,13 +608,13 @@ VIDEO_UPDATE( decocass )
int scrollx, scrolly_l, scrolly_r;
rectangle clip;
- if (0xc0 != (input_port_2_r(0) & 0xc0)) /* coin slots assert an NMI */
+ if (0xc0 != (input_port_2_r(machine, 0) & 0xc0)) /* coin slots assert an NMI */
cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, ASSERT_LINE);
if (0 == (watchdog_flip & 0x04))
- watchdog_reset_w (0,0);
+ watchdog_reset_w (machine,0,0);
else if (watchdog_count-- > 0)
- watchdog_reset_w (0,0);
+ watchdog_reset_w (machine,0,0);
#if TAPE_UI_DISPLAY
if (tape_timer)
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index ef148b15cba..3b06bc410b7 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -143,7 +143,7 @@ WRITE8_HANDLER( dogfgt_bitmapram_w )
return;
}
- internal_bitmapram_w(offset + BITMAPRAM_SIZE/3 * bm_plane,data);
+ internal_bitmapram_w(machine,offset + BITMAPRAM_SIZE/3 * bm_plane,data);
}
WRITE8_HANDLER( dogfgt_bgvideoram_w )
@@ -230,7 +230,7 @@ VIDEO_UPDATE( dogfgt )
lastpixcolor = pixcolor;
for (offs = 0;offs < BITMAPRAM_SIZE;offs++)
- internal_bitmapram_w(offs,bitmapram[offs]);
+ internal_bitmapram_w(machine,offs,bitmapram[offs]);
}
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index cf95a2876d2..696b7740d6d 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -94,22 +94,22 @@ WRITE8_HANDLER( dooyong_fg2scroll8_w )
WRITE16_HANDLER( dooyong_bgscroll16_w )
{
- if (ACCESSING_LSB) dooyong_bgscroll8_w(offset, data & 0x00ff);
+ if (ACCESSING_LSB) dooyong_bgscroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_bg2scroll16_w )
{
- if (ACCESSING_LSB) dooyong_bg2scroll8_w(offset, data & 0x00ff);
+ if (ACCESSING_LSB) dooyong_bg2scroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_fgscroll16_w )
{
- if (ACCESSING_LSB) dooyong_fgscroll8_w(offset, data & 0x00ff);
+ if (ACCESSING_LSB) dooyong_fgscroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_fg2scroll16_w )
{
- if (ACCESSING_LSB) dooyong_fg2scroll8_w(offset, data & 0x00ff);
+ if (ACCESSING_LSB) dooyong_fg2scroll8_w(machine, offset, data & 0x00ff);
}
@@ -866,10 +866,10 @@ VIDEO_START( popbingo )
VIDEO_EOF( dooyong )
{
- buffer_spriteram_w(0, 0);
+ buffer_spriteram_w(machine, 0, 0);
}
VIDEO_EOF( rshark )
{
- buffer_spriteram16_w(0, 0, 0);
+ buffer_spriteram16_w(machine, 0, 0, 0);
}
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 6e21f6943fa..8789639f9fa 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -123,7 +123,7 @@ WRITE8_HANDLER( dynax_blit2_dest_w )
}
WRITE8_HANDLER( tenkai_blit_dest_w )
{
- dynax_blit_dest_w(0, BITSWAP8(data, 7,6,5,4, 0,1,2,3));
+ dynax_blit_dest_w(machine, 0, BITSWAP8(data, 7,6,5,4, 0,1,2,3));
}
/* Background Color */
@@ -656,7 +656,7 @@ WRITE8_HANDLER( dynax_blitter_rev2_w )
case 3: blit_src = (blit_src & 0xffff00) | (data << 0); break;
case 4: blit_src = (blit_src & 0xff00ff) | (data << 8); break;
case 5: blit_src = (blit_src & 0x00ffff) | (data <<16); break;
- case 6: dynax_blit_scroll_w(0,data); break;
+ case 6: dynax_blit_scroll_w(machine,0,data); break;
}
}
@@ -671,7 +671,7 @@ WRITE8_HANDLER( tenkai_blitter_rev2_w )
case 3: blit_src = (blit_src & 0xffff00) | (data << 0); break;
case 4: blit_src = (blit_src & 0xff00ff) | (data << 8); break;
case 5: blit_src = (blit_src & 0x00ffff) | (data <<16); break;
- case 6: tenkai_blit_scroll_w(0,data); break;
+ case 6: tenkai_blit_scroll_w(machine,0,data); break;
}
}
@@ -686,7 +686,7 @@ WRITE8_HANDLER( jantouki_blitter_rev2_w )
case 3: blit_src = (blit_src & 0xffff00) | (data << 0); break;
case 4: blit_src = (blit_src & 0xff00ff) | (data << 8); break;
case 5: blit_src = (blit_src & 0x00ffff) | (data <<16); break;
- case 6: dynax_blit_scroll_w(0,data); break;
+ case 6: dynax_blit_scroll_w(machine,0,data); break;
}
}
@@ -700,7 +700,7 @@ WRITE8_HANDLER( jantouki_blitter2_rev2_w )
case 3: blit2_src = (blit2_src & 0xffff00) | (data << 0); break;
case 4: blit2_src = (blit2_src & 0xff00ff) | (data << 8); break;
case 5: blit2_src = (blit2_src & 0x00ffff) | (data <<16); break;
- case 6: dynax_blit2_scroll_w(0,data); break;
+ case 6: dynax_blit2_scroll_w(machine,0,data); break;
}
}
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 20c4cd40a66..ab362fad312 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -245,5 +245,5 @@ VIDEO_UPDATE( dynduke )
VIDEO_EOF( dynduke )
{
- buffer_spriteram16_w(0,0,0); // Could be a memory location instead
+ buffer_spriteram16_w(machine,0,0,0); // Could be a memory location instead
}
diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c
index 292ed28314d..06e0e2a8e32 100644
--- a/src/mame/video/eolith.c
+++ b/src/mame/video/eolith.c
@@ -25,8 +25,8 @@ WRITE32_HANDLER( eolith_vram_w )
switch(mem_mask)
{
case 0:
- eolith_vram_w(offset,data,0x0000ffff);
- eolith_vram_w(offset,data,0xffff0000);
+ eolith_vram_w(machine,offset,data,0x0000ffff);
+ eolith_vram_w(machine,offset,data,0xffff0000);
return;
case 0xffff:
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index bf4764b104a..49ea82c985e 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -243,5 +243,5 @@ VIDEO_UPDATE( exedexes )
VIDEO_EOF( exedexes )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index 41e9ec342c8..7ab7f7a4e63 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -444,8 +444,8 @@ static VIDEO_UPDATE( exidy440 )
{
int i;
- int beamx = ((input_port_4_r(0) & 0xff) * (HBSTART - HBEND)) >> 8;
- int beamy = ((input_port_5_r(0) & 0xff) * (VBSTART - VBEND)) >> 8;
+ int beamx = ((input_port_4_r(machine, 0) & 0xff) * (HBSTART - HBEND)) >> 8;
+ int beamy = ((input_port_5_r(machine, 0) & 0xff) * (VBSTART - VBEND)) >> 8;
/* The timing of this FIRQ is very important. The games look for an FIRQ
and then wait about 650 cycles, clear the old FIRQ, and wait a
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index 18e5020fee6..d45ec645148 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -112,7 +112,7 @@ WRITE8_HANDLER( flkatck_k007121_regs_w )
break;
}
- K007121_ctrl_0_w(offset,data);
+ K007121_ctrl_0_w(machine,offset,data);
}
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 71ba5d9e336..a9c6a0839d3 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -74,9 +74,9 @@ WRITE8_HANDLER( flstory_videoram_w )
WRITE8_HANDLER( flstory_palette_w )
{
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(machine, (offset & 0xff) + (palette_bank << 8),data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(machine, (offset & 0xff) + (palette_bank << 8),data);
}
READ8_HANDLER( flstory_palette_r )
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index d45eed87f3f..9f244907989 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -507,5 +507,5 @@ VIDEO_UPDATE( gaelco2_dual )
VIDEO_EOF( gaelco2 )
{
/* sprites are one frame ahead */
- buffer_spriteram16_w(0, 0, 0);
+ buffer_spriteram16_w(machine, 0, 0, 0);
}
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index a6ebe66df97..99d9d63617e 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -1091,19 +1091,19 @@ WRITE8_HANDLER( galaxian_flip_screen_y_w )
WRITE8_HANDLER( gteikob2_flip_screen_x_w )
{
- galaxian_flip_screen_x_w(offset, ~data);
+ galaxian_flip_screen_x_w(machine, offset, ~data);
}
WRITE8_HANDLER( gteikob2_flip_screen_y_w )
{
- galaxian_flip_screen_y_w(offset, ~data);
+ galaxian_flip_screen_y_w(machine, offset, ~data);
}
WRITE8_HANDLER( hotshock_flip_screen_w )
{
- galaxian_flip_screen_x_w(offset, data);
- galaxian_flip_screen_y_w(offset, data);
+ galaxian_flip_screen_x_w(machine, offset, data);
+ galaxian_flip_screen_y_w(machine, offset, data);
}
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index c28b1bc05c1..68a73397a8c 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -277,11 +277,11 @@ logerror("%04x: write %02x to port 80\n",activecpu_get_pc(),data);
for (offs = 0; offs < videoram_size; offs++)
{
- galivan_videoram_w(offs, 0x20);
+ galivan_videoram_w(machine, offs, 0x20);
}
for (offs = 0; offs < videoram_size; offs++)
{
- galivan_colorram_w(offs, 0x03);
+ galivan_colorram_w(machine, offs, 0x03);
}
}
diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c
index 6fe70c9bb71..e2473dba64d 100644
--- a/src/mame/video/gameplan.c
+++ b/src/mame/video/gameplan.c
@@ -144,13 +144,13 @@ static WRITE8_HANDLER( leprechn_video_command_w )
static TIMER_CALLBACK( clear_screen_done_callback )
{
/* indicate that the we are done clearing the screen */
- via_0_ca1_w(0, 0);
+ via_0_ca1_w(machine, 0, 0);
}
static WRITE8_HANDLER( video_command_trigger_w )
{
- gameplan_state *state = Machine->driver_data;
+ gameplan_state *state = machine->driver_data;
if (data == 0)
{
@@ -193,7 +193,7 @@ static WRITE8_HANDLER( video_command_trigger_w )
/* clear screen */
case 3:
/* indicate that the we are busy */
- via_0_ca1_w(0, 1);
+ via_0_ca1_w(machine, 0, 1);
memset(state->videoram, state->video_data & 0x0f, state->videoram_size);
@@ -265,7 +265,7 @@ static TIMER_CALLBACK( via_0_ca1_timer_callback )
gameplan_state *state = machine->driver_data;
/* !VBLANK is connected to CA1 */
- via_0_ca1_w(0, (UINT8)param);
+ via_0_ca1_w(machine, 0, (UINT8)param);
if (param)
timer_adjust_oneshot(state->via_0_ca1_timer, video_screen_get_time_until_pos(0, VBSTART, 0), 0);
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index 89f401debe1..6d26bccd232 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -400,7 +400,7 @@ WRITE16_HANDLER( genesis_vdp_w )
case 0x0a:
case 0x0b:
if (ACCESSING_LSB && sndti_exists(SOUND_SN76496, 0))
- SN76496_0_w(0, data & 0xff);
+ SN76496_0_w(machine, 0, data & 0xff);
break;
}
}
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index f6255b1b43c..5a20f8c3462 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -181,7 +181,7 @@ WRITE16_HANDLER( ginganin_vregs16_w )
tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
break;
case 7:
- soundlatch_w(0,data);
+ soundlatch_w(machine,0,data);
cpunum_set_input_line(Machine, 1, INPUT_LINE_NMI, PULSE_LINE);
break;
default:
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index c34a38a982c..d87fccfc7ad 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -156,5 +156,5 @@ VIDEO_UPDATE( gng )
VIDEO_EOF( gng )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index 203e3354d14..0ca8fb7a8a2 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -120,8 +120,8 @@ WRITE16_HANDLER( gradius3_gfxram_w )
VIDEO_UPDATE( gradius3 )
{
/* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */
- K052109_w(0x1d80,0x10);
- K052109_w(0x1f00,0x32);
+ K052109_w(machine,0x1d80,0x10);
+ K052109_w(machine,0x1f00,0x32);
if (dirtygfx)
{
diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c
index af3f686ddfc..8ea020378aa 100644
--- a/src/mame/video/groundfx.c
+++ b/src/mame/video/groundfx.c
@@ -261,12 +261,12 @@ VIDEO_UPDATE( groundfx )
it's contents the usual way.
*/
- if (TC0100SCN_long_r(0x4090/4,0) || TC0480SCP_long_r(0x20/4,0)==0x240866) { /* Anything in text layer - really stupid hack */
+ if (TC0100SCN_long_r(machine,0x4090/4,0) || TC0480SCP_long_r(machine,0x20/4,0)==0x240866) { /* Anything in text layer - really stupid hack */
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[2],0,4);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[3],0,8);
// TC0100SCN_tilemap_draw(machine,bitmap,cliprect,0,pivlayer[2],0,0);
- if (TC0480SCP_long_r(0x20/4,0)!=0x240866) /* Stupid hack for start of race */
+ if (TC0480SCP_long_r(machine,0x20/4,0)!=0x240866) /* Stupid hack for start of race */
TC0480SCP_tilemap_draw(bitmap,&hack_cliprect,layer[0],0,0);
draw_sprites(machine,bitmap,cliprect,1,44,-574);
} else {
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index 638f032a09e..1ad0fa70f62 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -157,7 +157,7 @@ static void gtia_reset(running_machine *machine)
int i;
/* reset the GTIA read/write/helper registers */
for (i = 0; i < 32; i++)
- atari_gtia_w(i,0);
+ atari_gtia_w(machine,i,0);
memset(&gtia.r, 0, sizeof(gtia.r));
if (is_ntsc())
gtia.r.pal = 0xff;
diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c
index aeb15dd1119..3596c09f961 100644
--- a/src/mame/video/hcastle.c
+++ b/src/mame/video/hcastle.c
@@ -177,7 +177,7 @@ WRITE8_HANDLER( hcastle_pf1_control_w )
{
tilemap_set_flip(fg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
- K007121_ctrl_0_w(offset,data);
+ K007121_ctrl_0_w(machine,offset,data);
}
WRITE8_HANDLER( hcastle_pf2_control_w )
@@ -193,7 +193,7 @@ WRITE8_HANDLER( hcastle_pf2_control_w )
{
tilemap_set_flip(bg_tilemap, (data & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
- K007121_ctrl_1_w(offset,data);
+ K007121_ctrl_1_w(machine,offset,data);
}
/*****************************************************************************/
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 48148a88743..2f1e01c8e18 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -49,7 +49,7 @@ static tilemap *bg_tilemap[2][4];
***************************************************************************/
-static void mrokumei_handleblit( int rom_base )
+static void mrokumei_handleblit( running_machine *machine, int rom_base )
{
int i;
int DestParam;
@@ -117,7 +117,7 @@ static void mrokumei_handleblit( int rom_base )
} /* i!=0 */
if (data) /* 00 is a nop */
- mrokumei_videoram_w( BaseAddr + DestAddr, data );
+ mrokumei_videoram_w( machine, BaseAddr + DestAddr, data );
if (homedata_vreg[1] & 0x80) /* flip screen */
{
@@ -136,7 +136,7 @@ finish:
cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,HOLD_LINE);
}
-static void reikaids_handleblit( int rom_base )
+static void reikaids_handleblit( running_machine *machine, int rom_base )
{
int i;
UINT16 DestParam;
@@ -221,7 +221,7 @@ static void reikaids_handleblit( int rom_base )
addr ^= 0x007c;
}
- reikaids_videoram_w( addr, dat );
+ reikaids_videoram_w( machine, addr, dat );
}
}
@@ -236,7 +236,7 @@ finish:
cpunum_set_input_line(Machine, 0,M6809_FIRQ_LINE,HOLD_LINE);
}
-static void pteacher_handleblit( int rom_base )
+static void pteacher_handleblit( running_machine *machine, int rom_base )
{
int i;
int DestParam;
@@ -309,7 +309,7 @@ static void pteacher_handleblit( int rom_base )
if ((addr & 0x2080) == 0)
{
addr = ((addr & 0xc000) >> 2) | ((addr & 0x1f00) >> 1) | (addr & 0x7f);
- pteacher_videoram_w( addr, data );
+ pteacher_videoram_w( machine, addr, data );
}
}
@@ -651,7 +651,7 @@ WRITE8_HANDLER( pteacher_blitter_bank_w )
WRITE8_HANDLER( mrokumei_blitter_start_w )
{
- if (data & 0x80) mrokumei_handleblit(((blitter_bank & 0x04) >> 2) * 0x10000);
+ if (data & 0x80) mrokumei_handleblit(machine, ((blitter_bank & 0x04) >> 2) * 0x10000);
/* bit 0 = bank switch; used by hourouki to access the
optional service mode ROM (not available in current dump) */
@@ -659,12 +659,12 @@ WRITE8_HANDLER( mrokumei_blitter_start_w )
WRITE8_HANDLER( reikaids_blitter_start_w )
{
- reikaids_handleblit((blitter_bank & 3) * 0x10000);
+ reikaids_handleblit(machine, (blitter_bank & 3) * 0x10000);
}
WRITE8_HANDLER( pteacher_blitter_start_w )
{
- pteacher_handleblit((blitter_bank >> 5) * 0x10000 & (memory_region_length(REGION_USER1) - 1));
+ pteacher_handleblit(machine, (blitter_bank >> 5) * 0x10000 & (memory_region_length(REGION_USER1) - 1));
}
diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c
index dfa42f312d5..7c92c47f6df 100644
--- a/src/mame/video/hyhoo.c
+++ b/src/mame/video/hyhoo.c
@@ -30,9 +30,9 @@ WRITE8_HANDLER( hyhoo_blitter_w )
switch (offset)
{
case 0x00: blitter_src_addr = (blitter_src_addr & 0xff00) | data;
- nb1413m3_gfxradr_l_w(0, data); break;
+ nb1413m3_gfxradr_l_w(machine, 0, data); break;
case 0x01: blitter_src_addr = (blitter_src_addr & 0x00ff) | (data << 8);
- nb1413m3_gfxradr_h_w(0, data); break;
+ nb1413m3_gfxradr_h_w(machine, 0, data); break;
case 0x02: blitter_destx = data; break;
case 0x03: blitter_desty = data; break;
case 0x04: blitter_sizex = data; break;
@@ -54,7 +54,7 @@ WRITE8_HANDLER( hyhoo_romsel_w )
{
hyhoo_gfxrom = (((data & 0xc0) >> 4) + (data & 0x03));
hyhoo_highcolorflag = data;
- nb1413m3_gfxrombank_w(0, data);
+ nb1413m3_gfxrombank_w(machine, 0, data);
if ((0x20000 * hyhoo_gfxrom) > (memory_region_length(REGION_GFX1) - 1))
{
diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c
index 6d0262369a6..44226494cf8 100644
--- a/src/mame/video/itech32.c
+++ b/src/mame/video/itech32.c
@@ -1410,22 +1410,22 @@ READ16_HANDLER( itech32_video_r )
WRITE16_HANDLER( bloodstm_video_w )
{
- itech32_video_w(offset / 2, data, mem_mask);
+ itech32_video_w(machine, offset / 2, data, mem_mask);
}
READ16_HANDLER( bloodstm_video_r )
{
- return itech32_video_r(offset / 2,0);
+ return itech32_video_r(machine, offset / 2,0);
}
WRITE32_HANDLER( itech020_video_w )
{
if (ACCESSING_MSW32)
- itech32_video_w(offset, data >> 16, mem_mask >> 16);
+ itech32_video_w(machine, offset, data >> 16, mem_mask >> 16);
else
- itech32_video_w(offset, data, mem_mask);
+ itech32_video_w(machine, offset, data, mem_mask);
}
@@ -1438,7 +1438,7 @@ WRITE32_HANDLER( drivedge_zbuf_control_w )
READ32_HANDLER( itech020_video_r )
{
- int result = itech32_video_r(offset,0);
+ int result = itech32_video_r(machine,offset,0);
return (result << 16) | result;
}
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index c0c3eda073a..236b556f63f 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -213,7 +213,7 @@ VIDEO_START( itech8 )
WRITE8_HANDLER( itech8_palette_w )
{
- tlc34076_w(offset/2, data);
+ tlc34076_w(machine, offset/2, data);
}
@@ -305,7 +305,7 @@ INLINE void consume_rle(int count)
*
*************************************/
-static void perform_blit(void)
+static void perform_blit(running_machine *machine)
{
offs_t addr = tms_state.regs[TMS34061_XYADDRESS] | ((tms_state.regs[TMS34061_XYOFFSET] & 0x300) << 8);
UINT8 shift = (BLITTER_FLAGS & BLITFLAG_SHIFT) ? 4 : 0;
@@ -314,7 +314,7 @@ static void perform_blit(void)
int xdir = (BLITTER_FLAGS & BLITFLAG_XFLIP) ? -1 : 1;
int xflip = (BLITTER_FLAGS & BLITFLAG_XFLIP);
int rle = (BLITTER_FLAGS & BLITFLAG_RLE);
- int color = tms34061_latch_r(0);
+ int color = tms34061_latch_r(machine, 0);
int width = BLITTER_WIDTH;
int height = BLITTER_HEIGHT;
UINT8 transmaskhi, transmasklo;
@@ -514,7 +514,7 @@ WRITE8_HANDLER( itech8_blitter_w )
}
/* perform the blit */
- perform_blit();
+ perform_blit(machine);
blit_in_progress = 1;
/* set a timer to go off when we're done */
@@ -544,7 +544,7 @@ WRITE8_HANDLER( itech8_tms34061_w )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- tms34061_w(col, 0xff, func, data);
+ tms34061_w(machine, col, 0xff, func, data);
}
@@ -559,7 +559,7 @@ READ8_HANDLER( itech8_tms34061_r )
col ^= 2;
/* Row address (RA0-RA8) is not dependent on the offset */
- return tms34061_r(col, 0xff, func);
+ return tms34061_r(machine, col, 0xff, func);
}
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index 7a8d0256186..56b73d8f7a5 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -25,7 +25,7 @@ WRITE8_HANDLER( jack_colorram_w )
WRITE8_HANDLER( jack_paletteram_w )
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(offset,~data);
+ paletteram_BBGGGRRR_w(machine,offset,~data);
}
READ8_HANDLER( jack_flipscreen_r )
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index da06b5fa4eb..0afbc89368b 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -136,6 +136,7 @@
#include "driver.h"
#include "deprecat.h"
+#include "memconv.h"
#include "profiler.h"
#include "machine/atarigen.h"
#include "cpu/mips/r3000.h"
@@ -706,16 +707,13 @@ WRITE16_HANDLER( jaguar_tom_regs_w )
READ32_HANDLER( jaguar_tom_regs32_r )
{
- return (jaguar_tom_regs_r(offset * 2, 0) << 16) | jaguar_tom_regs_r(offset * 2 + 1, 0);
+ return read32be_with_16be_handler(jaguar_tom_regs_r, machine, offset, mem_mask);
}
WRITE32_HANDLER( jaguar_tom_regs32_w )
{
- if (ACCESSING_MSW32)
- jaguar_tom_regs_w(offset * 2, data >> 16, mem_mask >> 16);
- if (ACCESSING_LSW32)
- jaguar_tom_regs_w(offset * 2 + 1, data, mem_mask);
+ write32be_with_16be_handler(jaguar_tom_regs_w, machine, offset, data, mem_mask);
}
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index eaa1dccafa8..3147b549e54 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -111,7 +111,7 @@ static void do_pen_lookup(jedi_state *state, bitmap_t *bitmap, const rectangle *
WRITE8_HANDLER( jedi_vscroll_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
state->vscroll = data | (offset << 8);
}
@@ -119,7 +119,7 @@ WRITE8_HANDLER( jedi_vscroll_w )
WRITE8_HANDLER( jedi_hscroll_w )
{
- jedi_state *state = Machine->driver_data;
+ jedi_state *state = machine->driver_data;
state->hscroll = data | (offset << 8);
}
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 3304ad745e4..e8b380aa9eb 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -420,7 +420,7 @@ WRITE32_HANDLER( konamigx_palette_w )
g = (paletteram32[offset] >> 8) & 0xff;
b = (paletteram32[offset] >> 0) & 0xff;
- palette_set_color(Machine,offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine,offset,MAKE_RGB(r,g,b));
}
WRITE32_HANDLER( konamigx_palette2_w )
@@ -437,7 +437,7 @@ WRITE32_HANDLER( konamigx_palette2_w )
g = (paletteram32[offset] >> 8) & 0xff;
b = (paletteram32[offset] >> 0) & 0xff;
- palette_set_color(Machine,offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine,offset,MAKE_RGB(r,g,b));
}
// main monitor for type 3
@@ -447,9 +447,9 @@ WRITE32_HANDLER( konamigx_555_palette_w )
paletteram16 = (UINT16 *)paletteram32;
if (ACCESSING_MSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2, data >> 16, mem_mask >> 16);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
if (ACCESSING_LSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2+1, data, mem_mask);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
// sub monitor for type 3
@@ -463,9 +463,9 @@ WRITE32_HANDLER( konamigx_555_palette2_w )
paletteram16 = (UINT16 *)paletteram32;
if (ACCESSING_MSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2, data >> 16, mem_mask >> 16);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
if (ACCESSING_LSW32)
- paletteram16_xRRRRRGGGGGBBBBB_word_w(offset*2+1, data, mem_mask);
+ paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
WRITE32_HANDLER( konamigx_tilebank_w )
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index 4f59dd2bc93..1ee2adfc2cf 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -2246,26 +2246,26 @@ WRITE8_HANDLER( K052109_w )
READ16_HANDLER( K052109_word_r )
{
- return K052109_r(offset + 0x2000) | (K052109_r(offset) << 8);
+ return K052109_r(machine,offset + 0x2000) | (K052109_r(machine,offset) << 8);
}
WRITE16_HANDLER( K052109_word_w )
{
if (ACCESSING_MSB)
- K052109_w(offset,(data >> 8) & 0xff);
+ K052109_w(machine,offset,(data >> 8) & 0xff);
if (ACCESSING_LSB)
- K052109_w(offset + 0x2000,data & 0xff);
+ K052109_w(machine,offset + 0x2000,data & 0xff);
}
READ16_HANDLER(K052109_lsb_r)
{
- return K052109_r(offset);
+ return K052109_r(machine,offset);
}
WRITE16_HANDLER(K052109_lsb_w)
{
if(ACCESSING_LSB)
- K052109_w(offset, data & 0xff);
+ K052109_w(machine, offset, data & 0xff);
}
void K052109_set_RMRD_line(int state)
@@ -2612,15 +2612,15 @@ WRITE8_HANDLER( K051960_w )
READ16_HANDLER( K051960_word_r )
{
- return K051960_r(offset*2 + 1) | (K051960_r(offset*2) << 8);
+ return K051960_r(machine,offset*2 + 1) | (K051960_r(machine,offset*2) << 8);
}
WRITE16_HANDLER( K051960_word_w )
{
if (ACCESSING_MSB)
- K051960_w(offset*2,(data >> 8) & 0xff);
+ K051960_w(machine,offset*2,(data >> 8) & 0xff);
if (ACCESSING_LSB)
- K051960_w(offset*2 + 1,data & 0xff);
+ K051960_w(machine,offset*2 + 1,data & 0xff);
}
READ8_HANDLER( K051937_r )
@@ -2685,15 +2685,15 @@ WRITE8_HANDLER( K051937_w )
READ16_HANDLER( K051937_word_r )
{
- return K051937_r(offset*2 + 1) | (K051937_r(offset*2) << 8);
+ return K051937_r(machine,offset*2 + 1) | (K051937_r(machine,offset*2) << 8);
}
WRITE16_HANDLER( K051937_word_w )
{
if (ACCESSING_MSB)
- K051937_w(offset*2,(data >> 8) & 0xff);
+ K051937_w(machine,offset*2,(data >> 8) & 0xff);
if (ACCESSING_LSB)
- K051937_w(offset*2 + 1,data & 0xff);
+ K051937_w(machine,offset*2 + 1,data & 0xff);
}
@@ -2926,23 +2926,23 @@ READ8_HANDLER( K052109_051960_r )
if (K052109_RMRD_line == CLEAR_LINE)
{
if (offset >= 0x3800 && offset < 0x3808)
- return K051937_r(offset - 0x3800);
+ return K051937_r(machine,offset - 0x3800);
else if (offset < 0x3c00)
- return K052109_r(offset);
+ return K052109_r(machine,offset);
else
- return K051960_r(offset - 0x3c00);
+ return K051960_r(machine,offset - 0x3c00);
}
- else return K052109_r(offset);
+ else return K052109_r(machine,offset);
}
WRITE8_HANDLER( K052109_051960_w )
{
if (offset >= 0x3800 && offset < 0x3808)
- K051937_w(offset - 0x3800,data);
+ K051937_w(machine,offset - 0x3800,data);
else if (offset < 0x3c00)
- K052109_w(offset,data);
+ K052109_w(machine,offset,data);
else
- K051960_w(offset - 0x3c00,data);
+ K051960_w(machine,offset - 0x3c00,data);
}
@@ -3188,26 +3188,26 @@ WRITE8_HANDLER( K053244_1_w )
READ16_HANDLER( K053244_lsb_r )
{
- return K053244_r(offset);
+ return K053244_r(machine, offset);
}
WRITE16_HANDLER( K053244_lsb_w )
{
if (ACCESSING_LSB)
- K053244_w(offset, data & 0xff);
+ K053244_w(machine, offset, data & 0xff);
}
READ16_HANDLER( K053244_word_r )
{
- return (K053244_r(offset*2)<<8)|K053244_r(offset*2+1);
+ return (K053244_r(machine, offset*2)<<8)|K053244_r(machine, offset*2+1);
}
WRITE16_HANDLER( K053244_word_w )
{
if (ACCESSING_MSB)
- K053244_w(offset*2, (data >> 8) & 0xff);
+ K053244_w(machine, offset*2, (data >> 8) & 0xff);
if (ACCESSING_LSB)
- K053244_w(offset*2+1, data & 0xff);
+ K053244_w(machine, offset*2+1, data & 0xff);
}
void K053244_bankselect(int chip, int bank)
@@ -4128,28 +4128,28 @@ WRITE8_HANDLER( K053246_w )
READ16_HANDLER( K053246_word_r )
{
offset <<= 1;
- return K053246_r(offset + 1) | (K053246_r(offset) << 8);
+ return K053246_r(machine, offset + 1) | (K053246_r(machine, offset) << 8);
}
WRITE16_HANDLER( K053246_word_w )
{
if (ACCESSING_MSB)
- K053246_w(offset<<1,(data >> 8) & 0xff);
+ K053246_w(machine, offset<<1,(data >> 8) & 0xff);
if (ACCESSING_LSB)
- K053246_w((offset<<1) + 1,data & 0xff);
+ K053246_w(machine, (offset<<1) + 1,data & 0xff);
}
READ32_HANDLER( K053246_long_r )
{
offset <<= 1;
- return (K053246_word_r(offset+1, 0xffff) | K053246_word_r(offset, 0xffff)<<16);
+ return (K053246_word_r(machine, offset+1, 0xffff) | K053246_word_r(machine, offset, 0xffff)<<16);
}
WRITE32_HANDLER( K053246_long_w )
{
offset <<= 1;
- K053246_word_w(offset, data>>16, mem_mask >> 16);
- K053246_word_w(offset+1, data, mem_mask);
+ K053246_word_w(machine, offset, data>>16, mem_mask >> 16);
+ K053246_word_w(machine, offset+1, data, mem_mask);
}
void K053246_set_OBJCHA_line(int state)
@@ -5155,13 +5155,13 @@ WRITE8_HANDLER( K053251_w )
WRITE16_HANDLER( K053251_lsb_w )
{
if (ACCESSING_LSB)
- K053251_w(offset, data & 0xff);
+ K053251_w(machine, offset, data & 0xff);
}
WRITE16_HANDLER( K053251_msb_w )
{
if (ACCESSING_MSB)
- K053251_w(offset, (data >> 8) & 0xff);
+ K053251_w(machine, offset, (data >> 8) & 0xff);
}
int K053251_get_priority(int ci)
@@ -5230,13 +5230,13 @@ if (K054000_ram[0x0c] == 0xff) Acy+=3;
READ16_HANDLER( K054000_lsb_r )
{
- return K054000_r(offset);
+ return K054000_r(machine, offset);
}
WRITE16_HANDLER( K054000_lsb_w )
{
if (ACCESSING_LSB)
- K054000_w(offset, data & 0xff);
+ K054000_w(machine, offset, data & 0xff);
}
@@ -6074,7 +6074,7 @@ READ16_HANDLER( K056832_old_rom_word_r )
READ32_HANDLER( K056832_rom_long_r )
{
offset <<= 1;
- return (K056832_rom_word_r(offset+1, 0xffff) | (K056832_rom_word_r(offset, 0xffff)<<16));
+ return (K056832_rom_word_r(machine, offset+1, 0xffff) | (K056832_rom_word_r(machine, offset, 0xffff)<<16));
}
/* only one page is mapped to videoram at a time through a window */
@@ -6383,8 +6383,8 @@ WRITE32_HANDLER( K056832_long_w )
// if (ACCESSING_xxx) trick. in particular, 8-bit writes
// are used to the tilemap bank register.
offset <<= 1;
- K056832_word_w(offset, data>>16, mem_mask >> 16);
- K056832_word_w(offset+1, data, mem_mask);
+ K056832_word_w(machine, offset, data>>16, mem_mask >> 16);
+ K056832_word_w(machine, offset+1, data, mem_mask);
}
WRITE16_HANDLER( K056832_b_word_w )
@@ -6396,11 +6396,11 @@ WRITE8_HANDLER( K056832_w )
{
if (offset & 1)
{
- K056832_word_w((offset>>1), data, 0xff00);
+ K056832_word_w(machine, (offset>>1), data, 0xff00);
}
else
{
- K056832_word_w((offset>>1), data<<8, 0x00ff);
+ K056832_word_w(machine, (offset>>1), data<<8, 0x00ff);
}
}
@@ -6408,11 +6408,11 @@ WRITE8_HANDLER( K056832_b_w )
{
if (offset & 1)
{
- K056832_b_word_w((offset>>1), data, 0xff00);
+ K056832_b_word_w(machine, (offset>>1), data, 0xff00);
}
else
{
- K056832_b_word_w((offset>>1), data<<8, 0x00ff);
+ K056832_b_word_w(machine, (offset>>1), data<<8, 0x00ff);
}
}
@@ -6420,11 +6420,11 @@ WRITE32_HANDLER( K056832_b_long_w )
{
if (ACCESSING_MSW32)
{
- K056832_b_word_w(offset<<1, data>>16, mem_mask >> 16);
+ K056832_b_word_w(machine, offset<<1, data>>16, mem_mask >> 16);
}
if (ACCESSING_LSW32)
{
- K056832_b_word_w((offset<<1)+1, data, mem_mask);
+ K056832_b_word_w(machine, (offset<<1)+1, data, mem_mask);
}
}
@@ -7241,8 +7241,8 @@ WRITE16_HANDLER( K054338_word_w )
WRITE32_HANDLER( K054338_long_w )
{
offset <<= 1;
- K054338_word_w(offset, data>>16, mem_mask>>16);
- K054338_word_w(offset+1, data, mem_mask);
+ K054338_word_w(machine, offset, data>>16, mem_mask>>16);
+ K054338_word_w(machine, offset+1, data, mem_mask);
}
// returns a 16-bit '338 register
@@ -8373,8 +8373,8 @@ WRITE16_HANDLER( K053252_word_w )
WRITE32_HANDLER( K053252_long_w )
{
offset <<= 1;
- K053252_word_w(offset, data>>16, mem_mask>>16);
- K053252_word_w(offset+1, data, mem_mask);
+ K053252_word_w(machine, offset, data>>16, mem_mask>>16);
+ K053252_word_w(machine, offset+1, data, mem_mask);
}
@@ -8392,19 +8392,19 @@ READ16_HANDLER( K055555_word_r ) { return(k55555_regs[offset]<<8); } // PCU2
READ32_HANDLER( K056832_long_r )
{
offset <<= 1;
- return (K056832_word_r(offset+1, 0xffff) | K056832_word_r(offset, 0xffff)<<16);
+ return (K056832_word_r(machine, offset+1, 0xffff) | K056832_word_r(machine, offset, 0xffff)<<16);
}
READ32_HANDLER( K053247_reg_long_r )
{
offset <<= 1;
- return (K053247_reg_word_r(offset+1, 0xffff) | K053247_reg_word_r(offset, 0xffff)<<16);
+ return (K053247_reg_word_r(machine, offset+1, 0xffff) | K053247_reg_word_r(machine, offset, 0xffff)<<16);
}
READ32_HANDLER( K055555_long_r )
{
offset <<= 1;
- return (K055555_word_r(offset+1, 0xffff) | K055555_word_r(offset, 0xffff)<<16);
+ return (K055555_word_r(machine, offset+1, 0xffff) | K055555_word_r(machine, offset, 0xffff)<<16);
}
READ16_HANDLER( K053244_reg_word_r ) { return(K053244_regs[0][offset*2]<<8|K053244_regs[0][offset*2+1]); }
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index c3d9c031657..c284ade658d 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -53,9 +53,9 @@ READ8_HANDLER( ladyfrog_videoram_r )
WRITE8_HANDLER( ladyfrog_palette_w )
{
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(machine, (offset & 0xff) + (palette_bank << 8),data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(machine, (offset & 0xff) + (palette_bank << 8),data);
}
READ8_HANDLER( ladyfrog_palette_r )
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 98fd50e7267..5bb2382ea92 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -249,7 +249,7 @@ WRITE8_HANDLER( lasso_video_control_w )
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
}
- lasso_flip_screen_w(offset, data);
+ lasso_flip_screen_w(machine, offset, data);
}
WRITE8_HANDLER( wwjgtin_video_control_w )
@@ -263,7 +263,7 @@ WRITE8_HANDLER( wwjgtin_video_control_w )
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
}
- lasso_flip_screen_w(offset, data);
+ lasso_flip_screen_w(machine, offset, data);
}
WRITE8_HANDLER( pinbo_video_control_w )
@@ -271,7 +271,7 @@ WRITE8_HANDLER( pinbo_video_control_w )
/* no need to dirty the tilemap -- only the sprites use the global bank */
gfxbank = (data & 0x0c) >> 2;
- lasso_flip_screen_w(offset, data);
+ lasso_flip_screen_w(machine, offset, data);
}
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 6e635d7b85a..8f20c7513c1 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -249,5 +249,5 @@ VIDEO_EOF( lastduel )
/* Spriteram is always 1 frame ahead, suggesting buffering. I can't find
a register to control this so I assume it happens automatically
every frame at the end of vblank */
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c
index a5c7f3e1bd2..85e3968921c 100644
--- a/src/mame/video/lazercmd.c
+++ b/src/mame/video/lazercmd.c
@@ -32,7 +32,7 @@ static void plot_pattern(running_machine *machine, bitmap_t *bitmap, int x, int
int xbit, ybit, size;
size = 2;
- if (input_port_2_r(0) & 0x40)
+ if (input_port_2_r(machine,0) & 0x40)
{
size = 4;
}
@@ -57,7 +57,7 @@ VIDEO_UPDATE( lazercmd )
{
int i,x,y;
- int video_inverted = input_port_2_r(0) & 0x20;
+ int video_inverted = input_port_2_r(machine,0) & 0x20;
/* The first row of characters are invisible */
for (i = 0; i < (VERT_RES - 1) * HORZ_RES; i++)
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 41aa4ca23ca..f0fc9458bfd 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -100,11 +100,11 @@ WRITE8_HANDLER( deco16_io_w )
/* Todo */
break;
case 8: /* Irq ack */
- cpunum_set_input_line(Machine, 0,DECO16_IRQ_LINE,CLEAR_LINE);
+ cpunum_set_input_line(machine, 0,DECO16_IRQ_LINE,CLEAR_LINE);
break;
case 9: /* Sound */
- soundlatch_w(0,data);
- cpunum_set_input_line(Machine, 1,M6502_IRQ_LINE,HOLD_LINE);
+ soundlatch_w(machine,0,data);
+ cpunum_set_input_line(machine, 1,M6502_IRQ_LINE,HOLD_LINE);
break;
}
}
@@ -147,7 +147,7 @@ VIDEO_START( liberate )
WRITE8_HANDLER( prosport_paletteram_w )
{
/* RGB output is inverted */
- paletteram_BBGGGRRR_w(offset,~data);
+ paletteram_BBGGGRRR_w(machine,offset,~data);
}
PALETTE_INIT( liberate )
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index 9ea8768007a..1f952f59496 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -289,5 +289,5 @@ VIDEO_UPDATE( trojan )
VIDEO_EOF( lwings )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index 217949cf7be..6e18d464050 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -800,8 +800,8 @@ VIDEO_START( spelunkr )
WRITE8_HANDLER( spelunk2_gfxport_w )
{
- m62_hscroll_high_w(0,(data&2)>>1);
- m62_vscroll_high_w(0,(data&1));
+ m62_hscroll_high_w(machine,0,(data&2)>>1);
+ m62_vscroll_high_w(machine,0,(data&1));
if (spelunkr_palbank != ((data & 0x0c) >> 2))
{
spelunkr_palbank = (data & 0x0c) >> 2;
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index 68b0cbe4678..463ced1bec0 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -93,7 +93,7 @@ WRITE16_HANDLER( m92_spritecontrol_w )
/* Sprite buffer - the data written doesn't matter (confirmed by several games) */
if (offset==4)
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
m92_sprite_buffer_busy = 0;
/* Pixel clock is 26.6666 MHz, we have 0x800 bytes, or 0x400 words
@@ -134,7 +134,7 @@ READ16_HANDLER( m92_paletteram_r )
WRITE16_HANDLER( m92_paletteram_w )
{
- paletteram16_xBBBBBGGGGGRRRRR_word_w(offset + 0x400 * m92_palette_bank, data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset + 0x400 * m92_palette_bank, data, mem_mask);
}
/*****************************************************************************/
diff --git a/src/mame/video/marvins.c b/src/mame/video/marvins.c
index 3c8cdd7131c..5631385a308 100644
--- a/src/mame/video/marvins.c
+++ b/src/mame/video/marvins.c
@@ -406,7 +406,7 @@ VIDEO_UPDATE( madcrash )
if( scroll_attributes & 1 ) sprite_scrollx += 256;
if( scroll_attributes & 2 ) fg_scrollx += 256;
- marvins_palette_bank_w(0, program_read_byte(0xc800+madcrash_vreg));
+ marvins_palette_bank_w(machine, 0, program_read_byte(0xc800+madcrash_vreg));
update_palette(machine, 1);
if( flipscreen != (attributes&0x80) )
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index 63e7cdad14f..ed6f44ceabd 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -450,13 +450,13 @@ WRITE16_HANDLER( megasys1_vregs_A_w )
case 0x300/2 : megasys1_screen_flag = new_data;
if (new_data & 0x10)
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
else
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
break;
- case 0x308/2 : soundlatch_word_w(0,new_data,0);
- cpunum_set_input_line(Machine, 1,4,HOLD_LINE);
+ case 0x308/2 : soundlatch_word_w(machine,0,new_data,0);
+ cpunum_set_input_line(machine, 1,4,HOLD_LINE);
break;
default : SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
@@ -472,7 +472,7 @@ READ16_HANDLER( megasys1_vregs_C_r )
{
switch (offset)
{
- case 0x8000/2: return soundlatch2_word_r(0,0);
+ case 0x8000/2: return soundlatch2_word_r(machine,0,0);
default: return megasys1_vregs[offset];
}
}
@@ -501,14 +501,14 @@ WRITE16_HANDLER( megasys1_vregs_C_w )
case 0x2308/2 : megasys1_screen_flag = new_data;
if (new_data & 0x10)
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, ASSERT_LINE);
else
- cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
+ cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
break;
case 0x8000/2 : /* Cybattler reads sound latch on irq 2 */
- soundlatch_word_w(0,new_data,0);
- cpunum_set_input_line(Machine, 1,2,HOLD_LINE);
+ soundlatch_word_w(machine,0,new_data,0);
+ cpunum_set_input_line(machine, 1,2,HOLD_LINE);
break;
default: SHOW_WRITE_ERROR("vreg %04X <- %04X",offset*2,data);
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index 46dbefd544d..2f185d76e67 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -306,7 +306,7 @@ WRITE16_HANDLER( midtunit_paletteram_w )
WRITE16_HANDLER( midxunit_paletteram_w )
{
if (!(offset & 1))
- midtunit_paletteram_w(offset / 2, data, mem_mask);
+ midtunit_paletteram_w(machine, offset / 2, data, mem_mask);
}
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index d7642002336..fc2fe01e817 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -119,14 +119,14 @@ READ8_HANDLER( mgakuen_objram_r )
WRITE8_HANDLER( pang_videoram_w )
{
- if (video_bank) mgakuen_objram_w(offset,data);
- else mgakuen_videoram_w(offset,data);
+ if (video_bank) mgakuen_objram_w(machine,offset,data);
+ else mgakuen_videoram_w(machine,offset,data);
}
READ8_HANDLER( pang_videoram_r )
{
- if (video_bank) return mgakuen_objram_r(offset);
- else return mgakuen_videoram_r(offset);
+ if (video_bank) return mgakuen_objram_r(machine,offset);
+ else return mgakuen_videoram_r(machine,offset);
}
/***************************************************************************
@@ -223,8 +223,8 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",activecpu_get_pc(),data);
WRITE8_HANDLER( pang_paletteram_w )
{
- if (paletteram_bank) paletteram_xxxxRRRRGGGGBBBB_le_w(offset + 0x800,data);
- else paletteram_xxxxRRRRGGGGBBBB_le_w(offset,data);
+ if (paletteram_bank) paletteram_xxxxRRRRGGGGBBBB_le_w(machine,offset + 0x800,data);
+ else paletteram_xxxxRRRRGGGGBBBB_le_w(machine,offset,data);
}
READ8_HANDLER( pang_paletteram_r )
@@ -235,7 +235,7 @@ READ8_HANDLER( pang_paletteram_r )
WRITE8_HANDLER( mgakuen_paletteram_w )
{
- paletteram_xxxxRRRRGGGGBBBB_le_w(offset,data);
+ paletteram_xxxxRRRRGGGGBBBB_le_w(machine,offset,data);
}
READ8_HANDLER( mgakuen_paletteram_r )
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 600b27531bb..887bc3c2a21 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -56,7 +56,7 @@ WRITE8_HANDLER( mjkjidai_ctrl_w )
// logerror("%04x: port c0 = %02x\n",activecpu_get_pc(),data);
/* bit 0 = NMI enable */
- interrupt_enable_w(0,data & 1);
+ interrupt_enable_w(machine,0,data & 1);
/* bit 1 = flip screen */
flip_screen_set(data & 0x02);
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 3549171cfe1..6f2fc0c61e5 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -125,11 +125,10 @@ VIDEO_START( naughtyb )
WRITE8_HANDLER( naughtyb_videoreg_w )
{
// bits 4+5 control the sound circuit
-
- pleiads_sound_control_c_w(offset,data);
+ pleiads_sound_control_c_w(machine,offset,data);
naughtyb_cocktail =
- ( ( input_port_2_r(0) & 0x80 ) && // cabinet == cocktail
+ ( ( input_port_2_r(machine,0) & 0x80 ) && // cabinet == cocktail
( data & 0x01 ) ); // handling player 2
palreg = (data >> 1) & 0x03; // pallette sel is bit 1 & 2
bankreg = (data >> 2) & 0x01; // banksel is just bit 2
@@ -138,11 +137,10 @@ WRITE8_HANDLER( naughtyb_videoreg_w )
WRITE8_HANDLER( popflame_videoreg_w )
{
// bits 4+5 control the sound circuit
-
- pleiads_sound_control_c_w(offset,data);
+ pleiads_sound_control_c_w(machine,offset,data);
naughtyb_cocktail =
- ( ( input_port_2_r(0) & 0x80 ) && // cabinet == cocktail
+ ( ( input_port_2_r(machine,0) & 0x80 ) && // cabinet == cocktail
( data & 0x01 ) ); // handling player 2
palreg = (data >> 1) & 0x03; // pallette sel is bit 1 & 2
bankreg = (data >> 3) & 0x01; // banksel is just bit 3
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index 6b4bed6c5f9..2db59770dd5 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -198,7 +198,7 @@ WRITE8_HANDLER( mjsikaku_romsel_w )
WRITE8_HANDLER( secolove_romsel_w )
{
mjsikaku_gfxrom = ((data & 0xc0) >> 4) + (data & 0x03);
- mjsikaku_gfxflag2_w(0, data);
+ mjsikaku_gfxflag2_w(machine, 0, data);
if ((mjsikaku_gfxrom << 17) > (memory_region_length(REGION_GFX1) - 1))
{
@@ -212,7 +212,7 @@ WRITE8_HANDLER( secolove_romsel_w )
WRITE8_HANDLER( crystalg_romsel_w )
{
mjsikaku_gfxrom = (data & 0x03);
- mjsikaku_gfxflag2_w(0, data);
+ mjsikaku_gfxflag2_w(machine, 0, data);
if ((mjsikaku_gfxrom << 17) > (memory_region_length(REGION_GFX1) - 1))
{
@@ -226,7 +226,7 @@ WRITE8_HANDLER( crystalg_romsel_w )
WRITE8_HANDLER( seiha_romsel_w )
{
mjsikaku_gfxrom = (data & 0x1f);
- mjsikaku_gfxflag3_w(0, data);
+ mjsikaku_gfxflag3_w(machine, 0, data);
if ((mjsikaku_gfxrom << 17) > (memory_region_length(REGION_GFX1) - 1))
{
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index 005e0131c88..edd67e5840e 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -809,7 +809,7 @@ READ16_HANDLER( neogeo_video_register_r )
/* accessing the LSB only is not mapped */
if (mem_mask == 0xff00)
- ret = neogeo_unmapped_r(0, 0) & 0x00ff;
+ ret = neogeo_unmapped_r(machine, 0, 0) & 0x00ff;
else
{
switch (offset)
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index 9f957a8aaea..a375c8265da 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -22,7 +22,7 @@ WRITE8_HANDLER( nitedrvr_hvc_w )
nitedrvr_hvc[offset & 0x3f] = data;
if ((offset & 0x30) == 0x30)
- watchdog_reset_w(0, 0);
+ watchdog_reset_w(machine, 0, 0);
}
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index ca762c6cc1b..3cc364e231d 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -55,18 +55,18 @@ WRITE8_HANDLER( ninjakun_paletteram_w )
{
int i;
- paletteram_BBGGRRII_w(offset,data);
+ paletteram_BBGGRRII_w(machine,offset,data);
// expand the sprite palette to full length
if (offset < 16)
{
- paletteram_BBGGRRII_w(0x200 + offset * 16 + 1, data);
+ paletteram_BBGGRRII_w(machine, 0x200 + offset * 16 + 1, data);
if (offset != 1)
{
for (i = 0; i < 16; i++)
{
- paletteram_BBGGRRII_w(0x200 + offset + i * 16, data);
+ paletteram_BBGGRRII_w(machine, 0x200 + offset + i * 16, data);
}
}
}
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index 9c663f270f6..b5451c8cf8c 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -101,9 +101,9 @@ WRITE8_HANDLER( nycaptor_palette_w )
return;
if (offset & 0x100)
- paletteram_xxxxBBBBGGGGRRRR_split2_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split2_w(machine, (offset & 0xff) + (palette_bank << 8),data);
else
- paletteram_xxxxBBBBGGGGRRRR_split1_w((offset & 0xff) + (palette_bank << 8),data);
+ paletteram_xxxxBBBBGGGGRRRR_split1_w(machine, (offset & 0xff) + (palette_bank << 8),data);
}
READ8_HANDLER( nycaptor_palette_r )
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 43eb90dee9f..70c91c00f78 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -209,7 +209,7 @@ static TILE_GET_INFO( ojankoy_get_tile_info )
******************************************************************************/
-void ojankoc_flipscreen(int data)
+void ojankoc_flipscreen(running_machine *machine, int data)
{
static int ojankoc_flipscreen_old = 0;
int x, y;
@@ -223,13 +223,13 @@ void ojankoc_flipscreen(int data)
for (x = 0; x < 0x100; x++) {
color1 = ojankohs_videoram[0x0000 + ((y * 256) + x)];
color2 = ojankohs_videoram[0x3fff - ((y * 256) + x)];
- ojankoc_videoram_w(0x0000 + ((y * 256) + x), color2);
- ojankoc_videoram_w(0x3fff - ((y * 256) + x), color1);
+ ojankoc_videoram_w(machine, 0x0000 + ((y * 256) + x), color2);
+ ojankoc_videoram_w(machine, 0x3fff - ((y * 256) + x), color1);
color1 = ojankohs_videoram[0x4000 + ((y * 256) + x)];
color2 = ojankohs_videoram[0x7fff - ((y * 256) + x)];
- ojankoc_videoram_w(0x4000 + ((y * 256) + x), color2);
- ojankoc_videoram_w(0x7fff - ((y * 256) + x), color1);
+ ojankoc_videoram_w(machine, 0x4000 + ((y * 256) + x), color2);
+ ojankoc_videoram_w(machine, 0x7fff - ((y * 256) + x), color1);
}
}
@@ -324,7 +324,7 @@ VIDEO_UPDATE( ojankoc )
{
/* redraw bitmap */
for (offs = 0; offs < 0x8000; offs++) {
- ojankoc_videoram_w(offs, ojankohs_videoram[offs]);
+ ojankoc_videoram_w(machine, offs, ojankohs_videoram[offs]);
}
ojankoc_screen_refresh = 0;
}
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index f0d47ec89f3..2f6bcdfdcf9 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -100,7 +100,7 @@ WRITE8_HANDLER( pastelg_romsel_w )
{
pastelg_gfxrom = ((data & 0xc0) >> 6);
pastelg_palbank = ((data & 0x10) >> 4);
- nb1413m3_sndrombank1_w(0, data);
+ nb1413m3_sndrombank1_w(machine, 0, data);
if ((pastelg_gfxrom << 16) > (memory_region_length(REGION_GFX1) - 1))
{
diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c
index 916385a3f30..9a54446c683 100644
--- a/src/mame/video/phoenix.c
+++ b/src/mame/video/phoenix.c
@@ -234,7 +234,7 @@ WRITE8_HANDLER( phoenix_videoreg_w )
videoram_pg_index = data & 1;
memory_set_bank(1, videoram_pg_index);
- cocktail_mode = videoram_pg_index && (input_port_3_r(0) & 0x01);
+ cocktail_mode = videoram_pg_index && (input_port_3_r(machine,0) & 0x01);
tilemap_set_flip(ALL_TILEMAPS, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -257,7 +257,7 @@ WRITE8_HANDLER( pleiads_videoreg_w )
videoram_pg_index = data & 1;
memory_set_bank(1, videoram_pg_index);
- cocktail_mode = videoram_pg_index && (input_port_3_r(0) & 0x01);
+ cocktail_mode = videoram_pg_index && (input_port_3_r(machine,0) & 0x01);
tilemap_set_flip(ALL_TILEMAPS, cocktail_mode ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -280,7 +280,7 @@ WRITE8_HANDLER( pleiads_videoreg_w )
pleiads_protection_question = data & 0xfc;
/* send two bits to sound control C (not sure if they are there) */
- pleiads_sound_control_c_w(offset, data);
+ pleiads_sound_control_c_w(machine, offset, data);
}
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 261cd63c3b1..b92dab58d6a 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -233,7 +233,7 @@ WRITE8_HANDLER( skyskipr_bitmap_w )
if (data & 0x80)
offset |= 0x40;
- popeye_bitmap_w(offset,data);
+ popeye_bitmap_w(machine,offset,data);
}
static TILE_GET_INFO( get_fg_tile_info )
@@ -280,7 +280,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
if (lastflip != flip_screen_get())
{
for (offs = 0;offs < popeye_bitmapram_size;offs++)
- popeye_bitmap_w(offs,popeye_bitmapram[offs]);
+ popeye_bitmap_w(machine,offs,popeye_bitmapram[offs]);
lastflip = flip_screen_get();
}
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index c22f5677b9d..88e94d5f4b0 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -1143,7 +1143,7 @@ VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct prio
VIDEO_EOF( psikyosh )
{
- buffer_spriteram32_w(0,0,0);
+ buffer_spriteram32_w(machine,0,0,0);
}
/*popmessage ("Regs %08x %08x %08x\n %08x %08x %08x",
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index 4d39e1573f5..28f3f046317 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -3915,7 +3915,7 @@ INTERRUPT_GEN( psx_vblank )
void psx_gpu_reset( void )
{
- psx_gpu_w( 1, 0, 0 );
+ psx_gpu_w( Machine, 1, 0, 0 );
}
void psx_lightgun_set( int n_x, int n_y )
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index ea339ba494c..03d378cf26a 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -171,19 +171,19 @@ READ8_HANDLER( psychic5_paged_ram_r )
switch(offset)
{
case 0x00:
- val = input_port_0_r(0);
+ val = input_port_0_r(machine,0);
break;
case 0x01:
- val = input_port_1_r(0);
+ val = input_port_1_r(machine,0);
break;
case 0x02:
- val = input_port_2_r(0);
+ val = input_port_2_r(machine,0);
break;
case 0x03:
- val = input_port_3_r(0);
+ val = input_port_3_r(machine,0);
break;
case 0x04:
- val = input_port_4_r(0);
+ val = input_port_4_r(machine,0);
break;
default:
val = ps5_io_ram[offset];
@@ -206,7 +206,7 @@ WRITE8_HANDLER( psychic5_paged_ram_w )
if (!ps5_vram_page)
{
if (offset < 0x1000)
- psychic5_bg_videoram_w(offset,data);
+ psychic5_bg_videoram_w(machine,offset,data);
else
ps5_dummy_bg_ram[offset & 0xfff] = data;
}
@@ -238,7 +238,7 @@ WRITE8_HANDLER( psychic5_paged_ram_w )
}
else
{
- psychic5_fg_videoram_w(offset & 0xfff, data);
+ psychic5_fg_videoram_w(machine, offset & 0xfff, data);
}
}
}
diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c
index 01d204669a9..f851226d277 100644
--- a/src/mame/video/rockola.c
+++ b/src/mame/video/rockola.c
@@ -275,7 +275,7 @@ WRITE8_HANDLER( satansat_b002_w )
/* it controls only IRQs, not NMIs. Here I am affecting both, which */
/* is wrong. */
- interrupt_enable_w(0,data & 0x02);
+ interrupt_enable_w(machine,0,data & 0x02);
/* other bits unused */
}
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index fb8ebd1fee7..d3a6304ae2f 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -450,7 +450,7 @@ WRITE8_HANDLER( monsterb_videoram_w )
}
/* handle everything else */
- segag80r_videoram_w(offset, data);
+ segag80r_videoram_w(machine, offset, data);
}
@@ -519,7 +519,7 @@ WRITE8_HANDLER( pignewt_videoram_w )
}
/* handle everything else */
- segag80r_videoram_w(offset, data);
+ segag80r_videoram_w(machine, offset, data);
}
@@ -602,7 +602,7 @@ WRITE8_HANDLER( sindbadm_videoram_w )
}
/* handle everything else */
- segag80r_videoram_w(offset, data);
+ segag80r_videoram_w(machine, offset, data);
}
diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c
index e7970abf1c1..bcd6bd44aa9 100644
--- a/src/mame/video/segaic24.c
+++ b/src/mame/video/segaic24.c
@@ -604,24 +604,24 @@ WRITE16_HANDLER(sys24_char_w)
READ32_HANDLER(sys24_tile32_r)
{
- return sys24_tile_r(offset*2, mem_mask&0xffff) | sys24_tile_r((offset*2)+1, mem_mask>>16)<<16;
+ return sys24_tile_r(machine, offset*2, mem_mask&0xffff) | sys24_tile_r(machine, (offset*2)+1, mem_mask>>16)<<16;
}
READ32_HANDLER(sys24_char32_r)
{
- return sys24_char_r(offset*2, mem_mask&0xffff) | sys24_char_r((offset*2)+1, mem_mask>>16)<<16;
+ return sys24_char_r(machine, offset*2, mem_mask&0xffff) | sys24_char_r(machine, (offset*2)+1, mem_mask>>16)<<16;
}
WRITE32_HANDLER(sys24_tile32_w)
{
- sys24_tile_w(offset*2, data&0xffff, mem_mask&0xffff);
- sys24_tile_w((offset*2)+1, data>>16, mem_mask>>16);
+ sys24_tile_w(machine, offset*2, data&0xffff, mem_mask&0xffff);
+ sys24_tile_w(machine, (offset*2)+1, data>>16, mem_mask>>16);
}
WRITE32_HANDLER(sys24_char32_w)
{
- sys24_char_w(offset*2, data&0xffff, mem_mask&0xffff);
- sys24_char_w((offset*2)+1, data>>16, mem_mask>>16);
+ sys24_char_w(machine,offset*2, data&0xffff, mem_mask&0xffff);
+ sys24_char_w(machine,(offset*2)+1, data>>16, mem_mask>>16);
}
// - System 24
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 4c748365891..d100c4a7e26 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -568,9 +568,9 @@ READ32_HANDLER( multi32_videoram_r )
WRITE32_HANDLER( multi32_videoram_w )
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- system32_videoram_w(offset*2+0, data, mem_mask);
+ system32_videoram_w(machine, offset*2+0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- system32_videoram_w(offset*2+1, data >> 16, mem_mask >> 16);
+ system32_videoram_w(machine, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -648,17 +648,17 @@ WRITE16_HANDLER( system32_sprite_control_w )
READ32_HANDLER( multi32_sprite_control_r )
{
- return system32_sprite_control_r(offset*2+0, mem_mask) |
- (system32_sprite_control_r(offset*2+1, mem_mask >> 16) << 16);
+ return system32_sprite_control_r(machine, offset*2+0, mem_mask) |
+ (system32_sprite_control_r(machine, offset*2+1, mem_mask >> 16) << 16);
}
WRITE32_HANDLER( multi32_sprite_control_w )
{
if ((mem_mask & 0x0000ffff) != 0x0000ffff)
- system32_sprite_control_w(offset*2+0, data, mem_mask);
+ system32_sprite_control_w(machine, offset*2+0, data, mem_mask);
if ((mem_mask & 0xffff0000) != 0xffff0000)
- system32_sprite_control_w(offset*2+1, data >> 16, mem_mask >> 16);
+ system32_sprite_control_w(machine, offset*2+1, data >> 16, mem_mask >> 16);
}
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index ab0134501ca..4b10eeb3e2b 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -360,5 +360,5 @@ VIDEO_UPDATE( sidearms )
VIDEO_EOF( sidearms )
{
- buffer_spriteram_w(0, 0);
+ buffer_spriteram_w(machine, 0, 0);
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index 3747d104fcf..47e335dfed1 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -59,12 +59,12 @@ VIDEO_START( simpsons )
static READ8_HANDLER( simpsons_K052109_r )
{
- return K052109_r(offset + 0x2000);
+ return K052109_r(machine,offset + 0x2000);
}
static WRITE8_HANDLER( simpsons_K052109_w )
{
- K052109_w(offset + 0x2000,data);
+ K052109_w(machine,offset + 0x2000,data);
}
static READ8_HANDLER( simpsons_K053247_r )
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 75b816a6c31..a82d8a0c685 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -18,18 +18,18 @@ static int width = 0;
MACHINE_RESET( skydiver )
{
/* reset all latches */
- skydiver_start_lamp_1_w(0, 0);
- skydiver_start_lamp_2_w(0, 0);
- skydiver_lamp_s_w(0, 0);
- skydiver_lamp_k_w(0, 0);
- skydiver_lamp_y_w(0, 0);
- skydiver_lamp_d_w(0, 0);
+ skydiver_start_lamp_1_w(machine, 0, 0);
+ skydiver_start_lamp_2_w(machine, 0, 0);
+ skydiver_lamp_s_w(machine, 0, 0);
+ skydiver_lamp_k_w(machine, 0, 0);
+ skydiver_lamp_y_w(machine, 0, 0);
+ skydiver_lamp_d_w(machine, 0, 0);
output_set_value("lampi", 0);
output_set_value("lampv", 0);
output_set_value("lampe", 0);
output_set_value("lampr", 0);
- skydiver_width_w(0, 0);
- skydiver_coin_lockout_w(0, 0);
+ skydiver_width_w(machine, 0, 0);
+ skydiver_coin_lockout_w(machine, 0, 0);
}
@@ -130,7 +130,7 @@ WRITE8_HANDLER( skydiver_2000_201F_w )
{
int bit = offset & 0x01;
- watchdog_reset_w(0,0);
+ watchdog_reset_w(machine,0,0);
switch (offset & 0x0e)
{
@@ -147,13 +147,13 @@ WRITE8_HANDLER( skydiver_2000_201F_w )
output_set_value("lampr", bit);
break;
case (0x0a):
- discrete_sound_w(SKYDIVER_OCT1_EN, bit);
+ discrete_sound_w(machine, SKYDIVER_OCT1_EN, bit);
break;
case (0x0c):
- discrete_sound_w(SKYDIVER_OCT2_EN, bit);
+ discrete_sound_w(machine, SKYDIVER_OCT2_EN, bit);
break;
case (0x0e):
- discrete_sound_w(SKYDIVER_NOISE_RST, bit);
+ discrete_sound_w(machine, SKYDIVER_NOISE_RST, bit);
break;
}
}
diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c
index 694d8aa4973..1c9f8553b70 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -67,7 +67,7 @@ WRITE8_HANDLER( skyfox_vregs_w )
switch (offset)
{
case 0: skyfox_bg_ctrl = data; break;
- case 1: soundlatch_w(0,data); break;
+ case 1: soundlatch_w(machine,0,data); break;
case 2: break;
case 3: break;
case 4: break;
diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c
index 013c7391574..bc161801153 100644
--- a/src/mame/video/sprint4.c
+++ b/src/mame/video/sprint4.c
@@ -136,10 +136,10 @@ VIDEO_EOF( sprint4 )
/* update sound status */
- discrete_sound_w(SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
- discrete_sound_w(SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
- discrete_sound_w(SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);
- discrete_sound_w(SPRINT4_MOTOR_DATA_4, videoram[0x397] & 15);
+ discrete_sound_w(machine, SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
+ discrete_sound_w(machine, SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
+ discrete_sound_w(machine, SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);
+ discrete_sound_w(machine, SPRINT4_MOTOR_DATA_4, videoram[0x397] & 15);
}
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 1ab82c0d52d..346a800e11b 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -170,5 +170,5 @@ VIDEO_UPDATE( srumbler )
VIDEO_EOF( srumbler )
{
- buffer_spriteram_w(0,0);
+ buffer_spriteram_w(machine,0,0);
}
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index cdedd1695f6..08893aa7f26 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -196,7 +196,7 @@ WRITE8_HANDLER(st0016_vregs_w)
if( srcadr < (memory_region_length(REGION_CPU1)-0x10000) && (dstadr < ST0016_MAX_CHAR_BANK*ST0016_CHAR_BANK_SIZE))
{
st0016_char_bank=dstadr>>5;
- st0016_character_ram_w(dstadr&0x1f,memory_region(REGION_CPU1)[0x10000+srcadr]);
+ st0016_character_ram_w(machine,dstadr&0x1f,memory_region(REGION_CPU1)[0x10000+srcadr]);
srcadr++;
dstadr++;
length--;
@@ -421,7 +421,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static void st0016_postload(void)
{
int i;
- st0016_rom_bank_w(0,st0016_rom_bank);
+ st0016_rom_bank_w(Machine,0,st0016_rom_bank);
for(i=0;i<ST0016_MAX_CHAR_BANK;i++)
decodechar(Machine->gfx[st0016_ramgfx], i,(UINT8 *) st0016_charram);
}
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index cde7f809732..2ca968a4bcd 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -158,7 +158,7 @@ VIDEO_UPDATE( subs )
}
/* Update sound */
- discrete_sound_w(SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data
- discrete_sound_w(SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data
+ discrete_sound_w(machine, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data
+ discrete_sound_w(machine, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data
return 0;
}
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index acd2487762a..b8dc23c701d 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -130,7 +130,7 @@ WRITE8_HANDLER( pbillian_0410_w )
bankaddress = 0x10000 + ((data & 0x08) >> 3) * 0x4000;
memory_set_bankptr(1,&rom[bankaddress]);
- interrupt_enable_w(0,data & 0x10);
+ interrupt_enable_w(machine,0,data & 0x10);
flip_screen_set(data & 0x20);
}
@@ -150,7 +150,7 @@ WRITE8_HANDLER( superqix_0410_w )
show_bitmap = (data & 0x04) >> 2;
/* bit 3 enables NMI */
- interrupt_enable_w(offset,data & 0x08);
+ interrupt_enable_w(machine,offset,data & 0x08);
/* bits 4-5 control ROM bank */
bankaddress = 0x10000 + ((data & 0x30) >> 4) * 0x4000;
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index b7a69431ab9..c6c8b0887f1 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -970,5 +970,5 @@ VIDEO_UPDATE(skns)
VIDEO_EOF(skns)
{
- buffer_spriteram32_w(0,0,0);
+ buffer_spriteram32_w(machine,0,0,0);
}
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index c44af171a5a..96b5fd987b1 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -87,7 +87,7 @@ WRITE8_HANDLER( tagteam_mirrorvideoram_w )
y = offset % 32;
offset = 32 * y + x;
- tagteam_videoram_w(offset,data);
+ tagteam_videoram_w(machine,offset,data);
}
WRITE8_HANDLER( tagteam_mirrorcolorram_w )
@@ -99,7 +99,7 @@ WRITE8_HANDLER( tagteam_mirrorcolorram_w )
y = offset % 32;
offset = 32 * y + x;
- tagteam_colorram_w(offset,data);
+ tagteam_colorram_w(machine,offset,data);
}
WRITE8_HANDLER( tagteam_control_w )
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index d3fe60fd207..838c0e4cc90 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -157,12 +157,12 @@ WRITE16_HANDLER( hitice_pixel_scroll_w )
COMBINE_DATA(&pixel_scroll[offset]);
}
-static void hitice_clear_pixel_bitmap(void)
+static void hitice_clear_pixel_bitmap(running_machine *machine)
{
int i;
for (i = 0;i < 0x40000;i++)
- hitice_pixelram_w(i,0,0);
+ hitice_pixelram_w(machine,i,0,0);
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -285,7 +285,7 @@ VIDEO_START( hitice )
VIDEO_RESET( hitice )
{
/* kludge: clear the bitmap on startup */
- hitice_clear_pixel_bitmap();
+ hitice_clear_pixel_bitmap(machine);
}
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index 113d213211b..bf45038280e 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -578,7 +578,7 @@ INLINE void taitoic_drawscanline(
/* Note: various assumptions are made in these routines, typically that
only CPU#0 is of interest. If in doubt, check the routine. */
-static int has_write_handler(int cpunum, write16_handler handler)
+static int has_write_handler(int cpunum, write16_machine_func handler)
{
const address_map *map;
for (map = memory_get_map(cpunum, ADDRESS_SPACE_PROGRAM); map && !IS_AMENTRY_END(map); map++)
@@ -1695,7 +1695,7 @@ WRITE16_HANDLER( TC0080VCO_word_w )
else if (offset < 0x20800/2) /* sprite ram */
{}
else if (offset < 0x20fff/2)
- TC0080VCO_scrollram_w(offset-(0x20800/2),TC0080VCO_ram[offset],mem_mask);
+ TC0080VCO_scrollram_w(machine,offset-(0x20800/2),TC0080VCO_ram[offset],mem_mask);
}
@@ -2492,15 +2492,15 @@ WRITE16_HANDLER( TC0100SCN_word_2_w )
WRITE16_HANDLER( TC0100SCN_dual_screen_w )
{
- TC0100SCN_word_0_w(offset,data,mem_mask);
- TC0100SCN_word_1_w(offset,data,mem_mask);
+ TC0100SCN_word_0_w(machine,offset,data,mem_mask);
+ TC0100SCN_word_1_w(machine,offset,data,mem_mask);
}
WRITE16_HANDLER( TC0100SCN_triple_screen_w )
{
- TC0100SCN_word_0_w(offset,data,mem_mask);
- TC0100SCN_word_1_w(offset,data,mem_mask);
- TC0100SCN_word_2_w(offset,data,mem_mask);
+ TC0100SCN_word_0_w(machine,offset,data,mem_mask);
+ TC0100SCN_word_1_w(machine,offset,data,mem_mask);
+ TC0100SCN_word_2_w(machine,offset,data,mem_mask);
}
@@ -2605,7 +2605,7 @@ WRITE16_HANDLER( TC0100SCN_ctrl_word_2_w )
READ32_HANDLER( TC0100SCN_ctrl_long_r )
{
- return (TC0100SCN_ctrl_word_0_r(offset*2,0)<<16)|TC0100SCN_ctrl_word_0_r(offset*2+1,0);
+ return (TC0100SCN_ctrl_word_0_r(machine,offset*2,0)<<16)|TC0100SCN_ctrl_word_0_r(machine,offset*2+1,0);
}
WRITE32_HANDLER( TC0100SCN_ctrl_long_w )
@@ -2616,30 +2616,30 @@ WRITE32_HANDLER( TC0100SCN_ctrl_long_w )
READ32_HANDLER( TC0100SCN_long_r )
{
- return (TC0100SCN_word_0_r(offset*2,0)<<16)|TC0100SCN_word_0_r(offset*2+1,0);
+ return (TC0100SCN_word_0_r(machine,offset*2,0)<<16)|TC0100SCN_word_0_r(machine,offset*2+1,0);
}
WRITE32_HANDLER( TC0100SCN_long_w )
{
if (((mem_mask & 0xff000000) == 0) || ((mem_mask & 0x00ff0000) == 0))
{
- int oldword = TC0100SCN_word_0_r(offset*2,0);
+ int oldword = TC0100SCN_word_0_r(machine,offset*2,0);
int newword = data>>16;
if ((mem_mask & 0x00ff0000) != 0)
newword |= (oldword &0x00ff);
if ((mem_mask & 0xff000000) != 0)
newword |= (oldword &0xff00);
- TC0100SCN_word_0_w(offset*2,newword,0);
+ TC0100SCN_word_0_w(machine,offset*2,newword,0);
}
if (((mem_mask & 0x0000ff00) == 0) || ((mem_mask & 0x000000ff) == 0))
{
- int oldword = TC0100SCN_word_0_r((offset*2)+1,0);
+ int oldword = TC0100SCN_word_0_r(machine,(offset*2)+1,0);
int newword = data&0xffff;
if ((mem_mask & 0x000000ff) != 0)
newword |= (oldword &0x00ff);
if ((mem_mask & 0x0000ff00) != 0)
newword |= (oldword &0xff00);
- TC0100SCN_word_0_w((offset*2)+1,newword,0);
+ TC0100SCN_word_0_w(machine,(offset*2)+1,newword,0);
}
}
@@ -2810,7 +2810,7 @@ READ16_HANDLER( TC0280GRD_word_r )
READ16_HANDLER( TC0430GRW_word_r )
{
- return TC0280GRD_word_r(offset,mem_mask);
+ return TC0280GRD_word_r(machine,offset,mem_mask);
}
WRITE16_HANDLER( TC0280GRD_word_w )
@@ -2821,7 +2821,7 @@ WRITE16_HANDLER( TC0280GRD_word_w )
WRITE16_HANDLER( TC0430GRW_word_w )
{
- TC0280GRD_word_w(offset,data,mem_mask);
+ TC0280GRD_word_w(machine,offset,data,mem_mask);
}
WRITE16_HANDLER( TC0280GRD_ctrl_word_w )
@@ -2831,7 +2831,7 @@ WRITE16_HANDLER( TC0280GRD_ctrl_word_w )
WRITE16_HANDLER( TC0430GRW_ctrl_word_w )
{
- TC0280GRD_ctrl_word_w(offset,data,mem_mask);
+ TC0280GRD_ctrl_word_w(machine,offset,data,mem_mask);
}
void TC0280GRD_tilemap_update(int base_color)
@@ -2914,7 +2914,7 @@ WRITE16_HANDLER( TC0360PRI_halfword_w )
{
if (ACCESSING_LSB)
{
- TC0360PRI_w(offset,data & 0xff);
+ TC0360PRI_w(machine,offset,data & 0xff);
#if 0
if (data & 0xff00)
{ logerror("CPU #0 PC %06x: warning - write %02x to MSB of TC0360PRI address %02x\n",activecpu_get_pc(),data,offset); }
@@ -2928,7 +2928,7 @@ WRITE16_HANDLER( TC0360PRI_halfword_swap_w )
{
if (ACCESSING_MSB)
{
- TC0360PRI_w(offset,(data >> 8) & 0xff);
+ TC0360PRI_w(machine,offset,(data >> 8) & 0xff);
#if 0
if (data & 0xff)
{ logerror("CPU #0 PC %06x: warning - write %02x to LSB of TC0360PRI address %02x\n",activecpu_get_pc(),data,offset); }
@@ -3270,43 +3270,43 @@ void TC0480SCP_vh_start(running_machine *machine, int gfxnum,int pixels,int x_of
READ32_HANDLER( TC0480SCP_ctrl_long_r )
{
- return (TC0480SCP_ctrl_word_r(offset*2,0)<<16)|TC0480SCP_ctrl_word_r(offset*2+1,0);
+ return (TC0480SCP_ctrl_word_r(machine,offset*2,0)<<16)|TC0480SCP_ctrl_word_r(machine,offset*2+1,0);
}
/* TODO: byte access ? */
WRITE32_HANDLER( TC0480SCP_ctrl_long_w )
{
- if (ACCESSING_MSW32) TC0480SCP_ctrl_word_w(offset*2,data>>16,mem_mask>>16);
- if (ACCESSING_LSW32) TC0480SCP_ctrl_word_w((offset*2)+1,data&0xffff,mem_mask&0xffff);
+ if (ACCESSING_MSW32) TC0480SCP_ctrl_word_w(machine,offset*2,data>>16,mem_mask>>16);
+ if (ACCESSING_LSW32) TC0480SCP_ctrl_word_w(machine,(offset*2)+1,data&0xffff,mem_mask&0xffff);
}
READ32_HANDLER( TC0480SCP_long_r )
{
- return (TC0480SCP_word_r(offset*2,0)<<16)|TC0480SCP_word_r(offset*2+1,0);
+ return (TC0480SCP_word_r(machine,offset*2,0)<<16)|TC0480SCP_word_r(machine,offset*2+1,0);
}
WRITE32_HANDLER( TC0480SCP_long_w )
{
if (((mem_mask & 0xff000000) == 0) || ((mem_mask & 0x00ff0000) == 0))
{
- int oldword = TC0480SCP_word_r(offset*2,0);
+ int oldword = TC0480SCP_word_r(machine,offset*2,0);
int newword = data>>16;
if ((mem_mask & 0x00ff0000) != 0)
newword |= (oldword &0x00ff);
if ((mem_mask & 0xff000000) != 0)
newword |= (oldword &0xff00);
- TC0480SCP_word_w(offset*2,newword,0);
+ TC0480SCP_word_w(machine,offset*2,newword,0);
}
if (((mem_mask & 0x0000ff00) == 0) || ((mem_mask & 0x000000ff) == 0))
{
- int oldword = TC0480SCP_word_r((offset*2)+1,0);
+ int oldword = TC0480SCP_word_r(machine,(offset*2)+1,0);
int newword = data&0xffff;
if ((mem_mask & 0x000000ff) != 0)
newword |= (oldword &0x00ff);
if ((mem_mask & 0x0000ff00) != 0)
newword |= (oldword &0xff00);
- TC0480SCP_word_w((offset*2)+1,newword,0);
+ TC0480SCP_word_w(machine,(offset*2)+1,newword,0);
}
}
@@ -4940,22 +4940,22 @@ READ8_HANDLER( TC0220IOC_r )
switch (offset)
{
case 0x00: /* IN00-07 (DSA) */
- return input_port_0_r(0);
+ return input_port_0_r(machine,0);
case 0x01: /* IN08-15 (DSB) */
- return input_port_1_r(0);
+ return input_port_1_r(machine,0);
case 0x02: /* IN16-23 (1P) */
- return input_port_2_r(0);
+ return input_port_2_r(machine,0);
case 0x03: /* IN24-31 (2P) */
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
case 0x04: /* coin counters and lockout */
return TC0220IOC_regs[4];
case 0x07: /* INB0-7 (coin) */
- return input_port_4_r(0);
+ return input_port_4_r(machine,0);
default:
logerror("PC %06x: warning - read TC0220IOC address %02x\n",activecpu_get_pc(),offset);
@@ -4970,7 +4970,7 @@ WRITE8_HANDLER( TC0220IOC_w )
switch (offset)
{
case 0x00:
- watchdog_reset_w(offset,data);
+ watchdog_reset(machine);
break;
case 0x04: /* coin counters and lockout, hi nibble irrelevant */
@@ -5002,71 +5002,71 @@ WRITE8_HANDLER( TC0220IOC_port_w )
READ8_HANDLER( TC0220IOC_portreg_r )
{
- return TC0220IOC_r(TC0220IOC_port);
+ return TC0220IOC_r(machine, TC0220IOC_port);
}
WRITE8_HANDLER( TC0220IOC_portreg_w )
{
- TC0220IOC_w(TC0220IOC_port, data);
+ TC0220IOC_w(machine, TC0220IOC_port, data);
}
READ16_HANDLER( TC0220IOC_halfword_port_r )
{
- return TC0220IOC_port_r( offset );
+ return TC0220IOC_port_r( machine, offset );
}
WRITE16_HANDLER( TC0220IOC_halfword_port_w )
{
if (ACCESSING_LSB)
- TC0220IOC_port_w( offset, data & 0xff );
+ TC0220IOC_port_w( machine, offset, data & 0xff );
}
READ16_HANDLER( TC0220IOC_halfword_portreg_r )
{
- return TC0220IOC_portreg_r( offset );
+ return TC0220IOC_portreg_r( machine, offset );
}
WRITE16_HANDLER( TC0220IOC_halfword_portreg_w )
{
if (ACCESSING_LSB)
- TC0220IOC_portreg_w( offset, data & 0xff );
+ TC0220IOC_portreg_w( machine, offset, data & 0xff );
}
READ16_HANDLER( TC0220IOC_halfword_byteswap_port_r )
{
- return TC0220IOC_port_r( offset ) << 8;
+ return TC0220IOC_port_r( machine, offset ) << 8;
}
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_port_w )
{
if (ACCESSING_MSB)
- TC0220IOC_port_w( offset, (data>>8) & 0xff );
+ TC0220IOC_port_w( machine, offset, (data>>8) & 0xff );
}
READ16_HANDLER( TC0220IOC_halfword_byteswap_portreg_r )
{
- return TC0220IOC_portreg_r( offset )<<8;
+ return TC0220IOC_portreg_r( machine, offset )<<8;
}
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_portreg_w )
{
if (ACCESSING_MSB)
- TC0220IOC_portreg_w( offset, (data>>8) & 0xff );
+ TC0220IOC_portreg_w( machine, offset, (data>>8) & 0xff );
}
READ16_HANDLER( TC0220IOC_halfword_r )
{
- return TC0220IOC_r(offset);
+ return TC0220IOC_r(machine,offset);
}
WRITE16_HANDLER( TC0220IOC_halfword_w )
{
if (ACCESSING_LSB)
- TC0220IOC_w(offset,data & 0xff);
+ TC0220IOC_w(machine,offset,data & 0xff);
else
{
/* qtorimon writes here the coin counters - bug? */
- TC0220IOC_w(offset,(data >> 8) & 0xff);
+ TC0220IOC_w(machine,offset,(data >> 8) & 0xff);
if (offset) /* ainferno writes watchdog in msb */
logerror("CPU #0 PC %06x: warning - write to MSB of TC0220IOC address %02x\n",activecpu_get_pc(),offset);
@@ -5075,16 +5075,16 @@ logerror("CPU #0 PC %06x: warning - write to MSB of TC0220IOC address %02x\n",ac
READ16_HANDLER( TC0220IOC_halfword_byteswap_r )
{
- return TC0220IOC_halfword_r(offset,mem_mask) << 8;
+ return TC0220IOC_halfword_r(machine,offset,mem_mask) << 8;
}
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_w )
{
if (ACCESSING_MSB)
- TC0220IOC_w(offset,(data >> 8) & 0xff);
+ TC0220IOC_w(machine,offset,(data >> 8) & 0xff);
else
{
- TC0220IOC_w(offset,data & 0xff);
+ TC0220IOC_w(machine,offset,data & 0xff);
logerror("CPU #0 PC %06x: warning - write to LSB of TC0220IOC address %02x\n",activecpu_get_pc(),offset);
}
@@ -5101,22 +5101,22 @@ READ8_HANDLER( TC0510NIO_r )
switch (offset)
{
case 0x00: /* DSA */
- return input_port_0_r(0);
+ return input_port_0_r(machine,0);
case 0x01: /* DSB */
- return input_port_1_r(0);
+ return input_port_1_r(machine,0);
case 0x02: /* 1P */
- return input_port_2_r(0);
+ return input_port_2_r(machine,0);
case 0x03: /* 2P */
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
case 0x04: /* coin counters and lockout */
return TC0510NIO_regs[4];
case 0x07: /* coin */
- return input_port_4_r(0);
+ return input_port_4_r(machine,0);
default:
logerror("PC %06x: warning - read TC0510NIO address %02x\n",activecpu_get_pc(),offset);
@@ -5131,7 +5131,7 @@ WRITE8_HANDLER( TC0510NIO_w )
switch (offset)
{
case 0x00:
- watchdog_reset_w(offset,data);
+ watchdog_reset(machine);
break;
case 0x04: /* coin counters and lockout */
@@ -5149,29 +5149,29 @@ logerror("PC %06x: warning - write %02x to TC0510NIO address %02x\n",activecpu_g
READ16_HANDLER( TC0510NIO_halfword_r )
{
- return TC0510NIO_r(offset);
+ return TC0510NIO_r(machine,offset);
}
WRITE16_HANDLER( TC0510NIO_halfword_w )
{
if (ACCESSING_LSB)
- TC0510NIO_w(offset,data & 0xff);
+ TC0510NIO_w(machine,offset,data & 0xff);
else
{
/* driftout writes the coin counters here - bug? */
logerror("CPU #0 PC %06x: warning - write to MSB of TC0510NIO address %02x\n",activecpu_get_pc(),offset);
- TC0510NIO_w(offset,(data >> 8) & 0xff);
+ TC0510NIO_w(machine,offset,(data >> 8) & 0xff);
}
}
READ16_HANDLER( TC0510NIO_halfword_wordswap_r )
{
- return TC0510NIO_halfword_r(offset ^ 1,mem_mask);
+ return TC0510NIO_halfword_r(machine,offset ^ 1,mem_mask);
}
WRITE16_HANDLER( TC0510NIO_halfword_wordswap_w )
{
- TC0510NIO_halfword_w(offset ^ 1,data,mem_mask);
+ TC0510NIO_halfword_w(machine,offset ^ 1,data,mem_mask);
}
@@ -5184,22 +5184,22 @@ READ8_HANDLER( TC0640FIO_r )
switch (offset)
{
case 0x00: /* DSA */
- return input_port_0_r(0);
+ return input_port_0_r(machine,0);
case 0x01: /* DSB */
- return input_port_1_r(0);
+ return input_port_1_r(machine,0);
case 0x02: /* 1P */
- return input_port_2_r(0);
+ return input_port_2_r(machine,0);
case 0x03: /* 2P */
- return input_port_3_r(0);
+ return input_port_3_r(machine,0);
case 0x04: /* coin counters and lockout */
return TC0640FIO_regs[4];
case 0x07: /* coin */
- return input_port_4_r(0);
+ return input_port_4_r(machine,0);
default:
logerror("PC %06x: warning - read TC0640FIO address %02x\n",activecpu_get_pc(),offset);
@@ -5214,7 +5214,7 @@ WRITE8_HANDLER( TC0640FIO_w )
switch (offset)
{
case 0x00:
- watchdog_reset_w(offset,data);
+ watchdog_reset(machine);
break;
case 0x04: /* coin counters and lockout */
@@ -5232,32 +5232,32 @@ logerror("PC %06x: warning - write %02x to TC0640FIO address %02x\n",activecpu_g
READ16_HANDLER( TC0640FIO_halfword_r )
{
- return TC0640FIO_r(offset);
+ return TC0640FIO_r(machine,offset);
}
WRITE16_HANDLER( TC0640FIO_halfword_w )
{
if (ACCESSING_LSB)
- TC0640FIO_w(offset,data & 0xff);
+ TC0640FIO_w(machine,offset,data & 0xff);
else
{
- TC0640FIO_w(offset,(data >> 8) & 0xff);
+ TC0640FIO_w(machine,offset,(data >> 8) & 0xff);
logerror("CPU #0 PC %06x: warning - write to MSB of TC0640FIO address %02x\n",activecpu_get_pc(),offset);
}
}
READ16_HANDLER( TC0640FIO_halfword_byteswap_r )
{
- return TC0640FIO_halfword_r(offset,mem_mask) << 8;
+ return TC0640FIO_halfword_r(machine,offset,mem_mask) << 8;
}
WRITE16_HANDLER( TC0640FIO_halfword_byteswap_w )
{
if (ACCESSING_MSB)
- TC0640FIO_w(offset,(data >> 8) & 0xff);
+ TC0640FIO_w(machine,offset,(data >> 8) & 0xff);
else
{
- TC0640FIO_w(offset,data & 0xff);
+ TC0640FIO_w(machine,offset,data & 0xff);
logerror("CPU #0 PC %06x: warning - write to LSB of TC0640FIO address %02x\n",activecpu_get_pc(),offset);
}
}
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index 79df41098a3..53536fb35cf 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -268,7 +268,7 @@ WRITE8_HANDLER( taitosj_characterram_w )
WRITE8_HANDLER( junglhbr_characterram_w )
{
- taitosj_characterram_w(offset, data ^ 0xfc);
+ taitosj_characterram_w(machine, offset, data ^ 0xfc);
}
diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c
index 828067559fe..45ce51957a3 100644
--- a/src/mame/video/thepit.c
+++ b/src/mame/video/thepit.c
@@ -219,11 +219,11 @@ READ8_HANDLER( thepit_input_port_0_r )
horizontal flip switch. (This is how the real PCB does it) */
if (thepit_flip_screen_x)
{
- return input_port_3_r(offset);
+ return input_port_3_r(machine,offset);
}
else
{
- return input_port_0_r(offset);
+ return input_port_0_r(machine,offset);
}
}
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index a1c84808698..1368069bf84 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -196,22 +196,22 @@ WRITE8_HANDLER( thief_blit_w ){
if( addr<0x2000*3 ) data = gfx_rom[addr];
}
offs = (y*32+x/8+i)&0x1fff;
- old_data = thief_videoram_r( offs );
+ old_data = thief_videoram_r( machine,offs );
if( xor_blit ){
- thief_videoram_w( offs, old_data^(data>>xoffset) );
+ thief_videoram_w( machine,offs, old_data^(data>>xoffset) );
}
else {
- thief_videoram_w( offs,
+ thief_videoram_w( machine,offs,
(old_data&(0xff00>>xoffset)) | (data>>xoffset)
);
}
offs = (offs+1)&0x1fff;
- old_data = thief_videoram_r( offs );
+ old_data = thief_videoram_r( machine,offs );
if( xor_blit ){
- thief_videoram_w( offs, old_data^((data<<(8-xoffset))&0xff) );
+ thief_videoram_w( machine,offs, old_data^((data<<(8-xoffset))&0xff) );
}
else {
- thief_videoram_w( offs,
+ thief_videoram_w( machine,offs,
(old_data&(0xff>>xoffset)) | ((data<<(8-xoffset))&0xff)
);
}
diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c
index e660e401472..d18ec02f30c 100644
--- a/src/mame/video/tia.c
+++ b/src/mame/video/tia.c
@@ -123,9 +123,9 @@ static const int nusiz[8][3] =
{ 1, 4, 0 }
};
-static read16_handler tia_read_input_port;
-static read8_handler tia_get_databus;
-static write16_handler tia_vsync_callback;
+static read16_machine_func tia_read_input_port;
+static read8_machine_func tia_get_databus;
+static write16_machine_func tia_vsync_callback;
static void extend_palette(running_machine *machine) {
int i,j;
@@ -877,7 +877,7 @@ static WRITE8_HANDLER( VSYNC_w )
Machine->screen[0].height);
if ( tia_vsync_callback ) {
- tia_vsync_callback( 0, curr_y, 0xFFFF );
+ tia_vsync_callback( machine, 0, curr_y, 0xFFFF );
}
prev_y = 0;
@@ -1361,11 +1361,11 @@ static WRITE8_HANDLER( NUSIZ1_w )
static WRITE8_HANDLER( HMCLR_w )
{
- HMP0_w( offset, 0 );
- HMP1_w( offset, 0 );
- HMM0_w( offset, 0 );
- HMM1_w( offset, 0 );
- HMBL_w( offset, 0 );
+ HMP0_w( machine, offset, 0 );
+ HMP1_w( machine, offset, 0 );
+ HMM0_w( machine, offset, 0 );
+ HMM1_w( machine, offset, 0 );
+ HMBL_w( machine, offset, 0 );
}
@@ -1650,10 +1650,9 @@ static READ8_HANDLER( INPT_r )
{
UINT64 elapsed = activecpu_gettotalcycles() - paddle_cycles;
int input = TIA_INPUT_PORT_ALWAYS_ON;
-
if ( tia_read_input_port )
{
- input = tia_read_input_port(offset & 3, 0xFFFF);
+ input = tia_read_input_port(machine, offset & 3, 0xFFFF);
}
if ( input == TIA_INPUT_PORT_ALWAYS_ON )
@@ -1676,7 +1675,7 @@ READ8_HANDLER( tia_r )
if ( tia_get_databus )
{
- data = tia_get_databus(offset) & 0x3f;
+ data = tia_get_databus(machine, offset) & 0x3f;
}
if (!(offset & 0x8))
@@ -1703,22 +1702,22 @@ READ8_HANDLER( tia_r )
case 0x7:
return data | CXPPMM;
case 0x8:
- return data | INPT_r(0);
+ return data | INPT_r(machine,0);
case 0x9:
- return data | INPT_r(1);
+ return data | INPT_r(machine,1);
case 0xA:
- return data | INPT_r(2);
+ return data | INPT_r(machine,2);
case 0xB:
- return data | INPT_r(3);
+ return data | INPT_r(machine,3);
case 0xC:
{
- int button = tia_read_input_port ? ( tia_read_input_port(4,0xFFFF) & 0x80 ) : 0x80;
+ int button = tia_read_input_port ? ( tia_read_input_port(machine,4,0xFFFF) & 0x80 ) : 0x80;
INPT4 = ( VBLANK & 0x40) ? ( INPT4 & button ) : button;
}
return data | INPT4;
case 0xD:
{
- int button = tia_read_input_port ? ( tia_read_input_port(5,0xFFFF) & 0x80 ) : 0x80;
+ int button = tia_read_input_port ? ( tia_read_input_port(machine,5,0xFFFF) & 0x80 ) : 0x80;
INPT5 = ( VBLANK & 0x40) ? ( INPT5 & button ) : button;
}
return data | INPT5;
@@ -1778,7 +1777,6 @@ WRITE8_HANDLER( tia_w )
0, // HMCLR
0, // CXCLR
};
-
int curr_x = current_x();
int curr_y = current_y();
@@ -1797,22 +1795,22 @@ WRITE8_HANDLER( tia_w )
switch (offset)
{
case 0x00:
- VSYNC_w(offset, data);
+ VSYNC_w(machine, offset, data);
break;
case 0x01:
- VBLANK_w(offset, data);
+ VBLANK_w(machine, offset, data);
break;
case 0x02:
- WSYNC_w(offset, data);
+ WSYNC_w(machine, offset, data);
break;
case 0x03:
- RSYNC_w(offset, data);
+ RSYNC_w(machine, offset, data);
break;
case 0x04:
- NUSIZ0_w(offset, data);
+ NUSIZ0_w(machine, offset, data);
break;
case 0x05:
- NUSIZ1_w(offset, data);
+ NUSIZ1_w(machine, offset, data);
break;
case 0x06:
COLUP0 = data;
@@ -1827,7 +1825,7 @@ WRITE8_HANDLER( tia_w )
COLUBK = data;
break;
case 0x0A:
- CTRLPF_w(offset, data);
+ CTRLPF_w(machine, offset, data);
break;
case 0x0B:
REFP0 = data;
@@ -1845,19 +1843,19 @@ WRITE8_HANDLER( tia_w )
PF2 = data;
break;
case 0x10:
- RESP0_w(offset, data);
+ RESP0_w(machine, offset, data);
break;
case 0x11:
- RESP1_w(offset, data);
+ RESP1_w(machine, offset, data);
break;
case 0x12:
- RESM0_w(offset, data);
+ RESM0_w(machine, offset, data);
break;
case 0x13:
- RESM1_w(offset, data);
+ RESM1_w(machine, offset, data);
break;
case 0x14:
- RESBL_w(offset, data);
+ RESBL_w(machine, offset, data);
break;
case 0x15: /* AUDC0 */
@@ -1866,14 +1864,14 @@ WRITE8_HANDLER( tia_w )
case 0x18: /* AUDF1 */
case 0x19: /* AUDV0 */
case 0x1A: /* AUDV1 */
- tia_sound_w(offset, data);
+ tia_sound_w(machine, offset, data);
break;
case 0x1B:
- GRP0_w(offset, data);
+ GRP0_w(machine, offset, data);
break;
case 0x1C:
- GRP1_w(offset, data);
+ GRP1_w(machine, offset, data);
break;
case 0x1D:
ENAM0 = data;
@@ -1885,19 +1883,19 @@ WRITE8_HANDLER( tia_w )
ENABL = data;
break;
case 0x20:
- HMP0_w(offset, data);
+ HMP0_w(machine, offset, data);
break;
case 0x21:
- HMP1_w(offset, data);
+ HMP1_w(machine, offset, data);
break;
case 0x22:
- HMM0_w(offset, data);
+ HMM0_w(machine, offset, data);
break;
case 0x23:
- HMM1_w(offset, data);
+ HMM1_w(machine, offset, data);
break;
case 0x24:
- HMBL_w(offset, data);
+ HMBL_w(machine, offset, data);
break;
case 0x25:
VDELP0 = data;
@@ -1909,19 +1907,19 @@ WRITE8_HANDLER( tia_w )
VDELBL = data;
break;
case 0x28:
- RESMP0_w(offset, data);
+ RESMP0_w(machine, offset, data);
break;
case 0x29:
- RESMP1_w(offset, data);
+ RESMP1_w(machine, offset, data);
break;
case 0x2A:
- HMOVE_w(offset, data);
+ HMOVE_w(machine, offset, data);
break;
case 0x2B:
- HMCLR_w(offset, data);
+ HMCLR_w(machine, offset, data);
break;
case 0x2C:
- CXCLR_w(offset, 0);
+ CXCLR_w(machine, offset, 0);
break;
}
}
diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h
index 9408bf987ca..f94e8511c9a 100644
--- a/src/mame/video/tia.h
+++ b/src/mame/video/tia.h
@@ -7,9 +7,9 @@
#define TIA_MAX_SCREEN_HEIGHT 342
struct tia_interface {
- read16_handler read_input_port;
- read8_handler databus_contents;
- write16_handler vsync_callback;
+ read16_machine_func read_input_port;
+ read8_machine_func databus_contents;
+ write16_machine_func vsync_callback;
};
PALETTE_INIT( tia_NTSC );
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index fd4b3f16d55..affda4cbe65 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -166,5 +166,5 @@ VIDEO_UPDATE( tigeroad )
VIDEO_EOF( tigeroad )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 130136cfa55..e53870ba8d3 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -345,7 +345,7 @@ WRITE16_HANDLER( tmnt_0a0000_w )
last = data & 0x08;
/* bit 5 = irq enable */
- interrupt_enable_w(0,data & 0x20);
+ interrupt_enable_w(machine,0,data & 0x20);
/* bit 7 = enable char ROM reading through the video RAM */
K052109_set_RMRD_line((data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 28ce4061f52..dd5d7ffa890 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -119,6 +119,7 @@ Abnormalities:
#include "driver.h"
+#include "deprecat.h"
#include "toaplan1.h"
#include "cpu/m68000/m68000.h"
@@ -318,12 +319,12 @@ static void toaplan1_set_scrolls(void)
static void rallybik_flipscreen(void)
{
- rallybik_bcu_flipscreen_w(0, bcu_flipscreen, 0);
+ rallybik_bcu_flipscreen_w(Machine, 0, bcu_flipscreen, 0);
}
static void toaplan1_flipscreen(void)
{
- toaplan1_bcu_flipscreen_w(0, bcu_flipscreen, 0);
+ toaplan1_bcu_flipscreen_w(Machine, 0, bcu_flipscreen, 0);
}
@@ -531,7 +532,7 @@ READ16_HANDLER( toaplan1_colorram1_r )
WRITE16_HANDLER( toaplan1_colorram1_w )
{
COMBINE_DATA(&toaplan1_colorram1[offset]);
- paletteram16_xBBBBBGGGGGRRRRR_word_w(offset, data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(machine,offset, data, mem_mask);
}
/* sprite palette */
@@ -543,7 +544,7 @@ READ16_HANDLER( toaplan1_colorram2_r )
WRITE16_HANDLER( toaplan1_colorram2_w )
{
COMBINE_DATA(&toaplan1_colorram2[offset]);
- paletteram16_xBBBBBGGGGGRRRRR_word_w(offset+(toaplan1_colorram1_size/2), data, mem_mask);
+ paletteram16_xBBBBBGGGGGRRRRR_word_w(machine,offset+(toaplan1_colorram1_size/2), data, mem_mask);
}
READ16_HANDLER( toaplan1_spriteram16_r )
@@ -599,7 +600,7 @@ WRITE16_HANDLER( toaplan1_bcu_control_w )
if (toaplan1_unk_reset_port && toaplan1_reset)
{
toaplan1_reset = 0;
- toaplan1_reset_sound(0,0,0);
+ toaplan1_reset_sound(machine,0,0,0);
}
}
@@ -649,7 +650,7 @@ READ16_HANDLER( toaplan1_tileram16_r )
READ16_HANDLER( rallybik_tileram16_r )
{
- UINT16 data = toaplan1_tileram16_r(offset, mem_mask);
+ UINT16 data = toaplan1_tileram16_r(machine, offset, mem_mask);
if (offset == 0) /* some bit lines may be stuck to others */
{
@@ -1229,18 +1230,18 @@ VIDEO_UPDATE( demonwld )
VIDEO_EOF( rallybik )
{
- buffer_spriteram16_w(0, 0, 0);
+ buffer_spriteram16_w(machine, 0, 0, 0);
}
VIDEO_EOF( toaplan1 )
{
- buffer_spriteram16_w(0, 0, 0);
+ buffer_spriteram16_w(machine, 0, 0, 0);
memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE);
}
VIDEO_EOF( samesame )
{
- buffer_spriteram16_w(0, 0, 0);
+ buffer_spriteram16_w(machine, 0, 0, 0);
memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE);
cpunum_set_input_line(machine, 0, MC68000_IRQ_2, HOLD_LINE); /* Frame done */
}
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index b0b9e3fe648..ed1a4e3ed9b 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -39,12 +39,12 @@ WRITE16_HANDLER( toki_control_w )
VIDEO_EOF( toki )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
VIDEO_EOF( tokib )
{
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
static TILE_GET_INFO( get_text_tile_info )
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index 4d0381c746e..e340d82ad9b 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -215,7 +215,7 @@ WRITE16_HANDLER( toobin_slip_w )
video_screen_update_partial(0, video_screen_get_vpos(0));
/* update the data */
- atarimo_0_slipram_w(offset, data, mem_mask);
+ atarimo_0_slipram_w(machine, offset, data, mem_mask);
}
diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c
index e4b392c404b..03b0c0ef865 100644
--- a/src/mame/video/triplhnt.c
+++ b/src/mame/video/triplhnt.c
@@ -142,7 +142,7 @@ VIDEO_UPDATE( triplhnt )
draw_sprites(machine, bitmap, cliprect);
- discrete_sound_w(TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15);
- discrete_sound_w(TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15);
+ discrete_sound_w(machine, TRIPLHNT_BEAR_ROAR_DATA, triplhnt_playfield_ram[0xfa] & 15);
+ discrete_sound_w(machine, TRIPLHNT_SHOT_DATA, triplhnt_playfield_ram[0xfc] & 15);
return 0;
}
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 566b947d6b5..f0cc68ee9db 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -440,7 +440,7 @@ VIDEO_EOF( twin16 )
need_process_spriteram = 1;
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
VIDEO_UPDATE( twin16 )
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 4b854caf609..88310ce1b94 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -290,37 +290,37 @@ WRITE16_HANDLER( twincobr_exscroll_w ) /* Extra unused video layer */
WRITE8_HANDLER( wardner_txlayer_w )
{
int shift = 8 * (offset & 1);
- twincobr_txoffs_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_txoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_bglayer_w )
{
int shift = 8 * (offset & 1);
- twincobr_bgoffs_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_bgoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_fglayer_w )
{
int shift = 8 * (offset & 1);
- twincobr_fgoffs_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_fgoffs_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_txscroll_w )
{
int shift = 8 * (offset & 1);
- twincobr_txscroll_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_txscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_bgscroll_w )
{
int shift = 8 * (offset & 1);
- twincobr_bgscroll_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_bgscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_fgscroll_w )
{
int shift = 8 * (offset & 1);
- twincobr_fgscroll_w(offset / 2, data << shift, 0xff00 >> shift);
+ twincobr_fgscroll_w(machine, offset / 2, data << shift, 0xff00 >> shift);
}
WRITE8_HANDLER( wardner_exscroll_w ) /* Extra unused video layer */
@@ -338,9 +338,9 @@ READ8_HANDLER( wardner_videoram_r )
{
int shift = 8 * (offset & 1);
switch (offset/2) {
- case 0: return twincobr_txram_r(0,0) >> shift; break;
- case 1: return twincobr_bgram_r(0,0) >> shift; break;
- case 2: return twincobr_fgram_r(0,0) >> shift; break;
+ case 0: return twincobr_txram_r(machine,0,0) >> shift; break;
+ case 1: return twincobr_bgram_r(machine,0,0) >> shift; break;
+ case 2: return twincobr_fgram_r(machine,0,0) >> shift; break;
}
return 0;
}
@@ -349,9 +349,9 @@ WRITE8_HANDLER( wardner_videoram_w )
{
int shift = 8 * (offset & 1);
switch (offset/2) {
- case 0: twincobr_txram_w(0,data << shift, 0xff00 >> shift); break;
- case 1: twincobr_bgram_w(0,data << shift, 0xff00 >> shift); break;
- case 2: twincobr_fgram_w(0,data << shift, 0xff00 >> shift); break;
+ case 0: twincobr_txram_w(machine,0,data << shift, 0xff00 >> shift); break;
+ case 1: twincobr_bgram_w(machine,0,data << shift, 0xff00 >> shift); break;
+ case 2: twincobr_fgram_w(machine,0,data << shift, 0xff00 >> shift); break;
}
}
@@ -517,5 +517,5 @@ VIDEO_EOF( toaplan0 )
/* Spriteram is always 1 frame ahead, suggesting spriteram buffering.
There are no CPU output registers that control this so we
assume it happens automatically every frame, at the end of vblank */
- buffer_spriteram16_w(0,0,0);
+ buffer_spriteram16_w(machine,0,0,0);
}
diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c
index a1a2ab0ff48..a6bbed7a5e1 100644
--- a/src/mame/video/ultratnk.c
+++ b/src/mame/video/ultratnk.c
@@ -140,8 +140,8 @@ VIDEO_EOF( ultratnk )
/* update sound status */
- discrete_sound_w(ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
- discrete_sound_w(ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
+ discrete_sound_w(machine, ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
+ discrete_sound_w(machine, ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
}
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index f3822fffde6..780ae28fd96 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -349,7 +349,7 @@ VIDEO_UPDATE( undrfire )
/* See if we should draw artificial gun targets */
/* (not yet implemented...) */
- if (input_port_7_word_r(0,0) & 0x1) /* Fake DSW */
+ if (input_port_7_word_r(machine,0,0) & 0x1) /* Fake DSW */
{
popmessage("Gunsights on");
}
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index 4be79cf3b32..6cd45d48dc7 100644
--- a/src/mame/video/vdc.c
+++ b/src/mame/video/vdc.c
@@ -78,7 +78,7 @@ static void draw_sgx_overscan_line(int line);
static void pce_refresh_line(int which, int line, int external_input, UINT8 *drawn, UINT16 *line_buffer);
static void pce_refresh_sprites(running_machine *machine, int which, int line, UINT8 *drawn, UINT16 *line_buffer);
static void vdc_do_dma(int which);
-static void vpc_init( void );
+static void vpc_init( running_machine *machine );
INTERRUPT_GEN( pce_interrupt )
{
@@ -366,7 +366,7 @@ VIDEO_START( pce )
vdc[0].inc = 1;
vdc[1].inc = 1;
- vpc_init();
+ vpc_init(machine);
}
@@ -1069,9 +1069,9 @@ READ8_HANDLER( vpc_r ) {
return data;
}
-static void vpc_init( void ) {
- vpc_w( 0, 0x11 );
- vpc_w( 1, 0x11 );
+static void vpc_init( running_machine *machine ) {
+ vpc_w( machine, 0, 0x11 );
+ vpc_w( machine, 1, 0x11 );
vpc.window1.w = 0;
vpc.window2.w = 0;
vpc.vdc_select = 0;
@@ -1079,13 +1079,13 @@ static void vpc_init( void ) {
WRITE8_HANDLER( sgx_vdc_w ) {
if ( vpc.vdc_select ) {
- vdc_1_w( offset, data );
+ vdc_1_w( machine, offset, data );
} else {
- vdc_0_w( offset, data );
+ vdc_0_w( machine, offset, data );
}
}
READ8_HANDLER( sgx_vdc_r ) {
- return ( vpc.vdc_select ) ? vdc_1_r( offset ) : vdc_0_r( offset );
+ return ( vpc.vdc_select ) ? vdc_1_r( machine, offset ) : vdc_0_r( machine, offset );
}
diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c
index 07298f92f21..07a1b7da95b 100644
--- a/src/mame/video/xmen.c
+++ b/src/mame/video/xmen.c
@@ -198,7 +198,7 @@ VIDEO_EOF( xmen6p )
for (offset=0;offset<(0xc000/2);offset++)
{
// K052109_lsb_w
- K052109_w(offset,xmen6p_tilemapright[offset]&0x00ff);
+ K052109_w(machine,offset,xmen6p_tilemapright[offset]&0x00ff);
}
@@ -217,7 +217,7 @@ VIDEO_EOF( xmen6p )
for (offset=0;offset<(0xc000/2);offset++)
{
// K052109_lsb_w
- K052109_w(offset,xmen6p_tilemapleft[offset]&0x00ff);
+ K052109_w(machine,offset,xmen6p_tilemapleft[offset]&0x00ff);
}
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index b794a05f7f8..decda3a12f3 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -52,7 +52,7 @@ READ8_HANDLER( xxmissio_bgram_r )
WRITE8_HANDLER( xxmissio_paletteram_w )
{
- paletteram_BBGGRRII_w(offset,data);
+ paletteram_BBGGRRII_w(machine,offset,data);
}
/****************************************************************************/
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 02e731737bd..58ed12a9438 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -83,7 +83,7 @@ WRITE8_HANDLER( yiear_control_w )
/* bit 2 is IRQ enable */
- interrupt_enable_w(0, data & 0x04);
+ interrupt_enable_w(machine, 0, data & 0x04);
/* bits 3 and 4 are coin counters */
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index 9299320cfcf..ccd708f26ad 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -37,7 +37,7 @@ READ8_HANDLER( zac_s2636_r )
READ8_HANDLER( tinvader_port_0_r )
{
- return input_port_0_r(0) - CollisionBackground;
+ return input_port_0_r(machine,0) - CollisionBackground;
}
/*****************************************/