summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-04-03 07:36:23 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-04-03 07:36:23 +0000
commitefbe64428a6f906768333dc49f44cf5e37ac0c34 (patch)
tree185e43b404e8623a5a946840979a014c03885917
parent0d89ceb44bd48d774c9c12d13317dd56acc417f4 (diff)
Switched from ACCESSING_BYTE_*, ACCESSING_WORD_*, ACCESSING_DWORD_*
macros to ACCESSING_BITS_*_* macros.
-rw-r--r--src/emu/cpu/mips/mips3com.c16
-rw-r--r--src/emu/machine/6821pia.c64
-rw-r--r--src/emu/machine/6840ptm.c16
-rw-r--r--src/emu/machine/6850acia.c38
-rw-r--r--src/emu/machine/at28c16.c28
-rw-r--r--src/emu/machine/idectrl.c16
-rw-r--r--src/emu/machine/msm6242.c2
-rw-r--r--src/emu/machine/smc91c9x.c6
-rw-r--r--src/emu/machine/timekpr.c28
-rw-r--r--src/emu/machine/tmp68301.c2
-rw-r--r--src/emu/memconv.h176
-rw-r--r--src/emu/memory.h33
-rw-r--r--src/emu/sound/2151intf.c12
-rw-r--r--src/emu/sound/2203intf.c20
-rw-r--r--src/emu/sound/2413intf.c20
-rw-r--r--src/emu/sound/2610intf.c16
-rw-r--r--src/emu/sound/ay8910.c40
-rw-r--r--src/emu/sound/es5506.c88
-rw-r--r--src/emu/sound/es8712.c12
-rw-r--r--src/emu/sound/iremga20.c2
-rw-r--r--src/emu/sound/k053260.c4
-rw-r--r--src/emu/sound/okim6295.c12
-rw-r--r--src/emu/sound/psx.c52
-rw-r--r--src/emu/sound/saa1099.c8
-rw-r--r--src/emu/sound/ymz280b.c16
-rw-r--r--src/emu/video/tlc34076.c4
-rw-r--r--src/emu/video/voodoo.c24
-rw-r--r--src/mame/audio/aztarac.c2
-rw-r--r--src/mame/audio/cchasm.c2
-rw-r--r--src/mame/audio/cyberbal.c2
-rw-r--r--src/mame/audio/dcs.c4
-rw-r--r--src/mame/audio/jaguar.c2
-rw-r--r--src/mame/audio/leland.c16
-rw-r--r--src/mame/audio/m72.c2
-rw-r--r--src/mame/audio/mcr.c4
-rw-r--r--src/mame/audio/seibu.c2
-rw-r--r--src/mame/audio/taitosnd.c8
-rw-r--r--src/mame/drivers/acommand.c4
-rw-r--r--src/mame/drivers/aerofgt.c4
-rw-r--r--src/mame/drivers/alpha68k.c14
-rw-r--r--src/mame/drivers/arcadecl.c4
-rw-r--r--src/mame/drivers/armedf.c2
-rw-r--r--src/mame/drivers/ashnojoe.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/astrocorp.c8
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atarig42.c4
-rw-r--r--src/mame/drivers/atarigt.c22
-rw-r--r--src/mame/drivers/atarigx2.c18
-rw-r--r--src/mame/drivers/atarisy2.c4
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/bigfghtr.c2
-rw-r--r--src/mame/drivers/bishjan.c20
-rw-r--r--src/mame/drivers/blmbycar.c6
-rw-r--r--src/mame/drivers/blockout.c2
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/cave.c14
-rw-r--r--src/mame/drivers/cischeat.c16
-rw-r--r--src/mame/drivers/coolpool.c2
-rw-r--r--src/mame/drivers/cps1.c16
-rw-r--r--src/mame/drivers/cps2.c4
-rw-r--r--src/mame/drivers/cps3.c66
-rw-r--r--src/mame/drivers/crospang.c2
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/cybertnk.c12
-rw-r--r--src/mame/drivers/darkhors.c12
-rw-r--r--src/mame/drivers/dcheese.c4
-rw-r--r--src/mame/drivers/ddenlovr.c42
-rw-r--r--src/mame/drivers/dec0.c6
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/deco32.c8
-rw-r--r--src/mame/drivers/deniam.c8
-rw-r--r--src/mame/drivers/dgpix.c2
-rw-r--r--src/mame/drivers/diverboy.c2
-rw-r--r--src/mame/drivers/djmain.c54
-rw-r--r--src/mame/drivers/dreamwld.c8
-rw-r--r--src/mame/drivers/drgnmst.c4
-rw-r--r--src/mame/drivers/eprom.c2
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/ertictac.c12
-rw-r--r--src/mame/drivers/esd16.c6
-rw-r--r--src/mame/drivers/expro02.c2
-rw-r--r--src/mame/drivers/exterm.c6
-rw-r--r--src/mame/drivers/f1gp.c2
-rw-r--r--src/mame/drivers/fantland.c12
-rw-r--r--src/mame/drivers/firebeat.c122
-rw-r--r--src/mame/drivers/foodf.c8
-rw-r--r--src/mame/drivers/fromanc2.c6
-rw-r--r--src/mame/drivers/fuukifg2.c2
-rw-r--r--src/mame/drivers/fuukifg3.c8
-rw-r--r--src/mame/drivers/gaelco.c6
-rw-r--r--src/mame/drivers/gaelco3d.c54
-rw-r--r--src/mame/drivers/gaiden.c10
-rw-r--r--src/mame/drivers/galpani2.c8
-rw-r--r--src/mame/drivers/galpanic.c8
-rw-r--r--src/mame/drivers/galspnbl.c2
-rw-r--r--src/mame/drivers/gamecstl.c36
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/genesis.c20
-rw-r--r--src/mame/drivers/gijoe.c4
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/goal92.c2
-rw-r--r--src/mame/drivers/gotcha.c2
-rw-r--r--src/mame/drivers/gradius3.c14
-rw-r--r--src/mame/drivers/groundfx.c10
-rw-r--r--src/mame/drivers/gstream.c2
-rw-r--r--src/mame/drivers/gstriker.c2
-rw-r--r--src/mame/drivers/gticlub.c34
-rw-r--r--src/mame/drivers/guab.c8
-rw-r--r--src/mame/drivers/gunbustr.c6
-rw-r--r--src/mame/drivers/hornet.c18
-rw-r--r--src/mame/drivers/hyprduel.c2
-rw-r--r--src/mame/drivers/igs_blit.c28
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/itech32.c36
-rw-r--r--src/mame/drivers/itech8.c10
-rw-r--r--src/mame/drivers/jalmah.c12
-rw-r--r--src/mame/drivers/jpmimpct.c6
-rw-r--r--src/mame/drivers/kaneko16.c34
-rw-r--r--src/mame/drivers/kickgoal.c8
-rw-r--r--src/mame/drivers/klax.c2
-rw-r--r--src/mame/drivers/konamigq.c16
-rw-r--r--src/mame/drivers/konamigx.c26
-rw-r--r--src/mame/drivers/konamim2.c32
-rw-r--r--src/mame/drivers/ksys573.c92
-rw-r--r--src/mame/drivers/lastduel.c2
-rw-r--r--src/mame/drivers/lastfght.c46
-rw-r--r--src/mame/drivers/limenko.c4
-rw-r--r--src/mame/drivers/lockon.c16
-rw-r--r--src/mame/drivers/lordgun.c4
-rw-r--r--src/mame/drivers/m107.c4
-rw-r--r--src/mame/drivers/m72.c26
-rw-r--r--src/mame/drivers/m90.c4
-rw-r--r--src/mame/drivers/m92.c6
-rw-r--r--src/mame/drivers/macrossp.c2
-rw-r--r--src/mame/drivers/madmotor.c2
-rw-r--r--src/mame/drivers/magmax.c2
-rw-r--r--src/mame/drivers/mcatadv.c2
-rw-r--r--src/mame/drivers/mcr68.c2
-rw-r--r--src/mame/drivers/mediagx.c22
-rw-r--r--src/mame/drivers/megadriv.c40
-rw-r--r--src/mame/drivers/megaplay.c4
-rw-r--r--src/mame/drivers/megasys1.c4
-rw-r--r--src/mame/drivers/meijinsn.c2
-rw-r--r--src/mame/drivers/metro.c24
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/model1.c2
-rw-r--r--src/mame/drivers/model2.c8
-rw-r--r--src/mame/drivers/model3.c110
-rw-r--r--src/mame/drivers/mquake.c6
-rw-r--r--src/mame/drivers/mystwarr.c14
-rw-r--r--src/mame/drivers/namcofl.c4
-rw-r--r--src/mame/drivers/namcona1.c6
-rw-r--r--src/mame/drivers/namcos11.c16
-rw-r--r--src/mame/drivers/namcos12.c8
-rw-r--r--src/mame/drivers/namcos2.c2
-rw-r--r--src/mame/drivers/namcos21.c6
-rw-r--r--src/mame/drivers/namcos22.c2
-rw-r--r--src/mame/drivers/naomi.c16
-rw-r--r--src/mame/drivers/nemesis.c20
-rw-r--r--src/mame/drivers/neogeo.c6
-rw-r--r--src/mame/drivers/nmg5.c2
-rw-r--r--src/mame/drivers/nmk16.c14
-rw-r--r--src/mame/drivers/nwk-tr.c26
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/ohmygod.c4
-rw-r--r--src/mame/drivers/oneshot.c2
-rw-r--r--src/mame/drivers/othldrby.c4
-rw-r--r--src/mame/drivers/othunder.c2
-rw-r--r--src/mame/drivers/overdriv.c14
-rw-r--r--src/mame/drivers/pgm.c10
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/playmark.c8
-rw-r--r--src/mame/drivers/plygonet.c6
-rw-r--r--src/mame/drivers/pntnpuzl.c4
-rw-r--r--src/mame/drivers/policetr.c2
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/powerins.c4
-rw-r--r--src/mame/drivers/psikyo.c8
-rw-r--r--src/mame/drivers/psikyo4.c22
-rw-r--r--src/mame/drivers/psikyosh.c18
-rw-r--r--src/mame/drivers/puckpkmn.c4
-rw-r--r--src/mame/drivers/pushman.c10
-rw-r--r--src/mame/drivers/qdrmfgp.c8
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/raiden2.c6
-rw-r--r--src/mame/drivers/rainbow.c2
-rw-r--r--src/mame/drivers/rampart.c8
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/relief.c10
-rw-r--r--src/mame/drivers/rpunch.c2
-rw-r--r--src/mame/drivers/rungun.c12
-rw-r--r--src/mame/drivers/sandscrp.c8
-rw-r--r--src/mame/drivers/seattle.c2
-rw-r--r--src/mame/drivers/segac2.c10
-rw-r--r--src/mame/drivers/segahang.c4
-rw-r--r--src/mame/drivers/segaorun.c4
-rw-r--r--src/mame/drivers/segas16a.c2
-rw-r--r--src/mame/drivers/segas16b.c6
-rw-r--r--src/mame/drivers/segas18.c6
-rw-r--r--src/mame/drivers/segas24.c18
-rw-r--r--src/mame/drivers/segas32.c44
-rw-r--r--src/mame/drivers/segaxbd.c8
-rw-r--r--src/mame/drivers/segaybd.c4
-rw-r--r--src/mame/drivers/seibuspi.c26
-rw-r--r--src/mame/drivers/sengokmj.c4
-rw-r--r--src/mame/drivers/seta.c22
-rw-r--r--src/mame/drivers/seta2.c10
-rw-r--r--src/mame/drivers/sf.c4
-rw-r--r--src/mame/drivers/shadfrce.c2
-rw-r--r--src/mame/drivers/shangha3.c6
-rw-r--r--src/mame/drivers/shanghai.c4
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/silkroad.c8
-rw-r--r--src/mame/drivers/snk68.c2
-rw-r--r--src/mame/drivers/snowbros.c8
-rw-r--r--src/mame/drivers/spbactn.c2
-rw-r--r--src/mame/drivers/splash.c6
-rw-r--r--src/mame/drivers/srmp2.c4
-rw-r--r--src/mame/drivers/sslam.c2
-rw-r--r--src/mame/drivers/ssv.c16
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/stv.c28
-rw-r--r--src/mame/drivers/suna16.c10
-rw-r--r--src/mame/drivers/superchs.c18
-rw-r--r--src/mame/drivers/suprnova.c14
-rw-r--r--src/mame/drivers/suprslam.c2
-rw-r--r--src/mame/drivers/system16.c14
-rw-r--r--src/mame/drivers/system18.c12
-rw-r--r--src/mame/drivers/tail2nos.c6
-rw-r--r--src/mame/drivers/taito_b.c4
-rw-r--r--src/mame/drivers/taito_f2.c8
-rw-r--r--src/mame/drivers/taito_f3.c8
-rw-r--r--src/mame/drivers/taitoair.c6
-rw-r--r--src/mame/drivers/taitojc.c34
-rw-r--r--src/mame/drivers/taitowlf.c36
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tceptor.c2
-rw-r--r--src/mame/drivers/tecmo16.c2
-rw-r--r--src/mame/drivers/tecmosys.c4
-rw-r--r--src/mame/drivers/terracre.c2
-rw-r--r--src/mame/drivers/tetrisp2.c12
-rw-r--r--src/mame/drivers/thoop2.c4
-rw-r--r--src/mame/drivers/thunderj.c2
-rw-r--r--src/mame/drivers/tigeroad.c2
-rw-r--r--src/mame/drivers/tmaster.c18
-rw-r--r--src/mame/drivers/tmnt.c24
-rw-r--r--src/mame/drivers/toaplan2.c48
-rw-r--r--src/mame/drivers/toypop.c2
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/tumbleb.c2
-rw-r--r--src/mame/drivers/ultraman.c20
-rw-r--r--src/mame/drivers/ultrsprt.c20
-rw-r--r--src/mame/drivers/undrfire.c18
-rw-r--r--src/mame/drivers/unico.c22
-rw-r--r--src/mame/drivers/vegas.c30
-rw-r--r--src/mame/drivers/vertigo.c2
-rw-r--r--src/mame/drivers/viper.c28
-rw-r--r--src/mame/drivers/wecleman.c18
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/xexex.c4
-rw-r--r--src/mame/drivers/xmen.c8
-rw-r--r--src/mame/drivers/xtheball.c4
-rw-r--r--src/mame/drivers/yunsun16.c4
-rw-r--r--src/mame/drivers/zerozone.c2
-rw-r--r--src/mame/drivers/zr107.c30
-rw-r--r--src/mame/machine/amiga.c6
-rw-r--r--src/mame/machine/atarigen.c20
-rw-r--r--src/mame/machine/cubocd32.c8
-rw-r--r--src/mame/machine/harddriv.c2
-rw-r--r--src/mame/machine/konamigx.c4
-rw-r--r--src/mame/machine/konamiic.c16
-rw-r--r--src/mame/machine/konppc.c4
-rw-r--r--src/mame/machine/mcr.c4
-rw-r--r--src/mame/machine/midtunit.c4
-rw-r--r--src/mame/machine/midwayic.c8
-rw-r--r--src/mame/machine/midwunit.c16
-rw-r--r--src/mame/machine/midyunit.c2
-rw-r--r--src/mame/machine/namcos2.c2
-rw-r--r--src/mame/machine/nmk004.c2
-rw-r--r--src/mame/machine/nmk112.c2
-rw-r--r--src/mame/machine/pgmprot.c4
-rw-r--r--src/mame/machine/psx.c20
-rw-r--r--src/mame/machine/segaic16.c2
-rw-r--r--src/mame/machine/segas24.c2
-rw-r--r--src/mame/machine/tatsumi.c4
-rw-r--r--src/mame/machine/toaplan1.c14
-rw-r--r--src/mame/machine/twincobr.c6
-rw-r--r--src/mame/machine/vertigo.c2
-rw-r--r--src/mame/machine/wrally.c2
-rw-r--r--src/mame/video/aerofgt.c8
-rw-r--r--src/mame/video/alpha68k.c4
-rw-r--r--src/mame/video/armedf.c6
-rw-r--r--src/mame/video/badlands.c2
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/btoads.c14
-rw-r--r--src/mame/video/cabal.c2
-rw-r--r--src/mame/video/cchasm.c2
-rw-r--r--src/mame/video/cischeat.c12
-rw-r--r--src/mame/video/cps1.c2
-rw-r--r--src/mame/video/crshrace.c4
-rw-r--r--src/mame/video/dcon.c2
-rw-r--r--src/mame/video/deadang.c2
-rw-r--r--src/mame/video/dooyong.c10
-rw-r--r--src/mame/video/dynduke.c4
-rw-r--r--src/mame/video/equites.c14
-rw-r--r--src/mame/video/f1gp.c6
-rw-r--r--src/mame/video/gaiden.c2
-rw-r--r--src/mame/video/genesis.c6
-rw-r--r--src/mame/video/goal92.c2
-rw-r--r--src/mame/video/gotcha.c4
-rw-r--r--src/mame/video/gticlub.c2
-rw-r--r--src/mame/video/itech32.c24
-rw-r--r--src/mame/video/kan_pand.c4
-rw-r--r--src/mame/video/kaneko16.c2
-rw-r--r--src/mame/video/konamigx.c16
-rw-r--r--src/mame/video/konamiic.c42
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/legionna.c2
-rw-r--r--src/mame/video/m107.c2
-rw-r--r--src/mame/video/m72.c8
-rw-r--r--src/mame/video/m92.c4
-rw-r--r--src/mame/video/midtunit.c16
-rw-r--r--src/mame/video/midyunit.c10
-rw-r--r--src/mame/video/model3.c8
-rw-r--r--src/mame/video/ms32.c2
-rw-r--r--src/mame/video/mystwarr.c4
-rw-r--r--src/mame/video/namcos2.c2
-rw-r--r--src/mame/video/nemesis.c4
-rw-r--r--src/mame/video/niyanpai.c4
-rw-r--r--src/mame/video/nmk16.c14
-rw-r--r--src/mame/video/ohmygod.c2
-rw-r--r--src/mame/video/policetr.c6
-rw-r--r--src/mame/video/powerins.c4
-rw-r--r--src/mame/video/psikyo.c8
-rw-r--r--src/mame/video/quizpani.c2
-rw-r--r--src/mame/video/raiden.c2
-rw-r--r--src/mame/video/realbrk.c4
-rw-r--r--src/mame/video/rpunch.c8
-rw-r--r--src/mame/video/segaic16.c2
-rw-r--r--src/mame/video/segas32.c18
-rw-r--r--src/mame/video/seta.c6
-rw-r--r--src/mame/video/sf.c2
-rw-r--r--src/mame/video/shangha3.c2
-rw-r--r--src/mame/video/snk68.c2
-rw-r--r--src/mame/video/stvvdp1.c18
-rw-r--r--src/mame/video/suna16.c4
-rw-r--r--src/mame/video/tail2nos.c2
-rw-r--r--src/mame/video/taito_b.c8
-rw-r--r--src/mame/video/taito_z.c2
-rw-r--r--src/mame/video/taitoic.c54
-rw-r--r--src/mame/video/taotaido.c8
-rw-r--r--src/mame/video/tatsumi.c4
-rw-r--r--src/mame/video/terracre.c2
-rw-r--r--src/mame/video/tetrisp2.c6
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/tmnt.c20
-rw-r--r--src/mame/video/toaplan1.c6
-rw-r--r--src/mame/video/toaplan2.c6
-rw-r--r--src/mame/video/toobin.c2
-rw-r--r--src/mame/video/toypop.c4
-rw-r--r--src/mame/video/ultraman.c2
-rw-r--r--src/mame/video/wecleman.c2
-rw-r--r--src/mame/video/welltris.c4
-rw-r--r--src/mame/video/wwfwfest.c4
-rw-r--r--src/osd/windows/winwork.c18
369 files changed, 2059 insertions, 2042 deletions
diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c
index b4216d33b26..a8f331468ad 100644
--- a/src/emu/cpu/mips/mips3com.c
+++ b/src/emu/cpu/mips/mips3com.c
@@ -894,9 +894,9 @@ static UINT64 program_read_qword_32be(offs_t offset)
static UINT64 program_read_qword_masked_32be(offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)program_read_masked_32be(offset, mem_mask >> 32) << 32;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= program_read_masked_32be(offset + 4, mem_mask);
return result;
}
@@ -922,9 +922,9 @@ static UINT64 program_read_qword_32le(offs_t offset)
static UINT64 program_read_qword_masked_32le(offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= program_read_masked_32le(offset, mem_mask);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)program_read_masked_32le(offset + 4, mem_mask >> 32) << 32;
return result;
}
@@ -949,9 +949,9 @@ static void program_write_qword_32be(offs_t offset, UINT64 data)
static void program_write_qword_masked_32be(offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
program_write_masked_32be(offset, data >> 32, mem_mask >> 32);
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
program_write_masked_32be(offset + 4, data, mem_mask);
}
@@ -975,8 +975,8 @@ static void program_write_qword_32le(offs_t offset, UINT64 data)
static void program_write_qword_masked_32le(offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
program_write_masked_32le(offset, data, mem_mask);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
program_write_masked_32le(offset + 4, data >> 32, mem_mask >> 32);
}
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 7a215811105..c7cb2c1216f 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -1209,14 +1209,14 @@ READ16_HANDLER( pia_5_lsb_r ) { return pia_read(5, offset); }
READ16_HANDLER( pia_6_lsb_r ) { return pia_read(6, offset); }
READ16_HANDLER( pia_7_lsb_r ) { return pia_read(7, offset); }
-WRITE16_HANDLER( pia_0_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(0, offset, data); }
-WRITE16_HANDLER( pia_1_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(1, offset, data); }
-WRITE16_HANDLER( pia_2_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(2, offset, data); }
-WRITE16_HANDLER( pia_3_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(3, offset, data); }
-WRITE16_HANDLER( pia_4_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(4, offset, data); }
-WRITE16_HANDLER( pia_5_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(5, offset, data); }
-WRITE16_HANDLER( pia_6_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(6, offset, data); }
-WRITE16_HANDLER( pia_7_lsb_w ) { if (ACCESSING_BYTE_0) pia_write(7, offset, data); }
+WRITE16_HANDLER( pia_0_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(0, offset, data); }
+WRITE16_HANDLER( pia_1_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(1, offset, data); }
+WRITE16_HANDLER( pia_2_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(2, offset, data); }
+WRITE16_HANDLER( pia_3_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(3, offset, data); }
+WRITE16_HANDLER( pia_4_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(4, offset, data); }
+WRITE16_HANDLER( pia_5_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(5, offset, data); }
+WRITE16_HANDLER( pia_6_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(6, offset, data); }
+WRITE16_HANDLER( pia_7_lsb_w ) { if (ACCESSING_BITS_0_7) pia_write(7, offset, data); }
READ16_HANDLER( pia_0_lsb_alt_r ) { return pia_alt_read(0, offset); }
READ16_HANDLER( pia_1_lsb_alt_r ) { return pia_alt_read(1, offset); }
@@ -1227,14 +1227,14 @@ READ16_HANDLER( pia_5_lsb_alt_r ) { return pia_alt_read(5, offset); }
READ16_HANDLER( pia_6_lsb_alt_r ) { return pia_alt_read(6, offset); }
READ16_HANDLER( pia_7_lsb_alt_r ) { return pia_alt_read(7, offset); }
-WRITE16_HANDLER( pia_0_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(0, offset, data); }
-WRITE16_HANDLER( pia_1_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(1, offset, data); }
-WRITE16_HANDLER( pia_2_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(2, offset, data); }
-WRITE16_HANDLER( pia_3_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(3, offset, data); }
-WRITE16_HANDLER( pia_4_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(4, offset, data); }
-WRITE16_HANDLER( pia_5_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(5, offset, data); }
-WRITE16_HANDLER( pia_6_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(6, offset, data); }
-WRITE16_HANDLER( pia_7_lsb_alt_w ) { if (ACCESSING_BYTE_0) pia_alt_write(7, offset, data); }
+WRITE16_HANDLER( pia_0_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(0, offset, data); }
+WRITE16_HANDLER( pia_1_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(1, offset, data); }
+WRITE16_HANDLER( pia_2_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(2, offset, data); }
+WRITE16_HANDLER( pia_3_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(3, offset, data); }
+WRITE16_HANDLER( pia_4_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(4, offset, data); }
+WRITE16_HANDLER( pia_5_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(5, offset, data); }
+WRITE16_HANDLER( pia_6_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(6, offset, data); }
+WRITE16_HANDLER( pia_7_lsb_alt_w ) { if (ACCESSING_BITS_0_7) pia_alt_write(7, offset, data); }
/******************* Standard 16-bit CPU interfaces, D8-D15 *******************/
@@ -1247,14 +1247,14 @@ READ16_HANDLER( pia_5_msb_r ) { return pia_read(5, offset) << 8; }
READ16_HANDLER( pia_6_msb_r ) { return pia_read(6, offset) << 8; }
READ16_HANDLER( pia_7_msb_r ) { return pia_read(7, offset) << 8; }
-WRITE16_HANDLER( pia_0_msb_w ) { if (ACCESSING_BYTE_1) pia_write(0, offset, data >> 8); }
-WRITE16_HANDLER( pia_1_msb_w ) { if (ACCESSING_BYTE_1) pia_write(1, offset, data >> 8); }
-WRITE16_HANDLER( pia_2_msb_w ) { if (ACCESSING_BYTE_1) pia_write(2, offset, data >> 8); }
-WRITE16_HANDLER( pia_3_msb_w ) { if (ACCESSING_BYTE_1) pia_write(3, offset, data >> 8); }
-WRITE16_HANDLER( pia_4_msb_w ) { if (ACCESSING_BYTE_1) pia_write(4, offset, data >> 8); }
-WRITE16_HANDLER( pia_5_msb_w ) { if (ACCESSING_BYTE_1) pia_write(5, offset, data >> 8); }
-WRITE16_HANDLER( pia_6_msb_w ) { if (ACCESSING_BYTE_1) pia_write(6, offset, data >> 8); }
-WRITE16_HANDLER( pia_7_msb_w ) { if (ACCESSING_BYTE_1) pia_write(7, offset, data >> 8); }
+WRITE16_HANDLER( pia_0_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(0, offset, data >> 8); }
+WRITE16_HANDLER( pia_1_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(1, offset, data >> 8); }
+WRITE16_HANDLER( pia_2_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(2, offset, data >> 8); }
+WRITE16_HANDLER( pia_3_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(3, offset, data >> 8); }
+WRITE16_HANDLER( pia_4_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(4, offset, data >> 8); }
+WRITE16_HANDLER( pia_5_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(5, offset, data >> 8); }
+WRITE16_HANDLER( pia_6_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(6, offset, data >> 8); }
+WRITE16_HANDLER( pia_7_msb_w ) { if (ACCESSING_BITS_8_15) pia_write(7, offset, data >> 8); }
READ16_HANDLER( pia_0_msb_alt_r ) { return pia_alt_read(0, offset) << 8; }
READ16_HANDLER( pia_1_msb_alt_r ) { return pia_alt_read(1, offset) << 8; }
@@ -1265,14 +1265,14 @@ READ16_HANDLER( pia_5_msb_alt_r ) { return pia_alt_read(5, offset) << 8; }
READ16_HANDLER( pia_6_msb_alt_r ) { return pia_alt_read(6, offset) << 8; }
READ16_HANDLER( pia_7_msb_alt_r ) { return pia_alt_read(7, offset) << 8; }
-WRITE16_HANDLER( pia_0_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(0, offset, data >> 8); }
-WRITE16_HANDLER( pia_1_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(1, offset, data >> 8); }
-WRITE16_HANDLER( pia_2_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(2, offset, data >> 8); }
-WRITE16_HANDLER( pia_3_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(3, offset, data >> 8); }
-WRITE16_HANDLER( pia_4_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(4, offset, data >> 8); }
-WRITE16_HANDLER( pia_5_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(5, offset, data >> 8); }
-WRITE16_HANDLER( pia_6_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(6, offset, data >> 8); }
-WRITE16_HANDLER( pia_7_msb_alt_w ) { if (ACCESSING_BYTE_1) pia_alt_write(7, offset, data >> 8); }
+WRITE16_HANDLER( pia_0_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(0, offset, data >> 8); }
+WRITE16_HANDLER( pia_1_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(1, offset, data >> 8); }
+WRITE16_HANDLER( pia_2_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(2, offset, data >> 8); }
+WRITE16_HANDLER( pia_3_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(3, offset, data >> 8); }
+WRITE16_HANDLER( pia_4_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(4, offset, data >> 8); }
+WRITE16_HANDLER( pia_5_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(5, offset, data >> 8); }
+WRITE16_HANDLER( pia_6_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(6, offset, data >> 8); }
+WRITE16_HANDLER( pia_7_msb_alt_w ) { if (ACCESSING_BITS_8_15) pia_alt_write(7, offset, data >> 8); }
/******************* 8-bit A/B port interfaces *******************/
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index 7c199ec81fd..f5ea53ea2e6 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -809,17 +809,17 @@ READ16_HANDLER( ptm6840_1_msb_r ) { return ptm6840_read(1, offset) << 8; }
READ16_HANDLER( ptm6840_2_msb_r ) { return ptm6840_read(2, offset) << 8; }
READ16_HANDLER( ptm6840_3_msb_r ) { return ptm6840_read(3, offset) << 8; }
-WRITE16_HANDLER( ptm6840_0_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(0, offset, data >> 8); }
-WRITE16_HANDLER( ptm6840_1_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(1, offset, data >> 8); }
-WRITE16_HANDLER( ptm6840_2_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(2, offset, data >> 8); }
-WRITE16_HANDLER( ptm6840_3_msb_w ) { if (ACCESSING_BYTE_1) ptm6840_write(3, offset, data >> 8); }
+WRITE16_HANDLER( ptm6840_0_msb_w ) { if (ACCESSING_BITS_8_15) ptm6840_write(0, offset, data >> 8); }
+WRITE16_HANDLER( ptm6840_1_msb_w ) { if (ACCESSING_BITS_8_15) ptm6840_write(1, offset, data >> 8); }
+WRITE16_HANDLER( ptm6840_2_msb_w ) { if (ACCESSING_BITS_8_15) ptm6840_write(2, offset, data >> 8); }
+WRITE16_HANDLER( ptm6840_3_msb_w ) { if (ACCESSING_BITS_8_15) ptm6840_write(3, offset, data >> 8); }
READ16_HANDLER( ptm6840_0_lsb_r ) { return ptm6840_read(0, offset); }
READ16_HANDLER( ptm6840_1_lsb_r ) { return ptm6840_read(1, offset); }
READ16_HANDLER( ptm6840_2_lsb_r ) { return ptm6840_read(2, offset); }
READ16_HANDLER( ptm6840_3_lsb_r ) { return ptm6840_read(3, offset); }
-WRITE16_HANDLER( ptm6840_0_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(0, offset, data & 0xff); }
-WRITE16_HANDLER( ptm6840_1_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(1, offset, data & 0xff); }
-WRITE16_HANDLER( ptm6840_2_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(2, offset, data & 0xff); }
-WRITE16_HANDLER( ptm6840_3_lsb_w ) { if (ACCESSING_BYTE_0) ptm6840_write(3, offset, data & 0xff); }
+WRITE16_HANDLER( ptm6840_0_lsb_w ) { if (ACCESSING_BITS_0_7) ptm6840_write(0, offset, data & 0xff); }
+WRITE16_HANDLER( ptm6840_1_lsb_w ) { if (ACCESSING_BITS_0_7) ptm6840_write(1, offset, data & 0xff); }
+WRITE16_HANDLER( ptm6840_2_lsb_w ) { if (ACCESSING_BITS_0_7) ptm6840_write(2, offset, data & 0xff); }
+WRITE16_HANDLER( ptm6840_3_lsb_w ) { if (ACCESSING_BITS_0_7) ptm6840_write(3, offset, data & 0xff); }
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index f952a44b5a9..06985faf2bc 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -787,22 +787,22 @@ READ16_HANDLER( acia6850_1_data_msb_r ) { return acia6850_data_r(1) << 8; }
READ16_HANDLER( acia6850_2_data_msb_r ) { return acia6850_data_r(2) << 8; }
READ16_HANDLER( acia6850_3_data_msb_r ) { return acia6850_data_r(3) << 8; }
-WRITE16_HANDLER( acia6850_0_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(0, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_1_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(1, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_2_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(2, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_3_ctrl_msb_w ) { if (ACCESSING_BYTE_1) acia6850_ctrl_w(3, (data >> 8) & 0xff); }
-
-WRITE16_HANDLER( acia6850_0_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(0, data & 0xff); }
-WRITE16_HANDLER( acia6850_1_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(1, data & 0xff); }
-WRITE16_HANDLER( acia6850_2_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(2, data & 0xff); }
-WRITE16_HANDLER( acia6850_3_ctrl_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_ctrl_w(3, data & 0xff); }
-
-WRITE16_HANDLER( acia6850_0_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(0, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_1_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(1, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_2_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(2, (data >> 8) & 0xff); }
-WRITE16_HANDLER( acia6850_3_data_msb_w ) { if (ACCESSING_BYTE_1) acia6850_data_w(3, (data >> 8) & 0xff); }
-
-WRITE16_HANDLER( acia6850_0_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(0, data & 0xff); }
-WRITE16_HANDLER( acia6850_1_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(1, data & 0xff); }
-WRITE16_HANDLER( acia6850_2_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(2, data & 0xff); }
-WRITE16_HANDLER( acia6850_3_data_lsb_w ) { if (ACCESSING_BYTE_0) acia6850_data_w(3, data & 0xff); }
+WRITE16_HANDLER( acia6850_0_ctrl_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_ctrl_w(0, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_1_ctrl_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_ctrl_w(1, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_2_ctrl_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_ctrl_w(2, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_3_ctrl_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_ctrl_w(3, (data >> 8) & 0xff); }
+
+WRITE16_HANDLER( acia6850_0_ctrl_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_ctrl_w(0, data & 0xff); }
+WRITE16_HANDLER( acia6850_1_ctrl_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_ctrl_w(1, data & 0xff); }
+WRITE16_HANDLER( acia6850_2_ctrl_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_ctrl_w(2, data & 0xff); }
+WRITE16_HANDLER( acia6850_3_ctrl_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_ctrl_w(3, data & 0xff); }
+
+WRITE16_HANDLER( acia6850_0_data_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_data_w(0, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_1_data_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_data_w(1, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_2_data_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_data_w(2, (data >> 8) & 0xff); }
+WRITE16_HANDLER( acia6850_3_data_msb_w ) { if (ACCESSING_BITS_8_15) acia6850_data_w(3, (data >> 8) & 0xff); }
+
+WRITE16_HANDLER( acia6850_0_data_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_data_w(0, data & 0xff); }
+WRITE16_HANDLER( acia6850_1_data_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_data_w(1, data & 0xff); }
+WRITE16_HANDLER( acia6850_2_data_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_data_w(2, data & 0xff); }
+WRITE16_HANDLER( acia6850_3_data_lsb_w ) { if (ACCESSING_BITS_0_7) acia6850_data_w(3, data & 0xff); }
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 4231356cf40..758a76e25d8 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -150,7 +150,7 @@ static void at28c16_write( UINT32 chip, offs_t offset, UINT8 data )
static UINT16 at28c16_16msb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= at28c16_read( chip, offset ) << 8;
}
@@ -159,7 +159,7 @@ static UINT16 at28c16_16msb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
static void at28c16_16msb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
at28c16_write( chip, offset, data >> 8 );
}
@@ -179,19 +179,19 @@ WRITE16_HANDLER( at28c16_16msb_3_w ) { at28c16_16msb_write( 3, offset, data, mem
static UINT32 at28c16_32le_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 0 ) << 0;
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 1 ) << 8;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 2 ) << 16;
}
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
data |= at28c16_read( chip, ( offset * 4 ) + 3 ) << 24;
}
@@ -200,19 +200,19 @@ static UINT32 at28c16_32le_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
static void at28c16_32le_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
at28c16_write( chip, ( offset * 4 ) + 0, data >> 0 );
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
at28c16_write( chip, ( offset * 4 ) + 1, data >> 8 );
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
at28c16_write( chip, ( offset * 4 ) + 2, data >> 16 );
}
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
at28c16_write( chip, ( offset * 4 ) + 3, data >> 24 );
}
@@ -230,11 +230,11 @@ WRITE32_HANDLER( at28c16_32le_3_w ) { at28c16_32le_write( 3, offset, data, mem_m
static UINT32 at28c16_32le_16lsb_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= at28c16_read( chip, ( offset * 2 ) + 0 ) << 0;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
data |= at28c16_read( chip, ( offset * 2 ) + 1 ) << 16;
}
@@ -243,11 +243,11 @@ static UINT32 at28c16_32le_16lsb_read( UINT32 chip, offs_t offset, UINT32 mem_ma
static void at28c16_32le_16lsb_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
at28c16_write( chip, ( offset * 2 ) + 0, data >> 0 );
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
at28c16_write( chip, ( offset * 2 ) + 1, data >> 16 );
}
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 5c36ad886df..dff1ab9b763 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -442,25 +442,25 @@ INLINE int convert_to_offset_and_size32(offs_t *offset, UINT32 mem_mask)
int size = 4;
/* determine which real offset */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
{
(*offset)++, size = 3;
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
{
(*offset)++, size = 2;
- if (!ACCESSING_BYTE_2)
+ if (!ACCESSING_BITS_16_23)
(*offset)++, size = 1;
}
}
/* determine the real size */
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
return size;
size--;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
return size;
size--;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
return size;
size--;
return size;
@@ -471,10 +471,10 @@ INLINE int convert_to_offset_and_size16(offs_t *offset, UINT32 mem_mask)
int size = 2;
/* determine which real offset */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
(*offset)++, size = 1;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
return size;
size--;
return size;
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index b662d0ce94d..978acf84f81 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -135,6 +135,6 @@ READ16_HANDLER( msm6242_lsb_r )
WRITE16_HANDLER( msm6242_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
msm6242_w(machine, offset, data);
}
diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c
index 925a15b6d02..d034b7643c4 100644
--- a/src/emu/machine/smc91c9x.c
+++ b/src/emu/machine/smc91c9x.c
@@ -418,7 +418,7 @@ READ16_HANDLER( smc91c94_r )
switch (offset)
{
case EREG_PNR_ARR:
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
ethernet.reg[EREG_INTERRUPT] &= ~0x0008;
update_ethernet_irq();
@@ -431,7 +431,7 @@ READ16_HANDLER( smc91c94_r )
UINT8 *buffer = (ethernet.reg[EREG_POINTER] & 0x8000) ? ethernet.rx : ethernet.tx;
int addr = ethernet.reg[EREG_POINTER] & 0x7ff;
result = buffer[addr++];
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
result |= buffer[addr++] << 8;
if (ethernet.reg[EREG_POINTER] & 0x4000)
ethernet.reg[EREG_POINTER] = (ethernet.reg[EREG_POINTER] & ~0x7ff) | (addr & 0x7ff);
@@ -549,7 +549,7 @@ WRITE16_HANDLER( smc91c94_w )
UINT8 *buffer = (ethernet.reg[EREG_POINTER] & 0x8000) ? ethernet.rx : ethernet.tx;
int addr = ethernet.reg[EREG_POINTER] & 0x7ff;
buffer[addr++] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
buffer[addr++] = data >> 8;
if (ethernet.reg[EREG_POINTER] & 0x4000)
ethernet.reg[EREG_POINTER] = (ethernet.reg[EREG_POINTER] & ~0x7ff) | (addr & 0x7ff);
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 713a5e41169..1fa3a3685a8 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -414,7 +414,7 @@ WRITE8_HANDLER( timekeeper_0_w )
static UINT16 timekeeper_msb16_read( UINT32 chip, offs_t offset, UINT16 mem_mask )
{
UINT16 data = 0;
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= timekeeper_read( chip, offset ) << 8;
}
@@ -423,7 +423,7 @@ static UINT16 timekeeper_msb16_read( UINT32 chip, offs_t offset, UINT16 mem_mask
static void timekeeper_msb16_write( UINT32 chip, offs_t offset, UINT16 data, UINT16 mem_mask )
{
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
timekeeper_write( chip, offset, data >> 8 );
}
@@ -437,19 +437,19 @@ WRITE16_HANDLER( timekeeper_0_msb16_w ) { timekeeper_msb16_write( 0, offset, dat
static UINT32 timekeeper_32be_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 0 ) << 24;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 1 ) << 16;
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 2 ) << 8;
}
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= timekeeper_read( chip, ( offset * 4 ) + 3 ) << 0;
}
@@ -458,19 +458,19 @@ static UINT32 timekeeper_32be_read( UINT32 chip, offs_t offset, UINT32 mem_mask
static void timekeeper_32be_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
timekeeper_write( chip, ( offset * 4 ) + 0, data >> 24 );
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
timekeeper_write( chip, ( offset * 4 ) + 1, data >> 16 );
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
timekeeper_write( chip, ( offset * 4 ) + 2, data >> 8 );
}
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
timekeeper_write( chip, ( offset * 4 ) + 3, data >> 0 );
}
@@ -482,11 +482,11 @@ WRITE32_HANDLER( timekeeper_0_32be_w ) { timekeeper_32be_write( 0, offset, data,
static UINT32 timekeeper_32le_lsb16_read( UINT32 chip, offs_t offset, UINT32 mem_mask )
{
UINT32 data = 0;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= timekeeper_read( chip, ( offset * 2 ) + 0 ) << 0;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
data |= timekeeper_read( chip, ( offset * 2 ) + 1 ) << 16;
}
@@ -495,11 +495,11 @@ static UINT32 timekeeper_32le_lsb16_read( UINT32 chip, offs_t offset, UINT32 mem
static void timekeeper_32le_lsb16_write( UINT32 chip, offs_t offset, UINT32 data, UINT32 mem_mask )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
timekeeper_write( chip, ( offset * 2 ) + 0, data >> 0 );
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
timekeeper_write( chip, ( offset * 2 ) + 1, data >> 16 );
}
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 0d3579aa7e7..4d46faa3c5b 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -155,7 +155,7 @@ WRITE16_HANDLER( tmp68301_regs_w )
{
COMBINE_DATA(&tmp68301_regs[offset]);
- if (!ACCESSING_BYTE_0) return;
+ if (!ACCESSING_BITS_0_7) return;
// logerror("CPU #0 PC %06X: TMP68301 Reg %04X<-%04X & %04X\n",activecpu_get_pc(),offset*2,data,mem_mask^0xffff);
diff --git a/src/emu/memconv.h b/src/emu/memconv.h
index 7fc730fb912..dedd4d7f698 100644
--- a/src/emu/memconv.h
+++ b/src/emu/memconv.h
@@ -88,9 +88,9 @@
INLINE UINT16 read16be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
result |= ((UINT16)(*handler)(param, offset * 2 + 0)) << 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
result |= ((UINT16)(*handler)(param, offset * 2 + 1)) << 0;
return result;
}
@@ -98,9 +98,9 @@ INLINE UINT16 read16be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write16be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
(*handler)(param, offset * 2 + 0, data >> 8);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
(*handler)(param, offset * 2 + 1, data >> 0);
}
@@ -114,9 +114,9 @@ INLINE void write16be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT16 read16le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
result |= ((UINT16) (*handler)(param, offset * 2 + 0)) << 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
result |= ((UINT16) (*handler)(param, offset * 2 + 1)) << 8;
return result;
}
@@ -124,9 +124,9 @@ INLINE UINT16 read16le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write16le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT16 data, UINT16 mem_mask)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
(*handler)(param, offset * 2 + 0, data >> 0);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
(*handler)(param, offset * 2 + 1, data >> 8);
}
@@ -140,9 +140,9 @@ INLINE void write16le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= read16be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 16) << 16;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= read16be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@@ -150,9 +150,9 @@ INLINE UINT32 read32be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write32be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
write16be_with_write8_handler(handler, param, offset * 2 + 0, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
write16be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@@ -166,9 +166,9 @@ INLINE void write32be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= read16le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask) << 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= read16le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@@ -176,9 +176,9 @@ INLINE UINT32 read32le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write32le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
write16le_with_write8_handler(handler, param, offset * 2 + 0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
write16le_with_write8_handler(handler, param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@@ -192,9 +192,9 @@ INLINE void write32le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read32be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= (*handler)(param, offset * 2 + 0, mem_mask >> 16) << 16;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= (*handler)(param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@@ -202,9 +202,9 @@ INLINE UINT32 read32be_with_16be_handler(read16_machine_func handler, void *para
INLINE void write32be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
(*handler)(param, offset * 2 + 0, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
(*handler)(param, offset * 2 + 1, data, mem_mask);
}
@@ -218,9 +218,9 @@ INLINE void write32be_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT32 read32le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= (*handler)(param, offset * 2 + 0, mem_mask) << 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= (*handler)(param, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@@ -228,9 +228,9 @@ INLINE UINT32 read32le_with_16le_handler(read16_machine_func handler, void *para
INLINE void write32le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
(*handler)(param, offset * 2 + 0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
(*handler)(param, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
@@ -290,9 +290,9 @@ INLINE void write32le_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT64 read64be_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32be_with_read8_handler(handler, param, offset * 2 + 1, mem_mask) << 0;
return result;
}
@@ -300,9 +300,9 @@ INLINE UINT64 read64be_with_read8_handler(read8_machine_func handler, void *para
INLINE void write64be_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32be_with_write8_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32be_with_write8_handler(handler, param, offset * 2 + 1, data, mem_mask);
}
@@ -316,9 +316,9 @@ INLINE void write64be_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT64 read64le_with_read8_handler(read8_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32le_with_read8_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@@ -326,9 +326,9 @@ INLINE UINT64 read64le_with_read8_handler(read8_machine_func handler, void *para
INLINE void write64le_with_write8_handler(write8_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32le_with_write8_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32le_with_write8_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -342,9 +342,9 @@ INLINE void write64le_with_write8_handler(write8_machine_func handler, void *par
INLINE UINT32 read64be_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32be_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@@ -352,9 +352,9 @@ INLINE UINT32 read64be_with_16be_handler(read16_machine_func handler, void *para
INLINE void write64be_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32be_with_16be_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32be_with_16be_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -368,9 +368,9 @@ INLINE void write64be_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT32 read64le_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32le_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@@ -378,9 +378,9 @@ INLINE UINT32 read64le_with_16le_handler(read16_machine_func handler, void *para
INLINE void write64le_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32le_with_16le_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32le_with_16le_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -394,9 +394,9 @@ INLINE void write64le_with_16le_handler(write16_machine_func handler, void *para
INLINE UINT32 read64be_with_16le_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 0, mem_mask >> 32) << 32;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32be_with_16le_handler(handler, param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@@ -404,9 +404,9 @@ INLINE UINT32 read64be_with_16le_handler(read16_machine_func handler, void *para
INLINE void write64be_with_16le_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32be_with_16le_handler(handler, param, offset * 2 + 0, data >> 32, mem_mask >> 32);
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32be_with_16le_handler(handler, param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -420,9 +420,9 @@ INLINE void write64be_with_16le_handler(write16_machine_func handler, void *para
INLINE UINT32 read64le_with_16be_handler(read16_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 0, mem_mask >> 0) << 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)read32le_with_16be_handler(handler, param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@@ -430,9 +430,9 @@ INLINE UINT32 read64le_with_16be_handler(read16_machine_func handler, void *para
INLINE void write64le_with_16be_handler(write16_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
write32le_with_16be_handler(handler, param, offset * 2 + 0, data >> 0, mem_mask >> 0);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
write32le_with_16be_handler(handler, param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -446,9 +446,9 @@ INLINE void write64le_with_16be_handler(write16_machine_func handler, void *para
INLINE UINT64 read64be_with_32be_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 32) << 32;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 0) << 0;
return result;
}
@@ -456,9 +456,9 @@ INLINE UINT64 read64be_with_32be_handler(read32_machine_func handler, void *para
INLINE void write64be_with_32be_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
(*handler)(param, offset * 2 + 0, data >> 32, mem_mask >> 32);
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
(*handler)(param, offset * 2 + 1, data >> 0, mem_mask >> 0);
}
@@ -472,9 +472,9 @@ INLINE void write64be_with_32be_handler(write32_machine_func handler, void *para
INLINE UINT64 read64le_with_32le_handler(read32_machine_func handler, void *param, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
result |= (UINT64)(*handler)(param, offset * 2 + 0, mem_mask >> 0) << 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
result |= (UINT64)(*handler)(param, offset * 2 + 1, mem_mask >> 32) << 32;
return result;
}
@@ -482,9 +482,9 @@ INLINE UINT64 read64le_with_32le_handler(read32_machine_func handler, void *para
INLINE void write64le_with_32le_handler(write32_machine_func handler, void *param, offs_t offset, UINT64 data, UINT64 mem_mask)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
(*handler)(param, offset * 2 + 0, data >> 0, mem_mask >> 0);
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
(*handler)(param, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
@@ -617,11 +617,11 @@ WRITE8TO16LE(name,write8)
************************************/
#define READ8TO16BE_MSB( name, read8 ) \
-READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BYTE_1 )
+READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BITS_8_15 )
#define WRITE8TO16BE_MSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BYTE_1 )
+WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BITS_8_15 )
#define READWRITE8TO16BE_MSB( name, read8, write8 ) \
@@ -634,11 +634,11 @@ WRITE8TO16BE_MSB(name,write8)
************************************/
#define READ8TO16LE_MSB( name, read8 ) \
-READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BYTE_1 )
+READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BITS_8_15 )
#define WRITE8TO16LE_MSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BYTE_1 )
+WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BITS_8_15 )
#define READWRITE8TO16LE_MSB( name, read8, write8 ) \
@@ -651,11 +651,11 @@ WRITE8TO16LE_MSB(name,write8)
************************************/
#define READ8TO16BE_LSB( name, read8 ) \
-READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BYTE_0 )
+READ_TEMPLATE_COND( 16, name, read8, read16be_with_read8_handler, ACCESSING_BITS_0_7 )
#define WRITE8TO16BE_LSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BYTE_0 )
+WRITE_TEMPLATE_COND( 16, name, write8, write16be_with_write8_handler, ACCESSING_BITS_0_7 )
#define READWRITE8TO16BE_LSB( name, read8, write8 ) \
@@ -668,11 +668,11 @@ WRITE8TO16BE_LSB(name,write8)
************************************/
#define READ8TO16LE_LSB( name, read8 ) \
-READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BYTE_0 )
+READ_TEMPLATE_COND( 16, name, read8, read16le_with_read8_handler, ACCESSING_BITS_0_7 )
#define WRITE8TO16LE_LSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BYTE_0 )
+WRITE_TEMPLATE_COND( 16, name, write8, write16le_with_write8_handler, ACCESSING_BITS_0_7 )
#define READWRITE8TO16LE_LSB( name, read8, write8 ) \
@@ -719,11 +719,11 @@ WRITE8TO32LE(name,write8)
************************************/
#define READ8TO32BE_MSB( name, read8 ) \
-READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BYTE_3 )
+READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BITS_24_31 )
#define WRITE8TO32BE_MSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BYTE_3 )
+WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BITS_24_31 )
#define READWRITE8TO32BE_MSB( name, read8, write8 ) \
@@ -736,11 +736,11 @@ WRITE8TO32BE_MSB(name,write8)
************************************/
#define READ8TO32LE_MSB( name, read8 ) \
-READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BYTE_3 )
+READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BITS_24_31 )
#define WRITE8TO32LE_MSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BYTE_3 )
+WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BITS_24_31 )
#define READWRITE8TO32LE_MSB( name, read8, write8 ) \
@@ -753,11 +753,11 @@ WRITE8TO32LE_MSB(name,write8)
************************************/
#define READ8TO32BE_LSB( name, read8 ) \
-READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BYTE_0 )
+READ_TEMPLATE_COND( 32, name, read8, read32be_with_read8_handler, ACCESSING_BITS_0_7 )
#define WRITE8TO32BE_LSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BYTE_0 )
+WRITE_TEMPLATE_COND( 32, name, write8, write32be_with_write8_handler, ACCESSING_BITS_0_7 )
#define READWRITE8TO32BE_LSB( name, read8, write8 ) \
@@ -770,11 +770,11 @@ WRITE8TO32BE_LSB(name,write8)
************************************/
#define READ8TO32LE_LSB( name, read8 ) \
-READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BYTE_0 )
+READ_TEMPLATE_COND( 32, name, read8, read32le_with_read8_handler, ACCESSING_BITS_0_7 )
#define WRITE8TO32LE_LSB( name, write8 ) \
-WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BYTE_0 )
+WRITE_TEMPLATE_COND( 32, name, write8, write32le_with_write8_handler, ACCESSING_BITS_0_7 )
#define READWRITE8TO32LE_LSB( name, read8, write8 ) \
@@ -889,11 +889,11 @@ WRITE16LETO32LE(name,write16)
*************************************/
#define READ16BETO32BE_MSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_WORD_1 )
+READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_BITS_16_31 )
#define WRITE16BETO32BE_MSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_WORD_1 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_BITS_16_31 )
#define READWRITE16BETO32BE_MSW( name, read16, write16 ) \
@@ -906,11 +906,11 @@ WRITE16BETO32BE_MSW(name,write16)
*************************************/
#define READ16LETO32BE_MSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_WORD_1 )
+READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_BITS_16_31 )
#define WRITE16LETO32BE_MSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_WORD_1 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_BITS_16_31 )
#define READWRITE16LETO32BE_MSW( name, read16, write16 ) \
@@ -923,11 +923,11 @@ WRITE16LETO32BE_MSW(name,write16)
*************************************/
#define READ16BETO32LE_MSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_WORD_1 )
+READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_BITS_16_31 )
#define WRITE16BETO32LE_MSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_WORD_1 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_BITS_16_31 )
#define READWRITE16BETO32LE_MSW( name, read16, write16 ) \
@@ -940,11 +940,11 @@ WRITE16BETO32LE_MSW(name,write16)
*************************************/
#define READ16LETO32LE_MSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_WORD_1 )
+READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_BITS_16_31 )
#define WRITE16LETO32LE_MSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_WORD_1 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_BITS_16_31 )
#define READWRITE16LETO32LE_MSW( name, read16, write16 ) \
@@ -956,11 +956,11 @@ WRITE16LETO32LE_MSW(name,write16)
*************************************/
#define READ16BETO32BE_LSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_WORD_0 )
+READ_TEMPLATE_COND( 32, name, read16, read32be_with_16be_handler, ACCESSING_BITS_0_15 )
#define WRITE16BETO32BE_LSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_WORD_0 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16be_handler, ACCESSING_BITS_0_15 )
#define READWRITE16BETO32BE_LSW( name, read16, write16 ) \
@@ -973,11 +973,11 @@ WRITE16BETO32BE_LSW(name,write16)
*************************************/
#define READ16LETO32BE_LSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_WORD_0 )
+READ_TEMPLATE_COND( 32, name, read16, read32be_with_16le_handler, ACCESSING_BITS_0_15 )
#define WRITE16LETO32BE_LSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_WORD_0 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32be_with_16le_handler, ACCESSING_BITS_0_15 )
#define READWRITE16LETO32BE_LSW( name, read16, write16 ) \
@@ -990,11 +990,11 @@ WRITE16LETO32BE_LSW(name,write16)
*************************************/
#define READ16BETO32LE_LSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_WORD_0 )
+READ_TEMPLATE_COND( 32, name, read16, read32le_with_16be_handler, ACCESSING_BITS_0_15 )
#define WRITE16BETO32LE_LSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_WORD_0 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16be_handler, ACCESSING_BITS_0_15 )
#define READWRITE16BETO32LE_LSW( name, read16, write16 ) \
@@ -1007,11 +1007,11 @@ WRITE16BETO32LE_LSW(name,write16)
*************************************/
#define READ16LETO32LE_LSW( name, read16 ) \
-READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_WORD_0 )
+READ_TEMPLATE_COND( 32, name, read16, read32le_with_16le_handler, ACCESSING_BITS_0_15 )
#define WRITE16LETO32LE_LSW( name, write16 ) \
-WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_WORD_0 )
+WRITE_TEMPLATE_COND( 32, name, write16, write32le_with_16le_handler, ACCESSING_BITS_0_15 )
#define READWRITE16LETO32LE_LSW( name, read16, write16 ) \
diff --git a/src/emu/memory.h b/src/emu/memory.h
index af0abf53923..ace72766807 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -412,23 +412,22 @@ union _addrmap64_token
/* helper macro for merging data with the memory mask */
#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
-
-#define ACCESSING_BYTE_0 ((~mem_mask & 0x000000ff)!=0)
-#define ACCESSING_BYTE_1 ((~mem_mask & 0x0000ff00)!=0)
-#define ACCESSING_BYTE_2 ((~mem_mask & 0x00ff0000)!=0)
-#define ACCESSING_BYTE_3 ((~mem_mask & 0xff000000)!=0)
-#define ACCESSING_BYTE_4 ((~mem_mask & U64(0x000000ff00000000))!=0)
-#define ACCESSING_BYTE_5 ((~mem_mask & U64(0x0000ff0000000000))!=0)
-#define ACCESSING_BYTE_6 ((~mem_mask & U64(0x00ff000000000000))!=0)
-#define ACCESSING_BYTE_7 ((~mem_mask & U64(0xff00000000000000))!=0)
-
-#define ACCESSING_WORD_0 ((~mem_mask & 0x0000ffff)!=0)
-#define ACCESSING_WORD_1 ((~mem_mask & 0xffff0000)!=0)
-#define ACCESSING_WORD_2 ((~mem_mask & U64(0x0000ffff00000000))!=0)
-#define ACCESSING_WORD_3 ((~mem_mask & U64(0xffff000000000000))!=0)
-
-#define ACCESSING_DWORD_0 ((~mem_mask & 0xffffffff)!=0)
-#define ACCESSING_DWORD_1 ((~mem_mask & U64(0xffffffff00000000))!=0)
+#define ACCESSING_BITS_0_7 ((~mem_mask & 0x000000ff) != 0)
+#define ACCESSING_BITS_8_15 ((~mem_mask & 0x0000ff00) != 0)
+#define ACCESSING_BITS_16_23 ((~mem_mask & 0x00ff0000) != 0)
+#define ACCESSING_BITS_24_31 ((~mem_mask & 0xff000000) != 0)
+#define ACCESSING_BITS_32_39 ((~mem_mask & U64(0x000000ff00000000)) != 0)
+#define ACCESSING_BITS_40_47 ((~mem_mask & U64(0x0000ff0000000000)) != 0)
+#define ACCESSING_BITS_48_55 ((~mem_mask & U64(0x00ff000000000000)) != 0)
+#define ACCESSING_BITS_56_63 ((~mem_mask & U64(0xff00000000000000)) != 0)
+
+#define ACCESSING_BITS_0_15 ((~mem_mask & 0x0000ffff) != 0)
+#define ACCESSING_BITS_16_31 ((~mem_mask & 0xffff0000) != 0)
+#define ACCESSING_BITS_32_47 ((~mem_mask & U64(0x0000ffff00000000)) != 0)
+#define ACCESSING_BITS_48_63 ((~mem_mask & U64(0xffff000000000000)) != 0)
+
+#define ACCESSING_BITS_0_31 ((~mem_mask & 0xffffffff) != 0)
+#define ACCESSING_BITS_32_63 ((~mem_mask & U64(0xffffffff00000000)) != 0)
/* bank switching for CPU cores */
diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index 25dba47044b..7594167924f 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -166,37 +166,37 @@ READ16_HANDLER( YM2151_status_port_2_lsb_r )
WRITE16_HANDLER( YM2151_register_port_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_register_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_register_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_register_port_2_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_register_port_2_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_data_port_0_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_data_port_1_w(machine, 0, data & 0xff);
}
WRITE16_HANDLER( YM2151_data_port_2_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2151_data_port_2_w(machine, 0, data & 0xff);
}
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index c8345eeda67..89cab585db8 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -233,62 +233,62 @@ READ16_HANDLER( YM2203_read_port_4_lsb_r ) { struct ym2203_info *info = sndti_to
WRITE16_HANDLER( YM2203_control_port_0_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_1_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_2_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_3_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_control_port_4_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,0,data);
}
WRITE16_HANDLER( YM2203_write_port_0_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_1_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_2_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_3_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,1,data);
}
WRITE16_HANDLER( YM2203_write_port_4_lsb_w )
{
struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM2203Write(info->chip,1,data);
}
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index c94f7395b43..b7368998a00 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_BYTE_0) YM2413_register_port_0_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_1_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_2_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_register_port_3_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_0_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_1_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_2_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_BYTE_0) YM2413_data_port_3_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_3_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_3_w(machine,offset,data & 0xff); }
/**************************************************************************
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index 1ff0e8b4a06..f5f01e26862 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -320,7 +320,7 @@ WRITE8_HANDLER( YM2610_control_port_0_A_w )
WRITE16_HANDLER( YM2610_control_port_0_A_lsb_w )
{
//logerror("PC %04x: 2610 Reg A %02X",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,0,data);
@@ -337,7 +337,7 @@ WRITE8_HANDLER( YM2610_control_port_0_B_w )
WRITE16_HANDLER( YM2610_control_port_0_B_lsb_w )
{
//logerror("PC %04x: 2610 Reg B %02X",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,2,data);
@@ -354,7 +354,7 @@ WRITE8_HANDLER( YM2610_control_port_1_A_w ){
}
WRITE16_HANDLER( YM2610_control_port_1_A_lsb_w ){
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,0,data);
@@ -367,7 +367,7 @@ WRITE8_HANDLER( YM2610_control_port_1_B_w ){
}
WRITE16_HANDLER( YM2610_control_port_1_B_lsb_w ){
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,2,data);
@@ -388,7 +388,7 @@ WRITE8_HANDLER( YM2610_data_port_0_A_w )
WRITE16_HANDLER( YM2610_data_port_0_A_lsb_w )
{
//logerror(" =%02X\n",data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,1,data);
@@ -405,7 +405,7 @@ WRITE8_HANDLER( YM2610_data_port_0_B_w )
WRITE16_HANDLER( YM2610_data_port_0_B_lsb_w )
{
//logerror(" =%02X\n",data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,0);
YM2610Write(info->chip,3,data);
@@ -422,7 +422,7 @@ WRITE8_HANDLER( YM2610_data_port_1_A_w ){
}
WRITE16_HANDLER( YM2610_data_port_1_A_lsb_w ){
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,1,data);
@@ -435,7 +435,7 @@ WRITE8_HANDLER( YM2610_data_port_1_B_w ){
}
WRITE16_HANDLER( YM2610_data_port_1_B_lsb_w ){
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
struct ym2610_info *info = sndti_token(chip_type,1);
YM2610Write(info->chip,3,data);
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index b1c14de7a55..b2ba34d10bc 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -262,32 +262,32 @@ WRITE8_HANDLER( AY8910_control_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY
WRITE8_HANDLER( AY8910_control_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data); }
WRITE8_HANDLER( AY8910_control_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data); }
WRITE8_HANDLER( AY8910_control_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data); }
-WRITE16_HANDLER( AY8910_control_port_0_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_1_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_2_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_3_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_4_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_0_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_1_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_2_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_3_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_4_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
+WRITE16_HANDLER( AY8910_control_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
+WRITE16_HANDLER( AY8910_control_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
+WRITE16_HANDLER( AY8910_control_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
+WRITE16_HANDLER( AY8910_control_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
+WRITE16_HANDLER( AY8910_control_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
+WRITE16_HANDLER( AY8910_control_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
+WRITE16_HANDLER( AY8910_control_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
+WRITE16_HANDLER( AY8910_control_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
+WRITE16_HANDLER( AY8910_control_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
+WRITE16_HANDLER( AY8910_control_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
WRITE8_HANDLER( AY8910_write_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data); }
WRITE8_HANDLER( AY8910_write_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data); }
WRITE8_HANDLER( AY8910_write_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data); }
WRITE8_HANDLER( AY8910_write_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data); }
WRITE8_HANDLER( AY8910_write_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data); }
-WRITE16_HANDLER( AY8910_write_port_0_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_1_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_2_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_3_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_4_lsb_w ) { if (ACCESSING_BYTE_0) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_0_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_1_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_2_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_3_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_4_msb_w ) { if (ACCESSING_BYTE_1) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }
+WRITE16_HANDLER( AY8910_write_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
+WRITE16_HANDLER( AY8910_write_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
+WRITE16_HANDLER( AY8910_write_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
+WRITE16_HANDLER( AY8910_write_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
+WRITE16_HANDLER( AY8910_write_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
+WRITE16_HANDLER( AY8910_write_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
+WRITE16_HANDLER( AY8910_write_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
+WRITE16_HANDLER( AY8910_write_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
+WRITE16_HANDLER( AY8910_write_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
+WRITE16_HANDLER( AY8910_write_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index 5fdbe824812..93929cc325c 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -1467,13 +1467,13 @@ WRITE8_HANDLER( ES5506_data_1_w )
WRITE16_HANDLER( ES5506_data_0_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
es5506_reg_write(sndti_token(SOUND_ES5506, 0), offset, data);
}
WRITE16_HANDLER( ES5506_data_1_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
es5506_reg_write(sndti_token(SOUND_ES5506, 1), offset, data);
}
@@ -1545,7 +1545,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
switch (offset)
{
case 0x00: /* CR */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
#if RAINE_CHECK
voice->control &= ~(CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_DIR);
@@ -1555,7 +1555,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
((data << 12) & CONTROL_BS0);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
voice->control |= ((data >> 2) & CONTROL_LPMASK) |
@@ -1567,36 +1567,36 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x01: /* FC */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->freqcount = (voice->freqcount & ~0x001fe) | ((data & 0x00ff) << 1);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->freqcount = (voice->freqcount & ~0x1fe00) | ((data & 0xff00) << 1);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, freq count=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->freqcount);
break;
case 0x02: /* STRT (hi) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->start = (voice->start & ~0x03fc0000) | ((data & 0x00ff) << 18);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->start = (voice->start & ~0x7c000000) | ((data & 0x1f00) << 18);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, loop start=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->start);
break;
case 0x03: /* STRT (lo) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->start = (voice->start & ~0x00000380) | ((data & 0x00e0) << 2);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->start = (voice->start & ~0x0003fc00) | ((data & 0xff00) << 2);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, loop start=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->start);
break;
case 0x04: /* END (hi) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->end = (voice->end & ~0x03fc0000) | ((data & 0x00ff) << 18);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->end = (voice->end & ~0x7c000000) | ((data & 0x1f00) << 18);
#if RAINE_CHECK
voice->control |= CONTROL_STOP0;
@@ -1606,9 +1606,9 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x05: /* END (lo) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->end = (voice->end & ~0x00000380) | ((data & 0x00e0) << 2);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->end = (voice->end & ~0x0003fc00) | ((data & 0xff00) << 2);
#if RAINE_CHECK
voice->control |= CONTROL_STOP0;
@@ -1618,50 +1618,50 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x06: /* K2 */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->k2 = (voice->k2 & ~0x00f0) | (data & 0x00f0);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->k2 = (voice->k2 & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, K2=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->k2);
break;
case 0x07: /* K1 */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->k1 = (voice->k1 & ~0x00f0) | (data & 0x00f0);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->k1 = (voice->k1 & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, K1=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->k1);
break;
case 0x08: /* LVOL */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->lvol = (voice->lvol & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, left vol=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->lvol);
break;
case 0x09: /* RVOL */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->rvol = (voice->rvol & ~0xff00) | (data & 0xff00);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, right vol=%04x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->rvol);
break;
case 0x0a: /* ACC (hi) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->accum = (voice->accum & ~0x03fc0000) | ((data & 0x00ff) << 18);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->accum = (voice->accum & ~0x7c000000) | ((data & 0x1f00) << 18);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, accum=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->accum);
break;
case 0x0b: /* ACC (lo) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->accum = (voice->accum & ~0x000003fc) | ((data & 0x00ff) << 2);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->accum = (voice->accum & ~0x0003fc00) | ((data & 0xff00) << 2);
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, accum=%08x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->accum);
@@ -1671,7 +1671,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x0d: /* ACT */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@@ -1686,7 +1686,7 @@ INLINE void es5505_reg_write_low(struct ES5506Chip *chip, struct ES5506Voice *vo
break;
case 0x0f: /* PAGE */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
chip->current_page = data & 0x7f;
break;
}
@@ -1698,13 +1698,13 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
switch (offset)
{
case 0x00: /* CR */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
voice->control &= ~(CONTROL_STOPMASK | CONTROL_BS0 | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ);
voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
((data << 12) & CONTROL_BS0);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
voice->control |= ((data >> 2) & CONTROL_LPMASK) |
@@ -1715,54 +1715,54 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x01: /* O4(n-1) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o4n1 = (voice->o4n1 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o4n1 = (INT16)((voice->o4n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O4(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o4n1 & 0x3ffff);
break;
case 0x02: /* O3(n-1) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o3n1 = (voice->o3n1 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o3n1 = (INT16)((voice->o3n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O3(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o3n1 & 0x3ffff);
break;
case 0x03: /* O3(n-2) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o3n2 = (voice->o3n2 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o3n2 = (INT16)((voice->o3n2 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O3(n-2)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o3n2 & 0x3ffff);
break;
case 0x04: /* O2(n-1) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o2n1 = (voice->o2n1 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o2n1 = (INT16)((voice->o2n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O2(n-1)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff);
break;
case 0x05: /* O2(n-2) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o2n2 = (voice->o2n2 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o2n2 = (INT16)((voice->o2n2 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O2(n-2)=%05x\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n2 & 0x3ffff);
break;
case 0x06: /* O1(n-1) */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
voice->o1n1 = (voice->o1n1 & ~0x00ff) | (data & 0x00ff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
voice->o1n1 = (INT16)((voice->o1n1 & ~0xff00) | (data & 0xff00));
if (LOG_COMMANDS && eslog)
fprintf(eslog, "%06x:voice %d, O1(n-1)=%05x (accum=%08x)\n", activecpu_get_previouspc(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff, voice->accum);
@@ -1777,7 +1777,7 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0d: /* ACT */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@@ -1792,7 +1792,7 @@ INLINE void es5505_reg_write_high(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0f: /* PAGE */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
chip->current_page = data & 0x7f;
break;
}
@@ -1821,7 +1821,7 @@ INLINE void es5505_reg_write_test(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0d: /* ACT */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chip->active_voices = data & 0x1f;
chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
@@ -1836,7 +1836,7 @@ INLINE void es5505_reg_write_test(struct ES5506Chip *chip, struct ES5506Voice *v
break;
case 0x0f: /* PAGE */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
chip->current_page = data & 0x7f;
break;
}
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index b56b3f2743f..0f697adf4c7 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -407,37 +407,37 @@ WRITE8_HANDLER( ES8712_data_2_w )
WRITE16_HANDLER( ES8712_data_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ES8712_data_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ES8712_data_w(1, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_2_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ES8712_data_w(2, offset, data & 0xff);
}
WRITE16_HANDLER( ES8712_data_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ES8712_data_w(0, offset, data >> 8);
}
WRITE16_HANDLER( ES8712_data_1_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ES8712_data_w(1, offset, data >> 8);
}
WRITE16_HANDLER( ES8712_data_2_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ES8712_data_w(2, offset, data >> 8);
}
diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c
index c974e19b125..c84fb04b062 100644
--- a/src/emu/sound/iremga20.c
+++ b/src/emu/sound/iremga20.c
@@ -138,7 +138,7 @@ WRITE16_HANDLER( IremGA20_w )
int channel;
/* only low byte hooked up? */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
//logerror("GA20: Offset %02x, data %04x\n",offset,data);
diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c
index a06d90b46b6..78f96cf76cb 100644
--- a/src/emu/sound/k053260.c
+++ b/src/emu/sound/k053260.c
@@ -428,7 +428,7 @@ WRITE8_HANDLER( K053260_1_w )
WRITE16_HANDLER( K053260_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053260_0_w (machine, offset, data & 0xff);
}
@@ -439,7 +439,7 @@ READ16_HANDLER( K053260_0_lsb_r )
WRITE16_HANDLER( K053260_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053260_1_w (machine, offset, data & 0xff);
}
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 3c80e2e366d..f2c4911a04b 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -604,37 +604,37 @@ WRITE8_HANDLER( OKIM6295_data_2_w )
WRITE16_HANDLER( OKIM6295_data_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_w(0, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_w(1, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_2_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_w(2, data & 0xff);
}
WRITE16_HANDLER( OKIM6295_data_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
OKIM6295_data_w(0, data >> 8);
}
WRITE16_HANDLER( OKIM6295_data_1_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
OKIM6295_data_w(1, data >> 8);
}
WRITE16_HANDLER( OKIM6295_data_2_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
OKIM6295_data_w(2, data >> 8);
}
diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c
index 62d79acf8ff..b085eb3fd0d 100644
--- a/src/emu/sound/psx.c
+++ b/src/emu/sound/psx.c
@@ -377,21 +377,21 @@ READ32_HANDLER( psx_spu_r )
switch( offset % 4 )
{
case SPU_CHANNEL_REG( 0x8 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 1, "psx_spu_r() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 1, "psx_spu_r() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
return ( chip->m_p_n_sustainrelease[ n_channel ] << 16 ) | chip->m_p_n_attackdecaysustain[ n_channel ];
case SPU_CHANNEL_REG( 0xc ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 1, "psx_spu_r() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 1, "psx_spu_r() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
}
@@ -446,48 +446,48 @@ WRITE32_HANDLER( psx_spu_w )
switch( offset % 4 )
{
case SPU_CHANNEL_REG( 0x0 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_volumeleft[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d volume left = %04x\n", n_channel, chip->m_p_n_volumeleft[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_volumeright[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d volume right = %04x\n", n_channel, chip->m_p_n_volumeright[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x4 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_pitch[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d pitch = %04x\n", n_channel, chip->m_p_n_pitch[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_address[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d address = %04x\n", n_channel, chip->m_p_n_address[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0x8 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_attackdecaysustain[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d attack/decay/sustain = %04x\n", n_channel, chip->m_p_n_attackdecaysustain[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_sustainrelease[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d sustain/release = %04x\n", n_channel, chip->m_p_n_sustainrelease[ n_channel ] );
}
break;
case SPU_CHANNEL_REG( 0xc ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_p_n_adsrvolume[ n_channel ] = data & 0xffff;
verboselog( 1, "psx_spu_w() channel %d adsr volume = %04x\n", n_channel, chip->m_p_n_adsrvolume[ n_channel ] );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_p_n_repeataddress[ n_channel ] = data >> 16;
verboselog( 1, "psx_spu_w() channel %d repeat address = %04x\n", n_channel, chip->m_p_n_repeataddress[ n_channel ] );
@@ -503,24 +503,24 @@ WRITE32_HANDLER( psx_spu_w )
switch( offset )
{
case SPU_REG( 0xd80 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_mainvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() main volume left = %04x\n", chip->m_n_mainvolumeleft );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_mainvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() main volume right = %04x\n", chip->m_n_mainvolumeright );
}
break;
case SPU_REG( 0xd84 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_reverberationdepthleft = data & 0xffff;
verboselog( 1, "psx_spu_w() reverberation depth left = %04x\n", chip->m_n_reverberationdepthleft );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_reverberationdepthright = data >> 16;
verboselog( 1, "psx_spu_w() reverberation depth right = %04x\n", chip->m_n_reverberationdepthright );
@@ -564,23 +564,23 @@ WRITE32_HANDLER( psx_spu_w )
verboselog( 1, "psx_spu_w() channel on/off = %08x\n", chip->m_n_channelonoff );
break;
case SPU_REG( 0xda0 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 0, "psx_spu_w( %08x, %08x, %08x ) %08x\n", offset, mem_mask, data, 0xc00 + ( offset * 4 ) );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_reverbworkareastart = data >> 16;
verboselog( 1, "psx_spu_w() reverb work area start = %04x\n", chip->m_n_reverbworkareastart );
}
break;
case SPU_REG( 0xda4 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_irqaddress = data & 0xffff;
verboselog( 1, "psx_spu_w() irq address = %04x\n", chip->m_n_irqaddress );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_spuoffset = ( data >> 16 ) * 4;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
@@ -588,14 +588,14 @@ WRITE32_HANDLER( psx_spu_w )
}
break;
case SPU_REG( 0xda8 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_spudata = data & 0xffff;
chip->m_p_n_spuram[ chip->m_n_spuoffset++ ] = chip->m_n_spudata;
chip->m_n_spuoffset %= ( SPU_RAM_SIZE / 2 );
verboselog( 1, "psx_spu_w() spu data = %04x\n", chip->m_n_spudata );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_spucontrol = data >> 16;
verboselog( 1, "psx_spu_w() spu control = %04x\n", chip->m_n_spucontrol );
@@ -607,24 +607,24 @@ WRITE32_HANDLER( psx_spu_w )
verboselog( 1, "psx_spu_w() spu status = %08x\n", chip->m_n_spustatus );
break;
case SPU_REG( 0xdb0 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_cdvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() cd volume left = %04x\n", chip->m_n_cdvolumeleft );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_cdvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() cd volume right = %04x\n", chip->m_n_cdvolumeright );
}
break;
case SPU_REG( 0xdb4 ):
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
chip->m_n_externalvolumeleft = data & 0xffff;
verboselog( 1, "psx_spu_w() external volume left = %04x\n", chip->m_n_externalvolumeleft );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
chip->m_n_externalvolumeright = data >> 16;
verboselog( 1, "psx_spu_w() external volume right = %04x\n", chip->m_n_externalvolumeright );
diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c
index f18b104be09..50f24871ea9 100644
--- a/src/emu/sound/saa1099.c
+++ b/src/emu/sound/saa1099.c
@@ -459,25 +459,25 @@ WRITE8_HANDLER( saa1099_write_port_1_w )
WRITE16_HANDLER( saa1099_control_port_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
saa1099_control_port_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_write_port_0_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
saa1099_write_port_w(0, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_control_port_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
saa1099_control_port_w(1, offset, data & 0xff);
}
WRITE16_HANDLER( saa1099_write_port_1_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
saa1099_write_port_w(1, offset, data & 0xff);
}
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 9b76212bc8c..a598f2d59b0 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -1002,25 +1002,25 @@ WRITE8_HANDLER( YMZ280B_register_1_w )
WRITE16_HANDLER( YMZ280B_register_0_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
- if (ACCESSING_BYTE_0) chip->current_register = data & 0xff;
+ if (ACCESSING_BITS_0_7) chip->current_register = data & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_0_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
- if (ACCESSING_BYTE_1) chip->current_register = (data >> 8) & 0xff;
+ if (ACCESSING_BITS_8_15) chip->current_register = (data >> 8) & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_1_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
- if (ACCESSING_BYTE_0) chip->current_register = data & 0xff;
+ if (ACCESSING_BITS_0_7) chip->current_register = data & 0xff;
}
WRITE16_HANDLER( YMZ280B_register_1_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
- if (ACCESSING_BYTE_1) chip->current_register = (data >> 8) & 0xff;
+ if (ACCESSING_BITS_8_15) chip->current_register = (data >> 8) & 0xff;
}
/**********************************************************************************************
@@ -1044,25 +1044,25 @@ WRITE8_HANDLER( YMZ280B_data_1_w )
WRITE16_HANDLER( YMZ280B_data_0_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
- if (ACCESSING_BYTE_0) write_to_register(chip, data & 0xff);
+ if (ACCESSING_BITS_0_7) write_to_register(chip, data & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_0_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
- if (ACCESSING_BYTE_1) write_to_register(chip, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) write_to_register(chip, (data >> 8) & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_1_lsb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
- if (ACCESSING_BYTE_0) write_to_register(chip, data & 0xff);
+ if (ACCESSING_BITS_0_7) write_to_register(chip, data & 0xff);
}
WRITE16_HANDLER( YMZ280B_data_1_msb_w )
{
struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
- if (ACCESSING_BYTE_1) write_to_register(chip, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) write_to_register(chip, (data >> 8) & 0xff);
}
/**********************************************************************************************
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index 520ed09d025..7de7965b3dd 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -249,7 +249,7 @@ READ16_HANDLER( tlc34076_lsb_r )
WRITE16_HANDLER( tlc34076_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
tlc34076_w(machine, offset, data);
}
@@ -260,7 +260,7 @@ READ16_HANDLER( tlc34076_msb_r )
WRITE16_HANDLER( tlc34076_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
tlc34076_w(machine, offset, data >> 8);
}
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index ef17394abd6..4d0363857fb 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -3164,9 +3164,9 @@ static INT32 lfb_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mask,
y = (offset >> v->fbi.lfb_stride) & ((1 << v->fbi.lfb_stride) - 1);
/* adjust the mask based on which half of the data is written */
- if (!ACCESSING_WORD_0)
+ if (!ACCESSING_BITS_0_15)
mask &= ~(0x0f - LFB_DEPTH_PRESENT_MSW);
- if (!ACCESSING_WORD_1)
+ if (!ACCESSING_BITS_16_31)
mask &= ~(0xf0 + LFB_DEPTH_PRESENT_MSW);
/* select the target buffer */
@@ -3688,9 +3688,9 @@ static void voodoo_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem_mas
/* modify the offset based on the mem_mask */
if (mem_mask)
{
- if (!ACCESSING_WORD_1)
+ if (!ACCESSING_BITS_16_31)
offset |= 0x80000000;
- if (!ACCESSING_WORD_0)
+ if (!ACCESSING_BITS_0_15)
offset |= 0x40000000;
}
@@ -4268,13 +4268,13 @@ static UINT32 banshee_io_r(voodoo_state *v, offs_t offset, UINT32 mem_mask)
case io_vgac0: case io_vgac4: case io_vgac8: case io_vgacc:
case io_vgad0: case io_vgad4: case io_vgad8: case io_vgadc:
result = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
result |= banshee_vga_r(v, offset*4+0) << 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
result |= banshee_vga_r(v, offset*4+1) << 8;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
result |= banshee_vga_r(v, offset*4+2) << 16;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
result |= banshee_vga_r(v, offset*4+3) << 24;
break;
@@ -4563,13 +4563,13 @@ static void banshee_io_w(voodoo_state *v, offs_t offset, UINT32 data, UINT32 mem
case io_vgab0: case io_vgab4: case io_vgab8: case io_vgabc:
case io_vgac0: case io_vgac4: case io_vgac8: case io_vgacc:
case io_vgad0: case io_vgad4: case io_vgad8: case io_vgadc:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
banshee_vga_w(v, offset*4+0, data >> 0);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
banshee_vga_w(v, offset*4+1, data >> 8);
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
banshee_vga_w(v, offset*4+2, data >> 16);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
banshee_vga_w(v, offset*4+3, data >> 24);
break;
diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c
index e7c2d2d279f..41bf6eeb19e 100644
--- a/src/mame/audio/aztarac.c
+++ b/src/mame/audio/aztarac.c
@@ -18,7 +18,7 @@ READ16_HANDLER( aztarac_sound_r )
WRITE16_HANDLER( aztarac_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xff;
soundlatch_w(machine, offset, data);
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index 0518d239aec..25a779a4bf4 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -88,7 +88,7 @@ WRITE16_HANDLER( cchasm_io_w )
{
static int led;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data >>= 8;
switch (offset & 0xf)
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index 65c6802b1e8..04fcafe72ef 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -146,7 +146,7 @@ READ16_HANDLER( cyberbal_sound_68k_r )
WRITE16_HANDLER( cyberbal_sound_68k_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
sound_data_from_68k = (data >> 8) & 0xff;
sound_data_from_68k_ready = 1;
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index 882cba2a98c..017f30f0aa8 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -1411,13 +1411,13 @@ WRITE32_HANDLER( dsio_idma_data_w )
{
UINT32 pc = activecpu_get_pc();
cpuintrf_push_context(dcs.cpunum);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
if (LOG_DCS_TRANSFERS)
logerror("%08X:IDMA_data_w(%04X) = %04X\n", pc, adsp2181_idma_addr_r(), data & 0xffff);
adsp2181_idma_data_w(data & 0xffff);
}
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
if (LOG_DCS_TRANSFERS)
logerror("%08X:IDMA_data_w(%04X) = %04X\n", pc, adsp2181_idma_addr_r(), data >> 16);
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index fc9a5f338d7..9ed2c14189b 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -367,7 +367,7 @@ static WRITE32_HANDLER( dsp_flags_w )
/* if they were clearing the A2S interrupt, see if we are headed for the spin */
/* loop with R22 != 0; if we are, just start spinning again */
- if (cpu_getactivecpu() == 2 && ACCESSING_BYTE_1 && (data & 0x400))
+ if (cpu_getactivecpu() == 2 && ACCESSING_BITS_8_15 && (data & 0x400))
{
/* see if we're going back to the spin loop */
if (!(data & 0x04000) && activecpu_get_reg(JAGUAR_R22) != 0)
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index f2a4b1dba3e..1a069c5ef10 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -1163,7 +1163,7 @@ static READ16_HANDLER( i80186_internal_port_r )
case 0x60/2:
if (LOG_PORTS) logerror("%05X:read 80186 Timer %d count\n", activecpu_get_pc(), (offset - 0x50/2) / 4);
which = (offset - 0x50/2) / 4;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
internal_timer_sync(which);
return i80186.timer[which].count;
@@ -1269,9 +1269,9 @@ static WRITE16_HANDLER( i80186_internal_port_w )
int temp, which;
/* handle partials */
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
data = (i80186_internal_port_r(machine, offset, 0) & 0xff00) | (data & 0x00ff);
- else if (!ACCESSING_BYTE_0)
+ else if (!ACCESSING_BITS_0_7)
data = (i80186_internal_port_r(machine, offset, 0) & 0x00ff) | (data & 0xff00);
switch (offset)
@@ -1576,7 +1576,7 @@ static WRITE16_HANDLER( pit8254_w )
int reg = offset & 3;
/* ignore odd offsets */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
data &= 0xff;
@@ -1825,7 +1825,7 @@ static WRITE16_HANDLER( dac_w )
struct dac_state *d = &dac[which];
/* handle value changes */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int count = (d->bufin - d->bufout) & DAC_BUFFER_SIZE_MASK;
@@ -1851,7 +1851,7 @@ static WRITE16_HANDLER( dac_w )
}
/* handle volume changes */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
d->volume = ((data >> 8) ^ 0x00) / DAC_VOLUME_SCALE;
if (LOG_DAC) logerror("%05X:DAC %d volume = %02X\n", activecpu_get_pc(), offset, data);
@@ -1897,7 +1897,7 @@ static WRITE16_HANDLER( dac_10bit_w )
int data16;
/* warning: this assumes all port writes here are word-sized */
- assert(ACCESSING_BYTE_0 && ACCESSING_BYTE_1);
+ assert(ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15);
data16 = data;
/* set the new value */
@@ -1930,7 +1930,7 @@ static WRITE16_HANDLER( ataxx_dac_control )
case 0x00:
case 0x01:
case 0x02:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
dac_w(machine, offset, data, 0xff00);
return;
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 828230669c6..5905803f094 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -123,7 +123,7 @@ void m72_ym2151_irq_handler(int irq)
WRITE16_HANDLER( m72_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data);
timer_call_after_resynch(NULL, Z80_ASSERT,setvector_callback);
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index a523adc43d3..248bee3048c 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -549,7 +549,7 @@ static READ16_HANDLER( csdeluxe_pia_r )
/* My guess is that Turbo Tag works through a fluke, whereby the 68000 */
/* using the MOVEP instruction outputs the same value on the high and */
/* low bytes. */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
return pia_0_alt_r(machine, offset) << 8;
else
return pia_0_alt_r(machine, offset);
@@ -557,7 +557,7 @@ static READ16_HANDLER( csdeluxe_pia_r )
static WRITE16_HANDLER( csdeluxe_pia_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
pia_0_alt_w(machine, offset, data >> 8);
else
pia_0_alt_w(machine, offset, data);
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 9bae2e5efe1..16882e66e74 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -434,7 +434,7 @@ READ16_HANDLER( seibu_main_word_r )
WRITE16_HANDLER( seibu_main_word_w )
{
//logerror("%06x: seibu_main_word_w(%x,%02x)\n",activecpu_get_pc(),offset,data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
switch (offset)
{
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 6f6c8de416a..1de5e3dfbf2 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -265,12 +265,12 @@ READ8_HANDLER( taitosound_slave_comm_r )
WRITE16_HANDLER( taitosound_port16_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
taitosound_port_w(machine,0,data & 0xff);
}
WRITE16_HANDLER( taitosound_comm16_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
taitosound_comm_w(machine,0,data & 0xff);
}
READ16_HANDLER( taitosound_comm16_lsb_r )
@@ -281,12 +281,12 @@ READ16_HANDLER( taitosound_comm16_lsb_r )
WRITE16_HANDLER( taitosound_port16_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
taitosound_port_w(machine,0,data >> 8);
}
WRITE16_HANDLER( taitosound_comm16_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
taitosound_comm_w(machine,0,data >> 8);
}
READ16_HANDLER( taitosound_comm16_msb_r )
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index d54540a6961..581a832fc1c 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -326,14 +326,14 @@ static WRITE16_HANDLER(ac_devices_w)
switch(offset)
{
case 0x16/2:
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
logerror("Request to play sample %02x with rom 2\n",data);
OKIM6295_data_0_w(machine,0,data);
}
break;
case 0x1a/2:
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
logerror("Request to play sample %02x with rom 1\n",data);
OKIM6295_data_1_w(machine,0,data);
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 50da02dacd7..4b9a1606498 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -105,7 +105,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
@@ -115,7 +115,7 @@ static WRITE16_HANDLER( sound_command_w )
static WRITE16_HANDLER( turbofrc_sound_command_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
pending_command = 1;
soundlatch_w(machine,offset,(data >> 8) & 0xff);
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index fffffa1e1c6..e18fc9c9f97 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -257,7 +257,7 @@ static WRITE16_HANDLER( alpha_microcontroller_w )
{
logerror("%04x: Alpha write trigger at %04x (%04x)\n",activecpu_get_pc(),offset,data);
/* 0x44 = coin clear signal to microcontroller? */
- if (offset==0x2d && ACCESSING_BYTE_0)
+ if (offset==0x2d && ACCESSING_BITS_0_7)
alpha68k_flipscreen_w(data & 1);
}
@@ -322,28 +322,28 @@ static READ16_HANDLER( jongbou_inputs_r )
static WRITE16_HANDLER( kyros_sound_w )
{
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
soundlatch_w(machine, 0, (data>>8)&0xff);
}
static WRITE16_HANDLER( alpha68k_II_sound_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
soundlatch_w(machine, 0, data&0xff);
}
static WRITE16_HANDLER( alpha68k_V_sound_w )
{
/* Sound & fix bank select are in the same word */
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data&0xff);
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
alpha68k_V_video_bank_w((data>>8)&0xff);
}
//AT
static WRITE16_HANDLER( paddlema_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine, 0, data);
cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
@@ -352,7 +352,7 @@ static WRITE16_HANDLER( paddlema_soundlatch_w )
static WRITE16_HANDLER( tnexspce_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine, 0, data);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index eea42036f41..af1e4966b3e 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -133,7 +133,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
OKIM6295_data_0_w(machine, offset, (data >> 8) & 0xff);
}
@@ -154,7 +154,7 @@ static WRITE16_HANDLER( latch_w )
*/
/* lower byte being modified? */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, (data & 0x80) ? 0x40000 : 0x00000);
atarigen_set_oki6295_vol(machine, (data & 0x001f) * 100 / 0x1f);
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 42b04f0e0c6..5f12fe8df2d 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -233,7 +233,7 @@ static WRITE16_HANDLER( kodure_io_w )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 3d84f0fab54..7cdd1f11905 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -107,7 +107,7 @@ static READ16_HANDLER(fake_4a00a_r)
static WRITE16_HANDLER( ashnojoe_soundlatch_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
//needed?
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 847acde28f6..874165b8920 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -90,7 +90,7 @@ static READ16_HANDLER( control2_r )
static WRITE16_HANDLER( control2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
cur_control2 = data;
/* bit 0 is data */
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 193baf220d5..ee541ef0374 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -100,7 +100,7 @@ static READ16_HANDLER( astrocorp_eeprom_r )
static WRITE16_HANDLER( astrocorp_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// latch the bit
EEPROM_write_bit(data & 0x01);
@@ -115,7 +115,7 @@ static WRITE16_HANDLER( astrocorp_eeprom_w )
static WRITE16_HANDLER( astrocorp_sound_bank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 8) & 1) );
// logerror("CPU #0 PC %06X: OKI bank %08X\n",activecpu_get_pc(),data);
@@ -124,14 +124,14 @@ static WRITE16_HANDLER( astrocorp_sound_bank_w )
static WRITE16_HANDLER( astrocorp_outputs_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, (data & 0x0004)); // coin counter
set_led_status(0, (data & 0x0008)); // you win
if ( (data & 0x0010)) dispensed_tickets++; // coin out
set_led_status(1, (data & 0x0020)); // coin/hopper jam
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
set_led_status(2, (data & 0x0100)); // bet
set_led_status(3, (data & 0x0800)); // start
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 0d32ee677fb..1d03819357d 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -89,7 +89,7 @@ static MACHINE_RESET( atarig1 )
static WRITE16_HANDLER( mo_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
atarirle_control_w(0, data & 7);
}
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 3b765d05f08..a946aa485c9 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -106,7 +106,7 @@ static READ16_HANDLER( a2d_data_r )
static WRITE16_HANDLER( io_latch_w )
{
/* upper byte */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* bit 14 controls the ASIC65 reset line */
asic65_reset((~data >> 14) & 1);
@@ -116,7 +116,7 @@ static WRITE16_HANDLER( io_latch_w )
}
/* lower byte */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 4 resets the sound CPU */
cpunum_set_input_line(machine, 2, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 84f5c1a160d..a99d386f224 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -206,13 +206,13 @@ static WRITE32_HANDLER( latch_w )
*/
/* upper byte */
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
/* bits 13-11 are the MO control bits */
atarirle_control_w(0, (data >> 27) & 7);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
// cage_reset_w(data & 0x00100000);
coin_counter_w(0, data & 0x00080000);
@@ -224,7 +224,7 @@ static WRITE32_HANDLER( latch_w )
static WRITE32_HANDLER( mo_command_w )
{
COMBINE_DATA(mo_command);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
}
@@ -246,9 +246,9 @@ static READ32_HANDLER( sound_data_r )
{
UINT32 result = 0;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= cage_control_r();
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= main_from_cage_r() << 16;
return result;
}
@@ -256,9 +256,9 @@ static READ32_HANDLER( sound_data_r )
static WRITE32_HANDLER( sound_data_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
cage_control_w(data);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
main_to_cage_w(data >> 16);
}
@@ -568,13 +568,13 @@ static READ32_HANDLER( colorram_protection_r )
UINT32 result32 = 0;
UINT16 result;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
result = atarigt_colorram_r(address);
(*protection_r)(address, &result);
result32 |= result << 16;
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
result = atarigt_colorram_r(address + 2);
(*protection_r)(address + 2, &result);
@@ -589,13 +589,13 @@ static WRITE32_HANDLER( colorram_protection_w )
{
offs_t address = 0xd80000 + offset * 4;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
if (!ignore_writes)
atarigt_colorram_w(address, data >> 16, mem_mask >> 16);
(*protection_w)(address, data >> 16);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
if (!ignore_writes)
atarigt_colorram_w(address + 2, data, mem_mask);
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 791f4a9c4a5..9abde73e184 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -98,9 +98,9 @@ static READ32_HANDLER( special_port3_r )
#if 0
static WRITE32_HANDLER( a2d_select_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
which_input = offset * 2;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
which_input = offset * 2 + 1;
}
#endif
@@ -136,14 +136,14 @@ static WRITE32_HANDLER( latch_w )
logerror("latch_w(%08X) & %08X\n", data, ~mem_mask);
/* upper byte */
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
/* bits 13-11 are the MO control bits */
atarirle_control_w(0, (data >> 27) & 7);
}
/* lower byte */
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x100000) ? CLEAR_LINE : ASSERT_LINE);
}
@@ -151,7 +151,7 @@ static WRITE32_HANDLER( latch_w )
static WRITE32_HANDLER( mo_command_w )
{
COMBINE_DATA(mo_command);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
atarirle_command_w(0, ((data & 0xffff) == 2) ? ATARIRLE_COMMAND_CHECKSUM : ATARIRLE_COMMAND_DRAW);
}
@@ -173,7 +173,7 @@ static WRITE32_HANDLER( atarigx2_protection_w )
// if (pc == 0x11cbe || pc == 0x11c30)
// logerror("%06X:Protection W@%04X = %04X (result to %06X)\n", pc, offset, data, activecpu_get_reg(M68K_A2));
// else
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
logerror("%06X:Protection W@%04X = %04X\n", pc, offset * 4, data >> 16);
else
logerror("%06X:Protection W@%04X = %04X\n", pc, offset * 4 + 2, data);
@@ -181,12 +181,12 @@ static WRITE32_HANDLER( atarigx2_protection_w )
COMBINE_DATA(&protection_base[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
last_write = protection_base[offset] >> 16;
last_write_offset = offset*2;
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
last_write = protection_base[offset] & 0xffff;
last_write_offset = offset*2+1;
@@ -1153,7 +1153,7 @@ static READ32_HANDLER( atarigx2_protection_r )
}
}
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
logerror("%06X:Protection R@%04X = %04X\n", activecpu_get_previouspc(), offset * 4, result >> 16);
else
logerror("%06X:Protection R@%04X = %04X\n", activecpu_get_previouspc(), offset * 4 + 2, result);
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 397ab9fd729..a38ed16fc83 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -301,7 +301,7 @@ static WRITE16_HANDLER( int0_ack_w )
static WRITE16_HANDLER( int1_ack_w )
{
/* reset sound CPU */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
}
@@ -314,7 +314,7 @@ static TIMER_CALLBACK( delayed_int_enable_w )
static WRITE16_HANDLER( int_enable_w )
{
- if (offset == 0 && ACCESSING_BYTE_0)
+ if (offset == 0 && ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data, delayed_int_enable_w);
}
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 7b326976fbb..2f330287b0f 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -252,7 +252,7 @@ static READ32_HANDLER(backfire_control3_r)
static WRITE32_HANDLER(backfire_eeprom_w)
{
logerror("%08x:write eprom %08x (%08x) %08x\n",activecpu_get_pc(),offset<<1,mem_mask,data);
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 04376fa17bb..3b23dd14575 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -310,7 +310,7 @@ static READ32_HANDLER( sound_data_r )
static WRITE32_HANDLER( sound_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
atarigen_sound_w(machine,offset, data, mem_mask);
}
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index e9b5ba79033..39b6f6278c7 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -278,7 +278,7 @@ static VIDEO_EOF( bigfghtr )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,((data & 0x7f) << 1) | 1);
}
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 536c14abda2..978d299a80d 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -122,7 +122,7 @@ if (input_code_pressed(KEYCODE_Z))
static WRITE16_HANDLER(colordac_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
colorram[clr_offset] = data;
palette_set_color_rgb(Machine, clr_offset/3,
@@ -133,7 +133,7 @@ static WRITE16_HANDLER(colordac_w)
clr_offset = (clr_offset+1) % (256*3);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
clr_offset = (data>>8) * 3;
}
@@ -145,17 +145,17 @@ static UINT16 bishjan_low;
static WRITE16_HANDLER( bishjan_low_w )
{
- if (ACCESSING_BYTE_1) bishjan_low = data >> 8;
+ if (ACCESSING_BITS_8_15) bishjan_low = data >> 8;
}
static WRITE16_HANDLER( bishjan_tmap1_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
bishjan_videoram1[offset*2] = data | bishjan_low;
tilemap_mark_tile_dirty(tmap1, offset*2);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
bishjan_videoram1[offset*2+1] = (data << 8) | bishjan_low;
tilemap_mark_tile_dirty(tmap1, offset*2+1);
@@ -163,12 +163,12 @@ static WRITE16_HANDLER( bishjan_tmap1_w )
}
static WRITE16_HANDLER( bishjan_tmap2_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
bishjan_videoram2[offset*2] = data | bishjan_low;
tilemap_mark_tile_dirty(tmap2, offset*2);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
bishjan_videoram2[offset*2+1] = (data << 8) | bishjan_low;
tilemap_mark_tile_dirty(tmap2, offset*2+1);
@@ -199,7 +199,7 @@ static UINT16 bishjan_sel, bishjan_input, bishjan_hopper;
static WRITE16_HANDLER( bishjan_sel_w )
{
- if (ACCESSING_BYTE_1) bishjan_sel = data >> 8;
+ if (ACCESSING_BITS_8_15) bishjan_sel = data >> 8;
}
static READ16_HANDLER( bishjan_unk_r )
@@ -214,7 +214,7 @@ static READ16_HANDLER( bishjan_unk_r )
static WRITE16_HANDLER( bishjan_input_w )
{
- if (ACCESSING_BYTE_1) bishjan_input = data >> 8;
+ if (ACCESSING_BITS_8_15) bishjan_input = data >> 8;
}
static READ16_HANDLER( bishjan_input_r )
@@ -234,7 +234,7 @@ static READ16_HANDLER( bishjan_input_r )
static WRITE16_HANDLER( bishjan_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// coin out data & 0x01;
bishjan_hopper = data & 0x02; // hopper
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index d833df6a64b..3ea44f849bb 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -55,7 +55,7 @@ VIDEO_UPDATE( blmbycar );
static WRITE16_HANDLER( blmbycar_okibank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *RAM = memory_region(REGION_SOUND1);
memcpy(&RAM[0x30000],&RAM[0x40000 + 0x10000*(data & 0xf)],0x10000);
@@ -76,13 +76,13 @@ static UINT8 pot_wheel = 0;
static WRITE16_HANDLER( blmbycar_pot_wheel_reset_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
pot_wheel = ~readinputport(2) & 0xff;
}
static WRITE16_HANDLER( blmbycar_pot_wheel_shift_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static int old;
if ( ((old & 0xff) == 0xff) && ((data & 0xff) == 0) )
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 8e2a3c786ce..33918377040 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -37,7 +37,7 @@ static INTERRUPT_GEN( blockout_interrupt )
static WRITE16_HANDLER( blockout_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 07207ab40cd..147f041bfd0 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -77,7 +77,7 @@ static TIMER_CALLBACK( delayed_sound_w )
static WRITE16_HANDLER( main_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index cf10a614ba6..30d87ea8436 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -271,7 +271,7 @@ static WRITE8_HANDLER( soundlatch_ack_w )
/* Handles writes to the YMZ280B */
static WRITE16_HANDLER( cave_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (offset) YMZ280B_data_0_w (machine, offset, data & 0xff);
else YMZ280B_register_0_w (machine, offset, data & 0xff);
@@ -329,7 +329,7 @@ static WRITE16_HANDLER( cave_eeprom_msb_w )
if (data & ~0xfe00)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_1 ) // even address
+ if ( ACCESSING_BITS_8_15 ) // even address
{
coin_lockout_w(1,~data & 0x8000);
coin_lockout_w(0,~data & 0x4000);
@@ -355,7 +355,7 @@ static WRITE16_HANDLER( sailormn_eeprom_msb_w )
static WRITE16_HANDLER( hotdogst_eeprom_msb_w )
{
- if ( ACCESSING_BYTE_1 ) // even address
+ if ( ACCESSING_BITS_8_15 ) // even address
{
// latch the bit
EEPROM_write_bit(data & 0x0800);
@@ -373,7 +373,7 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w )
if (data & ~0x00ef)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_0 ) // odd address
+ if ( ACCESSING_BITS_0_7 ) // odd address
{
coin_lockout_w(1,~data & 0x0008);
coin_lockout_w(0,~data & 0x0004);
@@ -394,7 +394,7 @@ static WRITE16_HANDLER( cave_eeprom_lsb_w )
/* - No eeprom or lockouts */
static WRITE16_HANDLER( gaia_coin_lsb_w )
{
- if ( ACCESSING_BYTE_0 ) // odd address
+ if ( ACCESSING_BITS_0_7 ) // odd address
{
coin_counter_w(1, data & 0x0002);
coin_counter_w(0, data & 0x0001);
@@ -408,7 +408,7 @@ static WRITE16_HANDLER( metmqstr_eeprom_msb_w )
if (data & ~0xff00)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_1 ) // even address
+ if ( ACCESSING_BITS_8_15 ) // even address
{
coin_counter_w(1, data & 0x2000);
coin_counter_w(0, data & 0x1000);
@@ -853,7 +853,7 @@ static WRITE16_HANDLER( korokoro_eeprom_msb_w )
show_leds();
}
- if ( ACCESSING_BYTE_1 ) // even address
+ if ( ACCESSING_BITS_8_15 ) // even address
{
hopper = data & 0x0100; // ???
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 185e225c66d..4d47e5f498a 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -542,14 +542,14 @@ READ16_HANDLER( scudhamm_analog_r )
*/
static WRITE16_HANDLER( scudhamm_leds_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
set_led_status(0, data & 0x0100); // 3 buttons
set_led_status(1, data & 0x0200);
set_led_status(2, data & 0x0400);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// set_led_status(3, data & 0x0010); // if we had more leds..
// set_led_status(4, data & 0x0020);
@@ -568,7 +568,7 @@ static WRITE16_HANDLER( scudhamm_enable_w )
static WRITE16_HANDLER( scudhamm_oki_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 0) & 0x3) );
OKIM6295_set_bank_base(1, 0x40000 * ((data >> 4) & 0x3) );
@@ -656,7 +656,7 @@ static READ16_HANDLER( armchmp2_buttons_r )
*/
static WRITE16_HANDLER( armchmp2_leds_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
set_led_status(0, data & 0x0100);
set_led_status(1, data & 0x1000);
@@ -664,7 +664,7 @@ static WRITE16_HANDLER( armchmp2_leds_w )
set_led_status(3, data & 0x4000);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x0040);
coin_counter_w(1, data & 0x0080);
@@ -832,7 +832,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bigrun_soundbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data >> 0) & 1) );
OKIM6295_set_bank_base(1, 0x40000 * ((data >> 4) & 1) );
@@ -866,11 +866,11 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( cischeat_soundbank_0_w )
{
- if (ACCESSING_BYTE_0) OKIM6295_set_bank_base(0, 0x40000 * (data & 1) );
+ if (ACCESSING_BITS_0_7) OKIM6295_set_bank_base(0, 0x40000 * (data & 1) );
}
static WRITE16_HANDLER( cischeat_soundbank_1_w )
{
- if (ACCESSING_BYTE_0) OKIM6295_set_bank_base(1, 0x40000 * (data & 1) );
+ if (ACCESSING_BITS_0_7) OKIM6295_set_bank_base(1, 0x40000 * (data & 1) );
}
static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index e54f2c3e6cd..58b430bd4e5 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -192,7 +192,7 @@ static WRITE16_HANDLER( nvram_thrash_w )
static WRITE16_HANDLER( nvram_data_w )
{
/* only the low 8 bits matter */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (nvram_write_enable)
generic_nvram16[offset] = data & 0xff;
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index c3d2475384d..eccf81bec27 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -238,7 +238,7 @@ static WRITE8_HANDLER( cps1_oki_pin7_w )
static WRITE16_HANDLER( cps1_sound_fade_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
cps1_sound_fade_timer = data & 0xff;
}
@@ -249,7 +249,7 @@ static READ8_HANDLER( cps1_snd_fade_timer_r )
static WRITE16_HANDLER( cps1_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data & 0xff);
}
@@ -257,7 +257,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
{
// popmessage("coinctrl %04x",data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0,data & 0x0100);
coin_counter_w(1,data & 0x0200);
@@ -265,7 +265,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
coin_lockout_w(1,~data & 0x0800);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* mercs sets bit 0 */
set_led_status(0,data & 0x02);
@@ -276,7 +276,7 @@ WRITE16_HANDLER( cps1_coinctrl_w )
static WRITE16_HANDLER( cpsq_coinctrl2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(2,data & 0x01);
coin_lockout_w(2,~data & 0x02);
@@ -339,7 +339,7 @@ READ16_HANDLER( qsound_sharedram1_r )
WRITE16_HANDLER( qsound_sharedram1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
qsound_sharedram1[offset] = data;
}
@@ -350,7 +350,7 @@ static READ16_HANDLER( qsound_sharedram2_r )
static WRITE16_HANDLER( qsound_sharedram2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
qsound_sharedram2[offset] = data;
}
@@ -434,7 +434,7 @@ READ16_HANDLER( cps1_eeprom_port_r )
WRITE16_HANDLER( cps1_eeprom_port_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/*
bit 0 = data
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 1acc988b9db..a790648d3d7 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -726,7 +726,7 @@ static CUSTOM_INPUT( cps2_eeprom_port_r )
static WRITE16_HANDLER( cps2_eeprom_port_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* bit 0 - Unused */
/* bit 1 - Unused */
@@ -743,7 +743,7 @@ static WRITE16_HANDLER( cps2_eeprom_port_w )
EEPROM_set_cs_line((data & 0x4000) ? CLEAR_LINE : ASSERT_LINE);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 - coin counter 1 */
/* bit 0 - coin counter 2 */
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index abdd56cbdcf..2a6a2ad67f3 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1387,7 +1387,7 @@ static UINT32 cram_bank = 0;
static WRITE32_HANDLER( cram_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// this seems to be related to accesses to the 0x04100000 region
if (cram_bank != data)
@@ -1445,22 +1445,22 @@ static READ32_HANDLER( cps3_gfxflash_r )
if(DEBUG_PRINTF) printf("gfxflash_r\n");
- if (ACCESSING_BYTE_3) // GFX Flash 1
+ if (ACCESSING_BITS_24_31) // GFX Flash 1
{
logerror("read GFX flash chip %d addr %02x\n", flash1-8, (offset<<1));
result |= intelflash_read(flash1, (offset<<1) ) << 24;
}
- if (ACCESSING_BYTE_2) // GFX Flash 2
+ if (ACCESSING_BITS_16_23) // GFX Flash 2
{
logerror("read GFX flash chip %d addr %02x\n", flash2-8, (offset<<1));
result |= intelflash_read(flash2, (offset<<1) ) << 16;
}
- if (ACCESSING_BYTE_1) // GFX Flash 1
+ if (ACCESSING_BITS_8_15) // GFX Flash 1
{
logerror("read GFX flash chip %d addr %02x\n", flash1-8, (offset<<1)+1);
result |= intelflash_read(flash1, (offset<<1)+0x1 ) << 8;
}
- if (ACCESSING_BYTE_0) // GFX Flash 2
+ if (ACCESSING_BITS_0_7) // GFX Flash 2
{
logerror("read GFX flash chip %d addr %02x\n", flash2-8, (offset<<1)+1);
result |= intelflash_read(flash2, (offset<<1)+0x1 ) << 0;
@@ -1485,25 +1485,25 @@ static WRITE32_HANDLER( cps3_gfxflash_w )
// if(DEBUG_PRINTF) printf("cps3_gfxflash_w %08x %08x %08x\n", offset *2, data, mem_mask);
- if (ACCESSING_BYTE_3) // GFX Flash 1
+ if (ACCESSING_BITS_24_31) // GFX Flash 1
{
command = (data >> 24) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1), command);
intelflash_write(flash1, (offset<<1), command);
}
- if (ACCESSING_BYTE_2) // GFX Flash 2
+ if (ACCESSING_BITS_16_23) // GFX Flash 2
{
command = (data >> 16) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash2-8, (offset<<1), command);
intelflash_write(flash2, (offset<<1), command);
}
- if (ACCESSING_BYTE_1) // GFX Flash 1
+ if (ACCESSING_BITS_8_15) // GFX Flash 1
{
command = (data >> 8) & 0xff;
logerror("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1)+1, command);
intelflash_write(flash1, (offset<<1)+0x1, command);
}
- if (ACCESSING_BYTE_0) // GFX Flash 2
+ if (ACCESSING_BITS_0_7) // GFX Flash 2
{
command = (data >> 0) & 0xff;
//if ( ((offset<<1)+1) != 0x555) printf("write to GFX flash chip %d addr %02x cmd %02x\n", flash1-8, (offset<<1)+1, command);
@@ -1536,22 +1536,22 @@ static UINT32 cps3_flashmain_r(int base, UINT32 offset, UINT32 mem_mask)
{
UINT32 result = 0;
- if (ACCESSING_BYTE_3) // Flash 1
+ if (ACCESSING_BITS_24_31) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+0, offset*4 );
result |= (intelflash_read(base+0, offset)<<24);
}
- if (ACCESSING_BYTE_2) // Flash 1
+ if (ACCESSING_BITS_16_23) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+1, offset*4 );
result |= (intelflash_read(base+1, offset)<<16);
}
- if (ACCESSING_BYTE_1) // Flash 1
+ if (ACCESSING_BITS_8_15) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+2, offset*4 );
result |= (intelflash_read(base+2, offset)<<8);
}
- if (ACCESSING_BYTE_0) // Flash 1
+ if (ACCESSING_BITS_0_7) // Flash 1
{
// logerror("read flash chip %d addr %02x\n", base+3, offset*4 );
result |= (intelflash_read(base+3, offset)<<0);
@@ -1649,25 +1649,25 @@ static READ32_HANDLER( cps3_flash2_r )
static void cps3_flashmain_w(int base, UINT32 offset, UINT32 data, UINT32 mem_mask)
{
int command;
- if (ACCESSING_BYTE_3) // Flash 1
+ if (ACCESSING_BITS_24_31) // Flash 1
{
command = (data >> 24) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+0, offset, command);
intelflash_write(base+0, offset, command);
}
- if (ACCESSING_BYTE_2) // Flash 2
+ if (ACCESSING_BITS_16_23) // Flash 2
{
command = (data >> 16) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+1, offset, command);
intelflash_write(base+1, offset, command);
}
- if (ACCESSING_BYTE_1) // Flash 2
+ if (ACCESSING_BITS_8_15) // Flash 2
{
command = (data >> 8) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+2, offset, command);
intelflash_write(base+2, offset, command);
}
- if (ACCESSING_BYTE_0) // Flash 2
+ if (ACCESSING_BITS_0_7) // Flash 2
{
command = (data >> 0) & 0xff;
logerror("write to flash chip %d addr %02x cmd %02x\n", base+3, offset, command);
@@ -1727,7 +1727,7 @@ static WRITE32_HANDLER( cps3_flash2_w )
static WRITE32_HANDLER( cram_gfxflash_bank_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
//printf("cram_gfxflash_bank_w MSB32 %08x\n",data);
/*
@@ -1774,7 +1774,7 @@ static WRITE32_HANDLER( cram_gfxflash_bank_w )
cram_gfxflash_bank-= 0x0002;// as with sound access etc. first 4 meg is 'special' and skipped
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* if(DEBUG_PRINTF)*/ printf("cram_gfxflash_bank_LSB_w LSB32 %08x\n",data);
}
@@ -1822,7 +1822,7 @@ static READ32_HANDLER( cps3_eeprom_r )
if (addr>=0x100 && addr<=0x17f)
{
- if (ACCESSING_BYTE_3) cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0xffff0000)>>16;
+ if (ACCESSING_BITS_24_31) cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0xffff0000)>>16;
else cps3_current_eeprom_read = (cps3_eeprom[offset-0x100/4] & 0x0000ffff)>>0;
// read word to latch...
return 0x00000000;
@@ -1830,7 +1830,7 @@ static READ32_HANDLER( cps3_eeprom_r )
else if (addr == 0x200)
{
// busy flag / read data..
- if (ACCESSING_BYTE_3) return 0;
+ if (ACCESSING_BITS_24_31) return 0;
else
{
//if(DEBUG_PRINTF) printf("reading %04x from eeprom\n", cps3_current_eeprom_read);
@@ -1871,12 +1871,12 @@ static READ32_HANDLER( cps3_cdrom_r )
{
UINT32 retval = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
retval |= ((UINT16)wd33c93_r(machine,0))<<16;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
retval |= (UINT16)wd33c93_r(machine,1);
}
@@ -1886,12 +1886,12 @@ static READ32_HANDLER( cps3_cdrom_r )
static WRITE32_HANDLER( cps3_cdrom_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
wd33c93_w(machine,0,(data & 0x00ff0000)>>16);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
wd33c93_w(machine,1,(data & 0x000000ff)>>0);
}
@@ -1910,7 +1910,7 @@ static WRITE32_HANDLER( cps3_ss_pal_base_w )
{
if(DEBUG_PRINTF) printf ("cps3_ss_pal_base_w %08x %08x\n", data, mem_mask);
- if(ACCESSING_BYTE_3)
+ if(ACCESSING_BITS_24_31)
{
cps3_ss_pal_base = (data & 0x00ff0000)>>16;
@@ -1951,11 +1951,11 @@ static WRITE32_HANDLER( cps3_palettedma_w )
{
COMBINE_DATA(&paldma_other2);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
paldma_length = (data & 0xffff0000)>>16;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0x0002)
{
@@ -2226,11 +2226,11 @@ static WRITE32_HANDLER( cps3_characterdma_w )
if (offset==0)
{
//COMBINE_DATA(&chardma_source);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chardma_source = data & 0x0000ffff;
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
if(DEBUG_PRINTF) printf("chardma_w accessing MSB32 of offset 0");
}
@@ -2239,7 +2239,7 @@ static WRITE32_HANDLER( cps3_characterdma_w )
{
COMBINE_DATA(&chardma_other);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
if ((data>>16) & 0x0040)
{
@@ -2290,12 +2290,12 @@ static WRITE32_HANDLER( cps3_colourram_w )
{
// COMBINE_DATA(&cps3_colourram[offset]);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
cps3_set_mame_colours(machine, offset*2, (data & 0xffff0000) >> 16, 0);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
cps3_set_mame_colours(machine, offset*2+1, (data & 0x0000ffff) >> 0, 0);
}
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 9ae3d1084cf..62f5121f32c 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -52,7 +52,7 @@ extern WRITE16_HANDLER ( bestri_tilebank_w );
static WRITE16_HANDLER ( crospang_soundlatch_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
}
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 141f35d3d51..0433a015b64 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -163,7 +163,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index f298f431eba..0c97f6ff401 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -72,7 +72,7 @@ static WRITE32_HANDLER( amiga_custom32_w )
static WRITE32_HANDLER( aga_overlay_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
data = (data >> 16) & 1;
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 8ad2059c625..ba03fe69f03 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -301,35 +301,35 @@ static WRITE16_HANDLER( io_w )
{
case 0:
// sound data
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
cpunum_set_input_line(Machine, 2, 0, HOLD_LINE);
else
LOG_UNKNOWN_WRITE
break;
case 2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
;//watchdog ? written in similar context to CPU1 @ 0x140002
else
LOG_UNKNOWN_WRITE
break;
case 6:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
;//select controller device
else
;//blank inputs
break;
case 8:
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
;//blank inputs
else
LOG_UNKNOWN_WRITE
break;
case 0xc:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
// This seems to only be written after each irq1 and irq2
logerror("irq wrote %04x\n", data);
else
@@ -337,7 +337,7 @@ static WRITE16_HANDLER( io_w )
break;
case 0xd4:
- if ( ACCESSING_BYTE_0 )
+ if ( ACCESSING_BITS_0_7 )
;// controller device data
else
LOG_UNKNOWN_WRITE
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 4c2118a7578..08883426081 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -242,7 +242,7 @@ static WRITE32_HANDLER( darkhors_eeprom_w )
if (data & ~0xff000000)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %08X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_3 )
+ if ( ACCESSING_BITS_24_31 )
{
// latch the bit
EEPROM_write_bit(data & 0x04000000);
@@ -257,7 +257,7 @@ static WRITE32_HANDLER( darkhors_eeprom_w )
static WRITE32_HANDLER( OKIM6295_data_0_msb32_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
OKIM6295_data_0_msb_w(machine, offset, data >> 16, mem_mask >> 16);
}
@@ -269,15 +269,15 @@ static READ32_HANDLER( OKIM6295_status_0_msb32_r )
static WRITE32_HANDLER( paletteram32_xBBBBBGGGGGRRRRR_dword_w )
{
paletteram16 = (UINT16 *)paletteram32;
- if (ACCESSING_WORD_1) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2+1, data, mem_mask);
+ if (ACCESSING_BITS_16_31) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
+ if (ACCESSING_BITS_0_15) paletteram16_xBBBBBGGGGGRRRRR_word_w(machine, offset*2+1, data, mem_mask);
}
static UINT32 input_sel;
static WRITE32_HANDLER( darkhors_input_sel_w )
{
COMBINE_DATA(&input_sel);
-// if (ACCESSING_WORD_1) popmessage("%04X",data >> 16);
+// if (ACCESSING_BITS_16_31) popmessage("%04X",data >> 16);
}
static int mask_to_bit( int mask )
@@ -309,7 +309,7 @@ static READ32_HANDLER( darkhors_input_sel_r )
static WRITE32_HANDLER( darkhors_unk1_w )
{
// 0x1000 lockout
-// if (ACCESSING_WORD_1) popmessage("%04X",data >> 16);
+// if (ACCESSING_BITS_16_31) popmessage("%04X",data >> 16);
}
static ADDRESS_MAP_START( darkhors_readmem, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index ad6542750dc..6c97649a3ec 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -142,7 +142,7 @@ static WRITE16_HANDLER( eeprom_control_w )
{
/* toggles bit $0100 very frequently while waiting for things */
/* bits $0080-$0010 are probably lamps */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_cs_line(~data & 8);
EEPROM_write_bit(data & 2);
@@ -154,7 +154,7 @@ static WRITE16_HANDLER( eeprom_control_w )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* write the latch and set the IRQ */
soundlatch_full = 1;
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 2a484b47115..adafcffedf5 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -224,7 +224,7 @@ static WRITE8_HANDLER( ddenlovr_bgcolor2_w )
static WRITE16_HANDLER( ddenlovr16_bgcolor_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_bgcolor_w(machine,offset,data);
}
@@ -241,7 +241,7 @@ static WRITE8_HANDLER( ddenlovr_priority2_w )
static WRITE16_HANDLER( ddenlovr16_priority_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_priority_w(machine,offset,data);
}
@@ -259,7 +259,7 @@ static WRITE8_HANDLER( ddenlovr_layer_enable2_w )
static WRITE16_HANDLER( ddenlovr16_layer_enable_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_layer_enable_w(machine,offset,data);
}
@@ -1119,14 +1119,14 @@ static WRITE8_HANDLER( rongrong_blitter_w )
static WRITE16_HANDLER( ddenlovr_blitter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
blitter_w(machine, 0,offset,data & 0xff,0);
}
static WRITE16_HANDLER( ddenlovr_blitter_irq_ack_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 1)
{
@@ -1312,12 +1312,12 @@ static READ16_HANDLER( ddenlovr_special_r )
static WRITE16_HANDLER( ddenlovr_coincounter_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
coin_counter_w(0, data & 1);
}
static WRITE16_HANDLER( ddenlovr_coincounter_1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
coin_counter_w(1, data & 1);
}
@@ -1344,7 +1344,7 @@ static WRITE8_HANDLER( rongrong_palette_w )
static WRITE16_HANDLER( ddenlovr_palette_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
rongrong_palette_w(machine,offset,data & 0xff);
}
@@ -1388,25 +1388,25 @@ static WRITE8_HANDLER( ddenlovr_transparency_mask2_w )
static WRITE16_HANDLER( ddenlovr16_palette_base_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_palette_base[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_palette_mask_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_palette_mask[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_transparency_pen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_transparency_pen[offset] = data & 0xff;
}
static WRITE16_HANDLER( ddenlovr16_transparency_mask_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_transparency_mask[offset] = data & 0xff;
}
@@ -1418,7 +1418,7 @@ static WRITE8_HANDLER( quizchq_oki_bank_w )
static WRITE16_HANDLER( ddenlovr_oki_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_set_bank_base(0, (data & 7) * 0x40000);
}
@@ -1427,7 +1427,7 @@ static int okibank;
static WRITE16_HANDLER( quiz365_oki_bank1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
okibank = (okibank & 2) | (data & 1);
OKIM6295_set_bank_base(0, okibank * 0x40000);
@@ -1436,7 +1436,7 @@ static WRITE16_HANDLER( quiz365_oki_bank1_w )
static WRITE16_HANDLER( quiz365_oki_bank2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
okibank = (okibank & 1) | ((data & 1) << 1);
OKIM6295_set_bank_base(0, okibank * 0x40000);
@@ -1465,7 +1465,7 @@ static WRITE8_HANDLER( ddenlovr_select_w )
static WRITE16_HANDLER( ddenlovr_select_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_select = data;
}
@@ -1476,7 +1476,7 @@ static WRITE8_HANDLER( ddenlovr_select2_w )
static WRITE16_HANDLER( ddenlovr_select2_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ddenlovr_select2 = data;
}
@@ -1540,7 +1540,7 @@ static READ8_HANDLER( rongrong_blitter_busy_r )
static WRITE16_HANDLER( quiz365_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (ddenlovr_select2 == 0x1c)
{
@@ -1623,7 +1623,7 @@ static READ16_HANDLER( ddenlvrj_dsw_r )
static WRITE16_HANDLER( ddenlvrj_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x01);
coin_counter_w(1, data & 0x04);
@@ -1749,7 +1749,7 @@ static READ16_HANDLER( nettoqc_protection_r )
static WRITE16_HANDLER( nettoqc_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x01);
coin_counter_w(1, data & 0x04);
@@ -1759,7 +1759,7 @@ static WRITE16_HANDLER( nettoqc_coincounter_w )
static WRITE16_HANDLER( nettoqc_oki_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_set_bank_base(0, (data & 3) * 0x40000);
}
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 5636b851708..9d739968c2b 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -65,7 +65,7 @@ static WRITE16_HANDLER( dec0_control_w )
break;
case 4: /* 6502 sound cpu */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@@ -101,7 +101,7 @@ static WRITE16_HANDLER( slyspy_control_w )
{
switch (offset<<1) {
case 0:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@@ -115,7 +115,7 @@ static WRITE16_HANDLER( slyspy_control_w )
static WRITE16_HANDLER( midres_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 9e7b6947de6..e7349ab524b 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -158,7 +158,7 @@ static READ32_HANDLER(hvysmsh_eeprom_r)
static WRITE32_HANDLER(hvysmsh_eeprom_w)
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
OKIM6295_set_bank_base(1, 0x40000 * (data & 0x7) );
@@ -201,7 +201,7 @@ static READ32_HANDLER(wcvol95_eeprom_r)
static WRITE32_HANDLER(wcvol95_eeprom_w)
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 2a140d67be4..42c669aa13d 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -359,12 +359,12 @@ static READ32_HANDLER( fghthist_control_r )
static WRITE32_HANDLER( fghthist_eeprom_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x10);
EEPROM_set_cs_line((data & 0x40) ? CLEAR_LINE : ASSERT_LINE);
}
- else if (!ACCESSING_BYTE_1)
+ else if (!ACCESSING_BITS_8_15)
{
// Volume port
}
@@ -434,7 +434,7 @@ static READ32_HANDLER( dragngun_eeprom_r )
static WRITE32_HANDLER( dragngun_eeprom_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x1);
EEPROM_set_cs_line((data & 0x4) ? CLEAR_LINE : ASSERT_LINE);
@@ -635,7 +635,7 @@ static READ32_HANDLER( nslasher_prot_r )
static WRITE32_HANDLER( nslasher_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x10);
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index b2c99047cba..74d48e7a064 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -54,7 +54,7 @@ VIDEO_UPDATE( deniam );
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine,offset,(data >> 8) & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@@ -68,7 +68,7 @@ static WRITE8_HANDLER( deniam16b_oki_rom_bank_w )
static WRITE16_HANDLER( deniam16c_oki_rom_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_set_bank_base(0,(data & 0x01) ? 0x40000 : 0x00000);
}
@@ -80,13 +80,13 @@ static MACHINE_RESET( deniam )
static WRITE16_HANDLER( YM3812_control_port_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
YM3812_control_port_0_w(machine,0,(data >> 8) & 0xff);
}
static WRITE16_HANDLER( YM3812_write_port_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
YM3812_write_port_0_w(machine,0,(data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 316a63b2152..04ec40c6b76 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -121,7 +121,7 @@ static WRITE32_HANDLER( flash_w )
// write game settings
- if(ACCESSING_WORD_0)
+ if(ACCESSING_BITS_0_15)
rom[BYTE_XOR_BE(offset*2 + 1)] = data & 0xffff;
else
rom[BYTE_XOR_BE(offset*2 + 0)] = (data & 0xffff0000) >> 16;
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 96f07780074..e0981ca1c47 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -59,7 +59,7 @@ VIDEO_UPDATE(diverboy);
static WRITE16_HANDLER( soundcmd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index dd8c0c8dbb3..2713b1dc489 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -96,7 +96,7 @@ static void sndram_set_bank(void)
static WRITE32_HANDLER( sndram_bank_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
sndram_bank = (data >> 16) & 0x1f;
sndram_set_bank();
@@ -107,16 +107,16 @@ static READ32_HANDLER( sndram_r )
{
UINT32 data = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
data |= sndram[offset * 4] << 24;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
data |= sndram[offset * 4 + 1] << 16;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
data |= sndram[offset * 4 + 2] << 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
data |= sndram[offset * 4 + 3];
return data;
@@ -124,16 +124,16 @@ static READ32_HANDLER( sndram_r )
static WRITE32_HANDLER( sndram_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
sndram[offset * 4] = data >> 24;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
sndram[offset * 4 + 1] = data >> 16;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
sndram[offset * 4 + 2] = data >> 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
sndram[offset * 4 + 3] = data;
}
@@ -144,9 +144,9 @@ static READ16_HANDLER( dual539_16_r )
{
UINT16 ret = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ret |= K054539_1_r(machine, offset);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ret |= K054539_0_r(machine, offset)<<8;
return ret;
@@ -154,9 +154,9 @@ static READ16_HANDLER( dual539_16_r )
static WRITE16_HANDLER( dual539_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054539_1_w(machine, offset, data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K054539_0_w(machine, offset, data>>8);
}
@@ -164,9 +164,9 @@ static READ32_HANDLER( dual539_r )
{
UINT32 data = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
data |= dual539_16_r(machine, offset * 2, mem_mask >> 16) << 16;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
data |= dual539_16_r(machine, offset * 2 + 1, mem_mask);
return data;
@@ -174,9 +174,9 @@ static READ32_HANDLER( dual539_r )
static WRITE32_HANDLER( dual539_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
dual539_16_w(machine, offset * 2, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
dual539_16_w(machine, offset * 2 + 1, data, mem_mask);
}
@@ -206,7 +206,7 @@ static READ32_HANDLER( obj_rom_r )
offset += bank * 0x200;
offset *= 4;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
offset += 2;
if (~mem_mask & 0xff00ff00)
@@ -220,7 +220,7 @@ static READ32_HANDLER( obj_rom_r )
static WRITE32_HANDLER( v_ctrl_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
data >>= 16;
mem_mask >>= 16;
@@ -241,7 +241,7 @@ static READ32_HANDLER( v_rom_r )
offset *= 2;
- if (!ACCESSING_BYTE_3)
+ if (!ACCESSING_BITS_24_31)
offset += 1;
offset += bank * 0x800 * 4;
@@ -271,7 +271,7 @@ static READ32_HANDLER( turntable_r )
{
UINT32 result = 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
UINT8 pos;
int delta;
@@ -294,7 +294,7 @@ static READ32_HANDLER( turntable_r )
static WRITE32_HANDLER( turntable_select_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
turntable_select = (data >> 19) & 1;
}
@@ -306,7 +306,7 @@ static WRITE32_HANDLER( turntable_select_w )
static READ32_HANDLER( ide_std_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x00ff) >> 8;
else
return ide_controller16_0_r(machine, IDE_STD_OFFSET + offset, 0x0000) << 16;
@@ -314,7 +314,7 @@ static READ32_HANDLER( ide_std_r )
static WRITE32_HANDLER( ide_std_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data << 8, 0x00ff);
else
ide_controller16_0_w(machine, IDE_STD_OFFSET + offset, data >> 16, 0x0000);
@@ -331,7 +331,7 @@ static READ32_HANDLER( ide_alt_r )
static WRITE32_HANDLER( ide_alt_w )
{
- if (offset == 0 && ACCESSING_BYTE_2)
+ if (offset == 0 && ACCESSING_BITS_16_23)
ide_controller16_0_w(machine, IDE_ALT_OFFSET, data >> 24, 0xff00);
}
@@ -371,7 +371,7 @@ static WRITE32_HANDLER( ide_alt_w )
static WRITE32_HANDLER( light_ctrl_1_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
output_set_value("right-red-hlt", !(data & 0x08000000)); // Right red HIGHLIGHT
output_set_value("left-red-hlt", !(data & 0x04000000)); // Left red HIGHLIGHT
@@ -382,7 +382,7 @@ static WRITE32_HANDLER( light_ctrl_1_w )
static WRITE32_HANDLER( light_ctrl_2_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
output_set_value("left-ssr", !!(data & 0x08000000)); // SSR
output_set_value("right-ssr", !!(data & 0x08000000)); // SSR
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index c4b21ec12b7..9a6036ad17f 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -226,7 +226,7 @@ static READ32_HANDLER(dreamwld_6295_0_r)
static WRITE32_HANDLER(dreamwld_6295_0_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
OKIM6295_data_0_w(machine, 0, (data>>24) & 0xff);
}
@@ -248,7 +248,7 @@ static void dreamwld_oki_setbank( UINT8 chip, UINT8 bank )
static WRITE32_HANDLER( dreamwld_6295_0_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
dreamwld_oki_setbank(0,data&0x3);
}
@@ -265,7 +265,7 @@ static READ32_HANDLER(dreamwld_6295_1_r)
static WRITE32_HANDLER(dreamwld_6295_1_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
OKIM6295_data_1_w(machine, 0, (data>>24) & 0xff);
}
@@ -277,7 +277,7 @@ static WRITE32_HANDLER(dreamwld_6295_1_w)
static WRITE32_HANDLER( dreamwld_6295_1_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
dreamwld_oki_setbank(1,data&0x3);
}
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index a32d108c718..c98db5c8bfd 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -45,7 +45,7 @@ static WRITE16_HANDLER( drgnmst_coin_w )
static WRITE16_HANDLER( drgnmst_snd_command_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
drgnmst_snd_command = (data & 0xff);
cpu_yield();
}
@@ -54,7 +54,7 @@ static WRITE16_HANDLER( drgnmst_snd_command_w )
static WRITE16_HANDLER( drgnmst_snd_flag_w )
{
/* Enables the following 68K write operation to latch through to the PIC */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
drgnmst_snd_flag = 1;
}
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 1c86f78895e..04b341f2aaa 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -119,7 +119,7 @@ static READ16_HANDLER( adc_r )
static WRITE16_HANDLER( eprom_latch_w )
{
/* reset extra CPU */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 1)
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, CLEAR_LINE);
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 4d41b1b9d59..85314600891 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -685,7 +685,7 @@ static READ16_HANDLER(mcu_r)
static WRITE16_HANDLER(mcu_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
mcu_ram[offset] = data & 0xff;
}
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 37299c683a0..910500f789a 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -63,7 +63,7 @@ static READ32_HANDLER(IRQRQA_r)
static WRITE32_HANDLER(IRQRQA_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
IRQSTA&=~data;
}
@@ -74,7 +74,7 @@ static READ32_HANDLER(IRQMSKA_r)
static WRITE32_HANDLER(IRQMSKA_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
IRQMSKA=(data&(~2))|0x80;
}
@@ -90,7 +90,7 @@ static READ32_HANDLER(IRQMSKB_r)
static WRITE32_HANDLER(IRQMSKB_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
IRQMSKB=data;
}
@@ -101,7 +101,7 @@ static READ32_HANDLER(FIQMSK_r)
static WRITE32_HANDLER(FIQMSK_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
FIQMSK=(data&(~0x2c))|0x80;
}
@@ -112,7 +112,7 @@ static READ32_HANDLER(T1low_r)
static WRITE32_HANDLER(T1low_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
T1low=data;
}
@@ -123,7 +123,7 @@ static READ32_HANDLER(T1high_r)
static WRITE32_HANDLER(T1high_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
T1high=data;
}
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 62e17b256d8..3e00dd99751 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -68,7 +68,7 @@ static WRITE16_HANDLER( esd16_spriteram_w ) { COMBINE_DATA(&spriteram16[offset])
static WRITE16_HANDLER( esd16_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,ASSERT_LINE); // Generate an IRQ
@@ -129,7 +129,7 @@ static WRITE16_HANDLER(hedpanic_platform_w)
static READ16_HANDLER( esd_eeprom_r )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
return ((EEPROM_read_bit() & 0x01) << 15);
}
@@ -140,7 +140,7 @@ static READ16_HANDLER( esd_eeprom_r )
static WRITE16_HANDLER( esd_eeprom_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// data line
EEPROM_write_bit((data & 0x0400) >> 6);
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index e34c3e80a18..50e577d36f6 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -228,7 +228,7 @@ static WRITE16_HANDLER( galsnew_paletteram_w )
static WRITE16_HANDLER( galsnew_6295_bankswitch_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
UINT8 *rom = memory_region(REGION_SOUND1);
memcpy(&rom[0x30000],&rom[0x40000 + ((data >> 8) & 0x0f) * 0x10000],0x10000);
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index efbd733fbb5..eeb03cd5624 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -187,7 +187,7 @@ static WRITE16_HANDLER( exterm_output_port_0_w )
/* All the outputs are activated on the rising edge */
static UINT16 last = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* Bit 0-1= Resets analog controls */
if ((data & 0x0001) && !(last & 0x0001))
@@ -196,7 +196,7 @@ static WRITE16_HANDLER( exterm_output_port_0_w )
aimpos[1] = 0;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* Bit 13 = Resets the slave CPU */
if ((data & 0x2000) && !(last & 0x2000))
@@ -222,7 +222,7 @@ static TIMER_CALLBACK( sound_delayed_w )
static WRITE16_HANDLER( sound_latch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, sound_delayed_w);
}
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 0bfb1c8b6c1..e57e57facce 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -69,7 +69,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 2c7c51ce7b3..734530ff39a 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -70,7 +70,7 @@ static WRITE8_HANDLER( fantland_nmi_enable_w )
static WRITE16_HANDLER( fantland_nmi_enable_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
fantland_nmi_enable_w(machine,offset*2,data);
}
@@ -82,7 +82,7 @@ static WRITE8_HANDLER( fantland_soundlatch_w )
static WRITE16_HANDLER( fantland_soundlatch_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
fantland_soundlatch_w(machine, offset*2, data);
}
@@ -102,17 +102,17 @@ static READ16_HANDLER( spriteram2_16_r )
static WRITE16_HANDLER( spriteram_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
spriteram[2*offset+0] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
spriteram[2*offset+1] = data >> 8;
}
static WRITE16_HANDLER( spriteram2_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
spriteram_2[2*offset+0] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
spriteram_2[2*offset+1] = data >> 8;
}
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index a0e004a35f0..1cd38720027 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -593,7 +593,7 @@ static void GCU_w(running_machine *machine, int chip, UINT32 offset, UINT32 data
//case 0x3c:
{
COMBINE_DATA( &gcu[chip].visible_area );
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
const device_config *screen = device_list_find_by_index(machine->config->devicelist, VIDEO_SCREEN, chip);
@@ -672,15 +672,15 @@ static READ32_HANDLER(input_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (readinputport(0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (readinputport(1) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (readinputport(2) & 0xff);
}
@@ -703,19 +703,19 @@ static READ32_HANDLER( sensor_r )
static READ32_HANDLER(flashram_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (intelflash_read(0, (offset*4)+0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= (intelflash_read(0, (offset*4)+1) & 0xff) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (intelflash_read(0, (offset*4)+2) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (intelflash_read(0, (offset*4)+3) & 0xff) << 0;
}
@@ -724,19 +724,19 @@ static READ32_HANDLER(flashram_r)
static WRITE32_HANDLER(flashram_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
intelflash_write(0, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
intelflash_write(0, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
intelflash_write(0, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
intelflash_write(0, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -757,19 +757,19 @@ static READ32_HANDLER(soundflash_r)
offset &= 0x7ffff;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (intelflash_read(chip, (offset*4)+0) & 0xff) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= (intelflash_read(chip, (offset*4)+1) & 0xff) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (intelflash_read(chip, (offset*4)+2) & 0xff) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (intelflash_read(chip, (offset*4)+3) & 0xff) << 0;
}
@@ -790,19 +790,19 @@ static WRITE32_HANDLER(soundflash_w)
offset &= 0x7ffff;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
intelflash_write(chip, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
intelflash_write(chip, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
intelflash_write(chip, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
intelflash_write(chip, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -1222,19 +1222,19 @@ static READ32_HANDLER( comm_uart_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= pc16552d_0_r(machine, (offset*4)+0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= pc16552d_0_r(machine, (offset*4)+1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= pc16552d_0_r(machine, (offset*4)+2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= pc16552d_0_r(machine, (offset*4)+3) << 0;
}
@@ -1244,19 +1244,19 @@ static READ32_HANDLER( comm_uart_r )
static WRITE32_HANDLER( comm_uart_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
pc16552d_0_w(machine, (offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
pc16552d_0_w(machine, (offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
pc16552d_0_w(machine, (offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pc16552d_0_w(machine, (offset*4)+3, (data >> 0) & 0xff);
}
@@ -1276,19 +1276,19 @@ static READ32_HANDLER( rtc_r )
int reg = offset * 4;
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= rtc65271_r((reg >> 8) & 0x1, (reg & 0xff) + 3) << 0;
}
@@ -1299,19 +1299,19 @@ static READ32_HANDLER( rtc_r )
static WRITE32_HANDLER( rtc_w )
{
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
rtc65271_w((reg >> 8) & 0x1, (reg & 0xff) + 3, (data >> 0) & 0xff);
}
@@ -1325,11 +1325,11 @@ static READ32_HANDLER( sound_r )
// printf("sound_r: %08X, %08X\n", offset, mem_mask);
- if (ACCESSING_BYTE_3) /* External RAM read */
+ if (ACCESSING_BITS_24_31) /* External RAM read */
{
r |= YMZ280B_data_0_r(machine, offset) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= YMZ280B_status_0_r(machine, offset) << 16;
}
@@ -1340,11 +1340,11 @@ static READ32_HANDLER( sound_r )
static WRITE32_HANDLER( sound_w )
{
// printf("sound_w: %08X, %08X, %08X\n", offset, data, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
YMZ280B_register_0_w(machine, offset, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
YMZ280B_data_0_w(machine, offset, (data >> 16) & 0xff);
}
@@ -1397,7 +1397,7 @@ static READ32_HANDLER( midi_uart_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= pc16552d_1_r(machine, offset >> 6) << 24;
}
@@ -1407,7 +1407,7 @@ static READ32_HANDLER( midi_uart_r )
static WRITE32_HANDLER( midi_uart_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
pc16552d_1_w(machine, offset >> 6, (data >> 24) & 0xff);
}
@@ -1518,7 +1518,7 @@ static READ32_HANDLER( extend_board_irq_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= (~extend_board_irq_active) << 24;
}
@@ -1530,7 +1530,7 @@ static WRITE32_HANDLER( extend_board_irq_w )
{
// printf("extend_board_irq_w: %08X, %08X, %08X\n", data, offset, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
extend_board_irq_active &= ~((data >> 24) & 0xff);
@@ -1543,7 +1543,7 @@ static WRITE32_HANDLER( extend_board_irq_w )
static WRITE32_HANDLER( lamp_output_w )
{
// -------- -------- -------- xxxxxxxx Status LEDs (active low)
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
output_set_value("status_led_0", (data & 0x01) ? 0 : 1);
output_set_value("status_led_1", (data & 0x02) ? 0 : 1);
@@ -1562,13 +1562,13 @@ static WRITE32_HANDLER( lamp_output_kbm_w )
{
lamp_output_w(machine, offset, data, mem_mask);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
output_set_value("door_lamp", (data & 0x10000000) ? 1 : 0);
output_set_value("start1p", (data & 0x01000000) ? 1 : 0);
output_set_value("start2p", (data & 0x02000000) ? 1 : 0);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
output_set_value("lamp1", (data & 0x00000100) ? 1 : 0);
output_set_value("lamp2", (data & 0x00000200) ? 1 : 0);
@@ -1595,7 +1595,7 @@ static WRITE32_HANDLER( lamp_output_ppp_w )
// 0x00020000 Stage LED 5
// 0x00040000 Stage LED 6
// 0x00080000 Stage LED 7
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
output_set_value("left", (data & 0x00000100) ? 1 : 0);
output_set_value("right", (data & 0x00000200) ? 1 : 0);
@@ -1603,14 +1603,14 @@ static WRITE32_HANDLER( lamp_output_ppp_w )
output_set_value("ok", (data & 0x00000800) ? 1 : 0);
output_set_value("slim", (data & 0x00008000) ? 1 : 0);
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
output_set_value("stage_led_0", (data & 0x01000000) ? 1 : 0);
output_set_value("stage_led_1", (data & 0x02000000) ? 1 : 0);
output_set_value("stage_led_2", (data & 0x04000000) ? 1 : 0);
output_set_value("stage_led_3", (data & 0x08000000) ? 1 : 0);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("stage_led_4", (data & 0x00010000) ? 1 : 0);
output_set_value("stage_led_5", (data & 0x00020000) ? 1 : 0);
@@ -1637,14 +1637,14 @@ static WRITE32_HANDLER( lamp_output2_ppp_w )
// 0x00000002 Top LED 5
// 0x00000004 Top LED 6
// 0x00000008 Top LED 7
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("top_led_0", (data & 0x00010000) ? 1 : 0);
output_set_value("top_led_1", (data & 0x00020000) ? 1 : 0);
output_set_value("top_led_2", (data & 0x00040000) ? 1 : 0);
output_set_value("top_led_3", (data & 0x00080000) ? 1 : 0);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
output_set_value("top_led_4", (data & 0x00000001) ? 1 : 0);
output_set_value("top_led_5", (data & 0x00000002) ? 1 : 0);
@@ -1667,7 +1667,7 @@ static WRITE32_HANDLER( lamp_output3_ppp_w )
// 0x00040000 Lamp 1
// 0x00100000 Lamp 2
// 0x00400000 Lamp 3
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
output_set_value("lamp_0", (data & 0x00010000) ? 1 : 0);
output_set_value("lamp_1", (data & 0x00040000) ? 1 : 0);
@@ -1684,19 +1684,19 @@ static READ32_HANDLER(ppc_spu_share_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= spu_shared_ram[(offset * 4) + 0] << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= spu_shared_ram[(offset * 4) + 1] << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= spu_shared_ram[(offset * 4) + 2] << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= spu_shared_ram[(offset * 4) + 3] << 0;
}
@@ -1706,19 +1706,19 @@ static READ32_HANDLER(ppc_spu_share_r)
static WRITE32_HANDLER(ppc_spu_share_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
spu_shared_ram[(offset * 4) + 0] = (data >> 24) & 0xff;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
spu_shared_ram[(offset * 4) + 1] = (data >> 16) & 0xff;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
spu_shared_ram[(offset * 4) + 2] = (data >> 8) & 0xff;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
spu_shared_ram[(offset * 4) + 3] = (data >> 0) & 0xff;
}
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index ed010863257..cf9328aa028 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -173,7 +173,7 @@ static MACHINE_RESET( foodf )
static WRITE16_HANDLER( digital_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
foodf_set_flip(data & 0x01);
@@ -223,9 +223,9 @@ 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_BYTE_0) pokey1_w(machine, offset, data & 0xff); }
-static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_BYTE_0) pokey2_w(machine, offset, data & 0xff); }
-static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_BYTE_0) pokey3_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( pokey1_word_w ) { if (ACCESSING_BITS_0_7) pokey1_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( pokey2_word_w ) { if (ACCESSING_BITS_0_7) pokey2_w(machine, offset, data & 0xff); }
+static WRITE16_HANDLER( pokey3_word_w ) { if (ACCESSING_BITS_0_7) pokey3_w(machine, offset, data & 0xff); }
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index a7c2b2d2313..9c6346e9ffe 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -194,7 +194,7 @@ static READ16_HANDLER( fromanc4_input_r )
static WRITE16_HANDLER( fromanc2_eeprom_w )
{
- if (ACCESSING_BYTE_1) {
+ if (ACCESSING_BITS_8_15) {
// latch the bit
EEPROM_write_bit(data & 0x0100);
@@ -208,7 +208,7 @@ static WRITE16_HANDLER( fromanc2_eeprom_w )
static WRITE16_HANDLER( fromancr_eeprom_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
fromancr_gfxbank_w(data & 0xfff8);
// latch the bit
@@ -224,7 +224,7 @@ static WRITE16_HANDLER( fromancr_eeprom_w )
static WRITE16_HANDLER( fromanc4_eeprom_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
// latch the bit
EEPROM_write_bit(data & 0x0004);
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 2eafbd8fee8..cc83d85f96b 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -78,7 +78,7 @@ static WRITE16_HANDLER( fuuki16_vregs_w )
static WRITE16_HANDLER( fuuki16_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 10784867aaf..08c771e6c90 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -186,7 +186,7 @@ VIDEO_EOF( fuuki32 );
static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
{
- if(ACCESSING_WORD_1)
+ if(ACCESSING_BITS_16_31)
{
int r,g,b;
COMBINE_DATA(&paletteram32[offset]);
@@ -198,7 +198,7 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
palette_set_color_rgb(Machine,offset*2,pal5bit(r),pal5bit(g),pal5bit(b));
}
- if(ACCESSING_WORD_0)
+ if(ACCESSING_BITS_0_15)
{
int r,g,b;
COMBINE_DATA(&paletteram32[offset]);
@@ -241,12 +241,12 @@ static READ32_HANDLER( snd_020_r )
static WRITE32_HANDLER( snd_020_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
fuuki32_shared_ram[offset*2] = data>>16;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
fuuki32_shared_ram[(offset*2)+1] = data & 0xff;
}
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 3976ce86e8a..cecc318f7b3 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -76,7 +76,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bigkarnk_sound_command_w )
{
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,M6809_FIRQ_LINE,HOLD_LINE);
}
@@ -84,7 +84,7 @@ static WRITE16_HANDLER( bigkarnk_sound_command_w )
static WRITE16_HANDLER( bigkarnk_coin_w )
{
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
switch ((offset >> 3)){
case 0x00: /* Coin Lockouts */
case 0x01:
@@ -302,7 +302,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 2dde1a89abb..1eb724b99fc 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -253,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 (ACCESSING_WORD_1) irq_ack_w(machine, offset, data >> 16, mem_mask >> 16); }
+static WRITE32_HANDLER( irq_ack_020_w ) { if (ACCESSING_BITS_16_31) irq_ack_w(machine, offset, data >> 16, mem_mask >> 16); }
@@ -276,26 +276,26 @@ static READ32_HANDLER( eeprom_data_020_r ) { return eeprom_data_r(machine, offse
static WRITE16_HANDLER( eeprom_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
EEPROM_write_bit(data & 0x01);
}
-static WRITE32_HANDLER( eeprom_data_020_w ) { if (ACCESSING_WORD_0) eeprom_data_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_data_020_w ) { if (ACCESSING_BITS_0_15) eeprom_data_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_clock_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE);
}
-static WRITE32_HANDLER( eeprom_clock_020_w ) { if (ACCESSING_WORD_0) eeprom_clock_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_clock_020_w ) { if (ACCESSING_BITS_0_15) eeprom_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( eeprom_cs_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
-static WRITE32_HANDLER( eeprom_cs_020_w ) { if (ACCESSING_WORD_0) eeprom_cs_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( eeprom_cs_020_w ) { if (ACCESSING_BITS_0_15) eeprom_cs_w(machine, offset, data, mem_mask); }
@@ -316,10 +316,10 @@ static TIMER_CALLBACK( delayed_sound_w )
static WRITE16_HANDLER( sound_data_w )
{
logerror("%06X:sound_data_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}
-static WRITE32_HANDLER( sound_data_020_w ) { if (ACCESSING_WORD_1) sound_data_w(machine, offset, data >> 16, mem_mask >> 16); }
+static WRITE32_HANDLER( sound_data_020_w ) { if (ACCESSING_BITS_16_31) sound_data_w(machine, offset, data >> 16, mem_mask >> 16); }
static READ16_HANDLER( sound_data_r )
@@ -333,11 +333,11 @@ static READ16_HANDLER( sound_data_r )
static READ16_HANDLER( sound_status_r )
{
logerror("%06X:sound_status_r(%02X) = %02X\n", activecpu_get_pc(), offset, sound_status);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
return sound_status;
return 0xffff;
}
-static READ32_HANDLER( sound_status_020_r ) { if (ACCESSING_WORD_0) return sound_status_r(machine, offset, mem_mask); return ~0; }
+static READ32_HANDLER( sound_status_020_r ) { if (ACCESSING_BITS_0_15) return sound_status_r(machine, offset, mem_mask); return ~0; }
static WRITE16_HANDLER( sound_status_w )
@@ -370,7 +370,7 @@ static CUSTOM_INPUT( analog_bit_r )
static WRITE16_HANDLER( analog_port_clock_w )
{
/* a zero/one combo is written here to clock the next analog port bit */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (!(data & 0xff))
{
@@ -383,13 +383,13 @@ 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 (ACCESSING_WORD_0) analog_port_clock_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( analog_port_clock_020_w ) { if (ACCESSING_BITS_0_15) analog_port_clock_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( analog_port_latch_w )
{
/* a zero is written here to read the analog ports, and a one is written when finished */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (!(data & 0xff))
{
@@ -402,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 (ACCESSING_WORD_0) analog_port_latch_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( analog_port_latch_020_w ) { if (ACCESSING_BITS_0_15) analog_port_latch_w(machine, offset, data, mem_mask); }
@@ -446,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 (ACCESSING_WORD_0) tms_reset_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_reset_020_w ) { if (ACCESSING_BITS_0_15) tms_reset_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_irq_w )
@@ -454,17 +454,17 @@ static WRITE16_HANDLER( tms_irq_w )
/* this is written twice, 0,1, in quick succession */
/* done after uploading, and after modifying the comm area */
logerror("%06X:tms_irq_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
cpunum_set_input_line(Machine, 1, 0, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
}
-static WRITE32_HANDLER( tms_irq_020_w ) { if (ACCESSING_WORD_0) tms_irq_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_irq_020_w ) { if (ACCESSING_BITS_0_15) 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 (ACCESSING_WORD_0) tms_control3_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( tms_control3_020_w ) { if (ACCESSING_BITS_0_15) tms_control3_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( tms_comm_w )
@@ -667,7 +667,7 @@ static void adsp_tx_callback(int port, INT32 data)
static WRITE32_HANDLER( unknown_107_w )
{
/* arbitrary data written */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
logerror("%06X:unknown_107_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_107_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@@ -676,7 +676,7 @@ static WRITE32_HANDLER( unknown_107_w )
static WRITE32_HANDLER( unknown_127_w )
{
/* arbitrary data written */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
logerror("%06X:unknown_127_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_127_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@@ -685,7 +685,7 @@ static WRITE32_HANDLER( unknown_127_w )
static WRITE32_HANDLER( unknown_137_w )
{
/* only written $00 or $ff */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
logerror("%06X:unknown_137_w = %02X\n", activecpu_get_pc(), data & 0xff);
else
logerror("%06X:unknown_137_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@@ -694,7 +694,7 @@ static WRITE32_HANDLER( unknown_137_w )
static WRITE32_HANDLER( unknown_13a_w )
{
/* only written $0000 or $0001 */
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
logerror("%06X:unknown_13a_w = %04X\n", activecpu_get_pc(), data & 0xffff);
else
logerror("%06X:unknown_13a_w(%02X) = %08X & %08X\n", activecpu_get_pc(), offset, data, ~mem_mask);
@@ -705,19 +705,19 @@ static WRITE16_HANDLER( led_0_w )
{
/* this has $00 written during an IRQ 6, then reset to $ff afterwards */
/* LED??? */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
set_led_status(0, data != 0);
}
-static WRITE32_HANDLER( led_0_020_w ) { if (ACCESSING_WORD_0) led_0_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( led_0_020_w ) { if (ACCESSING_BITS_0_15) led_0_w(machine, offset, data, mem_mask); }
static WRITE16_HANDLER( led_1_w )
{
/* LED??? -- only written $00 or $ff */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
set_led_status(1, data != 0);
}
-static WRITE32_HANDLER( led_1_020_w ) { if (ACCESSING_WORD_0) led_1_w(machine, offset, data, mem_mask); }
+static WRITE32_HANDLER( led_1_020_w ) { if (ACCESSING_BITS_0_15) led_1_w(machine, offset, data, mem_mask); }
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 86148bbe849..967c0c2b874 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -163,14 +163,14 @@ WRITE16_HANDLER( gaiden_flip_w );
static WRITE16_HANDLER( gaiden_sound_command_w )
{
- if (ACCESSING_BYTE_0) soundlatch_w(machine,0,data & 0xff); /* Ninja Gaiden */
- if (ACCESSING_BYTE_1) soundlatch_w(machine,0,data >> 8); /* Tecmo Knight */
+ if (ACCESSING_BITS_0_7) soundlatch_w(machine,0,data & 0xff); /* Ninja Gaiden */
+ if (ACCESSING_BITS_8_15) 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_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine,0,data >> 8);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
@@ -187,7 +187,7 @@ static int prot;
static WRITE16_HANDLER( wildfang_protection_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
static int jumpcode;
static const int jumppoints[] =
@@ -321,7 +321,7 @@ static MACHINE_RESET ( raiga )
static WRITE16_HANDLER( raiga_protection_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
static int jumpcode;
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 5cfce206466..2949a58d7bb 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -44,7 +44,7 @@ static READ16_HANDLER(galpani2_eeprom_r)
static WRITE16_HANDLER(galpani2_eeprom_w)
{
COMBINE_DATA( &eeprom_word );
- if ( ACCESSING_BYTE_0 )
+ if ( ACCESSING_BITS_0_7 )
{
// latch the bit
EEPROM_write_bit(data & 0x02);
@@ -186,7 +186,7 @@ static WRITE16_HANDLER( galpani2_mcu_nmi_w )
static WRITE16_HANDLER( galpani2_coin_lockout_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x0100);
coin_counter_w(1, data & 0x0200);
@@ -200,7 +200,7 @@ static WRITE16_HANDLER( galpani2_coin_lockout_w )
static WRITE16_HANDLER( galpani2_oki_0_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *ROM = memory_region(REGION_SOUND1);
logerror("CPU #0 PC %06X : OKI 0 bank %08X\n",activecpu_get_pc(),data);
@@ -210,7 +210,7 @@ static WRITE16_HANDLER( galpani2_oki_0_bank_w )
static WRITE16_HANDLER( galpani2_oki_1_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(1, 0x40000 * (data & 0xf) );
logerror("CPU #0 PC %06X : OKI 1 bank %08X\n",activecpu_get_pc(),data);
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 3f9e02de42e..73d33a5bef8 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -161,7 +161,7 @@ static INTERRUPT_GEN( galhustl_interrupt )
static WRITE16_HANDLER( galpanic_6295_bankswitch_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
UINT8 *rom = memory_region(REGION_SOUND1);
@@ -174,7 +174,7 @@ static WRITE16_HANDLER( galpanic_6295_bankswitch_w )
static WRITE16_HANDLER( galpania_6295_bankswitch_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
UINT8 *rom = memory_region(REGION_SOUND1);
@@ -185,7 +185,7 @@ static WRITE16_HANDLER( galpania_6295_bankswitch_w )
#ifdef UNUSED_FUNCTION
static WRITE16_HANDLER( galpania_misc_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pandora_set_clear_bitmap( data & 0x0004 );
}
@@ -196,7 +196,7 @@ static WRITE16_HANDLER( galpania_misc_w )
static WRITE16_HANDLER( galpanic_coin_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x100);
coin_counter_w(1, data & 0x200);
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 07172bd8972..c39b86d6e6f 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -36,7 +36,7 @@ VIDEO_UPDATE( galspnbl );
static WRITE16_HANDLER( soundcommand_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
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 37da6f30db7..84e4d3a388d 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -187,19 +187,19 @@ static void intel82439tx_init(void)
static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= mxtc_config_r(function, reg + 3) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= mxtc_config_r(function, reg + 2) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= mxtc_config_r(function, reg + 1) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= mxtc_config_r(function, reg + 0) << 0;
}
@@ -208,19 +208,19 @@ static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82439tx_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
mxtc_config_w(function, reg + 3, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
mxtc_config_w(function, reg + 2, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
mxtc_config_w(function, reg + 1, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mxtc_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@@ -244,19 +244,19 @@ static void piix4_config_w(int function, int reg, UINT8 data)
static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= piix4_config_r(function, reg + 3) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= piix4_config_r(function, reg + 2) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= piix4_config_r(function, reg + 1) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= piix4_config_r(function, reg + 0) << 0;
}
@@ -265,19 +265,19 @@ static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
piix4_config_w(function, reg + 3, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
piix4_config_w(function, reg + 2, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
piix4_config_w(function, reg + 1, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
piix4_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@@ -286,7 +286,7 @@ static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_ma
// ISA Plug-n-Play
static WRITE32_HANDLER( pnp_config_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// mame_printf_debug("PNP Config: %02X\n", (data >> 8) & 0xff);
}
@@ -294,7 +294,7 @@ static WRITE32_HANDLER( pnp_config_w )
static WRITE32_HANDLER( pnp_data_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// mame_printf_debug("PNP Data: %02X\n", (data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 16d190ec4fd..82624b76e20 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -209,7 +209,7 @@ static READ16_HANDLER( port4_r )
static WRITE16_HANDLER( sound_reset_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int oldword = sound_reset_val;
COMBINE_DATA(&sound_reset_val);
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 2b80d591b78..e7c89f400ef 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_BYTE_1) return YM3438_status_port_0_A_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) return YM3438_status_port_0_A_r(machine, 0) << 8;
else return YM3438_read_port_0_r(machine, 0);
break;
case 2:
- if (ACCESSING_BYTE_1) return YM3438_status_port_0_B_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) 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_BYTE_1) return YM3438_status_port_0_A_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) return YM3438_status_port_0_A_r(machine, 0) << 8;
else return YM3438_read_port_0_r(machine, 0);
break;
case 2:
- if (ACCESSING_BYTE_1) return YM3438_status_port_0_B_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) return YM3438_status_port_0_B_r(machine, 0) << 8;
else return 0;
break;
}
@@ -372,8 +372,8 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w )
{
offset &=0x1fff;
- if (ACCESSING_BYTE_0) genesis_z80_ram[offset+1] = data & 0xff;
- if (ACCESSING_BYTE_1) genesis_z80_ram[offset] = (data >> 8) & 0xff;
+ if (ACCESSING_BITS_0_7) genesis_z80_ram[offset+1] = data & 0xff;
+ if (ACCESSING_BITS_8_15) genesis_z80_ram[offset] = (data >> 8) & 0xff;
}
@@ -383,11 +383,11 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w )
switch (offset & 3)
{
case 0:
- if (ACCESSING_BYTE_1) YM3438_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) 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_BYTE_1) YM3438_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) 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_BYTE_0) SN76496_0_w(machine, 0, data & 0xff);
- if (ACCESSING_BYTE_1) SN76496_0_w(machine, 0, (data >>8) & 0xff);
+ if (ACCESSING_BITS_0_7) SN76496_0_w(machine, 0, data & 0xff);
+ if (ACCESSING_BITS_8_15) SN76496_0_w(machine, 0, (data >>8) & 0xff);
}
}
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 816af0c918a..e46b4fb1c2a 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -115,7 +115,7 @@ static READ16_HANDLER( control2_r )
static WRITE16_HANDLER( control2_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
/* bit 0 is data */
/* bit 1 is cs (active low) */
/* bit 2 is clock (active high) */
@@ -183,7 +183,7 @@ static INTERRUPT_GEN( gijoe_interrupt )
static WRITE16_HANDLER( sound_cmd_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
data &= 0xff;
soundlatch_w(machine, 0, data);
}
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 28c5fb46959..997d34f5014 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -87,7 +87,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 79d291b7ab5..bf035bd2f67 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -29,7 +29,7 @@ static int msm5205next;
static WRITE16_HANDLER( goal92_sound_command_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine, 0, (data >> 8) & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index b8121b421a5..c423d35ce0b 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -97,7 +97,7 @@ static WRITE16_HANDLER( gotcha_lamps_w )
static WRITE16_HANDLER( gotcha_oki_bank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
OKIM6295_set_bank_base(0,(((~data & 0x0100) >> 8) * 0x40000));
}
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index dfd1d776a17..8e0068e9ffa 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -40,11 +40,11 @@ static READ16_HANDLER( K052109_halfword_r )
static WRITE16_HANDLER( K052109_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K052109_w(machine,offset,data & 0xff);
/* is this a bug in the game or something else? */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
K052109_w(machine,offset,(data >> 8) & 0xff);
// logerror("%06x half %04x = %04x\n",activecpu_get_pc(),offset,data);
}
@@ -56,7 +56,7 @@ static READ16_HANDLER( K051937_halfword_r )
static WRITE16_HANDLER( K051937_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051937_w(machine,offset,data & 0xff);
}
@@ -67,7 +67,7 @@ static READ16_HANDLER( K051960_halfword_r )
static WRITE16_HANDLER( K051960_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051960_w(machine,offset,data & 0xff);
}
@@ -86,7 +86,7 @@ static MACHINE_RESET( gradius3 )
static WRITE16_HANDLER( cpuA_ctrl_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data >>= 8;
@@ -110,7 +110,7 @@ static WRITE16_HANDLER( cpuA_ctrl_w )
static WRITE16_HANDLER( cpuB_irqenable_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
irqBmask = (data >> 8) & 0x07;
}
@@ -147,7 +147,7 @@ logerror("%04x MISSED cpu B irq 4 %02x\n",activecpu_get_pc(),data);
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundlatch_w(machine,0,(data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index b4ffa22d140..52d26b6d0a9 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -183,12 +183,12 @@ static WRITE32_HANDLER( groundfx_input_w )
{
case 0x00:
{
- if (ACCESSING_BYTE_3) /* $500000 is watchdog */
+ if (ACCESSING_BITS_24_31) /* $500000 is watchdog */
{
watchdog_reset(machine);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x40);
@@ -201,7 +201,7 @@ static WRITE32_HANDLER( groundfx_input_w )
case 0x01:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
coin_lockout_w(0,~data & 0x01000000);
coin_lockout_w(1,~data & 0x02000000);
@@ -227,13 +227,13 @@ static WRITE32_HANDLER( groundfx_adc_w )
static WRITE32_HANDLER( rotate_control_w ) /* only a guess that it's rotation */
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
groundfx_rotate_ctrl[port_sel] = data;
return;
}
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
port_sel = (data &0x70000) >> 16;
}
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 5af288f28f9..b7c7ea2df81 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -126,7 +126,7 @@ static WRITE32_HANDLER( gstream_vram_w )
{
COMBINE_DATA(&gstream_vram[offset]);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
if (offset>=0x000/4 && offset<0x400/4)
{
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 9070c33e621..f94b819622f 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -203,7 +203,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 0cbbc26f5ae..83ca8b7b138 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -283,19 +283,19 @@ static READ32_HANDLER( sysreg_r )
UINT32 r = 0;
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= readinputport(1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= (adc1038_sars_r() << 7) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= readinputport(3) << 0;
}
@@ -303,7 +303,7 @@ static READ32_HANDLER( sysreg_r )
}
else if (offset == 1)
{
- if (ACCESSING_BYTE_3 )
+ if (ACCESSING_BITS_24_31 )
{
// 7 0
// |?????ae?|
@@ -328,15 +328,15 @@ static WRITE32_HANDLER( sysreg_w )
{
if (offset == 0)
{
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
gticlub_led_reg0 = (data >> 24) & 0xff;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
gticlub_led_reg1 = (data >> 16) & 0xff;
}
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
EEPROM_write_bit((data & 0x01) ? 1 : 0);
EEPROM_set_clock_line((data & 0x02) ? ASSERT_LINE : CLEAR_LINE);
@@ -345,7 +345,7 @@ static WRITE32_HANDLER( sysreg_w )
}
if( offset == 1 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
if (data & 0x80000000) /* CG Board 1 IRQ Ack */
{
@@ -414,19 +414,19 @@ READ32_HANDLER( lanc_r )
UINT32 r = 0;
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= K056230_r(reg+0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= K056230_r(reg+1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= K056230_r(reg+2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= K056230_r(reg+3) << 0;
}
@@ -438,19 +438,19 @@ WRITE32_HANDLER( lanc_w )
{
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
K056230_w(reg+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
K056230_w(reg+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
K056230_w(reg+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
K056230_w(reg+3, (data >> 0) & 0xff);
}
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 4c7c45cd795..2a31f15828a 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -108,10 +108,10 @@ static WRITE16_HANDLER( guab_tms34061_w )
else
col = offset <<= 1;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
tms34061_w(col, row, func, data >> 8);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
tms34061_w(col | 1, row, func, data & 0xff);
}
@@ -128,10 +128,10 @@ static READ16_HANDLER( guab_tms34061_r )
else
col = offset <<= 1;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
data |= tms34061_r(col, row, func) << 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
data |= tms34061_r(col | 1, row, func);
return data;
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index d0f72343177..4a2f85f275f 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -124,12 +124,12 @@ popmessage(t);
{
case 0x00:
{
- if (ACCESSING_BYTE_3) /* $400000 is watchdog */
+ if (ACCESSING_BITS_24_31) /* $400000 is watchdog */
{
watchdog_reset(machine);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x40);
@@ -141,7 +141,7 @@ popmessage(t);
case 0x01:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
/* game does not write a separate counter for coin 2!
It should disable both coins when 9 credits reached
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 8717d29e3f5..308d897ada4 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -593,27 +593,27 @@ static READ32_HANDLER( sysreg_r )
UINT32 r = 0;
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
//printf("read sysreg 0\n");
r |= readinputport(0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= readinputport(1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= readinputport(2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= 0xf7;
}
}
else if (offset == 1)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(3) << 24;
}
@@ -624,11 +624,11 @@ static READ32_HANDLER( sysreg_r )
static WRITE32_HANDLER( sysreg_w )
{
if( offset == 0 ) {
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
led_reg0 = (data >> 24) & 0xff;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
led_reg1 = (data >> 16) & 0xff;
}
@@ -636,10 +636,10 @@ static WRITE32_HANDLER( sysreg_w )
}
if( offset == 1 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0x80) /* CG Board 1 IRQ Ack */
{
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 860186b2e08..e90d7ae4168 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -107,7 +107,7 @@ static READ16_HANDLER( hyprduel_irq_cause_r )
static WRITE16_HANDLER( hyprduel_irq_cause_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data == int_num)
requested_int &= ~(int_num & ~*hypr_irq_enable);
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index 91e15e865c6..4e3f5bc42a0 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -627,7 +627,7 @@ static WRITE16_HANDLER( chmplst2_magic_w )
case 0x00:
COMBINE_DATA(&igs_input_sel2);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x20);
// coin out data & 0x40
@@ -640,7 +640,7 @@ static WRITE16_HANDLER( chmplst2_magic_w )
break;
case 0x02:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chmplst2_pen_hi = data & 0x07;
@@ -718,7 +718,7 @@ static WRITE16_HANDLER( chindrag_magic_w )
{
case 0x00:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
coin_counter_w(0,data & 2);
if (data & ~0x2)
@@ -781,7 +781,7 @@ static WRITE16_HANDLER( grtwall_magic_w )
switch(igs_magic[0])
{
case 0x02:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x01);
@@ -838,7 +838,7 @@ static READ16_HANDLER( grtwall_magic_r )
static WRITE16_HANDLER( lhb_okibank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
OKIM6295_set_bank_base(0, (data & 0x200) ? 0x40000 : 0);
}
@@ -853,7 +853,7 @@ static WRITE16_HANDLER( lhb_input2_w )
{
COMBINE_DATA(&igs_input_sel2);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x20 );
// coin out data & 0x40
@@ -897,7 +897,7 @@ static WRITE16_HANDLER( vbowl_magic_w )
switch(igs_magic[0])
{
case 0x02:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 1);
coin_counter_w(1,data & 2);
@@ -964,7 +964,7 @@ static WRITE16_HANDLER( xymg_magic_w )
case 0x01:
COMBINE_DATA(&igs_input_sel2);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x20);
// coin out data & 0x40
@@ -1012,13 +1012,13 @@ static READ16_HANDLER( xymg_magic_r )
static WRITE16_HANDLER( igs_YM3812_control_port_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM3812_control_port_0_w(machine,0,data);
}
static WRITE16_HANDLER( igs_YM3812_write_port_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
YM3812_write_port_0_w(machine,0,data);
}
@@ -1170,11 +1170,11 @@ static WRITE16_HANDLER( ics2115_0_word_w )
switch(offset)
{
case 1:
- if (ACCESSING_BYTE_0) ics2115_w(machine,1,data);
+ if (ACCESSING_BITS_0_7) ics2115_w(machine,1,data);
break;
case 2:
- if (ACCESSING_BYTE_0) ics2115_w(machine,2,data);
- if (ACCESSING_BYTE_1) ics2115_w(machine,3,data>>8);
+ if (ACCESSING_BITS_0_7) ics2115_w(machine,2,data);
+ if (ACCESSING_BITS_8_15) ics2115_w(machine,3,data>>8);
break;
}
}
@@ -1199,7 +1199,7 @@ static VIDEO_EOF( vbowl )
static WRITE16_HANDLER( vbowl_pen_hi_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
chmplst2_pen_hi = data & 0x07;
}
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 5633eaabbd1..244aeacab1e 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -103,7 +103,7 @@ WRITE16_HANDLER( inufuku_scrollreg_w );
static WRITE16_HANDLER( inufuku_soundcommand_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
/* hack... sound doesn't work otherwise */
if (data == 0x08) return;
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index f2e1243df45..2c77949685b 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -543,7 +543,7 @@ static TIMER_CALLBACK( delayed_sound_data_w )
static WRITE16_HANDLER( sound_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_data_w);
}
@@ -556,7 +556,7 @@ static READ32_HANDLER( sound_data32_r )
static WRITE32_HANDLER( sound_data32_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
timer_call_after_resynch(NULL, (data >> 16) & 0xff, delayed_sound_data_w);
}
@@ -890,37 +890,37 @@ static UINT8 written[0x8000];
static READ32_HANDLER( test1_r )
{
- if (ACCESSING_BYTE_3 && !written[0x100 + offset*4+0]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+0);
- if (ACCESSING_BYTE_2 && !written[0x100 + offset*4+1]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+1);
- if (ACCESSING_BYTE_1 && !written[0x100 + offset*4+2]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+2);
- if (ACCESSING_BYTE_0 && !written[0x100 + offset*4+3]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+3);
+ if (ACCESSING_BITS_24_31 && !written[0x100 + offset*4+0]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+0);
+ if (ACCESSING_BITS_16_23 && !written[0x100 + offset*4+1]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+1);
+ if (ACCESSING_BITS_8_15 && !written[0x100 + offset*4+2]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+2);
+ if (ACCESSING_BITS_0_7 && !written[0x100 + offset*4+3]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0x100 + offset*4+3);
return ((UINT32 *)main_ram)[0x100/4 + offset];
}
static WRITE32_HANDLER( test1_w )
{
- if (ACCESSING_BYTE_3) written[0x100 + offset*4+0] = 1;
- if (ACCESSING_BYTE_2) written[0x100 + offset*4+1] = 1;
- if (ACCESSING_BYTE_1) written[0x100 + offset*4+2] = 1;
- if (ACCESSING_BYTE_0) written[0x100 + offset*4+3] = 1;
+ if (ACCESSING_BITS_24_31) written[0x100 + offset*4+0] = 1;
+ if (ACCESSING_BITS_16_23) written[0x100 + offset*4+1] = 1;
+ if (ACCESSING_BITS_8_15) written[0x100 + offset*4+2] = 1;
+ if (ACCESSING_BITS_0_7) written[0x100 + offset*4+3] = 1;
COMBINE_DATA(&((UINT32 *)main_ram)[0x100/4 + offset]);
}
static READ32_HANDLER( test2_r )
{
- if (ACCESSING_BYTE_3 && !written[0xc00 + offset*4+0]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+0);
- if (ACCESSING_BYTE_2 && !written[0xc00 + offset*4+1]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+1);
- if (ACCESSING_BYTE_1 && !written[0xc00 + offset*4+2]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+2);
- if (ACCESSING_BYTE_0 && !written[0xc00 + offset*4+3]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+3);
+ if (ACCESSING_BITS_24_31 && !written[0xc00 + offset*4+0]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+0);
+ if (ACCESSING_BITS_16_23 && !written[0xc00 + offset*4+1]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+1);
+ if (ACCESSING_BITS_8_15 && !written[0xc00 + offset*4+2]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+2);
+ if (ACCESSING_BITS_0_7 && !written[0xc00 + offset*4+3]) logerror("%06X:read from uninitialized memory %04X\n", activecpu_get_pc(), 0xc00 + offset*4+3);
return ((UINT32 *)main_ram)[0xc00/4 + offset];
}
static WRITE32_HANDLER( test2_w )
{
- if (ACCESSING_BYTE_3) written[0xc00 + offset*4+0] = 1;
- if (ACCESSING_BYTE_2) written[0xc00 + offset*4+1] = 1;
- if (ACCESSING_BYTE_1) written[0xc00 + offset*4+2] = 1;
- if (ACCESSING_BYTE_0) written[0xc00 + offset*4+3] = 1;
+ if (ACCESSING_BITS_24_31) written[0xc00 + offset*4+0] = 1;
+ if (ACCESSING_BITS_16_23) written[0xc00 + offset*4+1] = 1;
+ if (ACCESSING_BITS_8_15) written[0xc00 + offset*4+2] = 1;
+ if (ACCESSING_BITS_0_7) written[0xc00 + offset*4+3] = 1;
COMBINE_DATA(&((UINT32 *)main_ram)[0xc00/4 + offset]);
}
#endif
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 8644a4730cd..690b29083f0 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -855,28 +855,28 @@ static READ16_HANDLER( tms34061_16_r )
static WRITE16_HANDLER( sound_data16_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
sound_data_w(machine, 0, data >> 8);
}
static WRITE16_HANDLER( grom_bank16_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
*itech8_grom_bank = data >> 8;
}
static WRITE16_HANDLER( display_page16_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
itech8_page_w(machine, 0, ~data >> 8);
}
static WRITE16_HANDLER( tms34061_latch16_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
tms34061_latch_w(machine, 0, data >> 8);
}
@@ -889,7 +889,7 @@ static WRITE16_HANDLER( blitter16_w )
static WRITE16_HANDLER( palette16_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
itech8_palette_w(machine, offset / 8, data >> 8);
}
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 17e656ff959..354022faa3b 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -441,7 +441,7 @@ static WRITE16_HANDLER( jalmah_tilebank_w )
---- xxxx Priority number (trusted,see mjzoomin)
*/
//popmessage("Write to tilebank %02x",data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (sc0bank != ((data & 0xf0) >> 4))
{
@@ -491,7 +491,7 @@ static UINT8 oki_rom,oki_bank;
static WRITE16_HANDLER( jalmah_okirom_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
UINT8 *oki = memory_region(REGION_SOUND1);
oki_rom = data & 1;
@@ -505,7 +505,7 @@ static WRITE16_HANDLER( jalmah_okirom_w )
static WRITE16_HANDLER( jalmah_okibank_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
UINT8 *oki = memory_region(REGION_SOUND1);
oki_bank = data & 3;
@@ -1319,7 +1319,7 @@ data value is REQ under mjzoomin video test menu.It is related to the MCU?
*/
static WRITE16_HANDLER( urashima_mcu_w )
{
- if(ACCESSING_BYTE_0 && data)
+ if(ACCESSING_BITS_0_7 && data)
{
//jm_regs[0x30e/2] = ?
@@ -1470,7 +1470,7 @@ data value is REQ under mjzoomin video test menu.It is related to the MCU?
*/
static WRITE16_HANDLER( daireika_mcu_w )
{
- if(ACCESSING_BYTE_0 && data)
+ if(ACCESSING_BITS_0_7 && data)
{
/*MCU program upload complete/upload kind*/
//jm_regs[0x000e/2] = 0x0005;
@@ -1755,7 +1755,7 @@ data value is REQ under mjzoomin video test menu.It is related to the MCU?
*/
static WRITE16_HANDLER( mjzoomin_mcu_w )
{
- if(ACCESSING_BYTE_0 && data)
+ if(ACCESSING_BITS_0_7 && data)
{
/*******************************************************
1st M68k code uploaded by the MCU(Service Mode PC=2a56).
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index c2ac3ed70da..56613bd93cb 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -508,7 +508,7 @@ static READ16_HANDLER( inputs1_r )
*************************************/
static WRITE16_HANDLER( volume_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
upd7759_set_bank_base(0, 0x20000 * ((data >> 1) & 3));
upd7759_reset_w(0, data & 0x01);
@@ -517,7 +517,7 @@ static WRITE16_HANDLER( volume_w )
static WRITE16_HANDLER( upd7759_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
upd7759_port_w(0, data);
upd7759_start_w(0, 0);
@@ -527,7 +527,7 @@ static WRITE16_HANDLER( upd7759_w )
static READ16_HANDLER( upd7759_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
return upd7759_busy_r(0);
}
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 86cbbd7ef06..df95d1c7de3 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -248,7 +248,7 @@ static READ16_HANDLER( kaneko16_rnd_r )
static WRITE16_HANDLER( kaneko16_coin_lockout_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x0100);
coin_counter_w(1, data & 0x0200);
@@ -270,7 +270,7 @@ static WRITE16_HANDLER( kaneko16_coin_lockout_w )
static WRITE16_HANDLER( kaneko16_soundlatch_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine, 0, (data & 0xff00) >> 8 );
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
@@ -297,7 +297,7 @@ static WRITE16_HANDLER( kaneko16_YM2149_0_w )
/* Each 2149 register is mapped to a different address */
AY8910_control_port_0_w(machine,0,offset);
/* The registers are mapped to odd addresses, except one! */
- if (ACCESSING_BYTE_0) AY8910_write_port_0_w(machine,0, data & 0xff);
+ if (ACCESSING_BITS_0_7) 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 )
@@ -305,7 +305,7 @@ static WRITE16_HANDLER( kaneko16_YM2149_1_w )
/* Each 2149 register is mapped to a different address */
AY8910_control_port_1_w(machine,0,offset);
/* The registers are mapped to odd addresses, except one! */
- if (ACCESSING_BYTE_0) AY8910_write_port_1_w(machine,0, data & 0xff);
+ if (ACCESSING_BITS_0_7) AY8910_write_port_1_w(machine,0, data & 0xff);
else AY8910_write_port_1_w(machine,0,(data >> 8) & 0xff);
}
@@ -331,7 +331,7 @@ static WRITE8_HANDLER( kaneko16_eeprom_reset_w )
static WRITE16_HANDLER( kaneko16_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// latch the bit
EEPROM_write_bit(data & 0x02);
@@ -343,7 +343,7 @@ static WRITE16_HANDLER( kaneko16_eeprom_w )
EEPROM_set_clock_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE );
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x0100);
coin_counter_w(1, data & 0x0200);
@@ -402,7 +402,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bakubrkr_oki_bank_sw )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
OKIM6295_set_bank_base(0, 0x40000 * (data & 0x7) );
logerror("PC:%06X Selecting OKI bank %02X\n",activecpu_get_pc(),data&0xff);
}
@@ -472,7 +472,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bloodwar_oki_0_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * (data & 0xf) );
// logerror("CPU #0 PC %06X : OKI0 bank %08X\n",activecpu_get_pc(),data);
@@ -481,7 +481,7 @@ static WRITE16_HANDLER( bloodwar_oki_0_bank_w )
static WRITE16_HANDLER( bloodwar_oki_1_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(1, 0x40000 * data );
// logerror("CPU #0 PC %06X : OKI1 bank %08X\n",activecpu_get_pc(),data);
@@ -490,7 +490,7 @@ static WRITE16_HANDLER( bloodwar_oki_1_bank_w )
static WRITE16_HANDLER( bloodwar_coin_lockout_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x0100);
coin_counter_w(1, data & 0x0200);
@@ -542,7 +542,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( bonkadv_oki_0_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * (data & 0xF));
logerror("CPU #0 PC %06X : OKI0 bank %08X\n",activecpu_get_pc(),data);
@@ -551,7 +551,7 @@ static WRITE16_HANDLER( bonkadv_oki_0_bank_w )
static WRITE16_HANDLER( bonkadv_oki_1_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(1, 0x40000 * data );
logerror("CPU #0 PC %06X : OKI1 bank %08X\n",activecpu_get_pc(),data);
@@ -611,7 +611,7 @@ static READ16_HANDLER( gtmr_wheel_r )
static WRITE16_HANDLER( gtmr_oki_0_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * (data & 0xF) );
// logerror("CPU #0 PC %06X : OKI0 bank %08X\n",activecpu_get_pc(),data);
@@ -620,7 +620,7 @@ static WRITE16_HANDLER( gtmr_oki_0_bank_w )
static WRITE16_HANDLER( gtmr_oki_1_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(1, 0x40000 * (data & 0x1) );
// logerror("CPU #0 PC %06X : OKI1 bank %08X\n",activecpu_get_pc(),data);
@@ -629,7 +629,7 @@ static WRITE16_HANDLER( gtmr_oki_1_bank_w )
static WRITE16_HANDLER( gtmr_oki_0_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_data_0_w(machine,0,data);
// logerror("CPU #0 PC %06X : OKI0 <- %08X\n",activecpu_get_pc(),data);
@@ -638,7 +638,7 @@ static WRITE16_HANDLER( gtmr_oki_0_data_w )
static WRITE16_HANDLER( gtmr_oki_1_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_data_1_w(machine,0,data);
// logerror("CPU #0 PC %06X : OKI1 <- %08X\n",activecpu_get_pc(),data);
@@ -796,7 +796,7 @@ ADDRESS_MAP_END
/* Untested */
static WRITE16_HANDLER( shogwarr_oki_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x10000 * ((data >> 0) & 0x3) );
OKIM6295_set_bank_base(1, 0x10000 * ((data >> 4) & 0x3) );
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index cbc4430cfab..f2d6feb9f18 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -163,7 +163,7 @@ static void kickgoal_play(int melody, int data)
WRITE16_HANDLER( kickgoal_snd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
logerror("PC:%06x Writing %04x to Sound CPU\n",activecpu_get_previouspc(),data);
if (data >= 0x40) {
@@ -218,7 +218,7 @@ static WRITE16_HANDLER( actionhw_snd_w )
{
logerror("PC:%06x Writing %04x to Sound CPU - mask %04x\n",activecpu_get_previouspc(),data,mem_mask);
- if (!ACCESSING_BYTE_0) data >>= 8;
+ if (!ACCESSING_BITS_0_7) data >>= 8;
switch (data)
{
@@ -465,7 +465,7 @@ static NVRAM_HANDLER( kickgoal )
static READ16_HANDLER( kickgoal_eeprom_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
return EEPROM_read_bit();
}
@@ -475,7 +475,7 @@ static READ16_HANDLER( kickgoal_eeprom_r )
static WRITE16_HANDLER( kickgoal_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
switch (offset)
{
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index a150437d964..4523a4aa4fd 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -89,7 +89,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_0_w(machine, offset, data & 0xff);
}
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 56a93e1eb9f..12b0d7a92b8 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -62,7 +62,7 @@ static UINT8 sndtor3k[ 16 ];
static WRITE32_HANDLER( soundr3k_w )
{
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
sndto000[ ( offset << 1 ) + 1 ] = data >> 16;
if( offset == 3 )
@@ -70,7 +70,7 @@ static WRITE32_HANDLER( soundr3k_w )
cpunum_set_input_line(Machine, 1, 1, HOLD_LINE );
}
}
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
sndto000[ offset << 1 ] = data;
}
@@ -155,11 +155,11 @@ static UINT8 *m_p_n_pcmram;
static WRITE32_HANDLER( pcmram_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
m_p_n_pcmram[ offset << 1 ] = data;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
m_p_n_pcmram[ ( offset << 1 ) + 1 ] = data >> 16;
}
@@ -223,11 +223,11 @@ static READ16_HANDLER( dual539_r )
UINT16 data;
data = 0;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= K054539_1_r( machine, offset );
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= K054539_0_r( machine, offset ) << 8;
}
@@ -236,11 +236,11 @@ static READ16_HANDLER( dual539_r )
static WRITE16_HANDLER( dual539_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
K054539_1_w( machine, offset, data );
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
K054539_0_w( machine, offset, data >> 8 );
}
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 0a9dee5eade..4ce01680722 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -496,7 +496,7 @@ static WRITE32_HANDLER( eeprom_w )
{
UINT32 odata;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
odata = data >> 24;
/*
@@ -517,7 +517,7 @@ static WRITE32_HANDLER( eeprom_w )
konamigx_wrport1_0 = odata;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
/*
bit 7 = mask all IRQ
@@ -553,7 +553,7 @@ static WRITE32_HANDLER( control_w )
// results.
// bit 17 = DOTSEL1 : 0 = 6M, 1=8M, 2=12M, 3=16M
// bit 16 = DOTSEL0
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
if (data & 0x400000)
{
@@ -627,14 +627,14 @@ static WRITE32_HANDLER( ccu_w )
if (offset == 0x1c/4)
{
// vblank interrupt ACK
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
cpunum_set_input_line(Machine, 0, 1, CLEAR_LINE);
gx_syncen |= 0x20;
}
// hblank interrupt ACK
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
cpunum_set_input_line(Machine, 0, 2, CLEAR_LINE);
gx_syncen |= 0x40;
@@ -764,14 +764,14 @@ static READ32_HANDLER( sound020_r )
reg = offset << 1;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
MSW = sndto020[reg];
if (reg == 2) MSW &= ~3; // supress VOLWR busy flags
rv |= MSW<<24;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
LSW = sndto020[reg+1];
rv |= LSW<<8;
@@ -832,14 +832,14 @@ static WRITE32_HANDLER( sound020_w )
{
int reg=0, val=0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
reg = offset<<1;
val = data>>24;
write_snd_020(reg, val);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
reg = (offset<<1)+1;
val = (data>>8)&0xff;
@@ -1207,9 +1207,9 @@ static READ16_HANDLER( dual539_r )
{
UINT16 ret = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ret |= K054539_1_r(machine, offset);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ret |= K054539_0_r(machine, offset)<<8;
return ret;
@@ -1217,9 +1217,9 @@ static READ16_HANDLER( dual539_r )
static WRITE16_HANDLER( dual539_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054539_1_w(machine, offset, data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K054539_0_w(machine, offset, data>>8);
}
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 43985fa40c1..2929edc7263 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -146,7 +146,7 @@ static READ64_HANDLER(irq_enable_r)
{
UINT64 r = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
r |= (UINT64)(irq_enable) << 32;
}
@@ -156,7 +156,7 @@ static READ64_HANDLER(irq_enable_r)
static WRITE64_HANDLER(irq_enable_w)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
irq_enable |= (UINT32)(data >> 32);
}
@@ -166,7 +166,7 @@ static READ64_HANDLER(irq_active_r)
{
UINT64 r = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
r |= (UINT64)(irq_active) << 32;
}
@@ -185,7 +185,7 @@ static READ64_HANDLER(unk1_r)
#ifdef UNUSED_FUNCTION
static READ64_HANDLER(unk2_r)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
return (UINT64)0xa5 << 32;
}
@@ -206,12 +206,12 @@ static READ64_HANDLER(unk4_r)
UINT64 r = 0;
// logerror("unk4_r: %08X, %08X%08X at %08X\n", offset, (UINT32)(mem_mask>>32), (UINT32)(mem_mask), activecpu_get_pc());
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
// MCfg
r |= (UINT64)((0 << 13) | (5 << 10)) << 32;
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
r |= unk20004 & ~0x800000;
}
@@ -223,7 +223,7 @@ static WRITE64_HANDLER(unk4_w)
// logerror("unk4_w: %08X%08X, %08X, %08X%08X at %08X\n", (UINT32)(data >> 32), (UINT32)(data),
// offset, (UINT32)(mem_mask>>32), (UINT32)(mem_mask), activecpu_get_pc());
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
if (data & 0x800000)
{
@@ -245,7 +245,7 @@ static READ64_HANDLER(unk30000_r)
static READ64_HANDLER(unk30030_r)
{
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
return 1;
}
@@ -254,11 +254,11 @@ static READ64_HANDLER(unk30030_r)
static WRITE64_HANDLER(video_w)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
vdl0_address = (UINT32)(data >> 32);
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
vdl1_address = (UINT32)(data);
}
@@ -266,7 +266,7 @@ static WRITE64_HANDLER(video_w)
static WRITE64_HANDLER(video_irq_ack_w)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
if ((data >> 32) & 0x8000)
{
@@ -319,7 +319,7 @@ static WRITE64_HANDLER(unk4000418_w)
static WRITE64_HANDLER(reset_w)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
if (data & U64(0x100000000))
{
@@ -725,7 +725,7 @@ static READ64_HANDLER(cde_r)
UINT32 r = 0;
int reg = offset * 2;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
reg++;
switch (reg)
@@ -800,7 +800,7 @@ static WRITE64_HANDLER(cde_w)
int reg = offset * 2;
UINT32 d;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
reg++;
d = (UINT32)(data);
@@ -953,7 +953,7 @@ static READ64_HANDLER(device2_r)
UINT32 r = 0;
int reg = offset * 2;
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
reg++;
switch (reg)
@@ -983,7 +983,7 @@ static READ64_HANDLER(cpu_r)
{
UINT64 r = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
r = (UINT64)(cpu_getactivecpu() ? 0x80000000 : 0);
//r |= 0x40000000; // sets Video-LowRes !?
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 7e665bdf88a..20ad1768c8a 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -987,7 +987,7 @@ static WRITE32_HANDLER( security_w )
verboselog( 2, "security_w( %08x, %08x, %08x )\n", offset, mem_mask, data );
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
switch( chiptype[ security_cart_number ] )
{
@@ -1054,19 +1054,19 @@ static READ32_HANDLER( flash_r )
{
int adr = offset * 2;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
data |= ( intelflash_read( flash_bank + 0, adr + 0 ) & 0xff ) << 0; // 31m/31l/31j/31h
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
data |= ( intelflash_read( flash_bank + 1, adr + 0 ) & 0xff ) << 8; // 27m/27l/27j/27h
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
data |= ( intelflash_read( flash_bank + 0, adr + 1 ) & 0xff ) << 16; // 31m/31l/31j/31h
}
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
data |= ( intelflash_read( flash_bank + 1, adr + 1 ) & 0xff ) << 24; // 27m/27l/27j/27h
}
@@ -1089,19 +1089,19 @@ static WRITE32_HANDLER( flash_w )
{
int adr = offset * 2;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
intelflash_write( flash_bank + 0, adr + 0, ( data >> 0 ) & 0xff );
}
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
intelflash_write( flash_bank + 1, adr + 0, ( data >> 8 ) & 0xff );
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
intelflash_write( flash_bank + 0, adr + 1, ( data >> 16 ) & 0xff );
}
- if( ACCESSING_BYTE_3 )
+ if( ACCESSING_BITS_24_31 )
{
intelflash_write( flash_bank + 1, adr + 1, ( data >> 24 ) & 0xff );
}
@@ -1610,13 +1610,13 @@ static READ32_HANDLER( ge765pwbba_r )
uPD4701_cs_w( 0, 0 );
uPD4701_xy_w( 0, 1 );
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
uPD4701_ul_w( 0, 0 );
data |= uPD4701_d_r( 0 ) << 0;
}
- if( ACCESSING_BYTE_2 )
+ if( ACCESSING_BITS_16_23 )
{
uPD4701_ul_w( 0, 1 );
data |= uPD4701_d_r( 0 ) << 16;
@@ -1642,21 +1642,21 @@ static WRITE32_HANDLER( ge765pwbba_w )
break;
case 0x20:
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
output_set_value( "motor", data & 0xff );
}
break;
case 0x22:
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
output_set_value( "brake", data & 0xff );
}
break;
case 0x28:
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
uPD4701_resety_w( 0, 1 );
uPD4701_resety_w( 0, 0 );
@@ -1750,28 +1750,28 @@ static WRITE32_HANDLER( gx700pwbf_io_w )
{
case 0x20:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx700pwbf_output( 0, data & 0xff );
}
break;
case 0x22:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx700pwbf_output( 1, data & 0xff );
}
break;
case 0x24:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx700pwbf_output( 2, data & 0xff );
}
break;
case 0x26:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx700pwbf_output( 3, data & 0xff );
}
@@ -2057,42 +2057,42 @@ static READ32_HANDLER( gx894pwbba_r )
data |= 0x10000;
break;
case 0x20:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
data |= 0x00001234;
}
break;
case 0x2b:
/* sound? */
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
// data |= 0x00001000; /* ? */
data |= 0x00002000; /* ? */
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
// data |= 0x10000000; /* rdy??? */
}
break;
case 0x2d:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
data |= gx894_ram[ gx894_ram_read_offset / 2 ];
// printf( "reading %08x %04x\r", gx894_ram_read_offset, gx894_ram[ gx894_ram_read_offset / 2 ] );
gx894_ram_read_offset += 2;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
// printf( "read offset 2d msw32\n" );
}
break;
case 0x30:
/* mp3? */
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
/* unknown data word */
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
/* 0x000-0x1ff */
data |= 0x1ff0000;
@@ -2100,38 +2100,38 @@ static READ32_HANDLER( gx894pwbba_r )
break;
case 0x31:
/* mp3? */
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
/* unknown data word count */
data |= 0x0000;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
// printf( "read offset 31 msw32\n" );
}
break;
case 0x32:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
data |= 0 & 0xffff0000;
}
/* todo */
break;
case 0x33:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
data |= 0 & 0x0000ffff;
}
/* todo */
break;
case 0x3b:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
data |= ds2401_read( 2 ) << 28;
}
break;
case 0x3d:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
/* fails if !8000 */
/* fails if 4000 */
@@ -2205,71 +2205,71 @@ static WRITE32_HANDLER( gx894pwbba_w )
/* sound? */
break;
case 0x2c:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894_ram_write_offset &= 0x0000ffff;
gx894_ram_write_offset |= ( data & 0x0000ffff ) << 16;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894_ram_write_offset &= 0xffff0000;
gx894_ram_write_offset |= ( data & 0xffff0000 ) >> 16;
}
break;
case 0x2d:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894_ram[ gx894_ram_write_offset / 2 ] = data & 0xffff;
// printf( "writing %08x %04x\r", gx894_ram_write_offset, gx894_ram[ gx894_ram_write_offset / 2 ] );
gx894_ram_write_offset += 2;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894_ram_read_offset &= 0x0000ffff;
gx894_ram_read_offset |= ( data & 0xffff0000 ) << 0;
}
break;
case 0x2e:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894_ram_read_offset &= 0xffff0000;
gx894_ram_read_offset |= ( data & 0x0000ffff ) >> 0;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
// printf( "write offset 2e msw32\n" );
}
break;
case 0x38:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894pwbba_output( 0, ( data >> 28 ) & 0xf );
}
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894pwbba_output( 1, ( data >> 12 ) & 0xf );
}
COMBINE_DATA( &a );
break;
case 0x39:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894pwbba_output( 7, ( data >> 28 ) & 0xf );
}
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894pwbba_output( 3, ( data >> 12 ) & 0xf );
}
COMBINE_DATA( &b );
break;
case 0x3b:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
ds2401_write( 2, !( ( data >> 28 ) & 1 ) );
}
break;
case 0x3e:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
/* 12 */
/* 13 */
@@ -2291,18 +2291,18 @@ static WRITE32_HANDLER( gx894pwbba_w )
}
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894pwbba_output( 4, ( data >> 28 ) & 0xf );
}
COMBINE_DATA( &c );
break;
case 0x3f:
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
gx894pwbba_output( 2, ( data >> 28 ) & 0xf );
}
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
gx894pwbba_output( 5, ( data >> 12 ) & 0xf );
}
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 0da87cdd28e..9309a7d8d53 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -39,7 +39,7 @@ extern UINT16 *lastduel_vram,*lastduel_scroll2,*lastduel_scroll1;
static WRITE16_HANDLER( lastduel_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data & 0xff);
}
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index ab89f8e52e6..ffb744df1a2 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -129,7 +129,7 @@ static VIDEO_UPDATE( lastfght )
static WRITE16_HANDLER(colordac_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
colorram[clr_offset] = data;
palette_set_color_rgb(Machine, clr_offset/3,
@@ -140,7 +140,7 @@ static WRITE16_HANDLER(colordac_w)
clr_offset = (clr_offset+1) % (256*3);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
clr_offset = (data>>8) * 3;
}
@@ -154,8 +154,8 @@ static int lastfght_x, lastfght_y, lastfght_w, lastfght_h;
// high byte of a 16 bit register
static WRITE16_HANDLER( lastfght_hi_w )
{
- if (ACCESSING_BYTE_1) logerror("%06x: 600000.b = %02x\n", activecpu_get_pc(),data>>8);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15) logerror("%06x: 600000.b = %02x\n", activecpu_get_pc(),data>>8);
+ if (ACCESSING_BITS_0_7)
{
lastfght_hi = data << 8;
//logerror("%06x: lastfght_hi = %02x\n", activecpu_get_pc(),data);
@@ -164,8 +164,8 @@ static WRITE16_HANDLER( lastfght_hi_w )
// screen x
static WRITE16_HANDLER( lastfght_x_w )
{
- if (ACCESSING_BYTE_1) logerror("%06x: 800008.b = %02x\n", activecpu_get_pc(),data>>8);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15) logerror("%06x: 800008.b = %02x\n", activecpu_get_pc(),data>>8);
+ if (ACCESSING_BITS_0_7)
{
lastfght_x = lastfght_hi | data;
//logerror("%06x: lastfght_x = %02x\n", activecpu_get_pc(),data);
@@ -174,12 +174,12 @@ static WRITE16_HANDLER( lastfght_x_w )
// screen y, screen width - 1
static WRITE16_HANDLER( lastfght_yw_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_y = lastfght_hi | (data >> 8);
//logerror("%06x: lastfght_y = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
lastfght_w = lastfght_hi | data;
//logerror("%06x: lastfght_w = %02x\n", activecpu_get_pc(),data);
@@ -188,22 +188,22 @@ static WRITE16_HANDLER( lastfght_yw_w )
// screen height - 1
static WRITE16_HANDLER( lastfght_h_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_h = lastfght_hi | (data >> 8);
//logerror("%06x: lastfght_h = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0) logerror("%06x: 80000d.b = %02x\n", activecpu_get_pc(),data);
+ if (ACCESSING_BITS_0_7) logerror("%06x: 80000d.b = %02x\n", activecpu_get_pc(),data);
}
// source delta x << 6, source x << 6
static WRITE16_HANDLER( lastfght_sx_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_dsx = lastfght_hi | (data >> 8);
//logerror("%06x: lastfght_dsx = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
lastfght_sx = lastfght_hi | data;
//logerror("%06x: lastfght_sx = %02x\n", activecpu_get_pc(),data);
@@ -212,12 +212,12 @@ static WRITE16_HANDLER( lastfght_sx_w )
// source y << 6, source y1 << 6
static WRITE16_HANDLER( lastfght_sy_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_sy = lastfght_hi | (data >> 8);
//logerror("%06x: lastfght_sy = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
lastfght_sy1 = lastfght_hi | data;
//logerror("%06x: lastfght_sy1 = %02x\n", activecpu_get_pc(),data);
@@ -226,12 +226,12 @@ static WRITE16_HANDLER( lastfght_sy_w )
// source rom (0x200000 bytes), source page (512x256 bytes)
static WRITE16_HANDLER( lastfght_sr_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_sp = (lastfght_hi>>8) >> 4;
//logerror("%06x: lastfght_sp = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
lastfght_sr = data;
//logerror("%06x: lastfght_sr = %02x\n", activecpu_get_pc(),data);
@@ -240,12 +240,12 @@ static WRITE16_HANDLER( lastfght_sr_w )
// source x1 << 6, source delta y << 6
static WRITE16_HANDLER( lastfght_sd_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
lastfght_sx1 = lastfght_hi | (data >> 8);
//logerror("%06x: lastfght_sx1 = %02x\n", activecpu_get_pc(),data>>8);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
lastfght_dsy = lastfght_hi | data;
//logerror("%06x: lastfght_dsy = %02x\n", activecpu_get_pc(),data);
@@ -254,7 +254,7 @@ static WRITE16_HANDLER( lastfght_sd_w )
// start blit
static WRITE16_HANDLER( lastfght_blit_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int x,y, addr;
UINT8 *gfxdata = memory_region( REGION_GFX1 );
@@ -285,12 +285,12 @@ static WRITE16_HANDLER( lastfght_blit_w )
}
}
}
- if (ACCESSING_BYTE_0) logerror("%06x: 600007.b = %02x\n", activecpu_get_pc(),data);
+ if (ACCESSING_BITS_0_7) logerror("%06x: 600007.b = %02x\n", activecpu_get_pc(),data);
}
// toggle framebuffer
static WRITE16_HANDLER( lastfght_dest_w )
{
- if (ACCESSING_BYTE_0) lastfght_dest ^= 1;
+ if (ACCESSING_BITS_0_7) lastfght_dest ^= 1;
}
static READ16_HANDLER( lastfght_c00000_r )
@@ -338,8 +338,8 @@ static READ16_HANDLER( lastfght_sound_r )
static WRITE16_HANDLER( lastfght_sound_w )
{
- if (ACCESSING_BYTE_1) logerror("%06x: sound_w msb = %02x\n", activecpu_get_pc(),data>>8);
- if (ACCESSING_BYTE_0) logerror("%06x: sound_w lsb = %02x\n", activecpu_get_pc(),data);
+ if (ACCESSING_BITS_8_15) logerror("%06x: sound_w msb = %02x\n", activecpu_get_pc(),data>>8);
+ if (ACCESSING_BITS_0_7) logerror("%06x: sound_w lsb = %02x\n", activecpu_get_pc(),data);
}
/***************************************************************************
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 9efced6b06d..46e6dfa2cd4 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -61,13 +61,13 @@ static WRITE32_HANDLER( limenko_paletteram_w )
UINT16 paldata;
COMBINE_DATA(&paletteram32[offset]);
- if(ACCESSING_WORD_0)
+ if(ACCESSING_BITS_0_15)
{
paldata = paletteram32[offset] & 0x7fff;
palette_set_color_rgb(Machine, offset * 2 + 1, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10));
}
- if(ACCESSING_WORD_1)
+ if(ACCESSING_BITS_16_31)
{
paldata = (paletteram32[offset] >> 16) & 0x7fff;
palette_set_color_rgb(Machine, offset * 2 + 0, pal5bit(paldata >> 0), pal5bit(paldata >> 5), pal5bit(paldata >> 10));
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 64952cc3541..a569b33a4aa 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -85,9 +85,9 @@ static WRITE16_HANDLER( main_gnd_w )
{
cpuintrf_push_context(GROUND_CPU);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
program_write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
program_write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
cpuintrf_pop_context();
@@ -108,9 +108,9 @@ static WRITE16_HANDLER( main_obj_w )
{
cpuintrf_push_context(OBJECT_CPU);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
program_write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
program_write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
cpuintrf_pop_context();
@@ -121,16 +121,16 @@ static WRITE16_HANDLER( tst_w )
if (offset < 0x800)
{
cpuintrf_push_context(GROUND_CPU);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
program_write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
program_write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
cpuintrf_pop_context();
cpuintrf_push_context(OBJECT_CPU);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
program_write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
program_write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
cpuintrf_pop_context();
}
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 755aa9a02fa..1fb9f930a68 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -166,8 +166,8 @@ static READ16_HANDLER( lordgun_gun_1_y_r ) { return lordgun_gun[1].hw_y; }
static WRITE16_HANDLER( lordgun_soundlatch_w )
{
- if (ACCESSING_BYTE_0) soundlatch_w (machine, 0, (data >> 0) & 0xff);
- if (ACCESSING_BYTE_1) soundlatch2_w(machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_0_7) soundlatch_w (machine, 0, (data >> 0) & 0xff);
+ if (ACCESSING_BITS_8_15) soundlatch2_w(machine, 0, (data >> 8) & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 1c7b2585570..5875351fc2f 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -38,7 +38,7 @@ static TIMER_CALLBACK( m107_scanline_interrupt );
static WRITE16_HANDLER( bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *RAM = memory_region(REGION_CPU1);
memory_set_bankptr(1,&RAM[0x100000 + ((data&0x7)*0x10000)]);
@@ -84,7 +84,7 @@ static TIMER_CALLBACK( m107_scanline_interrupt )
static WRITE16_HANDLER( m107_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x01);
coin_counter_w(1,data & 0x02);
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index ef10f4783eb..e18dbdbe18c 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -195,37 +195,37 @@ static INTERRUPT_GEN(fake_nmi)
static WRITE16_HANDLER( bchopper_sample_trigger_w )
{
static const int a[6] = { 0x0000, 0x0010, 0x2510, 0x6510, 0x8510, 0x9310 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 6) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 6) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( nspirit_sample_trigger_w )
{
static const int a[9] = { 0x0000, 0x0020, 0x2020, 0, 0x5720, 0, 0x7b60, 0x9b60, 0xc360 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 9) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 9) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( imgfight_sample_trigger_w )
{
static const int a[7] = { 0x0000, 0x0020, 0x44e0, 0x98a0, 0xc820, 0xf7a0, 0x108c0 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 7) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( loht_sample_trigger_w )
{
static const int a[7] = { 0x0000, 0x0020, 0, 0x2c40, 0x4320, 0x7120, 0xb200 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 7) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( xmultipl_sample_trigger_w )
{
static const int a[3] = { 0x0000, 0x0020, 0x1a40 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 3) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 3) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( dbreed72_sample_trigger_w )
{
static const int a[9] = { 0x00000, 0x00020, 0x02c40, 0x08160, 0x0c8c0, 0x0ffe0, 0x13000, 0x15820, 0x15f40 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 9) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 9) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( airduel_sample_trigger_w )
@@ -233,7 +233,7 @@ static WRITE16_HANDLER( airduel_sample_trigger_w )
static const int a[16] = {
0x00000, 0x00020, 0x03ec0, 0x05640, 0x06dc0, 0x083a0, 0x0c000, 0x0eb60,
0x112e0, 0x13dc0, 0x16520, 0x16d60, 0x18ae0, 0x1a5a0, 0x1bf00, 0x1c340 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 16) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 16) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( dkgenm72_sample_trigger_w )
@@ -244,7 +244,7 @@ static WRITE16_HANDLER( dkgenm72_sample_trigger_w )
0x10fa0, 0x10fc0, 0x10fe0, 0x11f40, 0x12b20, 0x130a0, 0x13c60, 0x14740,
0x153c0, 0x197e0, 0x1af40, 0x1c080 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 28) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 28) m72_set_sample_start(a[data & 0xff]);
}
static WRITE16_HANDLER( gallop_sample_trigger_w )
@@ -255,7 +255,7 @@ static WRITE16_HANDLER( gallop_sample_trigger_w )
0x10200, 0x10220, 0x10240, 0x11380, 0x12760, 0x12780, 0x127a0, 0x13c40,
0x140a0, 0x16760, 0x17e40, 0x18ee0, 0x19f60, 0x1bbc0, 0x1cee0 };
- if (ACCESSING_BYTE_0 && (data & 0xff) < 31) m72_set_sample_start(a[data & 0xff]);
+ if (ACCESSING_BITS_0_7 && (data & 0xff) < 31) m72_set_sample_start(a[data & 0xff]);
}
@@ -460,7 +460,7 @@ static void copy_le(UINT16 *dest, const UINT8 *src, UINT8 bytes)
static READ16_HANDLER( protection_r )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
copy_le(protection_ram,protection_code,CODE_LEN);
return protection_ram[0xffa/2+offset];
}
@@ -471,7 +471,7 @@ static WRITE16_HANDLER( protection_w )
COMBINE_DATA(&protection_ram[offset]);
data ^= 0xffff;
- if (offset == 0x0fff/2 && ACCESSING_BYTE_1 && (data >> 8) == 0)
+ if (offset == 0x0fff/2 && ACCESSING_BITS_8_15 && (data >> 8) == 0)
copy_le(&protection_ram[0x0fe0],protection_crc,CRC_LEN);
}
@@ -600,9 +600,9 @@ static READ16_HANDLER( soundram_r )
static WRITE16_HANDLER( soundram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundram[offset * 2 + 0] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundram[offset * 2 + 1] = data >> 8;
}
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 206c59795cb..f3360923664 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -59,7 +59,7 @@ static void set_m90_bank(void)
static WRITE16_HANDLER( m90_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x01);
coin_counter_w(1,data & 0x02);
@@ -70,7 +70,7 @@ static WRITE16_HANDLER( m90_coincounter_w )
static WRITE16_HANDLER( quizf1_bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
bankaddress = 0x10000 * (data & 0x0f);
set_m90_bank();
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index a039218cb5a..25cdbbf5e0c 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -274,13 +274,13 @@ static WRITE16_HANDLER( m92_eeprom_w )
{
UINT8 *RAM = memory_region(REGION_USER1);
// logerror("%05x: EEPROM WR %04x\n",activecpu_get_pc(),offset);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
RAM[offset] = data;
}
static WRITE16_HANDLER( m92_coincounter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x01);
coin_counter_w(1, data & 0x02);
@@ -292,7 +292,7 @@ static WRITE16_HANDLER( m92_coincounter_w )
static WRITE16_HANDLER( m92_bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
bankaddress = 0x100000 + ((data & 0x7) * 0x10000);
set_m92_bank();
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 96148623b80..e32c7ae6ecb 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -275,7 +275,7 @@ static READ32_HANDLER ( macrossp_soundstatus_r )
static WRITE32_HANDLER( macrossp_soundcmd_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
//logerror("%08x write soundcmd %08x (%08x)\n",activecpu_get_pc(),data,mem_mask);
soundlatch_word_w(machine,0,data >> 16,0);
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index fdc7ffe2050..16736d3a785 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -41,7 +41,7 @@ extern UINT16 *madmotor_pf1_data,*madmotor_pf2_data,*madmotor_pf3_data;
static WRITE16_HANDLER( madmotor_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index f909c31bc48..28c8ee2e9a7 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -31,7 +31,7 @@ static emu_timer *interrupt_timer;
static WRITE16_HANDLER( magmax_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
sound_latch = (data & 0xff) << 1;
cpunum_set_input_line(Machine, 1, 0, ASSERT_LINE);
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index e0058832346..99874412d3a 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -168,7 +168,7 @@ static WRITE16_HANDLER( mcat_soundlatch_w )
#if 0 // mcat only.. install read handler?
static WRITE16_HANDLER( mcat_coin_w )
{
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
{
coin_counter_w(0, data & 0x1000);
coin_counter_w(1, data & 0x2000);
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index de173bc66c2..ea561678053 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -222,7 +222,7 @@ static WRITE16_HANDLER( archrivl_control_w )
static WRITE16_HANDLER( pigskin_protection_w )
{
/* ignore upper-byte only */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* track the last 5 bytes */
protection_data[0] = protection_data[1];
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index cf234b58788..4fc05e970b5 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -466,17 +466,17 @@ static READ32_HANDLER( io20_r )
{
UINT32 r = 0;
// 0x20 - 0x21, PIC
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
r |= pic8259_32le_0_r(machine, offset, mem_mask);
}
// 0x22, 0x23, Cyrix configuration registers
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= mediagx_config_reg_r() << 24;
}
@@ -486,17 +486,17 @@ static READ32_HANDLER( io20_r )
static WRITE32_HANDLER( io20_w )
{
// 0x20 - 0x21, PIC
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
pic8259_32le_0_w(machine, offset, data, mem_mask);
}
// 0x22, 0x23, Cyrix configuration registers
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
mediagx_config_reg_sel = (data >> 16) & 0xff;
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
mediagx_config_reg_w((data >> 24) & 0xff);
}
@@ -506,7 +506,7 @@ static READ32_HANDLER( parallel_port_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
UINT8 nibble = parallel_latched;//(readinputport(parallel_pointer / 3) >> (4 * (parallel_pointer % 3))) & 15;
r |= ((~nibble & 0x08) << 12) | ((nibble & 0x07) << 11);
@@ -526,7 +526,7 @@ static READ32_HANDLER( parallel_port_r )
//r |= control_read << 8;*/
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= parport & 0xff0000;
}
@@ -538,7 +538,7 @@ static WRITE32_HANDLER( parallel_port_w )
{
COMBINE_DATA( &parport );
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/*
Controls:
@@ -699,12 +699,12 @@ static WRITE32_HANDLER( ad1847_w )
{
if (offset == 0)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
UINT16 ldata = (data >> 16) & 0xffff;
dacl[dacl_ptr++] = ldata;
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
UINT16 rdata = data & 0xffff;
dacr[dacr_ptr++] = rdata;
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index bf404bd0c1b..01d55d05f7f 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -895,12 +895,12 @@ static WRITE16_HANDLER( megadriv_vdp_w )
{
case 0x00:
case 0x02:
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
{
data = (data&0x00ff) | data<<8;
// mame_printf_debug("8-bit write VDP data port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
}
- else if (!ACCESSING_BYTE_0)
+ else if (!ACCESSING_BITS_0_7)
{
data = (data&0xff00) | data>>8;
// mame_printf_debug("8-bit write VDP data port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
@@ -910,7 +910,7 @@ static WRITE16_HANDLER( megadriv_vdp_w )
case 0x04:
case 0x06:
- if ((!ACCESSING_BYTE_1) || (!ACCESSING_BYTE_0)) mame_printf_debug("8-bit write VDP control port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
+ if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit write VDP control port access, offset %04x data %04x mem_mask %04x\n",offset,data,mem_mask);
megadriv_vdp_ctrl_port_w(data);
break;
@@ -925,8 +925,8 @@ static WRITE16_HANDLER( megadriv_vdp_w )
case 0x12:
case 0x14:
case 0x16:
- if (ACCESSING_BYTE_0) SN76496_0_w(machine, 0, data & 0xff);
- //if (ACCESSING_BYTE_1) SN76496_0_w(machine, 0, (data >>8) & 0xff);
+ if (ACCESSING_BITS_0_7) SN76496_0_w(machine, 0, data & 0xff);
+ //if (ACCESSING_BITS_8_15) SN76496_0_w(machine, 0, (data >>8) & 0xff);
break;
default:
@@ -1293,13 +1293,13 @@ static READ16_HANDLER( megadriv_vdp_r )
case 0x00:
case 0x02:
- if ((!ACCESSING_BYTE_1) || (!ACCESSING_BYTE_0)) mame_printf_debug("8-bit VDP read data port access, offset %04x mem_mask %04x\n",offset,mem_mask);
+ if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read data port access, offset %04x mem_mask %04x\n",offset,mem_mask);
retvalue = megadriv_vdp_data_port_r();
break;
case 0x04:
case 0x06:
- // if ((!ACCESSING_BYTE_1) || (!ACCESSING_BYTE_0)) mame_printf_debug("8-bit VDP read control port access, offset %04x mem_mask %04x\n",offset,mem_mask);
+ // if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read control port access, offset %04x mem_mask %04x\n",offset,mem_mask);
retvalue = megadriv_vdp_ctrl_port_r();
// retvalue = mame_rand(Machine);
// mame_printf_debug("%06x: Read Control Port at scanline %d hpos %d (return %04x)\n",activecpu_get_pc(),genesis_scanline_counter, get_hposition(),retvalue);
@@ -1309,7 +1309,7 @@ static READ16_HANDLER( megadriv_vdp_r )
case 0x0a:
case 0x0c:
case 0x0e:
- // if ((!ACCESSING_BYTE_1) || (!ACCESSING_BYTE_0)) mame_printf_debug("8-bit VDP read HV counter port access, offset %04x mem_mask %04x\n",offset,mem_mask);
+ // if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read HV counter port access, offset %04x mem_mask %04x\n",offset,mem_mask);
retvalue = megadriv_read_hv_counters();
// retvalue = mame_rand(Machine);
// mame_printf_debug("%06x: Read HV counters at scanline %d hpos %d (return %04x)\n",activecpu_get_pc(),genesis_scanline_counter, get_hposition(),retvalue);
@@ -1334,11 +1334,11 @@ static READ16_HANDLER( megadriv_68k_YM2612_read)
switch (offset)
{
case 0:
- if (ACCESSING_BYTE_1) return YM2612_status_port_0_A_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) 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_BYTE_1) return YM2612_status_port_0_A_r(machine, 0) << 8;
+ if (ACCESSING_BITS_8_15) return YM2612_status_port_0_A_r(machine, 0) << 8;
else return YM2612_status_port_0_A_r(machine, 0);
break;
}
@@ -1362,11 +1362,11 @@ static WRITE16_HANDLER( megadriv_68k_YM2612_write)
switch (offset)
{
case 0:
- if (ACCESSING_BYTE_1) YM2612_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) 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_BYTE_1) YM2612_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) YM2612_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
else YM2612_data_port_0_B_w (machine, 0, (data >> 0) & 0xff);
break;
}
@@ -2189,11 +2189,11 @@ static WRITE16_HANDLER( megadriv_68k_write_z80_ram )
if ((genz80.z80_has_bus==0) && (genz80.z80_is_reset==0))
{
- if (!ACCESSING_BYTE_0) // byte (MSB) access
+ if (!ACCESSING_BITS_0_7) // byte (MSB) access
{
genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8;
}
- else if (!ACCESSING_BYTE_1)
+ else if (!ACCESSING_BITS_8_15)
{
genz80.z80_prgram[(offset<<1)^1] = (data & 0x00ff);
}
@@ -2224,7 +2224,7 @@ static READ16_HANDLER( megadriv_68k_check_z80_bus )
/* Check if the 68k has the z80 bus */
- if (!ACCESSING_BYTE_0) // byte (MSB) access
+ if (!ACCESSING_BITS_0_7) // byte (MSB) access
{
if (genz80.z80_has_bus || genz80.z80_is_reset) retvalue = nextvalue | 0x0100;
else retvalue = (nextvalue & 0xfeff);
@@ -2233,7 +2233,7 @@ static READ16_HANDLER( megadriv_68k_check_z80_bus )
return retvalue;
}
- else if (!ACCESSING_BYTE_1) // is this valid?
+ else if (!ACCESSING_BITS_8_15) // is this valid?
{
//logerror("%06x: 68000 check z80 Bus (byte LSB access) %04x\n", activecpu_get_pc(),mem_mask);
if (genz80.z80_has_bus || genz80.z80_is_reset) retvalue = 0x0001;
@@ -2256,7 +2256,7 @@ static READ16_HANDLER( megadriv_68k_check_z80_bus )
static WRITE16_HANDLER( megadriv_68k_req_z80_bus )
{
/* Request the Z80 bus, allows 68k to read/write Z80 address space */
- if (!ACCESSING_BYTE_0) // byte access
+ if (!ACCESSING_BITS_0_7) // byte access
{
if (data & 0x0100)
{
@@ -2272,7 +2272,7 @@ static WRITE16_HANDLER( megadriv_68k_req_z80_bus )
}
}
- else if (!ACCESSING_BYTE_1) // is this valid?
+ else if (!ACCESSING_BITS_8_15) // is this valid?
{
if (data & 0x0001)
{
@@ -2306,7 +2306,7 @@ static WRITE16_HANDLER( megadriv_68k_req_z80_bus )
static WRITE16_HANDLER ( megadriv_68k_req_z80_reset )
{
- if (!ACCESSING_BYTE_0) // byte access
+ if (!ACCESSING_BITS_0_7) // byte access
{
if (data & 0x0100)
{
@@ -2322,7 +2322,7 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset )
sndti_reset(SOUND_YM2612, 0);
}
}
- else if (!ACCESSING_BYTE_1) // is this valid?
+ else if (!ACCESSING_BITS_8_15) // is this valid?
{
if (data & 0x0001)
{
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index df6e7a3fb6f..a3160b8e590 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -964,11 +964,11 @@ static READ16_HANDLER( megadriv_68k_read_z80_extra_ram )
static WRITE16_HANDLER( megadriv_68k_write_z80_extra_ram )
{
- if (!ACCESSING_BYTE_0) // byte (MSB) access
+ if (!ACCESSING_BITS_0_7) // byte (MSB) access
{
ic36_ram[(offset<<1)] = (data & 0xff00) >> 8;
}
- else if (!ACCESSING_BYTE_1)
+ else if (!ACCESSING_BITS_8_15)
{
ic36_ram[(offset<<1)^1] = (data & 0x00ff);
}
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index db00d3eb60a..699b8b2964b 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -3859,12 +3859,12 @@ static DRIVER_INIT( iganinju )
static WRITE16_HANDLER( OKIM6295_data_0_both_w )
{
- if (ACCESSING_BYTE_0) OKIM6295_data_0_w(machine, 0, (data >> 0) & 0xff );
+ if (ACCESSING_BITS_0_7) 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_BYTE_0) OKIM6295_data_1_w(machine, 0, (data >> 0) & 0xff );
+ if (ACCESSING_BITS_0_7) OKIM6295_data_1_w(machine, 0, (data >> 0) & 0xff );
else OKIM6295_data_1_w(machine, 0, (data >> 8) & 0xff );
}
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 199bcd32cc7..cd90d9ef2db 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -68,7 +68,7 @@ static unsigned deposits1=0, deposits2=0, credits=0;
static WRITE16_HANDLER( sound_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
soundlatch_w(machine, 0, data&0xff);
}
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index eb50781fd1f..01e258aa485 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -206,7 +206,7 @@ static WRITE16_HANDLER( metro_irq_cause_w )
{
//if (data & ~0x15) logerror("CPU #0 PC %06X : unknown bits of irqcause written: %04X\n",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= ~*metro_irq_enable;
@@ -357,7 +357,7 @@ static int metro_io_callback(int ioline, int state)
static WRITE16_HANDLER( metro_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
@@ -379,7 +379,7 @@ static READ16_HANDLER( daitorid_soundstatus_r )
static WRITE16_HANDLER( metro_soundstatus_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
metro_soundstatus = data & 0x01;
}
@@ -534,7 +534,7 @@ static READ16_HANDLER( ymf278b_r )
static WRITE16_HANDLER( ymf278b_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
switch(offset)
{
case 0:
@@ -578,7 +578,7 @@ static const struct YMF278B_interface ymf278b_interface =
static WRITE16_HANDLER( metro_coin_lockout_1word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// coin_lockout_w(0, data & 1);
// coin_lockout_w(1, data & 2);
@@ -1393,7 +1393,7 @@ static void gakusai_oki_bank_set(void)
static WRITE16_HANDLER( gakusai_oki_bank_hi_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
gakusai_oki_bank_hi = data & 0xff;
gakusai_oki_bank_set();
@@ -1402,7 +1402,7 @@ static WRITE16_HANDLER( gakusai_oki_bank_hi_w )
static WRITE16_HANDLER( gakusai_oki_bank_lo_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
gakusai_oki_bank_lo = data & 0xff;
gakusai_oki_bank_set();
@@ -1430,7 +1430,7 @@ static READ16_HANDLER( gakusai_eeprom_r )
static WRITE16_HANDLER( gakusai_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// latch the bit
EEPROM_write_bit(data & 0x01);
@@ -1562,7 +1562,7 @@ static READ16_HANDLER( dokyusp_eeprom_r )
static WRITE16_HANDLER( dokyusp_eeprom_bit_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// latch the bit
EEPROM_write_bit(data & 0x01);
@@ -1575,7 +1575,7 @@ static WRITE16_HANDLER( dokyusp_eeprom_bit_w )
static WRITE16_HANDLER( dokyusp_eeprom_reset_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// reset line asserted: reset.
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
@@ -2034,7 +2034,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( mouja_sound_rombank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_set_bank_base(0, ((data >> 3) & 0x07) * 0x40000);
}
@@ -2102,7 +2102,7 @@ static READ16_HANDLER( puzzlet_dsw_r )
static WRITE16_HANDLER( puzzlet_irq_enable_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
*metro_irq_enable = data^0xffff;
}
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index edf9fa6c3b6..559d4cc6a3c 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -185,7 +185,7 @@ static READ16_HANDLER( livequiz_eeprom_r )
static WRITE16_HANDLER( livequiz_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// latch the bit
EEPROM_write_bit(data & 0x04);
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 87af1179245..bb2d2a07d46 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -689,7 +689,7 @@ static READ16_HANDLER( fifoin_status_r )
static WRITE16_HANDLER( bank_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
switch(data & 0xf) {
case 0x1: // 100000-1fffff data roms banking
memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x1000000 + 0x100000*((data >> 4) & 0xf));
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index ec14308ac85..5bd89f5db83 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -415,15 +415,15 @@ static void chcolor(pen_t color, UINT16 data)
static WRITE32_HANDLER(pal32_w)
{
COMBINE_DATA(paletteram32+offset);
- if(ACCESSING_WORD_0)
+ if(ACCESSING_BITS_0_15)
chcolor(offset*2, paletteram32[offset]);
- if(ACCESSING_WORD_1)
+ if(ACCESSING_BITS_16_31)
chcolor(offset*2+1, paletteram32[offset]>>16);
}
static WRITE32_HANDLER(ctrl0_w)
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
model2_ctrlmode = data & 0x01;
EEPROM_write_bit(data & 0x20);
EEPROM_set_clock_line((data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
@@ -942,7 +942,7 @@ static WRITE32_HANDLER( model2o_serial_w )
static WRITE32_HANDLER( model2_serial_w )
{
- if (ACCESSING_BYTE_0 && (offset == 0))
+ if (ACCESSING_BITS_0_7 && (offset == 0))
{
SCSP_MidiIn(machine, 0, data&0xff, 0);
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 4945150ce13..08b8e9d3803 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -549,7 +549,7 @@ static int pci_reg;
static READ64_HANDLER( mpc105_addr_r )
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
return (UINT64)mpc105_addr << 32;
}
@@ -558,7 +558,7 @@ static READ64_HANDLER( mpc105_addr_r )
static WRITE64_HANDLER( mpc105_addr_w )
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
UINT32 d = BYTE_REVERSE32((UINT32)(data >> 32));
mpc105_addr = data >> 32;
@@ -586,7 +586,7 @@ static WRITE64_HANDLER( mpc105_data_w )
mpc105_regs[(pci_reg/2)+0] = BYTE_REVERSE32((UINT32)(data));
return;
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
pci_device_set_reg(pci_device, pci_reg, BYTE_REVERSE32((UINT32)data));
}
@@ -627,7 +627,7 @@ static UINT32 mpc106_addr;
static READ64_HANDLER( mpc106_addr_r )
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
return (UINT64)mpc106_addr << 32;
}
@@ -636,7 +636,7 @@ static READ64_HANDLER( mpc106_addr_r )
static WRITE64_HANDLER( mpc106_addr_w )
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
UINT32 d = BYTE_REVERSE32((UINT32)(data >> 32));
@@ -662,7 +662,7 @@ static READ64_HANDLER( mpc106_data_r )
return ((UINT64)(BYTE_REVERSE32(mpc106_regs[(pci_reg/2)+1])) << 32) |
((UINT64)(BYTE_REVERSE32(mpc106_regs[(pci_reg/2)+0])));
}
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
return (UINT64)(BYTE_REVERSE32(pci_device_get_reg(pci_device, pci_reg))) << 32;
}
@@ -679,7 +679,7 @@ static WRITE64_HANDLER( mpc106_data_w )
mpc106_regs[(pci_reg/2)+0] = BYTE_REVERSE32((UINT32)(data));
return;
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
pci_device_set_reg(pci_device, pci_reg, BYTE_REVERSE32((UINT32)data));
}
@@ -723,28 +723,28 @@ static READ64_HANDLER(scsi_r)
{
int reg = offset*8;
UINT64 r = 0;
- if (ACCESSING_BYTE_7) {
+ if (ACCESSING_BITS_56_63) {
r |= (UINT64)lsi53c810_reg_r(reg+0) << 56;
}
- if (ACCESSING_BYTE_6) {
+ if (ACCESSING_BITS_48_55) {
r |= (UINT64)lsi53c810_reg_r(reg+1) << 48;
}
- if (ACCESSING_BYTE_5) {
+ if (ACCESSING_BITS_40_47) {
r |= (UINT64)lsi53c810_reg_r(reg+2) << 40;
}
- if (ACCESSING_BYTE_4) {
+ if (ACCESSING_BITS_32_39) {
r |= (UINT64)lsi53c810_reg_r(reg+3) << 32;
}
- if (ACCESSING_BYTE_3) {
+ if (ACCESSING_BITS_24_31) {
r |= (UINT64)lsi53c810_reg_r(reg+4) << 24;
}
- if (ACCESSING_BYTE_2) {
+ if (ACCESSING_BITS_16_23) {
r |= (UINT64)lsi53c810_reg_r(reg+5) << 16;
}
- if (ACCESSING_BYTE_1) {
+ if (ACCESSING_BITS_8_15) {
r |= (UINT64)lsi53c810_reg_r(reg+6) << 8;
}
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
r |= (UINT64)lsi53c810_reg_r(reg+7) << 0;
}
@@ -754,28 +754,28 @@ static READ64_HANDLER(scsi_r)
static WRITE64_HANDLER(scsi_w)
{
int reg = offset*8;
- if (ACCESSING_BYTE_7) {
+ if (ACCESSING_BITS_56_63) {
lsi53c810_reg_w(reg+0, data >> 56);
}
- if (ACCESSING_BYTE_6) {
+ if (ACCESSING_BITS_48_55) {
lsi53c810_reg_w(reg+1, data >> 48);
}
- if (ACCESSING_BYTE_5) {
+ if (ACCESSING_BITS_40_47) {
lsi53c810_reg_w(reg+2, data >> 40);
}
- if (ACCESSING_BYTE_4) {
+ if (ACCESSING_BITS_32_39) {
lsi53c810_reg_w(reg+3, data >> 32);
}
- if (ACCESSING_BYTE_3) {
+ if (ACCESSING_BITS_24_31) {
lsi53c810_reg_w(reg+4, data >> 24);
}
- if (ACCESSING_BYTE_2) {
+ if (ACCESSING_BITS_16_23) {
lsi53c810_reg_w(reg+5, data >> 16);
}
- if (ACCESSING_BYTE_1) {
+ if (ACCESSING_BITS_8_15) {
lsi53c810_reg_w(reg+6, data >> 8);
}
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
lsi53c810_reg_w(reg+7, data >> 0);
}
}
@@ -810,7 +810,7 @@ static READ64_HANDLER( real3d_dma_r )
case 1:
return (dma_irq << 24) | (dma_endian << 8);
case 2:
- if(ACCESSING_DWORD_0) {
+ if(ACCESSING_BITS_0_31) {
return dma_data;
}
break;
@@ -824,17 +824,17 @@ static WRITE64_HANDLER( real3d_dma_w )
switch(offset)
{
case 0:
- if(ACCESSING_DWORD_1) { /* DMA source address */
+ if(ACCESSING_BITS_32_63) { /* DMA source address */
dma_source = BYTE_REVERSE32((UINT32)(data >> 32));
return;
}
- if(ACCESSING_DWORD_0) { /* DMA destination address */
+ if(ACCESSING_BITS_0_31) { /* DMA destination address */
dma_dest = BYTE_REVERSE32((UINT32)(data));
return;
}
break;
case 1:
- if(ACCESSING_DWORD_1) /* DMA length */
+ if(ACCESSING_BITS_32_63) /* DMA length */
{
int length = BYTE_REVERSE32((UINT32)(data >> 32)) * 4;
if (dma_endian & 0x80)
@@ -849,21 +849,21 @@ static WRITE64_HANDLER( real3d_dma_w )
scsi_irq_callback();
return;
}
- else if(ACCESSING_BYTE_2)
+ else if(ACCESSING_BITS_16_23)
{
if(data & 0x10000) {
dma_irq &= ~0x1;
}
return;
}
- else if(ACCESSING_BYTE_1)
+ else if(ACCESSING_BITS_8_15)
{
dma_endian = (data >> 8) & 0xff;
return;
}
break;
case 2:
- if(ACCESSING_DWORD_1) { /* DMA command */
+ if(ACCESSING_BITS_32_63) { /* DMA command */
UINT32 cmd = BYTE_REVERSE32((UINT32)(data >> 32));
if(cmd & 0x20000000) {
dma_data = BYTE_REVERSE32(real3d_device_id); /* (PCI Vendor & Device ID) */
@@ -874,7 +874,7 @@ static WRITE64_HANDLER( real3d_dma_w )
}
return;
}
- if(ACCESSING_DWORD_0) { /* ??? */
+ if(ACCESSING_BITS_0_31) { /* ??? */
dma_data = 0xffffffff;
return;
}
@@ -1050,11 +1050,11 @@ static READ64_HANDLER( model3_ctrl_r )
switch( offset )
{
case 0:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
return (UINT64)model3_controls_bank << 56;
}
- else if (ACCESSING_BYTE_3)
+ else if (ACCESSING_BITS_24_31)
{
if(model3_controls_bank & 0x1) {
eeprom_bit = EEPROM_read_bit() << 5;
@@ -1067,11 +1067,11 @@ static READ64_HANDLER( model3_ctrl_r )
break;
case 1:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
return (UINT64)readinputport(2) << 56;
}
- else if (ACCESSING_BYTE_3)
+ else if (ACCESSING_BITS_24_31)
{
return readinputport(3) << 24;
}
@@ -1087,25 +1087,25 @@ static READ64_HANDLER( model3_ctrl_r )
return U64(0xffffffffffffffff);
case 5:
- if (ACCESSING_BYTE_3) /* Serial comm RX FIFO 1 */
+ if (ACCESSING_BITS_24_31) /* Serial comm RX FIFO 1 */
{
return (UINT64)model3_serial_fifo1 << 24;
}
break;
case 6:
- if (ACCESSING_BYTE_7) /* Serial comm RX FIFO 2 */
+ if (ACCESSING_BITS_56_63) /* Serial comm RX FIFO 2 */
{
return (UINT64)model3_serial_fifo2 << 56;
}
- else if (ACCESSING_BYTE_3) /* Serial comm full/empty flags */
+ else if (ACCESSING_BITS_24_31) /* Serial comm full/empty flags */
{
return 0x0c << 24;
}
break;
case 7:
- if (ACCESSING_BYTE_3) /* ADC Data read */
+ if (ACCESSING_BITS_24_31) /* ADC Data read */
{
UINT8 adc_data = readinputport(5 + adc_channel);
adc_channel++;
@@ -1124,7 +1124,7 @@ static WRITE64_HANDLER( model3_ctrl_w )
switch(offset)
{
case 0:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
int reg = (data >> 56) & 0xff;
EEPROM_write_bit((reg & 0x20) ? 1 : 0);
@@ -1143,11 +1143,11 @@ static WRITE64_HANDLER( model3_ctrl_w )
return;
case 4:
- if (ACCESSING_BYTE_7) /* Port 4 direction */
+ if (ACCESSING_BITS_56_63) /* Port 4 direction */
{
}
- if (ACCESSING_BYTE_3) /* Serial comm TX FIFO 1 */
+ if (ACCESSING_BITS_24_31) /* Serial comm TX FIFO 1 */
{ /* Used for reading the light gun in Lost World */
switch(data >> 24)
{
@@ -1198,7 +1198,7 @@ static WRITE64_HANDLER( model3_ctrl_w )
return;
case 5:
- if (ACCESSING_BYTE_7) /* Serial comm TX FIFO 2 */
+ if (ACCESSING_BITS_56_63) /* Serial comm TX FIFO 2 */
{
model3_serial_fifo2 = data >> 56;
return;
@@ -1206,7 +1206,7 @@ static WRITE64_HANDLER( model3_ctrl_w )
break;
case 7:
- if (ACCESSING_BYTE_3) /* ADC Channel selection */
+ if (ACCESSING_BITS_24_31) /* ADC Channel selection */
{
adc_channel = (data >> 24) & 0xf;
}
@@ -1221,20 +1221,20 @@ static READ64_HANDLER( model3_sys_r )
switch (offset)
{
case 0x08/8:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
return ((UINT64)model3_crom_bank << 56);
}
break;
case 0x10/8:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
UINT64 res = model3_tap_read();
return res<<61;
}
- else if (ACCESSING_BYTE_3)
+ else if (ACCESSING_BITS_24_31)
{
return (model3_irq_enable<<24);
}
@@ -1254,14 +1254,14 @@ static WRITE64_HANDLER( model3_sys_w )
switch (offset)
{
case 0x10/8:
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
model3_irq_enable = (data>>24)&0xff;
}
else logerror("m3_sys: unknown mask on IRQen write\n");
break;
case 0x08/8:
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
model3_crom_bank = data >> 56;
@@ -1269,7 +1269,7 @@ static WRITE64_HANDLER( model3_sys_w )
data = (~data) & 0xf;
memory_set_bankptr( 1, memory_region( REGION_USER1 ) + 0x800000 + (data * 0x800000)); /* banked CROM */
}
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
data >>= 24;
model3_tap_write(
@@ -1286,10 +1286,10 @@ static WRITE64_HANDLER( model3_sys_w )
static READ64_HANDLER( model3_rtc_r )
{
UINT64 r = 0;
- if(ACCESSING_BYTE_7) {
+ if(ACCESSING_BITS_56_63) {
r |= (UINT64)rtc72421_r(machine, (offset*2)+0, (UINT32)(mem_mask >> 32)) << 32;
}
- if(ACCESSING_BYTE_3) {
+ if(ACCESSING_BITS_24_31) {
r |= (UINT64)rtc72421_r(machine, (offset*2)+1, (UINT32)(mem_mask));
}
return r;
@@ -1297,10 +1297,10 @@ static READ64_HANDLER( model3_rtc_r )
static WRITE64_HANDLER( model3_rtc_w )
{
- if(ACCESSING_BYTE_7) {
+ if(ACCESSING_BITS_56_63) {
rtc72421_w(machine, (offset*2)+0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
}
- if(ACCESSING_BYTE_3) {
+ if(ACCESSING_BITS_24_31) {
rtc72421_w(machine, (offset*2)+1, (UINT32)(data), (UINT32)(mem_mask));
}
}
@@ -1474,7 +1474,7 @@ static READ64_HANDLER(model3_security_r)
static WRITE64_HANDLER(daytona2_rombank_w)
{
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
data >>= 56;
data = (~data) & 0xf;
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index cf5bb7dbb88..d1bcfd867d2 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -88,12 +88,12 @@ static void mquake_cia_0_portb_w(UINT8 data)
static READ16_HANDLER( es5503_word_lsb_r )
{
- return (ACCESSING_BYTE_0) ? (ES5503_reg_0_r(machine, offset) | 0xff00) : 0xffff;
+ return (ACCESSING_BITS_0_7) ? (ES5503_reg_0_r(machine, offset) | 0xff00) : 0xffff;
}
static WRITE16_HANDLER( es5503_word_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// 5503 ROM is banked by the output channel (it's a handy 4-bit output from the 5503)
if (offset < 0xe0)
@@ -116,7 +116,7 @@ static WRITE16_HANDLER( es5503_word_lsb_w )
static WRITE16_HANDLER( output_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
logerror("%06x:output_w(%x) = %02x\n", activecpu_get_pc(), offset, data);
}
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 39535ad1fd2..c47fc4af0de 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -117,7 +117,7 @@ static NVRAM_HANDLER(gaiapols)
static READ16_HANDLER( mweeprom_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int res = readinputport(1) | EEPROM_read_bit();
@@ -137,7 +137,7 @@ static READ16_HANDLER( mweeprom_r )
static READ16_HANDLER( vseeprom_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int res = readinputport(1) | EEPROM_read_bit();
@@ -157,7 +157,7 @@ static READ16_HANDLER( vseeprom_r )
static WRITE16_HANDLER( mweeprom_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
EEPROM_write_bit((data&0x0100) ? 1 : 0);
EEPROM_set_cs_line((data&0x0200) ? CLEAR_LINE : ASSERT_LINE);
@@ -171,7 +171,7 @@ static WRITE16_HANDLER( mweeprom_w )
static READ16_HANDLER( dddeeprom_r )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
return (readinputport(1) | EEPROM_read_bit())<<8;
}
@@ -181,7 +181,7 @@ static READ16_HANDLER( dddeeprom_r )
static WRITE16_HANDLER( mmeeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_write_bit((data&0x01) ? 1 : 0);
EEPROM_set_cs_line((data&0x02) ? CLEAR_LINE : ASSERT_LINE);
@@ -305,7 +305,7 @@ static WRITE16_HANDLER( irq_ack_w )
{
K056832_b_word_w(machine, offset, data, mem_mask);
- if (offset == 3 && ACCESSING_BYTE_0)
+ if (offset == 3 && ACCESSING_BITS_0_7)
{
mw_irq_control = data&0xff;
@@ -582,7 +582,7 @@ static READ16_HANDLER( mccontrol_r )
static WRITE16_HANDLER( mccontrol_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
mw_irq_control = data>>8;
// bit 0 = watchdog
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 7b1a41d5515..98fe0a0c5b5 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -159,7 +159,7 @@ static READ32_HANDLER( namcofl_sysreg_r )
static WRITE32_HANDLER( namcofl_sysreg_w )
{
- if ((offset == 2) && ACCESSING_BYTE_0) // address space configuration
+ if ((offset == 2) && ACCESSING_BITS_0_7) // address space configuration
{
if (data == 0) // RAM at 00000000, ROM at 10000000
{
@@ -178,7 +178,7 @@ static WRITE32_HANDLER( namcofl_paletteram_w )
{
COMBINE_DATA(&paletteram32[offset]);
- if ((offset == 0x1808/4) && ACCESSING_WORD_1)
+ if ((offset == 0x1808/4) && ACCESSING_BITS_16_31)
{
UINT16 v = paletteram32[offset] >> 16;
UINT16 triggerscanline=(((v>>8)&0xff)|((v&0xff)<<8))-(32+1);
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 3e2928bc960..09d50f878dd 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -263,7 +263,7 @@ static READ16_HANDLER( namcona1_nvram_r )
static WRITE16_HANDLER( namcona1_nvram_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
namcona1_nvmem[offset] = data&0xff;
}
@@ -1124,12 +1124,12 @@ static READ16_HANDLER(snd_r)
static WRITE16_HANDLER(snd_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
C140_w(machine,(offset*2)+1, data);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
C140_w(machine,(offset*2), data>>8);
}
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 1f11dd9ca89..c7838b04fd0 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -648,11 +648,11 @@ static WRITE32_HANDLER( bankswitch_rom32_w )
{
verboselog( 2, "bankswitch_rom32_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
bankswitch_rom8( ( offset * 2 ), data & 0xffff );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
bankswitch_rom8( ( offset * 2 ) + 1, data >> 16 );
}
@@ -662,11 +662,11 @@ static WRITE32_HANDLER( bankswitch_rom64_upper_w )
{
verboselog( 2, "bankswitch_rom64_upper_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
m_n_bankoffset = 0;
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
m_n_bankoffset = 16;
}
@@ -682,11 +682,11 @@ static WRITE32_HANDLER( bankswitch_rom64_w )
{
verboselog( 2, "bankswitch_rom64_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
bankswitch_rom64( ( offset * 2 ), data & 0xffff );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
bankswitch_rom64( ( offset * 2 ) + 1, data >> 16 );
}
@@ -694,7 +694,7 @@ static WRITE32_HANDLER( bankswitch_rom64_w )
static WRITE32_HANDLER( lightgun_w )
{
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
output_set_value( "led0", !( data & 0x08 ) );
output_set_value( "led1", !( data & 0x04 ) );
@@ -703,7 +703,7 @@ static WRITE32_HANDLER( lightgun_w )
verboselog( 1, "lightgun_w: outputs (%08x %08x)\n", data, mem_mask );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 2, "lightgun_w: start reading (%08x %08x)\n", data, mem_mask );
}
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 5b893c38798..261a990573b 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1011,11 +1011,11 @@ static UINT32 m_n_tektagdmaoffset = 0xffffffff;
static WRITE32_HANDLER( dmaoffset_w )
{
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
m_n_dmaoffset = ( offset * 4 ) | ( data << 16 );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
m_n_dmaoffset = ( ( offset + 2 ) * 4 ) | ( data & 0xffff0000 );
}
@@ -1121,7 +1121,7 @@ ADDRESS_MAP_END
static WRITE32_HANDLER( system11gun_w )
{
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
/* start 1 */
set_led_status(0, !(data & 0x08));
@@ -1133,7 +1133,7 @@ static WRITE32_HANDLER( system11gun_w )
/* !(data & 0x01) */
verboselog( 1, "system11gun_w: outputs (%08x %08x)\n", data, mem_mask );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 2, "system11gun_w: start reading (%08x %08x)\n", data, mem_mask );
}
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index d12aba2608b..651058ccf39 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -524,7 +524,7 @@ static READ16_HANDLER( namcos2_68k_dpram_word_r )
static WRITE16_HANDLER( namcos2_68k_dpram_word_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
namcos2_dpram[offset] = data&0xff;
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 13795abdbad..ca155f99396 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -985,7 +985,7 @@ static READ16_HANDLER( pointram_data_r )
static WRITE16_HANDLER( pointram_data_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
// if( (pointram_idx%6)==0 ) logerror("\n" );
// logerror( " %02x", data );
@@ -1003,7 +1003,7 @@ static READ16_HANDLER( namcos21_depthcue_r )
}
static WRITE16_HANDLER( namcos21_depthcue_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
int bank = (pointram_control&0x20)?1:0;
namcos21_depthcue[bank][offset] = data;
@@ -1021,7 +1021,7 @@ static READ16_HANDLER( namcos2_68k_dualportram_word_r )
static WRITE16_HANDLER( namcos2_68k_dualportram_word_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
mpDualPortRAM[offset] = data&0xff;
}
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index e9ebea46690..d2719d5f31d 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1357,7 +1357,7 @@ static WRITE32_HANDLER( spotram_w )
*/
if( offset==0 )
{
- if( !ACCESSING_WORD_1 )
+ if( !ACCESSING_BITS_16_31 )
{
if( mSpotRAM.portW>=SPOTRAM_SIZE )
{
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index df4688d90f2..f0a656b65bb 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -574,7 +574,7 @@ static READ64_HANDLER( naomi_rom_board_r )
UINT8 *ROM = (UINT8 *)memory_region(REGION_USER1);
// ROM_DATA
- if ((offset == 1) && ACCESSING_WORD_0)
+ if ((offset == 1) && ACCESSING_BITS_0_15)
{
UINT64 ret;
@@ -584,7 +584,7 @@ static READ64_HANDLER( naomi_rom_board_r )
return ret;
}
- else if ((offset == 15) && ACCESSING_WORD_2) // boardid read
+ else if ((offset == 15) && ACCESSING_BITS_32_47) // boardid read
{
UINT64 ret;
@@ -602,31 +602,31 @@ static READ64_HANDLER( naomi_rom_board_r )
static WRITE64_HANDLER( naomi_rom_board_w )
{
- if ((offset == 1) && ACCESSING_WORD_2)
+ if ((offset == 1) && ACCESSING_BITS_32_47)
{
// DMA_OFFSETH
dma_offset &= 0xffff;
dma_offset |= (data >> 16) & 0x1fff0000;
}
- else if ((offset == 2) && ACCESSING_WORD_0)
+ else if ((offset == 2) && ACCESSING_BITS_0_15)
{
// DMA_OFFSETL
dma_offset &= 0xffff0000;
dma_offset |= (data & 0xffff);
}
- else if ((offset == 0) && ACCESSING_WORD_0)
+ else if ((offset == 0) && ACCESSING_BITS_0_15)
{
// ROM_OFFSETH
rom_offset &= 0xffff;
rom_offset |= (data & 0x1fff)<<16;
}
- else if ((offset == 0) && ACCESSING_WORD_2)
+ else if ((offset == 0) && ACCESSING_BITS_32_47)
{
// ROM_OFFSETL
rom_offset &= 0xffff0000;
rom_offset |= (data & 0xffff);
}
- else if ((offset == 15) && ACCESSING_WORD_0)
+ else if ((offset == 15) && ACCESSING_BITS_0_15)
{
// NAOMI_BOARDID_WRITE
x76f100_cs_write(0, (data >> 2) & 1 );
@@ -634,7 +634,7 @@ static WRITE64_HANDLER( naomi_rom_board_w )
x76f100_scl_write(0, (data >> 1) & 1 );
x76f100_sda_write(0, (data >> 0) & 1 );
}
- else if ((offset == 2) && ACCESSING_DWORD_1)
+ else if ((offset == 2) && ACCESSING_BITS_32_63)
{
// NAOMI_DMA_COUNT
dma_count = data >> 32;
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 68e365153f1..29f01fd521b 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -101,7 +101,7 @@ static INTERRUPT_GEN( nemesis_interrupt )
static WRITE16_HANDLER( salamand_soundlatch_word_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
@@ -141,7 +141,7 @@ static INTERRUPT_GEN( gx400_interrupt )
static WRITE16_HANDLER( gx400_irq1_enable_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
irq1_on = data & 0x0001;
/* else
logerror("irq1en = %08x\n",data);*/
@@ -149,7 +149,7 @@ logerror("irq1en = %08x\n",data);*/
static WRITE16_HANDLER( gx400_irq2_enable_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
irq2_on = data & 0x0001;
/* else
logerror("irq2en = %08x\n",data);*/
@@ -157,7 +157,7 @@ logerror("irq2en = %08x\n",data);*/
static WRITE16_HANDLER( gx400_irq4_enable_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
irq4_on = data & 0x0100;
/* else
logerror("irq4en = %08x\n",data);*/
@@ -172,7 +172,7 @@ static READ16_HANDLER( gx400_sharedram_word_r )
static WRITE16_HANDLER( gx400_sharedram_word_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
gx400_shared_ram[offset] = data;
}
@@ -192,19 +192,19 @@ static INTERRUPT_GEN( blkpnthr_interrupt )
static WRITE16_HANDLER( nemesis_irq_enable_word_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
irq_on = data & 0xff;
}
static WRITE16_HANDLER( konamigt_irq_enable_word_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
irq_on = data & 0xff;
}
static WRITE16_HANDLER( konamigt_irq2_enable_word_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
irq2_on = data & 0xff;
}
@@ -238,7 +238,7 @@ static UINT16 hcrash_selected_ip;
static WRITE16_HANDLER( selected_ip_w )
{
- if (ACCESSING_BYTE_0) hcrash_selected_ip = data & 0xff; // latch the value
+ if (ACCESSING_BITS_0_7) hcrash_selected_ip = data & 0xff; // latch the value
}
static READ16_HANDLER( selected_ip_r )
@@ -256,7 +256,7 @@ static READ16_HANDLER( selected_ip_r )
static WRITE16_HANDLER( nemesis_soundlatch_word_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
soundlatch_w(machine,offset,data & 0xff);
}
}
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 52582c144ce..186bb957577 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -524,7 +524,7 @@ static READ16_HANDLER( memcard_r )
static WRITE16_HANDLER( memcard_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (memcard_present() != -1)
memcard_data[offset] = data;
@@ -810,7 +810,7 @@ static void audio_cpu_banking_init(void)
static WRITE16_HANDLER( system_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 bit = (offset >> 3) & 0x01;
@@ -875,7 +875,7 @@ static WRITE16_HANDLER( system_control_w )
static WRITE16_HANDLER( watchdog_w )
{
/* only an LSB write resets the watchdog */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
watchdog_reset16_w(machine, offset, data, mem_mask);
}
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index a351ddb79f6..3790a9a32ac 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -243,7 +243,7 @@ static WRITE16_HANDLER( bg_videoram_w )
static WRITE16_HANDLER( nmg5_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
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 33488273d81..168b569d2df 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -186,11 +186,11 @@ static WRITE16_HANDLER( nmk16_mainram_strange_w )
dstram = nmk16_mainram;
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
{
dstram[offset] = (data & 0x00ff) | ((data & 0x00ff)<<8);
}
- else if (!ACCESSING_BYTE_0)
+ else if (!ACCESSING_BITS_0_7)
{
dstram[offset] = (data & 0xff00) | ((data & 0xff00)>>8);
}
@@ -280,7 +280,7 @@ static MACHINE_RESET( mustang_sound )
static WRITE16_HANDLER ( ssmissin_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0, HOLD_LINE);
@@ -313,7 +313,7 @@ static READ16_HANDLER( tharrier_mcu_r )
{
/* The MCU is mapped as the top byte for byte accesses only,
all word accesses are to the input port */
- if (ACCESSING_BYTE_1 && !ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15 && !ACCESSING_BITS_0_7)
{
static const UINT8 to_main[] =
{
@@ -340,7 +340,7 @@ static READ16_HANDLER( tharrier_mcu_r )
static WRITE16_HANDLER( macross2_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data & 0xff);
}
@@ -376,7 +376,7 @@ static WRITE8_HANDLER( tharrier_oki6295_bankswitch_1_w )
static WRITE16_HANDLER( afega_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data&0xff);
cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
@@ -4871,7 +4871,7 @@ static WRITE16_HANDLER( twinactn_scroll1_w )
static WRITE16_HANDLER( twinactn_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
flip_screen_set(data & 1);
if (data & (~1))
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 1f450f5ef11..8975ad18387 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -571,26 +571,26 @@ static READ32_HANDLER( sysreg_r )
UINT32 r = 0;
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= readinputport(1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= readinputport(2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= (adc1213x_do_r(0)) | (adc1213x_eoc_r(0) << 2);
}
}
else if (offset == 1)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(3) << 24;
}
@@ -602,11 +602,11 @@ static WRITE32_HANDLER( sysreg_w )
{
if( offset == 0 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
led_reg0 = (data >> 24) & 0xff;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
led_reg1 = (data >> 16) & 0xff;
}
@@ -614,7 +614,7 @@ static WRITE32_HANDLER( sysreg_w )
}
if( offset == 1 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
int cs = (data >> 27) & 0x1;
int conv = (data >> 26) & 0x1;
@@ -626,7 +626,7 @@ static WRITE32_HANDLER( sysreg_w )
adc1213x_di_w(0, di);
adc1213x_sclk_w(0, sclk);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0x80) // CG Board 1 IRQ Ack
{
@@ -679,7 +679,7 @@ static READ32_HANDLER( lanc2_r )
if (offset == 0)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= lanc2_ram[lanc2_ram_r & 0x7fff];
lanc2_ram_r++;
@@ -692,7 +692,7 @@ static READ32_HANDLER( lanc2_r )
if (offset == 4)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= 0x00000000;
}
@@ -707,7 +707,7 @@ static WRITE32_HANDLER( lanc2_w )
{
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
UINT8 value = data >> 24;
@@ -724,7 +724,7 @@ static WRITE32_HANDLER( lanc2_w )
//printf("lanc2_fpga_w: %02X at %08X\n", value, activecpu_get_pc());
}
- else if (ACCESSING_BYTE_0)
+ else if (ACCESSING_BITS_0_7)
{
lanc2_ram[lanc2_ram_w & 0x7fff] = data & 0xff;
lanc2_ram_w++;
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 803f910a98c..9372854792a 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -99,7 +99,7 @@ static READ16_HANDLER( special_port3_r )
static WRITE16_HANDLER( io_latch_w )
{
/* lower byte */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 4 resets the sound CPU */
cpunum_set_input_line(machine, 1, INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index ddb5f105efd..731d2b834ce 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -41,7 +41,7 @@ static MACHINE_RESET( ohmygod )
static WRITE16_HANDLER( ohmygod_ctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *rom = memory_region(REGION_SOUND1);
@@ -52,7 +52,7 @@ static WRITE16_HANDLER( ohmygod_ctrl_w )
memcpy(rom + 0x20000,rom + 0x40000 + 0x20000 * sndbank,0x20000);
}
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0,data & 0x1000);
coin_counter_w(1,data & 0x2000);
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 06e0be2a39f..3bb57fdfa2b 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -105,7 +105,7 @@ static READ16_HANDLER( oneshot_gun_y_p2_r )
static WRITE16_HANDLER( soundbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, 0x40000 * ((data & 0x03) ^ 0x03));
}
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index cd6b60c6608..461afe7790e 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -45,13 +45,13 @@ static READ16_HANDLER( pap )
static WRITE16_HANDLER( oki_bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_set_bank_base(0, (data & 1) * 0x40000);
}
static WRITE16_HANDLER( coinctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 1);
coin_counter_w(1,data & 2);
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 7c8a3608210..d1db813c34f 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -358,7 +358,7 @@ static int eeprom_r(void)
static WRITE16_HANDLER( othunder_TC0220IOC_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
switch (offset)
{
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index db1e492d17a..1335f145357 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -55,25 +55,25 @@ static READ16_HANDLER( K051316_rom_1_msb_r )
static WRITE16_HANDLER( K051316_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051316_0_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_1_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051316_1_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_ctrl_0_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051316_ctrl_0_w(machine,offset,data >> 8);
}
static WRITE16_HANDLER( K051316_ctrl_1_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051316_ctrl_1_w(machine,offset,data >> 8);
}
@@ -137,7 +137,7 @@ static READ16_HANDLER( eeprom_r )
static WRITE16_HANDLER( eeprom_w )
{
//logerror("%06x: write %04x to eeprom_w\n",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 is data */
/* bit 1 is clock (active high) */
@@ -172,7 +172,7 @@ static MACHINE_RESET( overdriv )
static WRITE16_HANDLER( cpuA_ctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 probably enables the second 68000 */
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE);
@@ -199,7 +199,7 @@ static WRITE16_HANDLER( cpuB_ctrl_w )
{
COMBINE_DATA(&cpuB_ctrl);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 = enable sprite ROM reading */
K053246_set_OBJCHA_line((data & 0x01) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index d32e7a342a4..5b626b5f7ed 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -404,9 +404,9 @@ static WRITE16_HANDLER( arm7_ram_w )
static WRITE16_HANDLER ( z80_ram_w )
{
int pc = activecpu_get_pc();
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
z80_mainram[offset*2] = data >> 8;
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
z80_mainram[offset*2+1] = data;
if(pc != 0xf12 && pc != 0xde2 && pc != 0x100c50 && pc != 0x100b20)
@@ -443,7 +443,7 @@ static WRITE16_HANDLER ( z80_ctrl_w )
static WRITE16_HANDLER ( m68k_l1_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
if (PGMLOGERROR) logerror("SL 1 m68.w %02x (%06x) IRQ\n", data & 0xff, activecpu_get_pc());
soundlatch_w(machine, 0, data);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
@@ -755,11 +755,11 @@ static READ32_HANDLER( kovsh_arm7_protlatch_r )
static WRITE32_HANDLER( kovsh_arm7_protlatch_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
kovsh_highlatch = data>>16;
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
kovsh_lowlatch = data;
}
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 8b4d9be4442..823ef41cf26 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -126,7 +126,7 @@ static NVRAM_HANDLER( pirates )
static WRITE16_HANDLER( pirates_out_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bits 0-2 control EEPROM */
EEPROM_write_bit(data & 0x04);
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 4fbe0a736ca..4379c065e1b 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -81,7 +81,7 @@ VIDEO_UPDATE( hrdtimes );
static WRITE16_HANDLER( coinctrl_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_counter_w(0,data & 0x0100);
coin_counter_w(1,data & 0x0200);
@@ -151,7 +151,7 @@ static READ16_HANDLER( hotmind_port2_r )
static WRITE16_HANDLER( wbeachvl_coin_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bits 0-3 are coin counters? (only 0 used?) */
coin_counter_w(0,data & 0x01);
@@ -168,7 +168,7 @@ static WRITE16_HANDLER( wbeachvl_coin_eeprom_w )
static WRITE16_HANDLER( hotmind_coin_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x20);
@@ -186,7 +186,7 @@ static WRITE16_HANDLER( hrdtimes_coin_w )
static WRITE16_HANDLER( playmark_snd_command_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
playmark_snd_command = (data & 0xff);
playmark_snd_flag = 1;
cpu_yield();
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index e26c47253ca..07639412850 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -101,7 +101,7 @@ static NVRAM_HANDLER( polygonet )
static READ32_HANDLER( polygonet_eeprom_r )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
return 0x0200 | (EEPROM_read_bit()<<8);
}
@@ -120,7 +120,7 @@ static READ32_HANDLER( polygonet_eeprom_r )
static WRITE32_HANDLER( polygonet_eeprom_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
EEPROM_write_bit((data & 0x01000000) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_set_cs_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE);
@@ -175,7 +175,7 @@ static READ32_HANDLER( sound_r )
static WRITE32_HANDLER( sound_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine, 0, (data>>8)&0xff);
}
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index fb2edb1eabf..339a4cc25a7 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -253,12 +253,12 @@ static WRITE16_HANDLER( pntnpuzl_palette_w )
{
static int indx,sub,rgb[3];
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
indx = data >> 8;
sub = 0;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
rgb[sub++] = data & 0xff;
if (sub == 3)
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index d2c48568201..1a94674fb0b 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -178,7 +178,7 @@ static WRITE32_HANDLER( control_w )
COMBINE_DATA(&control_data);
/* handle EEPROM I/O */
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
EEPROM_write_bit(data & 0x00800000);
EEPROM_set_cs_line((data & 0x00200000) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 253455458cc..25e5f9bd5b3 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -68,7 +68,7 @@ static READ16_HANDLER( magicstk_port2_r )
static WRITE16_HANDLER( magicstk_coin_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x20);
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 20041c06cba..ecfbdc4b5c6 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -60,7 +60,7 @@ static int oki_bank;
static WRITE16_HANDLER( powerins_okibank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *RAM = memory_region(REGION_SOUND1);
int new_bank = data & 0x7;
@@ -75,7 +75,7 @@ static WRITE16_HANDLER( powerins_okibank_w )
static WRITE16_HANDLER( powerins_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine, 0, data & 0xff);
}
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 075aa304dbc..774664022ff 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -171,7 +171,7 @@ static TIMER_CALLBACK( psikyo_soundlatch_callback )
static WRITE32_HANDLER( psikyo_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, psikyo_soundlatch_callback);
}
@@ -181,7 +181,7 @@ static WRITE32_HANDLER( psikyo_soundlatch_w )
static WRITE32_HANDLER( s1945_soundlatch_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
timer_call_after_resynch(NULL, (data >> 16) & 0xff, psikyo_soundlatch_callback);
}
@@ -330,9 +330,9 @@ static READ32_HANDLER( s1945_input_r )
static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
{
paletteram16 = (UINT16 *)paletteram32;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 1ae79792bb6..1226b158063 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -200,7 +200,7 @@ static NVRAM_HANDLER(93C56)
static WRITE32_HANDLER( ps4_eeprom_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
EEPROM_write_bit((data & 0x00200000) ? 1 : 0);
EEPROM_set_cs_line((data & 0x00800000) ? CLEAR_LINE : ASSERT_LINE);
@@ -214,7 +214,7 @@ static WRITE32_HANDLER( ps4_eeprom_w )
static READ32_HANDLER( ps4_eeprom_r )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
return ((EEPROM_read_bit() << 20)); /* EEPROM */
}
@@ -286,7 +286,7 @@ static WRITE32_HANDLER( ps4_bgpen_2_dword_w )
static WRITE32_HANDLER( ps4_screen1_brt_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
/* Need seperate brightness for both screens if displaying together */
double brt1 = data & 0xff;
static double oldbrt1;
@@ -312,7 +312,7 @@ static WRITE32_HANDLER( ps4_screen1_brt_w )
static WRITE32_HANDLER( ps4_screen2_brt_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
/* Need seperate brightness for both screens if displaying together */
double brt2 = data & 0xff;
static double oldbrt2;
@@ -344,7 +344,7 @@ static WRITE32_HANDLER( ps4_vidregs_w )
#if ROMTEST
if(offset==2) /* Configure bank for gfx test */
{
- if (ACCESSING_WORD_0) // Bank
+ if (ACCESSING_BITS_0_15) // Bank
{
UINT8 *ROM = memory_region(REGION_GFX1);
memory_set_bankptr(2,&ROM[0x2000 * (psikyo4_vidregs[offset]&0x1fff)]); /* Bank comes from vidregs */
@@ -370,22 +370,22 @@ static READ32_HANDLER( psh_ymf_fm_r )
static WRITE32_HANDLER( psh_ymf_fm_w )
{
- if (ACCESSING_BYTE_3) // FM bank 1 address (OPL2/OPL3 compatible)
+ if (ACCESSING_BITS_24_31) // FM bank 1 address (OPL2/OPL3 compatible)
{
YMF278B_control_port_0_A_w(machine, 0, data>>24);
}
- if (ACCESSING_BYTE_2) // FM bank 1 data
+ if (ACCESSING_BITS_16_23) // FM bank 1 data
{
YMF278B_data_port_0_A_w(machine, 0, data>>16);
}
- if (ACCESSING_BYTE_1) // FM bank 2 address (OPL3/YMF 262 extended)
+ if (ACCESSING_BITS_8_15) // FM bank 2 address (OPL3/YMF 262 extended)
{
YMF278B_control_port_0_B_w(machine, 0, data>>8);
}
- if (ACCESSING_BYTE_0) // FM bank 2 data
+ if (ACCESSING_BITS_0_7) // FM bank 2 data
{
YMF278B_data_port_0_B_w(machine, 0, data);
}
@@ -393,7 +393,7 @@ static WRITE32_HANDLER( psh_ymf_fm_w )
static WRITE32_HANDLER( psh_ymf_pcm_w )
{
- if (ACCESSING_BYTE_3) // PCM address (OPL4/YMF 278B extended)
+ if (ACCESSING_BITS_24_31) // PCM address (OPL4/YMF 278B extended)
{
YMF278B_control_port_0_C_w(machine, 0, data>>24);
@@ -405,7 +405,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
#endif
}
- if (ACCESSING_BYTE_2) // PCM data
+ if (ACCESSING_BITS_16_23) // PCM data
{
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 3bc6ec1f136..e69af93e499 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -388,7 +388,7 @@ static NVRAM_HANDLER(93C56)
static WRITE32_HANDLER( psh_eeprom_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
EEPROM_write_bit((data & 0x20000000) ? 1 : 0);
EEPROM_set_cs_line((data & 0x80000000) ? CLEAR_LINE : ASSERT_LINE);
@@ -402,7 +402,7 @@ static WRITE32_HANDLER( psh_eeprom_w )
static READ32_HANDLER( psh_eeprom_r )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
return ((EEPROM_read_bit() << 28) | (readinputport(4) << 24)); /* EEPROM | Region */
}
@@ -441,7 +441,7 @@ static WRITE32_HANDLER( psikyosh_vidregs_w )
#if ROMTEST
if(offset==4) /* Configure bank for gfx test */
{
- if (ACCESSING_WORD_0) // Bank
+ if (ACCESSING_BITS_0_15) // Bank
{
UINT8 *ROM = memory_region(REGION_GFX1);
memory_set_bankptr(2,&ROM[0x20000 * (psikyosh_vidregs[offset]&0xfff)]); /* Bank comes from vidregs */
@@ -468,22 +468,22 @@ static READ32_HANDLER( psh_ymf_fm_r )
static WRITE32_HANDLER( psh_ymf_fm_w )
{
- if (ACCESSING_BYTE_3) // FM bank 1 address (OPL2/OPL3 compatible)
+ if (ACCESSING_BITS_24_31) // FM bank 1 address (OPL2/OPL3 compatible)
{
YMF278B_control_port_0_A_w(machine, 0, data>>24);
}
- if (ACCESSING_BYTE_2) // FM bank 1 data
+ if (ACCESSING_BITS_16_23) // FM bank 1 data
{
YMF278B_data_port_0_A_w(machine, 0, data>>16);
}
- if (ACCESSING_BYTE_1) // FM bank 2 address (OPL3/YMF 262 extended)
+ if (ACCESSING_BITS_8_15) // FM bank 2 address (OPL3/YMF 262 extended)
{
YMF278B_control_port_0_B_w(machine, 0, data>>8);
}
- if (ACCESSING_BYTE_0) // FM bank 2 data
+ if (ACCESSING_BITS_0_7) // FM bank 2 data
{
YMF278B_data_port_0_B_w(machine, 0, data);
}
@@ -491,7 +491,7 @@ static WRITE32_HANDLER( psh_ymf_fm_w )
static WRITE32_HANDLER( psh_ymf_pcm_w )
{
- if (ACCESSING_BYTE_3) // PCM address (OPL4/YMF 278B extended)
+ if (ACCESSING_BITS_24_31) // PCM address (OPL4/YMF 278B extended)
{
YMF278B_control_port_0_C_w(machine, 0, data>>24);
@@ -503,7 +503,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
#endif
}
- if (ACCESSING_BYTE_2) // PCM data
+ if (ACCESSING_BITS_16_23) // PCM data
{
YMF278B_data_port_0_C_w(machine, 0, data>>16);
}
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index be7369a64ec..c348f9f2f1d 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -100,11 +100,11 @@ static WRITE16_HANDLER( puckpkmn_YM3438_w )
switch (offset)
{
case 0:
- if (ACCESSING_BYTE_1) YM3438_control_port_0_A_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) 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_BYTE_1) YM3438_control_port_0_B_w (machine, 0, (data >> 8) & 0xff);
+ if (ACCESSING_BITS_8_15) 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/pushman.c b/src/mame/drivers/pushman.c
index 174d64c88b3..0c9ac39e8f9 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -39,7 +39,7 @@ static UINT16 latch,new_latch=0;
static WRITE16_HANDLER( pushman_control_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundlatch_w(machine,0,(data>>8)&0xff);
}
@@ -56,9 +56,9 @@ static READ16_HANDLER( pushman_68705_r )
static WRITE16_HANDLER( pushman_68705_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[2*offset]=data>>8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[2*offset+1]=data&0xff;
if (offset==1)
@@ -87,9 +87,9 @@ static READ16_HANDLER( bballs_68705_r )
static WRITE16_HANDLER( bballs_68705_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[2*offset]=data>>8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[2*offset+1]=data&0xff;
if(offset==0)
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index f034b80b218..08c6daf590b 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -176,7 +176,7 @@ static WRITE16_HANDLER( gp2_vram_mirror_w )
static READ16_HANDLER( sndram_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
return sndram[offset];
return 0;
@@ -184,7 +184,7 @@ static READ16_HANDLER( sndram_r )
static WRITE16_HANDLER( sndram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
sndram[offset] = data & 0xff;
if (offset >= 0x40000)
@@ -194,7 +194,7 @@ static WRITE16_HANDLER( sndram_w )
static READ16_HANDLER( k054539_word_r )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
return K054539_0_r(machine, offset);
return 0;
@@ -202,7 +202,7 @@ static READ16_HANDLER( k054539_word_r )
static WRITE16_HANDLER( k054539_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054539_0_w(machine, offset, data);
}
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 8ccd043d740..cb0cba74fe1 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -91,7 +91,7 @@ static READ8_HANDLER( input_2_r )
static WRITE16_HANDLER( led_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bits 0 and 1 are coin counters */
coin_counter_w(0, data & 2);
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index b3bc8d5e434..05ea7d3c41e 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -2043,7 +2043,7 @@ static NVRAM_HANDLER( rdx_v33 )
static WRITE16_HANDLER( rdx_v33_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x20);
@@ -2102,8 +2102,8 @@ static READ16_HANDLER( rdx_v33_oki_r )
static WRITE16_HANDLER( rdx_v33_oki_w )
{
- if (ACCESSING_BYTE_0) OKIM6295_data_0_w(machine, 0, data & 0x00ff);
- if (ACCESSING_BYTE_1) logerror("rdx_v33_oki_w MSB %04x\n",data);
+ if (ACCESSING_BITS_0_7) OKIM6295_data_0_w(machine, 0, data & 0x00ff);
+ if (ACCESSING_BITS_8_15) logerror("rdx_v33_oki_w MSB %04x\n",data);
}
static READ16_HANDLER( rdx_v33_unknown_r )
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 5573debce73..f6e1675084f 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -265,7 +265,7 @@ static UINT8 jumping_latch = 0;
static WRITE16_HANDLER( jumping_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
jumping_latch = data & 0xff; /*M68000 writes .b to $400007*/
cpunum_set_input_line(Machine, 1,0,HOLD_LINE);
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index e86b98b49e7..9414d6442e3 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -91,7 +91,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
OKIM6295_data_0_w(machine, offset, (data >> 8) & 0xff);
}
@@ -105,7 +105,7 @@ static WRITE16_HANDLER( adpcm_w )
static WRITE16_HANDLER( ym2413_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (offset & 1)
YM2413_data_port_0_w(machine, 0, (data >> 8) & 0xff);
@@ -141,7 +141,7 @@ static WRITE16_HANDLER( latch_w )
*/
/* upper byte being modified? */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (data & 0x1000)
logerror("Color bank set to 1!\n");
@@ -150,7 +150,7 @@ static WRITE16_HANDLER( latch_w )
}
/* lower byte being modified? */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
atarigen_set_oki6295_vol(machine, (data & 0x0020) ? 100 : 0);
if (!(data & 0x0010))
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 46314704737..6846ac41bc0 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -94,7 +94,7 @@ static READ16_HANDLER( eeprom_r )
static WRITE16_HANDLER( eeprom_w )
{
//bad ?
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
EEPROM_write_bit(data & 0x04);
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE:ASSERT_LINE );
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 25c8d7f8585..546e3dc8bdc 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -120,13 +120,13 @@ static READ16_HANDLER( special_port2_r )
static WRITE16_HANDLER( audio_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
ym2413_volume = (data >> 1) & 15;
atarigen_set_ym2413_vol(machine, (ym2413_volume * overall_volume * 100) / (127 * 15));
adpcm_bank_base = (0x040000 * ((data >> 6) & 3)) | (adpcm_bank_base & 0x100000);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
adpcm_bank_base = (0x100000 * ((data >> 8) & 1)) | (adpcm_bank_base & 0x0c0000);
OKIM6295_set_bank_base(0, adpcm_bank_base);
@@ -135,7 +135,7 @@ static WRITE16_HANDLER( audio_control_w )
static WRITE16_HANDLER( audio_volume_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
overall_volume = data & 127;
atarigen_set_ym2413_vol(machine, (ym2413_volume * overall_volume * 100) / (127 * 15));
@@ -159,7 +159,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_0_w(machine, offset, data & 0xff);
}
@@ -173,7 +173,7 @@ static WRITE16_HANDLER( adpcm_w )
static WRITE16_HANDLER( ym2413_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (offset & 1)
YM2413_data_port_0_w(machine, 0, data & 0xff);
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 43a0061a5a6..42aff2217ea 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -186,7 +186,7 @@ static TIMER_CALLBACK( sound_command_w_callback )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, sound_command_w_callback);
}
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 34fd8b8d372..63eb3fb185d 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -123,7 +123,7 @@ static READ16_HANDLER( rng_sysregs_r )
break;
case 0x06/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data = readinputport(1) | EEPROM_read_bit();
@@ -155,7 +155,7 @@ static WRITE16_HANDLER( rng_sysregs_w )
bit7 : set before massive memory writes
bit10 : IRQ5 ACK
*/
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_write_bit((data & 0x01) ? 1 : 0);
EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
@@ -180,25 +180,25 @@ static WRITE16_HANDLER( rng_sysregs_w )
static WRITE16_HANDLER( sound_cmd1_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundlatch_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( sound_cmd2_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundlatch2_w(machine, 0, data>>8);
}
static WRITE16_HANDLER( sound_irq_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE);
}
static READ16_HANDLER( sound_status_msb_r )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
return(rng_sound_status<<8);
return(0);
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 9bfaeccc803..f4369fc49a9 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -138,7 +138,7 @@ static READ16_HANDLER( sandscrp_irq_cause_r )
/* Clear the cause of the interrupt */
static WRITE16_HANDLER( sandscrp_irq_cause_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
kaneko16_sprite_flipx = data & 1;
kaneko16_sprite_flipy = data & 1;
@@ -159,7 +159,7 @@ static WRITE16_HANDLER( sandscrp_irq_cause_w )
static WRITE16_HANDLER( sandscrp_coin_counter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x0001);
coin_counter_w(1, data & 0x0002);
@@ -177,7 +177,7 @@ static READ16_HANDLER( sandscrp_latchstatus_word_r )
static WRITE16_HANDLER( sandscrp_latchstatus_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
latch1_full = data & 0x80;
latch2_full = data & 0x40;
@@ -192,7 +192,7 @@ static READ16_HANDLER( sandscrp_soundlatch_word_r )
static WRITE16_HANDLER( sandscrp_soundlatch_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
latch1_full = 1;
soundlatch_w(machine, 0, data & 0xff);
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 46e52d0132f..a5643a87738 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -1641,7 +1641,7 @@ static READ32_HANDLER( status_leds_r )
static WRITE32_HANDLER( status_leds_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
status_leds = data;
}
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index a0627f0717b..54325170c4c 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -192,7 +192,7 @@ static READ16_HANDLER( ym3438_r )
static WRITE16_HANDLER( ym3438_w )
{
/* only works if we're accessing the low byte */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static UINT8 last_port;
@@ -222,7 +222,7 @@ static WRITE16_HANDLER( segac2_upd7759_w )
return;
/* only works if we're accessing the low byte */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
upd7759_port_w(0, data & 0xff);
upd7759_start_w(0, 0);
@@ -487,7 +487,7 @@ static WRITE16_HANDLER( io_chip_w )
static WRITE16_HANDLER( control_w )
{
/* skip if not LSB */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
data &= 0x0f;
@@ -534,7 +534,7 @@ static WRITE16_HANDLER( prot_w )
int table_index;
/* only works for the LSB */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
/* compute the table index */
@@ -575,7 +575,7 @@ static WRITE16_HANDLER( prot_w )
static WRITE16_HANDLER( counter_timer_w )
{
/* only LSB matters */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/*int value = data & 1;*/
switch (data & 0x1e)
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index f8035b2f3ef..585eb277674 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -166,7 +166,7 @@ static READ16_HANDLER( hangon_io_r )
static WRITE16_HANDLER( hangon_io_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
switch (offset & 0x3020/2)
{
case 0x0000/2: /* PPI @ 4B */
@@ -212,7 +212,7 @@ static READ16_HANDLER( sharrier_io_r )
static WRITE16_HANDLER( sharrier_io_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
switch (offset & 0x0030/2)
{
case 0x0000/2:
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 7c4d2926a3d..734522e927f 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -411,12 +411,12 @@ static WRITE16_HANDLER( outrun_custom_io_w )
switch (offset & 0x70/2)
{
case 0x00/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ppi8255_0_w(machine, offset & 3, data);
return;
case 0x20/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* Output port:
D7: /MUTE
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 0cbed4da8c1..b4f24b809ba 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -297,7 +297,7 @@ static WRITE16_HANDLER( standard_io_w )
case 0x0000/2:
/* the port C handshaking signals control the Z80 NMI, */
/* so we have to sync whenever we access this PPI */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, ((offset & 3) << 8) | (data & 0xff), delayed_ppi8255_w);
return;
}
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 3930e632ee4..c8286ce9829 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1187,7 +1187,7 @@ static WRITE16_HANDLER( misc_io_w )
static WRITE16_HANDLER( rom_5704_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
segaic16_tilemap_set_bank(0, offset & 1, data & 7);
}
@@ -1225,7 +1225,7 @@ static WRITE16_HANDLER( rom_5797_bank_math_w )
break;
case 0x2000/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
segaic16_tilemap_set_bank(0, offset & 1, data & 7);
break;
}
@@ -1531,7 +1531,7 @@ static void wrestwar_i8751_sim(running_machine *machine)
static WRITE16_HANDLER( atomicp_sound_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
switch (offset & 1)
{
case 0: YM2413_register_port_0_w(machine, 0, data >> 8); break;
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 429b5c571ce..845ad6fe4c3 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -347,7 +347,7 @@ static WRITE16_HANDLER( misc_io_w )
/* I/O chip */
case 0x0000/2:
case 0x1000/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
io_chip_w(machine, offset, data, mem_mask);
return;
@@ -356,7 +356,7 @@ static WRITE16_HANDLER( misc_io_w )
/* video control latch */
case 0x2000/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
system18_set_vdp_mixing(data & 0xff);
return;
@@ -381,7 +381,7 @@ static WRITE16_HANDLER( misc_io_w )
static WRITE16_HANDLER( rom_5987_bank_w )
{
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
offset &= 0xf;
data &= 0xff;
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 341ba74fad7..0c171329899 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -409,7 +409,7 @@ static WRITE16_HANDLER( fdc_w )
if(!track_size)
return;
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
data &= 0xff;
switch(offset) {
case 0:
@@ -499,7 +499,7 @@ static READ16_HANDLER( fdc_status_r )
static WRITE16_HANDLER( fdc_ctrl_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
logerror("FDC control %02x\n", data & 0xff);
}
@@ -634,7 +634,7 @@ static UINT8 hotrod_ctrl_cur;
static WRITE16_HANDLER( hotrod3_ctrl_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
data &= 3;
hotrod_ctrl_cur = readinputport(9+data);
}
@@ -642,7 +642,7 @@ static WRITE16_HANDLER( hotrod3_ctrl_w )
static READ16_HANDLER( hotrod3_ctrl_r )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
switch(offset) {
// Steering dials
case 0:
@@ -735,7 +735,7 @@ static READ16_HANDLER( curbank_r )
static WRITE16_HANDLER( curbank_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
curbank = data & 0xff;
reset_bank();
}
@@ -751,13 +751,13 @@ static READ16_HANDLER( ym_status_r )
static WRITE16_HANDLER( ym_register_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
YM2151_register_port_0_w(machine, 0, data);
}
static WRITE16_HANDLER( ym_data_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
YM2151_data_port_0_w(machine, 0, data);
}
@@ -782,7 +782,7 @@ static READ16_HANDLER( mlatch_r )
static WRITE16_HANDLER( mlatch_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
int i;
UINT8 mxor = 0;
if(!mlatch_table) {
@@ -861,7 +861,7 @@ static WRITE16_HANDLER(irq_w)
break;
}
case 1:
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
UINT8 old_tb = irq_timerb;
irq_timerb = data;
if(old_tb != irq_timerb)
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index ae99d1fd6d8..5aa9ef3b416 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -527,9 +527,9 @@ static READ16_HANDLER( interrupt_control_16_r )
static WRITE16_HANDLER( interrupt_control_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
int_control_w(offset*2+0, data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
int_control_w(offset*2+1, data >> 8);
}
@@ -550,13 +550,13 @@ static READ32_HANDLER( interrupt_control_32_r )
static WRITE32_HANDLER( interrupt_control_32_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
int_control_w(offset*4+0, data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
int_control_w(offset*4+1, data >> 8);
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
int_control_w(offset*4+2, data >> 16);
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
int_control_w(offset*4+3, data >> 24);
}
@@ -642,7 +642,7 @@ static void common_io_chip_w(int which, offs_t offset, UINT16 data, UINT16 mem_m
UINT8 old;
/* only LSB matters */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
/* generic implementation */
@@ -719,9 +719,9 @@ static READ32_HANDLER( io_chip_0_r )
static WRITE32_HANDLER( io_chip_0_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
common_io_chip_w(0, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
common_io_chip_w(0, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -735,9 +735,9 @@ static READ32_HANDLER( io_chip_1_r )
static WRITE32_HANDLER( io_chip_1_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
common_io_chip_w(1, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
common_io_chip_w(1, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -762,7 +762,7 @@ static READ16_HANDLER( io_expansion_r )
static WRITE16_HANDLER( io_expansion_w )
{
/* only LSB matters */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
if (custom_io_w[0])
@@ -786,14 +786,14 @@ static READ32_HANDLER( io_expansion_0_r )
static WRITE32_HANDLER( io_expansion_0_w )
{
/* only LSB matters */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (custom_io_w[0])
(*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 (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
if (custom_io_w[0])
(*custom_io_w[0])(machine, offset*2+1, data >> 16, mem_mask >> 16);
@@ -817,14 +817,14 @@ static READ32_HANDLER( io_expansion_1_r )
static WRITE32_HANDLER( io_expansion_1_w )
{
/* only LSB matters */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (custom_io_w[1])
(*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 (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
if (custom_io_w[1])
(*custom_io_w[1])(machine, offset*2+1, data >> 16, mem_mask >> 16);
@@ -993,9 +993,9 @@ static READ16_HANDLER( shared_ram_16_r )
static WRITE16_HANDLER( shared_ram_16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
z80_shared_ram[offset*2+0] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
z80_shared_ram[offset*2+1] = data >> 8;
}
@@ -1009,13 +1009,13 @@ static READ32_HANDLER( shared_ram_32_r )
static WRITE32_HANDLER( shared_ram_32_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
z80_shared_ram[offset*4+0] = data;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
z80_shared_ram[offset*4+1] = data >> 8;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
z80_shared_ram[offset*4+2] = data >> 16;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
z80_shared_ram[offset*4+3] = data >> 24;
}
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 07ad7800647..f3b6d9f7fc8 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -329,7 +329,7 @@ static WRITE16_HANDLER( iochip_0_w )
UINT8 oldval;
/* access is via the low 8 bits */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
data &= 0xff;
@@ -402,7 +402,7 @@ static READ16_HANDLER( iochip_1_r )
static WRITE16_HANDLER( iochip_1_w )
{
/* access is via the low 8 bits */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
data &= 0xff;
@@ -417,7 +417,7 @@ static WRITE16_HANDLER( iochip_1_w )
static WRITE16_HANDLER( iocontrol_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
logerror("I/O chip force input = %d\n", data & 1);
/* Racing Hero and ABCop set this and fouls up their output ports */
@@ -436,7 +436,7 @@ static WRITE16_HANDLER( iocontrol_w )
static WRITE16_HANDLER( aburner2_iochip_0_D_w )
{
/* access is via the low 8 bits */
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
iochip_regs[0][3] = data;
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 7cfb5cb72bb..075f90f3f7b 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -217,7 +217,7 @@ static TIMER_CALLBACK( delayed_sound_data_w )
static WRITE16_HANDLER( sound_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_data_w);
}
@@ -344,7 +344,7 @@ static WRITE16_HANDLER( io_chip_w )
static READ16_HANDLER( analog_r )
{
int result = 0xff;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
result = analog_data[offset & 3] & 0x80;
analog_data[offset & 3] <<= 1;
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 9019a3331b8..5b237d89cf3 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -824,7 +824,7 @@ static READ32_HANDLER( sound_fifo_r )
static WRITE32_HANDLER( sound_fifo_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
z80_fifoin_push(data & 0xff);
}
}
@@ -852,14 +852,14 @@ static READ32_HANDLER( spi_unknown_r )
static WRITE32_HANDLER( ds2404_reset_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
DS2404_1W_reset_w(machine, offset, data);
}
}
static READ32_HANDLER( ds2404_data_r )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
return DS2404_data_r(machine, offset);
}
return 0;
@@ -867,14 +867,14 @@ static READ32_HANDLER( ds2404_data_r )
static WRITE32_HANDLER( ds2404_data_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
DS2404_data_w(machine, offset, data);
}
}
static WRITE32_HANDLER( ds2404_clk_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
DS2404_clk_w(machine, offset, data);
}
}
@@ -882,7 +882,7 @@ static WRITE32_HANDLER( ds2404_clk_w )
static WRITE32_HANDLER( eeprom_w )
{
// tile banks
- if( ACCESSING_BYTE_2 ) {
+ if( ACCESSING_BITS_16_23 ) {
rf2_set_layer_banks(data >> 16);
EEPROM_write_bit((data & 0x800000) ? 1 : 0);
EEPROM_set_clock_line((data & 0x400000) ? ASSERT_LINE : CLEAR_LINE);
@@ -896,7 +896,7 @@ static WRITE32_HANDLER( eeprom_w )
static WRITE32_HANDLER( z80_prg_fifo_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
if (z80_prg_fifo_pos<0x40000) z80_rom[z80_prg_fifo_pos] = data & 0xff;
z80_prg_fifo_pos++;
}
@@ -905,12 +905,12 @@ static WRITE32_HANDLER( z80_prg_fifo_w )
static WRITE32_HANDLER( z80_enable_w )
{
// tile banks
- if( ACCESSING_BYTE_2 ) {
+ if( ACCESSING_BITS_16_23 ) {
rf2_set_layer_banks(data >> 16);
}
logerror("z80 data = %08x mask = %08x\n",data,mem_mask);
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
if( data & 0x1 ) {
z80_prg_fifo_pos = 0;
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, CLEAR_LINE );
@@ -922,7 +922,7 @@ logerror("z80 data = %08x mask = %08x\n",data,mem_mask);
static READ32_HANDLER( spi_controls1_r )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
return (readinputport(1) << 8) | readinputport(0) | 0xffff0000;
}
return 0xffffffff;
@@ -930,7 +930,7 @@ static READ32_HANDLER( spi_controls1_r )
static READ32_HANDLER( spi_controls2_r )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
return ((readinputport(2) | 0xffffff00) & ~0x40) | (EEPROM_read_bit() << 6);
}
return 0xffffffff;
@@ -948,14 +948,14 @@ static READ32_HANDLER( spi_6295_1_r )
static WRITE32_HANDLER( spi_6295_0_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
OKIM6295_data_0_w(machine, 0, data & 0xff);
}
}
static WRITE32_HANDLER( spi_6295_1_w )
{
- if( ACCESSING_BYTE_0 ) {
+ if( ACCESSING_BITS_0_7 ) {
OKIM6295_data_1_w(machine, 0, data & 0xff);
}
}
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index f930540cc50..00b9dbd4060 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -80,7 +80,7 @@ static READ16_HANDLER( mahjong_panel_r )
static WRITE16_HANDLER( mahjong_panel_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
sengokumj_mux_data = data >> 8;
}
@@ -89,7 +89,7 @@ static WRITE16_HANDLER( sengokmj_out_w )
static UINT8 old = 0;
static int coins_used = 0;
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
if((old & 4) == 0 && (data & 4) == 4)
{
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index a33d12d3b5c..56080559e51 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1476,7 +1476,7 @@ static READ16_HANDLER( sharedram_68000_r )
static WRITE16_HANDLER( sharedram_68000_w )
{
- if (ACCESSING_BYTE_0) sharedram[offset] = data & 0xff;
+ if (ACCESSING_BITS_0_7) sharedram[offset] = data & 0xff;
}
@@ -1494,7 +1494,7 @@ static WRITE16_HANDLER( sub_ctrl_w )
switch(offset)
{
case 0/2: // bit 0: reset sub cpu?
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if ( !(old_data&1) && (data&1) )
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, PULSE_LINE);
@@ -1506,11 +1506,11 @@ static WRITE16_HANDLER( sub_ctrl_w )
break;
case 4/2: // not sure
- if (ACCESSING_BYTE_0) soundlatch_w(machine, 0, data & 0xff);
+ if (ACCESSING_BITS_0_7) soundlatch_w(machine, 0, data & 0xff);
break;
case 6/2: // not sure
- if (ACCESSING_BYTE_0) soundlatch2_w(machine, 0, data & 0xff);
+ if (ACCESSING_BITS_0_7) soundlatch2_w(machine, 0, data & 0xff);
break;
}
@@ -1677,7 +1677,7 @@ static READ16_HANDLER ( calibr50_ip_r )
static WRITE16_HANDLER( calibr50_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_word_w(machine,0,data,mem_mask);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
@@ -1762,7 +1762,7 @@ static WRITE16_HANDLER( usclssic_lockout_w )
{
static int old_tiles_offset = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
seta_tiles_offset = (data & 0x10) ? 0x4000: 0;
if (old_tiles_offset != seta_tiles_offset) tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -2589,7 +2589,7 @@ static READ16_HANDLER( kiwame_nvram_r )
static WRITE16_HANDLER( kiwame_nvram_w )
{
- if (ACCESSING_BYTE_0) COMBINE_DATA( &kiwame_nvram[offset] );
+ if (ACCESSING_BITS_0_7) COMBINE_DATA( &kiwame_nvram[offset] );
}
static READ16_HANDLER( kiwame_input_r )
@@ -2760,7 +2760,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( utoukond_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
soundlatch_w(machine,0,data & 0xff);
@@ -3069,8 +3069,8 @@ ADDRESS_MAP_END
Crazy Fight
***************************************************************************/
-static WRITE16_HANDLER( YM3812_control_port_0_lsb_w ) { if (ACCESSING_BYTE_0) YM3812_control_port_0_w(machine, 0, data & 0xff); }
-static WRITE16_HANDLER( YM3812_write_port_0_lsb_w ) { if (ACCESSING_BYTE_0) YM3812_write_port_0_w(machine, 0, data & 0xff); }
+static WRITE16_HANDLER( YM3812_control_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) YM3812_control_port_0_w(machine, 0, data & 0xff); }
+static WRITE16_HANDLER( YM3812_write_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) 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
@@ -9278,7 +9278,7 @@ logerror("%04x: twineagl_200100_r %d\n",activecpu_get_pc(),offset);
static WRITE16_HANDLER( twineagl_200100_w )
{
logerror("%04x: twineagl_200100_w %d = %02x\n",activecpu_get_pc(),offset,data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
xram[offset] = data & 0xff;
}
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index f36ee3bdd1c..c46130be15c 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -423,7 +423,7 @@ U38 - U40 Mask roms (Graphics 23c64020 64Mbit) - 23C64020 read as 27C322 with pi
static WRITE16_HANDLER( seta2_sound_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
UINT8 *ROM = memory_region( REGION_SOUND1 );
int banks = (memory_region_length( REGION_SOUND1 ) - 0x100000) / 0x20000;
@@ -443,7 +443,7 @@ static WRITE16_HANDLER( seta2_sound_bank_w )
static WRITE16_HANDLER( grdians_lockout_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// initially 0, then either $25 (coin 1) or $2a (coin 2)
coin_counter_w(0,data & 0x01); // or 0x04
@@ -575,7 +575,7 @@ static READ16_HANDLER( mj4simai_p1_r )
static WRITE16_HANDLER( mj4simai_keyboard_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
keyboard_row = data & 0xff;
}
@@ -691,7 +691,7 @@ static READ16_HANDLER( pzlbowl_coins_r )
static WRITE16_HANDLER( pzlbowl_coin_counter_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x10);
coin_counter_w(1,data & 0x20);
@@ -780,7 +780,7 @@ static READ16_HANDLER( samshoot_lightgun2_r )
static WRITE16_HANDLER( samshoot_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x10);
coin_counter_w(1, data & 0x20);
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 4dc19366ad9..917ea17106e 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -38,7 +38,7 @@ static READ16_HANDLER( dummy_r )
static WRITE16_HANDLER( sf_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 0x01);
coin_counter_w(1,data & 0x02);
@@ -51,7 +51,7 @@ static WRITE16_HANDLER( sf_coin_w )
static WRITE16_HANDLER( soundcmd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index a6dce6081eb..3d1b9c24685 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -210,7 +210,7 @@ static READ16_HANDLER( shadfrce_input_ports_r )
static WRITE16_HANDLER ( shadfrce_sound_brt_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine,1,data >> 8);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE );
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index b9ff4e5b2e0..e6b9e1e1bee 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -77,7 +77,7 @@ static READ16_HANDLER( heberpop_gfxrom_r )
static WRITE16_HANDLER( shangha3_coinctrl_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_lockout_w(0,~data & 0x0400);
coin_lockout_w(1,~data & 0x0400);
@@ -88,7 +88,7 @@ static WRITE16_HANDLER( shangha3_coinctrl_w )
static WRITE16_HANDLER( heberpop_coinctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* the sound ROM bank is selected by the main CPU! */
OKIM6295_set_bank_base(0,(data & 0x08) ? 0x40000 : 0x00000);
@@ -103,7 +103,7 @@ static WRITE16_HANDLER( heberpop_coinctrl_w )
static WRITE16_HANDLER( heberpop_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
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/shanghai.c b/src/mame/drivers/shanghai.c
index 22ede72190d..5ffe352fd84 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -620,7 +620,7 @@ static READ16_HANDLER( HD63484_status_r )
static WRITE16_HANDLER( HD63484_address_w )
{
/* only low 8 bits are used */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
regno = data;
}
@@ -739,7 +739,7 @@ static INTERRUPT_GEN( shanghai_interrupt )
static WRITE16_HANDLER( shanghai_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,data & 1);
coin_counter_w(1,data & 2);
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index a7d51cf3af0..b6b68bfc8d8 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -126,7 +126,7 @@ static READ16_HANDLER( adpcm_r )
static WRITE16_HANDLER( adpcm_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
OKIM6295_data_0_w(machine, offset, data & 0xff);
}
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 4bb87e124d7..37c222f73ef 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -166,7 +166,7 @@ static READ32_HANDLER(silk_6295_0_r)
static WRITE32_HANDLER(silk_6295_0_w)
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
logerror("OKI0: write %x mem_mask %8x\n", data>>16, mem_mask);
OKIM6295_data_0_w(machine, 0, (data>>16) & 0xff);
@@ -180,7 +180,7 @@ static READ32_HANDLER(silk_6295_1_r)
static WRITE32_HANDLER(silk_6295_1_w)
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
logerror("OKI1: write %x mem_mask %8x\n", data>>16, mem_mask);
OKIM6295_data_1_w(machine, 0, (data>>16) & 0xff);
@@ -194,7 +194,7 @@ static READ32_HANDLER(silk_ym_r)
static WRITE32_HANDLER(silk_ym_regport_w)
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
YM2151_register_port_0_w(machine, 0, (data>>16) & 0xff);
}
@@ -202,7 +202,7 @@ static WRITE32_HANDLER(silk_ym_regport_w)
static WRITE32_HANDLER(silk_ym_dataport_w)
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
YM2151_data_port_0_w(machine, 0, (data>>16) & 0xff);
}
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index d06da7da739..8a19a723f92 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -121,7 +121,7 @@ static WRITE16_HANDLER( protection_w )
{
/* top byte is used, meaning unknown */
/* bottom byte is protection in ikari 3 and streetsm */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
invert_controls = ((data & 0xff) == 0x07) ? 0xff : 0x00;
}
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index d8094af5398..2dc575ce63c 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -75,7 +75,7 @@ out of the sprite list at that point.. (verify on real hw)
static WRITE16_HANDLER( snowbros_flipscreen_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
flip_screen_set(~data & 0x8000);
}
@@ -145,7 +145,7 @@ static READ16_HANDLER( snowbros_68000_sound_r )
static WRITE16_HANDLER( snowbros_68000_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@@ -154,7 +154,7 @@ static WRITE16_HANDLER( snowbros_68000_sound_w )
static WRITE16_HANDLER( semicom_soundcmd_w )
{
- if (ACCESSING_BYTE_0) soundlatch_w(machine,0,data & 0xff);
+ if (ACCESSING_BITS_0_7) soundlatch_w(machine,0,data & 0xff);
}
@@ -287,7 +287,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( twinadv_68000_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 826013aa714..35f47f065b3 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -137,7 +137,7 @@ VIDEO_UPDATE( spbactn );
static WRITE16_HANDLER( soundcommand_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 9327af6ad93..de693bf8a3c 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -68,7 +68,7 @@ VIDEO_UPDATE( funystrp );
static WRITE16_HANDLER( splash_sh_irqtrigger_w )
{
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
@@ -76,7 +76,7 @@ static WRITE16_HANDLER( splash_sh_irqtrigger_w )
static WRITE16_HANDLER( roldf_sh_irqtrigger_w )
{
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
soundlatch_w(machine,0,data & 0xff);
cpunum_set_input_line(machine, 1,0,HOLD_LINE);
}
@@ -102,7 +102,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( splash_coin_w )
{
- if (ACCESSING_BYTE_1){
+ if (ACCESSING_BITS_8_15){
switch ((offset >> 3)){
case 0x00: /* Coin Lockouts */
case 0x01:
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 542e39630b9..9e0e286fafe 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -289,7 +289,7 @@ static READ16_HANDLER( srmp2_input_1_r )
--x- ---- : Player 1 and 2 side flag
*/
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
{
return 0xffff;
}
@@ -322,7 +322,7 @@ static READ16_HANDLER( srmp2_input_1_r )
static READ16_HANDLER( srmp2_input_2_r )
{
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
{
return 0x0001;
}
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 14815c891da..5eca9d6cb1c 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -320,7 +320,7 @@ static void sslam_play(running_machine *machine, int track, int data)
static WRITE16_HANDLER( sslam_snd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
logerror("PC:%06x Writing %04x to Sound CPU\n",activecpu_get_previouspc(),data);
if (data >= 0x40) {
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 9922072f14f..2d506971518 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -308,7 +308,7 @@ static INTERRUPT_GEN( gdfs_interrupt )
static WRITE16_HANDLER( ssv_lockout_w )
{
// popmessage("%02X",data & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_lockout_w(1,~data & 0x01);
coin_lockout_w(0,~data & 0x02);
@@ -323,7 +323,7 @@ static WRITE16_HANDLER( ssv_lockout_w )
static WRITE16_HANDLER( ssv_lockout_inv_w )
{
// popmessage("%02X",data & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_lockout_w(1, data & 0x01);
coin_lockout_w(0, data & 0x02);
@@ -501,7 +501,7 @@ static WRITE16_HANDLER( gdfs_eeprom_w )
if (data & ~0x7b00)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_1 )
+ if ( ACCESSING_BITS_8_15 )
{
// data & 0x8000 ? (near palette writes)
// data & 0x0001 ?
@@ -561,7 +561,7 @@ static WRITE16_HANDLER( gdfs_blitram_w )
if (data & ~0x43)
logerror("CPU #0 PC: %06X - Unknown gdfs_gfxram_bank bit written %04X\n",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
gdfs_gfxram_bank = data & 3;
}
break;
@@ -828,7 +828,7 @@ static READ16_HANDLER( srmp7_irqv_r )
static WRITE16_HANDLER( srmp7_sound_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int bank = 0x400000/2 * (data & 1); // UINT16 address
int voice;
@@ -908,7 +908,7 @@ static READ16_HANDLER( sxyreact_dial_r )
static WRITE16_HANDLER( sxyreact_dial_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static int old;
@@ -1063,7 +1063,7 @@ static READ16_HANDLER( eaglshot_gfxrom_r )
static WRITE16_HANDLER( eaglshot_gfxrom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
gfxrom_select = data;
}
@@ -1082,7 +1082,7 @@ static READ16_HANDLER( eaglshot_trackball_r )
static WRITE16_HANDLER( eaglshot_trackball_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
trackball_select = data;
}
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 9fcbcdd720b..c18667402c2 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -91,7 +91,7 @@ static READ16_HANDLER( stlforce_input_port_1_r )
static WRITE16_HANDLER( eeprom_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
EEPROM_write_bit(data & 0x01);
EEPROM_set_cs_line((data & 0x02) ? CLEAR_LINE : ASSERT_LINE );
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index c0bfe1d091f..7958532fa8b 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -769,10 +769,10 @@ static READ32_HANDLER ( stv_SMPC_r32 )
/* registers are all byte accesses, convert here */
offset = offset << 2; // multiply offset by 4
- if (ACCESSING_BYTE_3) { byte = 0; readdata = stv_SMPC_r8(offset+byte) << 24; }
- if (ACCESSING_BYTE_2) { byte = 1; readdata = stv_SMPC_r8(offset+byte) << 16; }
- if (ACCESSING_BYTE_1) { byte = 2; readdata = stv_SMPC_r8(offset+byte) << 8; }
- if (ACCESSING_BYTE_0) { byte = 3; readdata = stv_SMPC_r8(offset+byte) << 0; }
+ if (ACCESSING_BITS_24_31) { byte = 0; readdata = stv_SMPC_r8(offset+byte) << 24; }
+ if (ACCESSING_BITS_16_23) { byte = 1; readdata = stv_SMPC_r8(offset+byte) << 16; }
+ if (ACCESSING_BITS_8_15) { byte = 2; readdata = stv_SMPC_r8(offset+byte) << 8; }
+ if (ACCESSING_BITS_0_7) { byte = 3; readdata = stv_SMPC_r8(offset+byte) << 0; }
return readdata;
}
@@ -785,10 +785,10 @@ static WRITE32_HANDLER ( stv_SMPC_w32 )
/* registers are all byte accesses, convert here so we can use the data more easily later */
offset = offset << 2; // multiply offset by 4
- if (ACCESSING_BYTE_3) { byte = 0; writedata = data >> 24; }
- if (ACCESSING_BYTE_2) { byte = 1; writedata = data >> 16; }
- if (ACCESSING_BYTE_1) { byte = 2; writedata = data >> 8; }
- if (ACCESSING_BYTE_0) { byte = 3; writedata = data >> 0; }
+ if (ACCESSING_BITS_24_31) { byte = 0; writedata = data >> 24; }
+ if (ACCESSING_BITS_16_23) { byte = 1; writedata = data >> 16; }
+ if (ACCESSING_BITS_8_15) { byte = 2; writedata = data >> 8; }
+ if (ACCESSING_BITS_0_7) { byte = 3; writedata = data >> 0; }
writedata &= 0xff;
@@ -1048,7 +1048,7 @@ static WRITE32_HANDLER ( stv_io_w32 )
switch(offset)
{
case 1:
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
/*Why does the BIOS tests these as ACTIVE HIGH?A program bug?*/
ioga[1] = (data) & 0xff;
@@ -1062,24 +1062,24 @@ static WRITE32_HANDLER ( stv_io_w32 )
}
break;
case 2:
- if(ACCESSING_BYTE_2)
+ if(ACCESSING_BITS_16_23)
{
ioga[2] = data >> 16;
mux_data = ioga[2];
}
- else if(ACCESSING_BYTE_0)
+ else if(ACCESSING_BITS_0_7)
ioga[2] = data;
break;
case 3:
- if(ACCESSING_BYTE_2)
+ if(ACCESSING_BITS_16_23)
ioga[3] = data;
break;
case 4:
- if(ACCESSING_BYTE_2)
+ if(ACCESSING_BITS_16_23)
port_sel = (data & 0xffff0000) >> 16;
break;
case 5:
- if(ACCESSING_BYTE_2)
+ if(ACCESSING_BITS_16_23)
ioga[5] = data;
break;
}
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 17d07186e98..6e84816ee21 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -51,7 +51,7 @@ VIDEO_UPDATE( bestbest );
static WRITE16_HANDLER( suna16_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w( machine, 0, data & 0xff );
}
@@ -61,7 +61,7 @@ static WRITE16_HANDLER( suna16_soundlatch_w )
static WRITE16_HANDLER( bssoccer_leds_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
set_led_status(0, data & 0x01);
set_led_status(1, data & 0x02);
@@ -75,7 +75,7 @@ static WRITE16_HANDLER( bssoccer_leds_w )
static WRITE16_HANDLER( uballoon_leds_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x01);
set_led_status(0, data & 0x02);
@@ -87,7 +87,7 @@ static WRITE16_HANDLER( uballoon_leds_w )
static WRITE16_HANDLER( bestbest_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x04);
}
@@ -205,7 +205,7 @@ static READ16_HANDLER( bestbest_prot_r )
static WRITE16_HANDLER( bestbest_prot_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
switch (data & 0xff)
{
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 8f0398bf026..c0e9828b3b9 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -63,14 +63,14 @@ static READ16_HANDLER( shared_ram_r )
static WRITE16_HANDLER( shared_ram_w )
{
if ((offset&1)==0) {
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[offset/2]=(shared_ram[offset/2]&0x00ffffff)|((data&0xff00)<<16);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[offset/2]=(shared_ram[offset/2]&0xff00ffff)|((data&0x00ff)<<16);
} else {
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[offset/2]=(shared_ram[offset/2]&0xffff00ff)|((data&0xff00)<< 0);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[offset/2]=(shared_ram[offset/2]&0xffffff00)|((data&0x00ff)<< 0);
}
}
@@ -86,13 +86,13 @@ static WRITE32_HANDLER( cpua_ctrl_w )
is there an irq enable in the top nibble?
*/
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
cpunum_set_input_line(Machine, 2, INPUT_LINE_RESET, (data &0x200) ? CLEAR_LINE : ASSERT_LINE);
if (data&0x8000) cpunum_set_input_line(Machine, 0,3,HOLD_LINE); /* Guess */
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* Lamp control bits of some sort in the lsb */
}
@@ -143,12 +143,12 @@ static WRITE32_HANDLER( superchs_input_w )
{
case 0x00:
{
- if (ACCESSING_BYTE_3) /* $300000 is watchdog */
+ if (ACCESSING_BITS_24_31) /* $300000 is watchdog */
{
watchdog_reset(machine);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x40);
@@ -163,7 +163,7 @@ static WRITE32_HANDLER( superchs_input_w )
case 0x01:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
coin_lockout_w(0,~data & 0x01000000);
coin_lockout_w(1,~data & 0x02000000);
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index b2ed7141316..515043ec5a5 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -732,25 +732,25 @@ static WRITE32_HANDLER( skns_io_w )
{
switch(offset) {
case 2:
- if(ACCESSING_BYTE_3)
+ if(ACCESSING_BITS_24_31)
{ /* Coin Lock/Count */
// coin_counter_w(0, data & 0x01000000);
// coin_counter_w(1, data & 0x02000000);
// coin_lockout_w(0, ~data & 0x04000000);
// coin_lockout_w(1, ~data & 0x08000000); // Works in puzzloop, others behave strange.
}
- if(ACCESSING_BYTE_2)
+ if(ACCESSING_BITS_16_23)
{ /* Analogue Input Select */
}
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
{ /* Extended Output - Port A, Mahjong inputs, Comms etc. */
}
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{ /* Extended Output - Port B */
}
break;
case 3:
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
{ /* Interrupt Clear, do we need these? */
/* if(data&0x01)
cpunum_set_input_line(machine, 0,1,CLEAR_LINE);
@@ -852,9 +852,9 @@ static WRITE32_HANDLER( skns_v3t_w )
static WRITE32_HANDLER( skns_ymz280_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
YMZ280B_register_0_w(machine,offset,(data >> 24) & 0xff);
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
YMZ280B_data_0_w(machine,offset,(data >> 16) & 0xff);
}
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index bc92a2e198b..858bc338eca 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -103,7 +103,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index f42e45821c2..8358ec29fc8 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -209,7 +209,7 @@ static UINT16 coinctrl;
static WRITE16_HANDLER( sys16_3d_coinctrl_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
coinctrl = data&0xff;
sys16_refreshenable = coinctrl & 0x10;
@@ -409,7 +409,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( sound_command_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
soundlatch_w( machine,0,data&0xff );
cpunum_set_input_line(machine, 1, 0, HOLD_LINE );
@@ -418,7 +418,7 @@ static WRITE16_HANDLER( sound_command_w )
static WRITE16_HANDLER( sound_command_nmi_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
soundlatch_w( machine,0,data&0xff );
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
@@ -430,7 +430,7 @@ static WRITE16_HANDLER( sound_command_nmi_w )
static WRITE16_HANDLER( sys16_coinctrl_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
coinctrl = data&0xff;
sys16_refreshenable = coinctrl & 0x20;
@@ -502,7 +502,7 @@ MACHINE_DRIVER_END
static WRITE16_HANDLER( sys16_tilebank_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
switch(offset & 1)
{
@@ -891,7 +891,7 @@ static int eswat_tilebank0;
static WRITE16_HANDLER( eswat_tilebank0_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
eswat_tilebank0 = data&0xff;
}
@@ -1228,7 +1228,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( ga_sound_command_w )
{
COMBINE_DATA( &sys16_workingram[(0xecfc-0xc000)/2] );
- if( ACCESSING_BYTE_1 )
+ if( ACCESSING_BITS_8_15 )
{
soundlatch_w( machine,0,data>>8 );
cpunum_set_input_line(Machine, 1, 0, HOLD_LINE );
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index 987f76f4422..87dfe460a8b 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -86,7 +86,7 @@ extern WRITE16_HANDLER( segac2_vdp_w );
static WRITE16_HANDLER( sys18_refreshenable_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
sys16_refreshenable = data & 0x02;
}
@@ -94,7 +94,7 @@ static WRITE16_HANDLER( sys18_refreshenable_w )
static WRITE16_HANDLER( sys18_tilebank_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
sys16_tile_bank0 = (data >> 0) & 0x0F;
sys16_tile_bank1 = (data >> 4) & 0x0F;
@@ -193,7 +193,7 @@ static const struct MSM5205interface shdancbl_msm5205_interface =
static UINT8* shdancbl_soundbank_ptr = NULL; /* Pointer to currently selected portion of ROM */
static WRITE16_HANDLER( sound_command_irq_w ){
- if( ACCESSING_BYTE_0 ){
+ if( ACCESSING_BITS_0_7 ){
soundlatch_w( machine,0,data&0xff );
cpunum_set_input_line(machine, 1, 0, HOLD_LINE );
}
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( sound_writeport_18, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static WRITE16_HANDLER( sound_command_nmi_w ){
- if( ACCESSING_BYTE_0 ){
+ if( ACCESSING_BITS_0_7 ){
soundlatch_w( machine,0,data&0xff );
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -478,7 +478,7 @@ static int io_reg[0x10];
static READ16_HANDLER( sys18_io_r )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
switch(offset & 0x3000/2)
{
@@ -576,7 +576,7 @@ static READ16_HANDLER( sys18_io_r )
static WRITE16_HANDLER( sys18_io_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
switch(offset & 0x3000/2)
{
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 83ed70fa8a5..7b6b0d27bd9 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -39,7 +39,7 @@ static MACHINE_RESET( tail2nos )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,offset,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
@@ -53,13 +53,13 @@ static READ16_HANDLER( tail2nos_K051316_0_r )
static WRITE16_HANDLER( tail2nos_K051316_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_0_w(machine,offset,data & 0xff);
}
static WRITE16_HANDLER( tail2nos_K051316_ctrl_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_ctrl_0_w(machine,offset,data & 0xff);
}
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 2bf57121fa7..f6ae7ed5c39 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -362,7 +362,7 @@ static READ16_HANDLER( trackx2_lo_r )
static WRITE16_HANDLER( gain_control_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (offset==0)
{
@@ -429,7 +429,7 @@ static WRITE16_HANDLER( eeprom_w )
{
COMBINE_DATA(&eep_latch);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data >>= 8; /*M68k byte write*/
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index c54f6d92669..d8a9becc450 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -315,7 +315,7 @@ static WRITE16_HANDLER( taitof2_watchdog_w )
static WRITE16_HANDLER( growl_coin_word_w ) /* what about coins 3&4 ?? */
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_lockout_w(0, ~data & 0x01);
coin_lockout_w(1, ~data & 0x02);
@@ -326,7 +326,7 @@ static WRITE16_HANDLER( growl_coin_word_w ) /* what about coins 3&4 ?? */
static WRITE16_HANDLER( taitof2_4p_coin_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_lockout_w(0, ~data & 0x01);
coin_lockout_w(1, ~data & 0x02);
@@ -341,7 +341,7 @@ static WRITE16_HANDLER( taitof2_4p_coin_word_w )
static WRITE16_HANDLER( ninjak_coin_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
coin_lockout_w(0, ~data & 0x0100);
coin_lockout_w(1, ~data & 0x0200);
@@ -871,7 +871,7 @@ static WRITE16_HANDLER ( driveout_sound_command_w )
{
static int nibble = 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data >>= 8;
if (offset==0)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index d71c3b0dcb6..502967be37a 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -89,7 +89,7 @@ static WRITE32_HANDLER( f3_control_w )
watchdog_reset(machine);
return;
case 0x01: /* Coin counters & lockouts */
- if (ACCESSING_BYTE_3) {
+ if (ACCESSING_BITS_24_31) {
coin_lockout_w(0,~data & 0x01000000);
coin_lockout_w(1,~data & 0x02000000);
coin_counter_w(0, data & 0x04000000);
@@ -98,14 +98,14 @@ static WRITE32_HANDLER( f3_control_w )
}
return;
case 0x04: /* Eeprom */
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x04);
EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
}
return;
case 0x05: /* Player 3 & 4 coin counters */
- if (ACCESSING_BYTE_3) {
+ if (ACCESSING_BITS_24_31) {
coin_lockout_w(2,~data & 0x01000000);
coin_lockout_w(3,~data & 0x02000000);
coin_counter_w(2, data & 0x04000000);
@@ -134,7 +134,7 @@ static WRITE32_HANDLER( f3_sound_bankswitch_w )
UINT32 idx;
idx = (offset << 1) & 0x1e;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
idx += 1;
if (idx >= 8)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 2edf2e37661..eb53fee2564 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -240,7 +240,7 @@ VIDEO_UPDATE( taitoair );
static WRITE16_HANDLER( system_control_w )
{
- if ((ACCESSING_BYTE_0 == 0) && ACCESSING_BYTE_1)
+ if ((ACCESSING_BITS_0_7 == 0) && ACCESSING_BITS_8_15)
{
data >>= 8;
}
@@ -259,7 +259,7 @@ static READ16_HANDLER( lineram_r )
static WRITE16_HANDLER( lineram_w )
{
- if (ACCESSING_BYTE_1 && ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7)
taitoair_line_ram[offset] = data;
}
@@ -270,7 +270,7 @@ static READ16_HANDLER( dspram_r )
static WRITE16_HANDLER( dspram_w )
{
- if (ACCESSING_BYTE_1 && ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7)
dsp_ram[offset] = data;
}
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 5e8079d77a5..6de77f3f02d 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -419,7 +419,7 @@ static READ32_HANDLER ( jc_control_r )
{
case 0x0:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= ((readinputport(0) & 0x2) << 2) << 24;
}
@@ -427,7 +427,7 @@ static READ32_HANDLER ( jc_control_r )
}
case 0x1:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
UINT32 data = EEPROM_read_bit() & 1;
data |= readinputport(0) & 0xfe;
@@ -437,7 +437,7 @@ static READ32_HANDLER ( jc_control_r )
}
case 0x2:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(1) << 24;
}
@@ -445,7 +445,7 @@ static READ32_HANDLER ( jc_control_r )
}
case 0x3:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(2) << 24;
}
@@ -453,7 +453,7 @@ static READ32_HANDLER ( jc_control_r )
}
case 0x4:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
//r |= (mame_rand(Machine) & 0xff) << 24;
}
@@ -461,7 +461,7 @@ static READ32_HANDLER ( jc_control_r )
}
case 0x7:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(3) << 24;
}
@@ -483,7 +483,7 @@ static WRITE32_HANDLER ( jc_control_w )
{
case 0x3:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
EEPROM_set_clock_line(((data >> 24) & 0x08) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(((data >> 24) & 0x04) ? 1 : 0);
@@ -562,19 +562,19 @@ static READ32_HANDLER(mcu_comm_r)
UINT32 r = 0;
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= mcu_comm_reg_r(reg + 0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= mcu_comm_reg_r(reg + 1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= mcu_comm_reg_r(reg + 2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= mcu_comm_reg_r(reg + 3) << 0;
}
@@ -586,19 +586,19 @@ static WRITE32_HANDLER(mcu_comm_w)
{
int reg = offset * 4;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
mcu_comm_reg_w(reg + 0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
mcu_comm_reg_w(reg + 1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
mcu_comm_reg_w(reg + 2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mcu_comm_reg_w(reg + 3, (data >> 0) & 0xff);
}
@@ -752,12 +752,12 @@ static int first_dsp_reset = 1;
static WRITE32_HANDLER(dsp_shared_w)
{
//mame_printf_debug("dsp_shared_ram: %08X, %04X at %08X\n", offset, data >> 16, activecpu_get_pc());
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
dsp_shared_ram[offset] &= 0x00ff;
dsp_shared_ram[offset] |= (data >> 16) & 0xff00;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
dsp_shared_ram[offset] &= 0xff00;
dsp_shared_ram[offset] |= (data >> 16) & 0x00ff;
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index a012daa9bd9..5981bb3d4c6 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -153,19 +153,19 @@ static void intel82439tx_init(void)
static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= mxtc_config_r(function, reg + 3) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= mxtc_config_r(function, reg + 2) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= mxtc_config_r(function, reg + 1) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= mxtc_config_r(function, reg + 0) << 0;
}
@@ -174,19 +174,19 @@ static UINT32 intel82439tx_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82439tx_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
mxtc_config_w(function, reg + 3, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
mxtc_config_w(function, reg + 2, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
mxtc_config_w(function, reg + 1, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mxtc_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@@ -210,19 +210,19 @@ static void piix4_config_w(int function, int reg, UINT8 data)
static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= piix4_config_r(function, reg + 3) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= piix4_config_r(function, reg + 2) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= piix4_config_r(function, reg + 1) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= piix4_config_r(function, reg + 0) << 0;
}
@@ -231,19 +231,19 @@ static UINT32 intel82371ab_pci_r(int function, int reg, UINT32 mem_mask)
static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_mask)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
piix4_config_w(function, reg + 3, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
piix4_config_w(function, reg + 2, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
piix4_config_w(function, reg + 1, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
piix4_config_w(function, reg + 0, (data >> 0) & 0xff);
}
@@ -252,7 +252,7 @@ static void intel82371ab_pci_w(int function, int reg, UINT32 data, UINT32 mem_ma
// ISA Plug-n-Play
static WRITE32_HANDLER( pnp_config_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// mame_printf_debug("PNP Config: %02X\n", (data >> 8) & 0xff);
}
@@ -260,7 +260,7 @@ static WRITE32_HANDLER( pnp_config_w )
static WRITE32_HANDLER( pnp_data_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// mame_printf_debug("PNP Data: %02X\n", (data >> 8) & 0xff);
}
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 68fe412e32a..020c7bc7d8b 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -91,7 +91,7 @@ static READ16_HANDLER( pending_command_r )
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine,offset,data & 0xff);
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index a5f745b0576..48cd45dfc33 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -75,7 +75,7 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 0f255636c54..46e75911121 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -52,7 +52,7 @@ static READ16_HANDLER( m68k_shared_word_r )
static WRITE16_HANDLER( m68k_shared_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
m68k_shared_ram[offset] = data & 0xff;
}
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 8d321d97971..7b66a556f1e 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -60,7 +60,7 @@ VIDEO_UPDATE( tecmo16 );
static WRITE16_HANDLER( tecmo16_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0x00,data & 0xff);
cpunum_set_input_line(machine, 1,INPUT_LINE_NMI,PULSE_LINE);
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 35295ff894a..0623ea32de4 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -268,7 +268,7 @@ static READ16_HANDLER(reg_f80000_r)
static READ16_HANDLER(reg_b80000_r)
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// Bit 7: 0 = ready to write
// Bit 6: 0 = ready to read
@@ -338,7 +338,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( eeprom_w )
{
- if ( ACCESSING_BYTE_1 )
+ if ( ACCESSING_BITS_8_15 )
{
EEPROM_write_bit(data & 0x0800);
EEPROM_set_cs_line((data & 0x0200) ? CLEAR_LINE : ASSERT_LINE );
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 892ce6b66d1..2763da3f91c 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -183,7 +183,7 @@ static READ16_HANDLER( amazon_protection_r )
static WRITE16_HANDLER( amazon_protection_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
if( offset==1 )
{
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 01da035ec9f..d13a1941a6d 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -97,7 +97,7 @@ VIDEO_UPDATE( rocknms );
static WRITE16_HANDLER( tetrisp2_systemregs_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
tetrisp2_systemregs[offset] = data;
}
@@ -107,7 +107,7 @@ static WRITE16_HANDLER( tetrisp2_systemregs_w )
static WRITE16_HANDLER( rockn_systemregs_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
tetrisp2_systemregs[offset] = data;
if (offset == 0x0c)
@@ -121,7 +121,7 @@ static WRITE16_HANDLER( rockn_systemregs_w )
static WRITE16_HANDLER( rocknms_sub_systemregs_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
rocknms_sub_systemregs[offset] = data;
if (offset == 0x0c)
@@ -148,7 +148,7 @@ static READ16_HANDLER( tetrisp2_sound_r )
static WRITE16_HANDLER( tetrisp2_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (offset) YMZ280B_data_0_w (machine, offset, data & 0xff);
else YMZ280B_register_0_w (machine, offset, data & 0xff);
@@ -300,7 +300,7 @@ static READ16_HANDLER( rocknms_main2sub_r )
static WRITE16_HANDLER( rocknms_main2sub_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
rocknms_main2sub = (data ^ 0xffff);
}
@@ -311,7 +311,7 @@ static READ16_HANDLER( rocknms_port_0_r )
static WRITE16_HANDLER( rocknms_sub2main_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
rocknms_sub2main = (data ^ 0xffff);
}
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 3fdcdf058a7..bf143835963 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -72,14 +72,14 @@ static WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
static WRITE16_HANDLER( thoop2_coin_w )
{
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
switch ((offset >> 3)){
case 0x00: /* Coin Lockouts */
case 0x01:
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index b27730fcf3d..fb2d70d4402 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -91,7 +91,7 @@ static READ16_HANDLER( special_port2_r )
static WRITE16_HANDLER( latch_w )
{
/* reset extra CPU */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* 0 means hold CPU 2's reset low */
if (data & 1)
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 17ecfc32710..6c94c6fd6a5 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -158,7 +158,7 @@ static WRITE16_HANDLER( f1dream_control_w )
static WRITE16_HANDLER( tigeroad_soundcmd_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
soundlatch_w(machine,offset,data >> 8);
}
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 83281c7a850..07878c27bf9 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -46,14 +46,14 @@ To Do:
static int okibank;
static WRITE16_HANDLER( tmaster_oki_bank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
// data & 0x0800?
okibank = ((data >> 8) & 3);
OKIM6295_set_bank_base(0, okibank * 0x40000);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// data & 0x0002?
}
@@ -76,7 +76,7 @@ static void show_touchscreen(void)
static WRITE16_HANDLER( tmaster_tscreen_reset_w )
{
- if (ACCESSING_BYTE_0 && data == 0x05)
+ if (ACCESSING_BITS_0_7 && data == 0x05)
{
touchscreen = 0;
show_touchscreen();
@@ -419,7 +419,7 @@ static WRITE16_HANDLER( galgames_eeprom_w )
if (data & ~0x0003)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_0 )
+ if ( ACCESSING_BITS_0_7 )
{
// latch the bit
EEPROM_write_bit(data & 0x0001);
@@ -447,7 +447,7 @@ static UINT8 palette_data[3];
static WRITE16_HANDLER( galgames_palette_offset_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
palette_offset = data & 0xff;
palette_index = 0;
@@ -455,7 +455,7 @@ static WRITE16_HANDLER( galgames_palette_offset_w )
}
static WRITE16_HANDLER( galgames_palette_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
palette_data[palette_index] = data & 0xff;
if (++palette_index == 3)
@@ -474,7 +474,7 @@ static READ16_HANDLER( galgames_okiram_r )
}
static WRITE16_HANDLER( galgames_okiram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
memory_region(REGION_SOUND1)[offset] = data & 0xff;
}
@@ -486,7 +486,7 @@ static WRITE16_HANDLER( galgames_cart_sel_w )
// cart selection (0 1 2 3 4 7)
// 7 resets the eeprom
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
EEPROM_set_cs_line(((data&0xff) == 0x07) ? ASSERT_LINE : CLEAR_LINE);
}
@@ -497,7 +497,7 @@ static READ16_HANDLER( galgames_cart_clock_r )
static WRITE16_HANDLER( galgames_cart_clock_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// bit 3 = clock
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 02d6265abcf..4c593016102 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -134,9 +134,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_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K052109_w(machine,offset,(data >> 8) & 0xff);
- else if (ACCESSING_BYTE_0)
+ else if (ACCESSING_BITS_0_7)
K052109_w(machine,offset + 0x2000,data & 0xff);
}
@@ -185,9 +185,9 @@ static WRITE16_HANDLER( K053244_word_noA1_w )
{
offset &= ~1; /* handle mirror address */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K053244_w(machine,offset,(data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053244_w(machine,offset + 1,data & 0xff);
}
@@ -223,7 +223,7 @@ static INTERRUPT_GEN( lgtnfght_interrupt )
static WRITE16_HANDLER( tmnt_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data & 0xff);
}
@@ -250,7 +250,7 @@ static READ16_HANDLER( glfgreat_sound_r )
static WRITE16_HANDLER( glfgreat_sound_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K053260_0_w(machine, offset, (data >> 8) & 0xff);
if (offset)
@@ -264,7 +264,7 @@ static READ16_HANDLER( prmrsocr_sound_r )
static WRITE16_HANDLER( prmrsocr_sound_cmd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xff;
if (offset == 0) soundlatch_w(machine,0,data);
@@ -551,7 +551,7 @@ static READ16_HANDLER( sunsetbl_eeprom_r )
static WRITE16_HANDLER( blswhstl_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
@@ -625,7 +625,7 @@ static WRITE16_HANDLER( thndrx2_eeprom_w )
{
static int last;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
@@ -668,12 +668,12 @@ static READ16_HANDLER( prmrsocr_eeprom_r )
static WRITE16_HANDLER( prmrsocr_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
prmrsocr_122000_w(machine,offset,data,mem_mask);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* bit 8 is data */
/* bit 9 is cs (active low) */
@@ -932,7 +932,7 @@ static WRITE16_HANDLER( tmnt2_1c0800_w )
COMBINE_DATA(tmnt2_1c0800 + offset);
- if (offset != 0x18/2 || !ACCESSING_BYTE_1) return;
+ if (offset != 0x18/2 || !ACCESSING_BITS_8_15) return;
mcu = tmnt2_1c0800;
if ((mcu[8] & 0xff00) != 0x8200) return;
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 183c658ee8e..8e5f9d6a1f6 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -653,11 +653,11 @@ static WRITE8_HANDLER( toaplan2_coin_w )
static WRITE16_HANDLER( toaplan2_coin_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_coin_w(machine, offset, data & 0xff);
}
- if (ACCESSING_BYTE_1 && (data & 0xff00) )
+ if (ACCESSING_BITS_8_15 && (data & 0xff00) )
{
logerror("Writing unknown upper MSB command (%04x) to coin control\n",data & 0xff00);
}
@@ -665,12 +665,12 @@ static WRITE16_HANDLER( toaplan2_coin_word_w )
static WRITE16_HANDLER( shippumd_coin_word_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_coin_w(machine, offset, data & 0xff);
OKIM6295_set_bank_base(0, (((data & 0x10) >> 4) * 0x40000));
}
- if (ACCESSING_BYTE_1 && (data & 0xff00) )
+ if (ACCESSING_BITS_8_15 && (data & 0xff00) )
{
logerror("Writing unknown upper MSB command (%04x) to coin control\n",data & 0xff00);
}
@@ -683,7 +683,7 @@ static READ16_HANDLER( toaplan2_shared_r )
static WRITE16_HANDLER( toaplan2_shared_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_shared_ram[offset] = data & 0xff;
}
@@ -694,7 +694,7 @@ static WRITE16_HANDLER( toaplan2_hd647180_cpu_w )
/* Command sent to secondary CPU. Support for HD647180 will be
required when a ROM dump becomes available for this hardware */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (toaplan2_sub_cpu == CPU_2_Z80) /* Whoopee */
{
@@ -731,7 +731,7 @@ static READ16_HANDLER( pipibibi_z80_status_r )
static WRITE16_HANDLER( pipibibi_z80_task_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_shared_ram[0] = data & 0xff;
}
@@ -766,7 +766,7 @@ static READ16_HANDLER( ghox_mcu_r )
static WRITE16_HANDLER( ghox_mcu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mcu_data = data;
if ((data >= 0xd0) && (data < 0xe0))
@@ -825,7 +825,7 @@ static READ16_HANDLER( ghox_shared_ram_r )
static WRITE16_HANDLER( ghox_shared_ram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_shared_ram16[offset] = data & 0xff;
}
@@ -842,7 +842,7 @@ static READ16_HANDLER( shared_ram_r )
static WRITE16_HANDLER( shared_ram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xff;
switch (offset * 2)
@@ -883,7 +883,7 @@ static READ16_HANDLER( toaplan2_snd_cpu_r )
static WRITE16_HANDLER( dogyuun_snd_cpu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mcu_data = data;
dogyuun_okisnd_w(machine, data);
@@ -903,7 +903,7 @@ static READ16_HANDLER( kbash_snd_cpu_r )
static WRITE16_HANDLER( kbash_snd_cpu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
kbash_okisnd_w(machine, data);
}
@@ -937,7 +937,7 @@ static READ16_HANDLER( fixeight_sec_cpu_r )
static WRITE16_HANDLER( fixeight_sec_cpu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (mcu_data & 0xff00)
{
@@ -974,7 +974,7 @@ static WRITE16_HANDLER( fixeight_sec_cpu_w )
static WRITE16_HANDLER( vfive_snd_cpu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mcu_data = data;
}
@@ -983,7 +983,7 @@ static WRITE16_HANDLER( vfive_snd_cpu_w )
static WRITE16_HANDLER( batsugun_snd_cpu_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
mcu_data = data;
batsugun_okisnd_w(machine, data);
@@ -998,7 +998,7 @@ static READ16_HANDLER( V25_sharedram_r )
static WRITE16_HANDLER( V25_sharedram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
V25_shared_ram[offset] = data & 0xff;
}
@@ -1006,7 +1006,7 @@ static WRITE16_HANDLER( V25_sharedram_w )
static WRITE16_HANDLER( oki_bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
OKIM6295_set_bank_base(0, (data & 1) * 0x40000);
}
@@ -1014,7 +1014,7 @@ static WRITE16_HANDLER( oki_bankswitch_w )
static WRITE16_HANDLER( fixeighb_oki_bankswitch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 7;
if (data <= 4)
@@ -1039,7 +1039,7 @@ static READ16_HANDLER( raizing_shared_ram_r )
static WRITE16_HANDLER( raizing_shared_ram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
raizing_shared_ram[offset] = data & 0xff;
}
@@ -1048,7 +1048,7 @@ static WRITE16_HANDLER( raizing_shared_ram_w )
static WRITE16_HANDLER( bgaregga_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine, offset, data & 0xff);
cpunum_set_input_line(machine, 1, 0, HOLD_LINE);
@@ -1155,7 +1155,7 @@ static READ16_HANDLER( batrider_z80_busack_r )
static WRITE16_HANDLER( batrider_z80_busreq_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
raizing_Z80_busreq = (data & 0xff);
}
@@ -1176,7 +1176,7 @@ static READ16_HANDLER( raizing_z80rom_r )
// these two latches are always written together, via a single move.l instruction
static WRITE16_HANDLER( batrider_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine, offset, data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
@@ -1186,7 +1186,7 @@ static WRITE16_HANDLER( batrider_soundlatch_w )
static WRITE16_HANDLER( batrider_soundlatch2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch2_w(machine, offset, data & 0xff);
cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, ASSERT_LINE);
@@ -1320,7 +1320,7 @@ static WRITE16_HANDLER( bbakraid_nvram_w )
if (data & ~0x001f)
logerror("CPU #0 PC:%06X - Unknown EEPROM data being written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_0 )
+ if ( ACCESSING_BITS_0_7 )
{
// chip select
EEPROM_set_cs_line((data & 0x01) ? CLEAR_LINE : ASSERT_LINE );
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index 9d50a743627..7924ff649fa 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -149,7 +149,7 @@ static READ16_HANDLER( toypop_m68000_sharedram_r )
static WRITE16_HANDLER( toypop_m68000_sharedram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
toypop_m68000_sharedram[offset] = data & 0xff;
}
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 6b02d08bb74..84023eabb47 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -95,7 +95,7 @@ static WRITE16_HANDLER( pcup_prgbank_w )
int bank;
UINT8 *ROM1 = memory_region(REGION_USER1);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
bank = (data>>4) &0x07;
memory_set_bankptr(2,&ROM1[0x80000*(bank)]);
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index f6eacfa491d..dfac9ca2575 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -847,7 +847,7 @@ static WRITE8_HANDLER( YM2151_w )
static WRITE16_HANDLER( semicom_soundcmd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xff);
// needed for Super Trio which reads the sound with polling
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index b65089073d0..afdd86624a4 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -49,62 +49,62 @@ static READ16_HANDLER( ultraman_K051316_2_r )
static WRITE16_HANDLER( ultraman_K051316_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_2_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_ctrl_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_ctrl_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051316_ctrl_2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051316_ctrl_2_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051937_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051937_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( ultraman_K051960_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051960_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( sound_cmd_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
soundlatch_w(machine,0,data & 0xff);
}
static WRITE16_HANDLER( sound_irq_trigger_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
cpunum_set_input_line(Machine, 1,INPUT_LINE_NMI,PULSE_LINE);
}
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 446390a36fb..a383d7210b9 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -51,7 +51,7 @@ static READ32_HANDLER( eeprom_r )
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
r |= (((EEPROM_read_bit()) << 1) | (readinputport(6) << 3)) << 24;
return r;
@@ -59,7 +59,7 @@ static READ32_HANDLER( eeprom_r )
static WRITE32_HANDLER( eeprom_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
EEPROM_write_bit((data & 0x01000000) ? 1 : 0);
EEPROM_set_clock_line((data & 0x02000000) ? CLEAR_LINE : ASSERT_LINE);
@@ -107,10 +107,10 @@ static READ16_HANDLER( sound_r )
UINT16 r = 0;
int reg = offset * 2;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
r |= K054539_0_r(machine, reg+0) << 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
r |= K054539_0_r(machine, reg+1) << 0;
return r;
@@ -120,10 +120,10 @@ static WRITE16_HANDLER( sound_w )
{
int reg = offset * 2;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K054539_0_w(machine, reg+0, (data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054539_0_w(machine, reg+1, (data >> 0) & 0xff);
}
@@ -131,10 +131,10 @@ static READ16_HANDLER( K056800_68k_r )
{
UINT16 r = 0;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
r |= K056800_sound_r(machine, (offset*2)+0, 0xffff) << 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
r |= K056800_sound_r(machine, (offset*2)+1, 0xffff) << 0;
return r;
@@ -142,10 +142,10 @@ static READ16_HANDLER( K056800_68k_r )
static WRITE16_HANDLER( K056800_68k_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K056800_sound_w(machine, (offset*2)+0, (data >> 8) & 0xff, 0xffff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
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 fbc4806c90f..6169a4e8bea 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -311,12 +311,12 @@ static WRITE32_HANDLER( undrfire_input_w )
{
case 0x00:
{
- if (ACCESSING_BYTE_3) /* $500000 is watchdog */
+ if (ACCESSING_BITS_24_31) /* $500000 is watchdog */
{
watchdog_reset(machine);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_set_clock_line((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
EEPROM_write_bit(data & 0x40);
@@ -329,7 +329,7 @@ static WRITE32_HANDLER( undrfire_input_w )
case 0x01:
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
coin_lockout_w(0,~data & 0x01000000);
coin_lockout_w(1,~data & 0x02000000);
@@ -351,14 +351,14 @@ static READ16_HANDLER( shared_ram_r )
static WRITE16_HANDLER( shared_ram_w )
{
if ((offset&1)==0) {
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[offset/2]=(shared_ram[offset/2]&0x00ffffff)|((data&0xff00)<<16);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[offset/2]=(shared_ram[offset/2]&0xff00ffff)|((data&0x00ff)<<16);
} else {
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
shared_ram[offset/2]=(shared_ram[offset/2]&0xffff00ff)|((data&0xff00)<< 0);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
shared_ram[offset/2]=(shared_ram[offset/2]&0xffffff00)|((data&0x00ff)<< 0);
}
}
@@ -431,13 +431,13 @@ logerror("CPU #0 PC %06x: warning - read unmapped lightgun offset %06x\n",active
static WRITE32_HANDLER( rotate_control_w ) /* only a guess that it's rotation */
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
undrfire_rotate_ctrl[port_sel] = data;
return;
}
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
port_sel = (data &0x70000) >> 16;
}
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 80d9c3b7870..7fde9c3f17f 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -38,8 +38,8 @@ Year + Game PCB Notes
***************************************************************************/
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_BYTE_1) YM3812_control_port_0_w(machine,0,data >> 8); }
-static WRITE16_HANDLER( YM3812_data_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM3812_write_port_0_w(machine,0,data >> 8); }
+static WRITE16_HANDLER( YM3812_register_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM3812_control_port_0_w(machine,0,data >> 8); }
+static WRITE16_HANDLER( YM3812_data_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM3812_write_port_0_w(machine,0,data >> 8); }
/*
@@ -54,7 +54,7 @@ static WRITE16_HANDLER( YM3812_data_port_0_msb_w ) { if (ACCESSING_BYTE_1) YM38
static WRITE16_HANDLER( burglarx_sound_bank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int bank = (data >> 8 ) & 1;
OKIM6295_set_bank_base(0, 0x40000 * bank );
@@ -109,7 +109,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( zeropnt_sound_bank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* Banked sound samples. The 3rd quarter of the ROM
contains garbage. Indeed, only banks 0&1 are used */
@@ -226,16 +226,16 @@ static READ32_HANDLER( zeropnt2_guny_1_msb_r ) { return (unico_guny_1_msb_r(mac
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 (ACCESSING_BYTE_2) OKIM6295_data_0_w(machine,0,(data >> 16) & 0xff); }
-static WRITE32_HANDLER( zeropnt2_oki1_w ) { if (ACCESSING_BYTE_2) OKIM6295_data_1_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_oki0_w ) { if (ACCESSING_BITS_16_23) OKIM6295_data_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_oki1_w ) { if (ACCESSING_BITS_16_23) OKIM6295_data_1_w(machine,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 (ACCESSING_BYTE_2) YM2151_register_port_0_w(machine,0,(data >> 16) & 0xff); }
-static WRITE32_HANDLER( zeropnt2_ym2151_data_w ) { if (ACCESSING_BYTE_2) YM2151_data_port_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_ym2151_reg_w ) { if (ACCESSING_BITS_16_23) YM2151_register_port_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_ym2151_data_w ) { if (ACCESSING_BITS_16_23) YM2151_data_port_0_w(machine,0,(data >> 16) & 0xff); }
static WRITE32_HANDLER( zeropnt2_sound_bank_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
int bank = ((data >> 24) & 3) % 4;
UINT8 *dst = memory_region(REGION_SOUND1);
@@ -246,7 +246,7 @@ static WRITE32_HANDLER( zeropnt2_sound_bank_w )
static WRITE32_HANDLER( zeropnt2_leds_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
coin_counter_w(0,data & 0x00010000);
set_led_status(0,data & 0x00800000); // Start 1
@@ -259,7 +259,7 @@ static WRITE32_HANDLER( zeropnt2_eeprom_w )
if (data & ~0xfe00000)
logerror("CPU #0 PC: %06X - Unknown EEPROM bit written %04X\n",activecpu_get_pc(),data);
- if ( ACCESSING_BYTE_3 )
+ if ( ACCESSING_BITS_24_31 )
{
// latch the bit
EEPROM_write_bit(data & 0x04000000);
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index eeba953ef02..2d012df8fa9 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -1341,7 +1341,7 @@ static READ32_HANDLER( sio_irq_clear_r )
static WRITE32_HANDLER( sio_irq_clear_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
sio_irq_clear = data;
@@ -1370,7 +1370,7 @@ static READ32_HANDLER( sio_irq_enable_r )
static WRITE32_HANDLER( sio_irq_enable_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
sio_irq_enable = data;
update_sio_irqs();
@@ -1392,7 +1392,7 @@ static READ32_HANDLER( sio_irq_status_r )
static WRITE32_HANDLER( sio_led_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
sio_led_state = data;
}
@@ -1412,10 +1412,10 @@ static READ32_HANDLER( sio_led_r )
static WRITE32_HANDLER( sio_w )
{
- if (ACCESSING_BYTE_0) offset += 0;
- if (ACCESSING_BYTE_1) offset += 1;
- if (ACCESSING_BYTE_2) offset += 2;
- if (ACCESSING_BYTE_3) offset += 3;
+ if (ACCESSING_BITS_0_7) offset += 0;
+ if (ACCESSING_BITS_8_15) offset += 1;
+ if (ACCESSING_BITS_16_23) offset += 2;
+ if (ACCESSING_BITS_24_31) offset += 3;
if (LOG_SIO && offset != 0)
logerror("%08X:sio write to offset %X = %02X\n", activecpu_get_pc(), offset, data >> (offset*8));
if (offset < 4)
@@ -1428,10 +1428,10 @@ static WRITE32_HANDLER( sio_w )
static READ32_HANDLER( sio_r )
{
UINT32 result = 0;
- if (ACCESSING_BYTE_0) offset += 0;
- if (ACCESSING_BYTE_1) offset += 1;
- if (ACCESSING_BYTE_2) offset += 2;
- if (ACCESSING_BYTE_3) offset += 3;
+ if (ACCESSING_BITS_0_7) offset += 0;
+ if (ACCESSING_BITS_8_15) offset += 1;
+ if (ACCESSING_BITS_16_23) offset += 2;
+ if (ACCESSING_BITS_24_31) offset += 3;
if (offset < 4)
result = sio_data[0] | (sio_data[1] << 8) | (sio_data[2] << 16) | (sio_data[3] << 24);
if (LOG_SIO && offset != 2)
@@ -1507,9 +1507,9 @@ static WRITE32_HANDLER( ide_alt_w )
static READ32_HANDLER( ethernet_r )
{
UINT32 result = 0;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= smc91c94_r(machine, offset * 2 + 0, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= smc91c94_r(machine, offset * 2 + 1, mem_mask >> 16) << 16;
return result;
}
@@ -1517,9 +1517,9 @@ static READ32_HANDLER( ethernet_r )
static WRITE32_HANDLER( ethernet_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
smc91c94_w(machine, offset * 2 + 0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
smc91c94_w(machine, offset * 2 + 1, data >> 16, mem_mask >> 16);
}
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 9ffb9097c8e..a4aca6f9ef0 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -24,7 +24,7 @@
*************************************/
static READ16_DEVICE_HANDLER( vertigo_pit8254_lsb_r ) { return pit8253_r( device, offset ); }
-static WRITE16_DEVICE_HANDLER( vertigo_pit8254_lsb_w ) { if (ACCESSING_BYTE_0) pit8253_w(device, offset, data); }
+static WRITE16_DEVICE_HANDLER( vertigo_pit8254_lsb_w ) { if (ACCESSING_BITS_0_7) pit8253_w(device, offset, data); }
static ADDRESS_MAP_START( vertigo_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x000007) AM_ROM
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index bbedb58d76a..911d84d8788 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -180,7 +180,7 @@ static READ64_HANDLER(cf_card_data_r)
{
UINT64 r = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
switch (offset & 0xf)
{
@@ -201,7 +201,7 @@ static READ64_HANDLER(cf_card_data_r)
static WRITE64_HANDLER(cf_card_data_w)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
switch (offset & 0xf)
{
@@ -223,7 +223,7 @@ static READ64_HANDLER(cf_card_r)
{
UINT64 r = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
if (cf_card_ide)
{
@@ -286,7 +286,7 @@ static WRITE64_HANDLER(cf_card_w)
{
//printf("compact_flash_w: %08X%08X, %08X, %08X%08X at %08X\n", (UINT32)(data>>32), (UINT32)(data), offset, (UINT32)(mem_mask >> 32), (UINT32)(mem_mask), activecpu_get_pc());
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
if (offset < 0x10)
{
@@ -357,7 +357,7 @@ static WRITE64_HANDLER(cf_card_w)
static WRITE64_HANDLER(unk2_w)
{
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
cf_card_ide = 0;
}
@@ -370,7 +370,7 @@ static READ64_HANDLER(ata_r)
{
UINT64 r = 0;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
int reg = (offset >> 4) & 0x7;
@@ -382,7 +382,7 @@ static READ64_HANDLER(ata_r)
static WRITE64_HANDLER(ata_w)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
int reg = (offset >> 4) & 0x7;
@@ -396,7 +396,7 @@ static READ64_HANDLER(unk1_r)
UINT64 r = 0;
//return 0;//U64(0x0000400000000000);
- if (ACCESSING_BYTE_5)
+ if (ACCESSING_BITS_40_47)
{
r |= (UINT64)(unk1_bit << 5) << 40;
}
@@ -406,7 +406,7 @@ static READ64_HANDLER(unk1_r)
static WRITE64_HANDLER(unk1a_w)
{
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
unk1_bit = 1;
}
@@ -414,7 +414,7 @@ static WRITE64_HANDLER(unk1a_w)
static WRITE64_HANDLER(unk1b_w)
{
- if (ACCESSING_BYTE_7)
+ if (ACCESSING_BITS_56_63)
{
unk1_bit = 0;
}
@@ -563,11 +563,11 @@ static READ64_HANDLER(m48t58_r)
{
UINT64 r = 0;
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
r |= (UINT64)timekeeper_0_32be_r(machine, (offset * 2) + 0, (UINT32)(mem_mask >> 32)) << 32;
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
r |= timekeeper_0_32be_r(machine, (offset * 2) + 1, (UINT32)(mem_mask));
}
@@ -577,11 +577,11 @@ static READ64_HANDLER(m48t58_r)
static WRITE64_HANDLER(m48t58_w)
{
- if (ACCESSING_DWORD_1)
+ if (ACCESSING_BITS_32_63)
{
timekeeper_0_32be_w(machine, (offset * 2) + 0, (UINT32)(data >> 32), (UINT32)(mem_mask >> 32));
}
- if (ACCESSING_DWORD_0)
+ if (ACCESSING_BITS_0_31)
{
timekeeper_0_32be_w(machine, (offset * 2) + 1, (UINT32)(data), (UINT32)(mem_mask));
}
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 86dbeef9821..4d5f87d54ba 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -366,7 +366,7 @@ static WRITE16_HANDLER( wecleman_protection_w )
*/
static WRITE16_HANDLER( irqctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// logerror("CPU #0 - PC = %06X - $140005 <- %02X (old value: %02X)\n",activecpu_get_pc(), data&0xFF, old_data&0xFF);
@@ -400,7 +400,7 @@ static WRITE16_HANDLER( irqctrl_w )
*/
static WRITE16_HANDLER( selected_ip_w )
{
- if (ACCESSING_BYTE_0) wecleman_selected_ip = data & 0xff; // latch the value
+ if (ACCESSING_BITS_0_7) wecleman_selected_ip = data & 0xff; // latch the value
}
/* $140021.b - Return the previously selected input port's value */
@@ -456,7 +456,7 @@ static WRITE16_HANDLER( blitter_w )
COMBINE_DATA(&blitter_regs[offset]);
/* do a blit if $80010.b has been written */
- if ( (offset == 0x10/2) && (ACCESSING_BYTE_1) )
+ if ( (offset == 0x10/2) && (ACCESSING_BITS_8_15) )
{
/* 80000.b = ?? usually 0 - other values: 02 ; 00 - ? logic function ? */
/* 80001.b = ?? usually 0 - other values: 3f ; 01 - ? height ? */
@@ -573,22 +573,22 @@ static READ16_HANDLER( hotchase_K051316_1_r )
static WRITE16_HANDLER( hotchase_K051316_0_w )
{
- if (ACCESSING_BYTE_0) K051316_0_w(machine, offset, data & 0xff);
+ if (ACCESSING_BITS_0_7) K051316_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_1_w )
{
- if (ACCESSING_BYTE_0) K051316_1_w(machine, offset, data & 0xff);
+ if (ACCESSING_BITS_0_7) K051316_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_ctrl_0_w )
{
- if (ACCESSING_BYTE_0) K051316_ctrl_0_w(machine, offset, data & 0xff);
+ if (ACCESSING_BITS_0_7) K051316_ctrl_0_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_K051316_ctrl_1_w )
{
- if (ACCESSING_BYTE_0) K051316_ctrl_1_w(machine, offset, data & 0xff);
+ if (ACCESSING_BITS_0_7) K051316_ctrl_1_w(machine, offset, data & 0xff);
}
static WRITE16_HANDLER( hotchase_soundlatch_w );
@@ -649,7 +649,7 @@ ADDRESS_MAP_END
/* 140001.b */
WRITE16_HANDLER( wecleman_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xFF);
cpunum_set_input_line(machine, 2,0, HOLD_LINE);
@@ -717,7 +717,7 @@ ADDRESS_MAP_END
/* 140001.b */
static WRITE16_HANDLER( hotchase_soundlatch_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch_w(machine,0,data & 0xFF);
cpunum_set_input_line(machine, 2,M6809_IRQ_LINE, HOLD_LINE);
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 9a6d2a34e79..10c16b82b15 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -344,7 +344,7 @@ static int pending_command;
static WRITE16_HANDLER( sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pending_command = 1;
soundlatch_w(machine, 0, data & 0xff);
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index bb0cf6d25c2..18ec2c84318 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -252,7 +252,7 @@ static WRITE16_HANDLER( control2_w )
static WRITE16_HANDLER( sound_cmd1_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
// anyone knows why 0x1a keeps lurking the sound queue in the world version???
if (xexex_strip0x1a)
@@ -264,7 +264,7 @@ static WRITE16_HANDLER( sound_cmd1_w )
static WRITE16_HANDLER( sound_cmd2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
soundlatch2_w(machine, 0, data & 0xff);
}
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 2d1387359b2..a7a6f6a086d 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -106,7 +106,7 @@ logerror("%06x xmen6p_eeprom_r\n",activecpu_get_pc());
static WRITE16_HANDLER( eeprom_w )
{
logerror("%06x: write %04x to 108000\n",activecpu_get_pc(),data);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 = coin counter */
coin_counter_w(0,data & 0x01);
@@ -118,7 +118,7 @@ logerror("%06x: write %04x to 108000\n",activecpu_get_pc(),data);
EEPROM_set_cs_line((data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
EEPROM_set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* bit 8 = enable sprite ROM reading */
K053246_set_OBJCHA_line((data & 0x0100) ? ASSERT_LINE : CLEAR_LINE);
@@ -134,7 +134,7 @@ static READ16_HANDLER( sound_status_r )
static WRITE16_HANDLER( sound_cmd_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
data &= 0xff;
soundlatch_w(machine, 0, data);
}
@@ -149,7 +149,7 @@ static WRITE16_HANDLER( sound_irq_w )
static WRITE16_HANDLER( xmen_18fa00_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
/* bit 2 is interrupt enable */
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 6d5aa588b5a..6e7280d8e1f 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -125,7 +125,7 @@ static void xtheball_from_shiftreg(UINT32 address, UINT16 *shiftreg)
static WRITE16_HANDLER( dac_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
DAC_data_w(0, data >> 8);
}
@@ -139,7 +139,7 @@ static WRITE16_HANDLER( dac_w )
static WRITE16_HANDLER( bit_controls_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (bitvals[offset] != (data & 1))
{
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 6258cd08a9f..e4e1a67df93 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -114,7 +114,7 @@ VIDEO_UPDATE( yunsun16 );
static WRITE16_HANDLER( yunsun16_sound_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int bank = data & 3;
UINT8 *dst = memory_region(REGION_SOUND1);
@@ -150,7 +150,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( magicbub_sound_command_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/*
HACK: the game continuously sends this. It'll play the oki sample
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index bb29b271982..17cada0a3e9 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -59,7 +59,7 @@ logerror("CPU #0 PC %06x: warning - read unmapped memory address %06x\n",activec
static WRITE16_HANDLER( zerozone_sound_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
soundlatch_w(machine,offset,data >> 8);
cpunum_set_input_line_and_vector(machine, 1,0,HOLD_LINE,0xff);
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 3491362c7bf..8f3d39eedc9 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -169,27 +169,27 @@ static READ32_HANDLER( sysreg_r )
UINT32 r = 0;
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= readinputport(0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= readinputport(1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int adc_bit = adc083x_do_read(0);
r |= ((readinputport(2) & 0x7f) | (adc_bit << 7)) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= readinputport(3) << 0;
}
}
else if (offset == 1)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= ((adc083x_sars_read(0) << 5) | (EEPROM_read_bit() << 4)) << 24;
}
@@ -202,15 +202,15 @@ static WRITE32_HANDLER( sysreg_w )
{
if( offset == 0 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
led_reg0 = (data >> 24) & 0xff;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
led_reg1 = (data >> 16) & 0xff;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
EEPROM_write_bit((data & 0x1) ? 1 : 0);
EEPROM_set_clock_line((data & 0x2) ? ASSERT_LINE : CLEAR_LINE);
@@ -225,7 +225,7 @@ static WRITE32_HANDLER( sysreg_w )
}
else if( offset == 1 )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
if (data & 0x80000000) /* CG Board 1 IRQ Ack */
cpunum_set_input_line(Machine, 0, INPUT_LINE_IRQ1, CLEAR_LINE);
@@ -276,12 +276,12 @@ static READ32_HANDLER( ccu_r )
case 0x1c/4:
{
// Midnight Run polls the vertical counter in vblank
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
ccu_vcth ^= 0xff;
r |= ccu_vcth << 24;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
ccu_vctl++;
ccu_vctl &= 0x1ff;
@@ -357,9 +357,9 @@ static READ16_HANDLER( dual539_r )
{
UINT16 ret = 0;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
ret |= K054539_1_r(machine, offset);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
ret |= K054539_0_r(machine, offset)<<8;
return ret;
@@ -367,9 +367,9 @@ static READ16_HANDLER( dual539_r )
static WRITE16_HANDLER( dual539_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054539_1_w(machine, offset, data);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K054539_0_w(machine, offset, data>>8);
}
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index 734103ccd9e..1c6c638750d 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -1106,7 +1106,7 @@ WRITE16_HANDLER( amiga_cia_w )
/* offsets 0000-07ff reference CIA B, and are accessed via the MSB */
if ((offset & 0x0800) == 0)
{
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
return;
which = 1;
data >>= 8;
@@ -1115,7 +1115,7 @@ WRITE16_HANDLER( amiga_cia_w )
/* offsets 0800-0fff reference CIA A, and are accessed via the LSB */
else
{
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
return;
which = 0;
data &= 0xff;
@@ -1737,7 +1737,7 @@ WRITE16_HANDLER( amiga_autoconfig_w )
logerror("autoconfig_w(%02X) = %04X & %04X\n", offset, data, mem_mask ^ 0xffff);
/* if no current device, bail */
- if (!cur_autoconfig || !ACCESSING_BYTE_1)
+ if (!cur_autoconfig || !ACCESSING_BITS_8_15)
return;
/* switch off of the base offset */
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index aeec6ba0804..e2d9c8de68b 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -706,19 +706,19 @@ void atarigen_sound_reset(void)
WRITE16_HANDLER( atarigen_sound_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, delayed_sound_w);
}
WRITE16_HANDLER( atarigen_sound_upper_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
timer_call_after_resynch(NULL, (data >> 8) & 0xff, delayed_sound_w);
}
WRITE32_HANDLER( atarigen_sound_upper32_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
timer_call_after_resynch(NULL, (data >> 24) & 0xff, delayed_sound_w);
}
@@ -1294,9 +1294,9 @@ WRITE16_HANDLER( atarigen_alpha_w )
WRITE32_HANDLER( atarigen_alpha32_w )
{
COMBINE_DATA(&atarigen_alpha32[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
tilemap_mark_tile_dirty(atarigen_alpha_tilemap, offset * 2);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
tilemap_mark_tile_dirty(atarigen_alpha_tilemap, offset * 2 + 1);
}
@@ -1338,9 +1338,9 @@ WRITE16_HANDLER( atarigen_playfield_w )
WRITE32_HANDLER( atarigen_playfield32_w )
{
COMBINE_DATA(&atarigen_playfield32[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
tilemap_mark_tile_dirty(atarigen_playfield_tilemap, offset * 2);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
tilemap_mark_tile_dirty(atarigen_playfield_tilemap, offset * 2 + 1);
}
@@ -1512,7 +1512,7 @@ WRITE16_HANDLER( atarigen_expanded_666_paletteram_w )
{
COMBINE_DATA(&paletteram16[offset]);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int palentry = offset / 2;
int newword = (paletteram16[palentry * 2] & 0xff00) | (paletteram16[palentry * 2 + 1] >> 8);
@@ -1538,7 +1538,7 @@ WRITE32_HANDLER( atarigen_666_paletteram32_w )
COMBINE_DATA(&paletteram32[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
newword = paletteram32[offset] >> 16;
@@ -1549,7 +1549,7 @@ WRITE32_HANDLER( atarigen_666_paletteram32_w )
palette_set_color_rgb(machine, offset * 2, pal6bit(r), pal6bit(g), pal6bit(b));
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
newword = paletteram32[offset] & 0xffff;
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index 2081341c48d..fe91915e23c 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -852,17 +852,17 @@ WRITE32_HANDLER(amiga_akiko32_w)
break;
case 0x18/4: /* CDROM COMMAND 1 */
- if ( ACCESSING_BYTE_2 )
+ if ( ACCESSING_BITS_16_23 )
akiko.cdrom_cmd_start = ( data >> 16 ) & 0xff;
- if ( ACCESSING_BYTE_1 )
+ if ( ACCESSING_BITS_8_15 )
akiko.cdrom_cmd_resp = ( data >> 8 ) & 0xff;
akiko_update_cdrom();
break;
case 0x1C/4: /* CDROM COMMAND 2 */
- if ( ACCESSING_BYTE_2 )
+ if ( ACCESSING_BITS_16_23 )
akiko.cdrom_cmd_end = ( data >> 16 ) & 0xff;
akiko_update_cdrom();
@@ -872,7 +872,7 @@ WRITE32_HANDLER(amiga_akiko32_w)
#if LOG_AKIKO_CD
logerror( "Read Req mask W: data %08x - mem mask %08x\n", data, mem_mask );
#endif
- if ( ACCESSING_WORD_1 )
+ if ( ACCESSING_BITS_16_31 )
{
akiko.cdrom_readreqmask = (data >> 16);
akiko.cdrom_readmask = 0;
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index a959568a61e..c81173337c3 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -679,7 +679,7 @@ READ16_HANDLER( hd68k_duart_r )
WRITE16_HANDLER( hd68k_duart_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int newdata = (data >> 8) & 0xff;
duart_write_data[offset] = newdata;
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index 31e072f0c7e..79961ebecaa 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -1841,7 +1841,7 @@ WRITE16_HANDLER( K055550_word_w )
COMBINE_DATA(prot_data+offset);
- if (offset == 0 && ACCESSING_BYTE_1)
+ if (offset == 0 && ACCESSING_BITS_8_15)
{
data >>= 8;
switch (data)
@@ -1968,7 +1968,7 @@ WRITE16_HANDLER( K053990_martchmp_word_w )
COMBINE_DATA(prot_data+offset);
- if (offset == 0x0c && ACCESSING_BYTE_1)
+ if (offset == 0x0c && ACCESSING_BITS_8_15)
{
mode = (prot_data[0x0d]<<8 & 0xff00) | (prot_data[0x0f] & 0xff);
diff --git a/src/mame/machine/konamiic.c b/src/mame/machine/konamiic.c
index 9c9acd72cf6..20599967557 100644
--- a/src/mame/machine/konamiic.c
+++ b/src/mame/machine/konamiic.c
@@ -71,19 +71,19 @@ READ32_HANDLER(K056800_host_r)
{
UINT32 r = 0;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
r |= K056800_host_reg_r((offset*4)+0) << 24;
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
r |= K056800_host_reg_r((offset*4)+1) << 16;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r |= K056800_host_reg_r((offset*4)+2) << 8;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r |= K056800_host_reg_r((offset*4)+3) << 0;
}
@@ -93,19 +93,19 @@ READ32_HANDLER(K056800_host_r)
WRITE32_HANDLER(K056800_host_w)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
K056800_host_reg_w((offset*4)+0, (data >> 24) & 0xff);
}
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
K056800_host_reg_w((offset*4)+1, (data >> 16) & 0xff);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
K056800_host_reg_w((offset*4)+2, (data >> 8) & 0xff);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
K056800_host_reg_w((offset*4)+3, (data >> 0) & 0xff);
}
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index e30f5b08c67..ddd4921c57f 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -137,7 +137,7 @@ WRITE32_HANDLER( cgboard_dsp_comm_w_ppc )
{
if (offset == 0)
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
dsp_shared_ram_bank[cgboard_id] = (data >> 24) & 0x1;
@@ -158,7 +158,7 @@ WRITE32_HANDLER( cgboard_dsp_comm_w_ppc )
cpunum_set_input_line(Machine, dsp, INPUT_LINE_IRQ1, ASSERT_LINE);
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
dsp_comm_ppc[cgboard_id][offset] = data & 0xff;
}
else
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 50d2e785b39..fdd92c64dd8 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -902,14 +902,14 @@ static READ16_HANDLER( mcr68_6840_r_common )
WRITE16_HANDLER( mcr68_6840_upper_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
mcr68_6840_w_common(machine, offset, (data >> 8) & 0xff);
}
WRITE16_HANDLER( mcr68_6840_lower_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
mcr68_6840_w_common(machine, offset, data & 0xff);
}
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index e8f9d53b587..2c36aaa8f7b 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -144,7 +144,7 @@ static READ16_HANDLER( mk_prot_r )
static WRITE16_HANDLER( mk_prot_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
int first_val = (data >> 9) & 0x3f;
int i;
@@ -609,7 +609,7 @@ WRITE16_HANDLER( midtunit_sound_w )
}
/* call through based on the sound type */
- if (ACCESSING_BYTE_0 && ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15)
switch (chip_type)
{
case SOUND_ADPCM:
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index f3dff5a5a47..94ab6af3146 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -852,9 +852,9 @@ void midway_ioasic_fifo_full_w(UINT16 data)
READ32_HANDLER( midway_ioasic_packed_r )
{
UINT32 result = 0;
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
result |= midway_ioasic_r(machine, offset*2, 0xffff0000) & 0xffff;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
result |= (midway_ioasic_r(machine, offset*2+1, 0xffff0000) & 0xffff) << 16;
return result;
}
@@ -948,9 +948,9 @@ READ32_HANDLER( midway_ioasic_r )
WRITE32_HANDLER( midway_ioasic_packed_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
midway_ioasic_w(machine, offset*2, data & 0xffff, 0xffff0000);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
midway_ioasic_w(machine, offset*2+1, data >> 16, 0xffff0000);
}
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index 3d04a9e23e8..fe60d729a0d 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -162,10 +162,10 @@ WRITE16_HANDLER( midxunit_unknown_w )
{
int offs = offset / 0x40000;
- if (offs == 1 && ACCESSING_BYTE_0)
+ if (offs == 1 && ACCESSING_BITS_0_7)
dcs_reset_w(data & 2);
- if (ACCESSING_BYTE_0 && offset % 0x40000 == 0)
+ if (ACCESSING_BITS_0_7 && offset % 0x40000 == 0)
logerror("%08X:midxunit_unknown_w @ %d = %02X\n", activecpu_get_pc(), offs, data & 0xff);
}
@@ -229,7 +229,7 @@ READ16_HANDLER( midxunit_analog_r )
WRITE16_HANDLER( midxunit_analog_select_w )
{
- if (offset == 0 && ACCESSING_BYTE_0)
+ if (offset == 0 && ACCESSING_BITS_0_7)
midxunit_analog_port = data - 8 + 4;
}
@@ -328,7 +328,7 @@ READ16_HANDLER( midxunit_uart_r )
WRITE16_HANDLER( midxunit_uart_w )
{
/* convert to a byte offset, ignoring MSB writes */
- if ((offset & 1) || !ACCESSING_BYTE_0)
+ if ((offset & 1) || !ACCESSING_BITS_0_7)
return;
offset /= 2;
data &= 0xff;
@@ -645,21 +645,21 @@ READ16_HANDLER( midwunit_security_r )
WRITE16_HANDLER( midwunit_security_w )
{
- if (offset == 0 && ACCESSING_BYTE_0)
+ if (offset == 0 && ACCESSING_BITS_0_7)
midway_serial_pic_w(data);
}
WRITE16_HANDLER( midxunit_security_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
security_bits = data & 0x0f;
}
WRITE16_HANDLER( midxunit_security_clock_w )
{
- if (offset == 0 && ACCESSING_BYTE_0)
+ if (offset == 0 && ACCESSING_BITS_0_7)
midway_serial_pic_w(((~data & 2) << 3) | security_bits);
}
@@ -695,7 +695,7 @@ WRITE16_HANDLER( midwunit_sound_w )
}
/* call through based on the sound type */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
logerror("%08X:Sound write = %04X\n", activecpu_get_pc(), data);
dcs_data_w(data & 0xff);
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index 07d73516728..59d1c9c52f6 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -560,7 +560,7 @@ WRITE16_HANDLER( midyunit_sound_w )
}
/* call through based on the sound type */
- if (ACCESSING_BYTE_0 && ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15)
switch (chip_type)
{
case SOUND_NARC:
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 260e84fd0eb..7732b9fcc50 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -150,7 +150,7 @@ NVRAM_HANDLER( namcos2 )
}
WRITE16_HANDLER( namcos2_68k_eeprom_w ){
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
namcos2_eeprom[offset] = data;
}
diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c
index 55bd80309ab..6456df70100 100644
--- a/src/mame/machine/nmk004.c
+++ b/src/mame/machine/nmk004.c
@@ -1057,7 +1057,7 @@ void NMK004_init(void)
WRITE16_HANDLER( NMK004_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
logerror("%06x: NMK004_w %02x\n",activecpu_get_pc(),data);
NMK004_state.from_main = data & 0xff;
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index d72ab349054..f99d76004f6 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -54,7 +54,7 @@ WRITE8_HANDLER( NMK112_okibank_w )
WRITE16_HANDLER( NMK112_okibank_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
NMK112_okibank_w(machine, offset, data & 0xff);
}
diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c
index 951f3db853e..e0d208f33cc 100644
--- a/src/mame/machine/pgmprot.c
+++ b/src/mame/machine/pgmprot.c
@@ -392,7 +392,7 @@ READ16_HANDLER( pgm_asic3_r )
WRITE16_HANDLER( pgm_asic3_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
if(asic3_reg < 3)
asic3_latch[asic3_reg] = data << 1;
@@ -421,7 +421,7 @@ WRITE16_HANDLER( pgm_asic3_w )
WRITE16_HANDLER( pgm_asic3_reg_w )
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
asic3_reg = data & 0xff;
}
diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c
index 78a8c85be84..fc0e9867603 100644
--- a/src/mame/machine/psx.c
+++ b/src/mame/machine/psx.c
@@ -854,12 +854,12 @@ WRITE32_HANDLER( psx_sio_w )
verboselog( 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
break;
case 2:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
m_p_n_sio_mode[ n_port ] = data & 0xffff;
verboselog( 1, "psx_sio_w %d mode %04x\n", n_port, data & 0xffff );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 1, "psx_sio_w %d control %04x\n", n_port, data >> 16 );
m_p_n_sio_control[ n_port ] = data >> 16;
@@ -897,11 +897,11 @@ WRITE32_HANDLER( psx_sio_w )
}
break;
case 3:
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 0, "psx_sio_w( %08x, %08x, %08x )\n", offset, data, mem_mask );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
m_p_n_sio_baud[ n_port ] = data >> 16;
verboselog( 1, "psx_sio_w %d baud %04x\n", n_port, data >> 16 );
@@ -930,33 +930,33 @@ READ32_HANDLER( psx_sio_r )
break;
case 1:
data = m_p_n_sio_status[ n_port ];
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 1, "psx_sio_r %d status %04x\n", n_port, data & 0xffff );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
}
break;
case 2:
data = ( m_p_n_sio_control[ n_port ] << 16 ) | m_p_n_sio_mode[ n_port ];
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 1, "psx_sio_r %d mode %04x\n", n_port, data & 0xffff );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 1, "psx_sio_r %d control %04x\n", n_port, data >> 16 );
}
break;
case 3:
data = m_p_n_sio_baud[ n_port ] << 16;
- if( ACCESSING_WORD_0 )
+ if( ACCESSING_BITS_0_15 )
{
verboselog( 0, "psx_sio_r( %08x, %08x ) %08x\n", offset, mem_mask, data );
}
- if( ACCESSING_WORD_1 )
+ if( ACCESSING_BITS_16_31 )
{
verboselog( 1, "psx_sio_r %d baud %04x\n", n_port, data >> 16 );
}
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index ec3ba4d34d4..c0191bec4dc 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -417,7 +417,7 @@ READ16_HANDLER( segaic16_memory_mapper_lsb_r )
WRITE16_HANDLER( segaic16_memory_mapper_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
memory_mapper_w(&memory_mapper, offset, data & 0xff);
}
diff --git a/src/mame/machine/segas24.c b/src/mame/machine/segas24.c
index 77d038f77ec..d424f92fcbc 100644
--- a/src/mame/machine/segas24.c
+++ b/src/mame/machine/segas24.c
@@ -81,7 +81,7 @@ READ32_HANDLER(system24temp_sys16_io_dword_r)
WRITE16_HANDLER( system24temp_sys16_io_w )
{
- if(ACCESSING_BYTE_0) {
+ if(ACCESSING_BITS_0_7) {
if(offset < 8) {
if(!(system24temp_sys16_io_dir & (1 << offset))) {
logerror("IO port write on input-only port (%d, [%02x], %02x, %d:%x)\n", offset, system24temp_sys16_io_dir, data & 0xff, cpu_getactivecpu(), activecpu_get_pc());
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 975f365c3ed..0add9cbbca7 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -111,7 +111,7 @@ WRITE16_HANDLER( apache3_v30_v20_w )
logerror("%08x: write unmapped v30 rom %08x\n",activecpu_get_pc(),offset);
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
cpuintrf_push_context(2);
program_write_byte(offset, data&0xff);
@@ -170,7 +170,7 @@ READ16_HANDLER( roundup_v30_z80_r )
WRITE16_HANDLER( roundup_v30_z80_w )
{
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (tatsumi_control_word&0x20)
offset+=0x8000; /* Upper half of Z80 address space */
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 96b780be4bf..b49677ff7cf 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -36,7 +36,7 @@ INTERRUPT_GEN( toaplan1_interrupt )
WRITE16_HANDLER( toaplan1_intenable_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan1_intenable = data & 0xff;
}
@@ -140,7 +140,7 @@ WRITE16_HANDLER( demonwld_dsp_ctrl_w )
logerror("68000:%08x Writing %08x to %08x.\n",activecpu_get_pc() ,data ,0xe0000a + offset);
#endif
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
switch (data)
{
@@ -201,7 +201,7 @@ WRITE16_HANDLER( vimana_mcu_w )
{
case 0: break;
case 1: break;
- case 2: if (ACCESSING_BYTE_0) vimana_credits = data & 0xff; break;
+ case 2: if (ACCESSING_BITS_0_7) vimana_credits = data & 0xff; break;
}
}
@@ -212,7 +212,7 @@ READ16_HANDLER( toaplan1_shared_r )
WRITE16_HANDLER( toaplan1_shared_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan1_sharedram[offset] = data & 0xff;
}
@@ -223,7 +223,7 @@ WRITE16_HANDLER( toaplan1_reset_sound )
{
/* Reset the secondary CPU and sound chip during soft resets */
- if (ACCESSING_BYTE_0 && (data == 0))
+ if (ACCESSING_BITS_0_7 && (data == 0))
{
logerror("PC:%04x Resetting Sound CPU and Sound chip (%08x)\n",activecpu_get_previouspc(),data);
if (machine->config->sound[0].type == SOUND_YM3812)
@@ -281,11 +281,11 @@ WRITE8_HANDLER( toaplan1_coin_w )
WRITE16_HANDLER( samesame_coin_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan1_coin_w(machine, offset, data & 0xff);
}
- if (ACCESSING_BYTE_1 && (data&0xff00))
+ if (ACCESSING_BITS_8_15 && (data&0xff00))
{
logerror("PC:%04x Writing unknown MSB data (%04x) to coin count/lockout port\n",activecpu_get_previouspc(),data);
}
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index dca0030d692..ce31f0d0f98 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -240,7 +240,7 @@ static void toaplan0_control_w(int offset, int data)
WRITE16_HANDLER( twincobr_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan0_control_w(offset, data & 0xff);
}
@@ -259,7 +259,7 @@ READ16_HANDLER( twincobr_sharedram_r )
WRITE16_HANDLER( twincobr_sharedram_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
twincobr_sharedram[offset] = data & 0xff;
}
@@ -297,7 +297,7 @@ static void toaplan0_coin_dsp_w(int offset, int data)
WRITE16_HANDLER( fshark_coin_dsp_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan0_coin_dsp_w(offset, data & 0xff);
}
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index a387eb8139f..c7c457cf225 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -188,7 +188,7 @@ static TIMER_CALLBACK( sound_command_w )
WRITE16_HANDLER( vertigo_audio_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
timer_call_after_resynch(NULL, data & 0xff, sound_command_w);
}
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index 06b6ba0a817..cde330ed820 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -119,7 +119,7 @@ WRITE16_HANDLER( OKIM6295_bankswitch_w )
{
UINT8 *RAM = memory_region(REGION_SOUND1);
- if (ACCESSING_BYTE_0){
+ if (ACCESSING_BITS_0_7){
memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000);
}
}
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index 007685e6106..d7c1177c6a0 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -193,7 +193,7 @@ static void setbank(tilemap *tmap,int num,int bank)
WRITE16_HANDLER( pspikes_gfxbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
setbank(bg1_tilemap,0,(data & 0xf0) >> 4);
setbank(bg1_tilemap,1,data & 0x0f);
@@ -210,7 +210,7 @@ WRITE16_HANDLER( pspikesb_gfxbank_w )
WRITE16_HANDLER( karatblz_gfxbank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
setbank(bg1_tilemap,0,(data & 0x0100) >> 8);
setbank(bg2_tilemap,1,(data & 0x0800) >> 11);
@@ -219,7 +219,7 @@ WRITE16_HANDLER( karatblz_gfxbank_w )
WRITE16_HANDLER( spinlbrk_gfxbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
setbank(bg1_tilemap,0,(data & 0x07));
setbank(bg2_tilemap,1,(data & 0x38) >> 3);
@@ -272,7 +272,7 @@ WRITE16_HANDLER( aerofgt_bg2scrolly_w )
WRITE16_HANDLER( pspikes_palette_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
spritepalettebank = data & 0x03;
if (charpalettebank != (data & 0x1c) >> 2)
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index 0930dd84d8a..42e9885cdad 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -56,8 +56,8 @@ static TILE_GET_INFO( get_tile_info )
WRITE16_HANDLER( alpha68k_videoram_w )
{
/* Doh. */
- if(ACCESSING_BYTE_0)
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_0_7)
+ if(ACCESSING_BITS_8_15)
videoram16[offset] = data;
else
videoram16[offset] = data & 0xff;
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index bddcac45596..2bbea22219e 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -167,7 +167,7 @@ static int waiting_msb;
WRITE16_HANDLER( terraf_fg_scrollx_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
armedf_fg_scrollx = data >> 8;
waiting_msb = 1;
@@ -176,7 +176,7 @@ WRITE16_HANDLER( terraf_fg_scrollx_w )
WRITE16_HANDLER( terraf_fg_scrolly_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (waiting_msb)
terraf_scroll_msb = data >> 8;
@@ -187,7 +187,7 @@ WRITE16_HANDLER( terraf_fg_scrolly_w )
WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
waiting_msb = 0;
}
diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c
index 7a5b37aa1f7..c2b13b2056c 100644
--- a/src/mame/video/badlands.c
+++ b/src/mame/video/badlands.c
@@ -98,7 +98,7 @@ VIDEO_START( badlands )
WRITE16_HANDLER( badlands_pf_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
if (playfield_tile_bank != (data & 1))
{
video_screen_update_partial(machine->primary_screen, video_screen_get_vpos(machine->primary_screen));
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index d0c0a67e430..b1ec09f751e 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -163,7 +163,7 @@ WRITE16_HANDLER( bionicc_scroll_w )
WRITE16_HANDLER( bionicc_gfxctrl_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
flip_screen_set(data & 0x0100);
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index f4dffc022e3..115fdf2049a 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -83,7 +83,7 @@ WRITE16_HANDLER( btoads_misc_control_w )
WRITE16_HANDLER( btoads_display_control_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* allow multiple changes during display */
int scanline = video_screen_get_vpos(machine->primary_screen);
@@ -121,9 +121,9 @@ WRITE16_HANDLER( btoads_scroll0_w )
video_screen_update_now(machine->primary_screen);
/* upper bits are Y scroll, lower bits are X scroll */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
yscroll0 = data >> 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
xscroll0 = data & 0xff;
}
@@ -134,9 +134,9 @@ WRITE16_HANDLER( btoads_scroll1_w )
video_screen_update_now(machine->primary_screen);
/* upper bits are Y scroll, lower bits are X scroll */
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
yscroll1 = data >> 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
xscroll1 = data & 0xff;
}
@@ -200,14 +200,14 @@ READ16_HANDLER( btoads_vram_bg1_r )
WRITE16_HANDLER( btoads_vram_fg_display_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
vram_fg_display[offset] = data;
}
WRITE16_HANDLER( btoads_vram_fg_draw_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
vram_fg_draw[offset] = data;
}
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index da61765b9e5..7dddf3f416c 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -54,7 +54,7 @@ VIDEO_START( cabal )
WRITE16_HANDLER( cabal_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int flip = (data & 0x20) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0;
tilemap_set_flip(background_layer,flip);
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index e55bb2dbdfe..617cdc8306a 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -107,7 +107,7 @@ static void cchasm_refresh (void)
WRITE16_HANDLER( cchasm_refresh_control_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
switch (data >> 8)
{
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 2ce8ede0098..b9d78888b73 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -253,7 +253,7 @@ WRITE16_HANDLER( bigrun_vregs_w )
switch (offset)
{
case 0x0000/2 : // leds
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,new_data & 0x01);
coin_counter_w(1,new_data & 0x02);
@@ -266,7 +266,7 @@ WRITE16_HANDLER( bigrun_vregs_w )
break;
case 0x0004/2 : // motor (seat?)
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
set_led_status(2, (new_data != old_data) ? 1 : 0);
break;
@@ -347,7 +347,7 @@ WRITE16_HANDLER( cischeat_vregs_w )
switch (offset)
{
case 0x0000/2 : // leds
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,new_data & 0x01);
coin_counter_w(1,new_data & 0x02);
@@ -360,7 +360,7 @@ WRITE16_HANDLER( cischeat_vregs_w )
break;
case 0x0004/2 : // motor (seat?)
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
set_led_status(2, (new_data != old_data) ? 1 : 0);
break;
@@ -492,7 +492,7 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000
*/
// "shudder" motors, leds
case 0x0004/2 :
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0,new_data & 0x01);
coin_counter_w(1,new_data & 0x02);
@@ -546,7 +546,7 @@ WRITE16_HANDLER( f1gpstr2_vregs_w )
switch (offset)
{
case 0x0000/2 :
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
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);
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 8b913cfcd3f..db08934b3c3 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1471,7 +1471,7 @@ static void cps1_render_sprites(running_machine *machine, bitmap_t *bitmap, cons
WRITE16_HANDLER( cps2_objram_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
cps2_objram_bank = data & 1;
}
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 1ff41bb8545..909f419547c 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -72,7 +72,7 @@ WRITE16_HANDLER( crshrace_videoram2_w )
WRITE16_HANDLER( crshrace_roz_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (roz_bank != (data & 0xff))
{
@@ -85,7 +85,7 @@ WRITE16_HANDLER( crshrace_roz_bank_w )
WRITE16_HANDLER( crshrace_gfxctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
gfxctrl = data & 0xdf;
flipscreen = data & 0x20;
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index a44b590eb23..7f5f2bcaf27 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -21,7 +21,7 @@ READ16_HANDLER( dcon_control_r )
WRITE16_HANDLER( dcon_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
dcon_enable=data;
if ((dcon_enable&4)==4)
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index f7b765eb5b1..1284f16c868 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -20,7 +20,7 @@ WRITE16_HANDLER( deadang_text_w )
WRITE16_HANDLER( deadang_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
deadangle_tilebank = data&1;
if (deadangle_tilebank!=deadangle_oldtilebank)
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index c3fb77f248f..3098c4367dd 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_BYTE_0) dooyong_bgscroll8_w(machine, offset, data & 0x00ff);
+ if (ACCESSING_BITS_0_7) dooyong_bgscroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_bg2scroll16_w )
{
- if (ACCESSING_BYTE_0) dooyong_bg2scroll8_w(machine, offset, data & 0x00ff);
+ if (ACCESSING_BITS_0_7) dooyong_bg2scroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_fgscroll16_w )
{
- if (ACCESSING_BYTE_0) dooyong_fgscroll8_w(machine, offset, data & 0x00ff);
+ if (ACCESSING_BITS_0_7) dooyong_fgscroll8_w(machine, offset, data & 0x00ff);
}
WRITE16_HANDLER( dooyong_fg2scroll16_w )
{
- if (ACCESSING_BYTE_0) dooyong_fg2scroll8_w(machine, offset, data & 0x00ff);
+ if (ACCESSING_BITS_0_7) dooyong_fg2scroll8_w(machine, offset, data & 0x00ff);
}
@@ -188,7 +188,7 @@ WRITE8_HANDLER( flytiger_ctrl_w )
WRITE16_HANDLER( rshark_ctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 flips screen */
flip_screen_set(data & 0x0001);
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index c792ec27731..3ef1ac0c28c 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -93,7 +93,7 @@ WRITE16_HANDLER( dynduke_gfxbank_w )
{
static int old_back,old_fore;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data&0x01) back_bankbase=0x1000; else back_bankbase=0;
if (data&0x10) fore_bankbase=0x1000; else fore_bankbase=0;
@@ -112,7 +112,7 @@ WRITE16_HANDLER( dynduke_gfxbank_w )
WRITE16_HANDLER( dynduke_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// bit 0x80 toggles, maybe sprite buffering?
// bit 0x40 is flipscreen
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index 5b99d72aed3..e5316bcbd74 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -162,7 +162,7 @@ READ16_HANDLER(equites_fg_videoram_r)
WRITE16_HANDLER(equites_fg_videoram_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
equites_fg_videoram[offset] = data & 0xff;
@@ -179,16 +179,16 @@ WRITE16_HANDLER(equites_bg_videoram_w)
WRITE16_HANDLER(equites_bgcolor_w)
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
bgcolor = data >> 8;
}
WRITE16_HANDLER(equites_scrollreg_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
tilemap_set_scrolly(bg_tilemap, 0, data & 0xff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
tilemap_set_scrollx(bg_tilemap, 0, data >> 8);
}
@@ -222,16 +222,16 @@ WRITE16_HANDLER(equites_flip1_w)
WRITE16_HANDLER(splndrbt_flip0_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
flip_screen_set(0);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
bgcolor = data >> 8;
}
WRITE16_HANDLER(splndrbt_flip1_w)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
flip_screen_set(1);
}
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index af5f07eb20b..320f5953afa 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -155,7 +155,7 @@ WRITE16_HANDLER( f1gp_fgscroll_w )
WRITE16_HANDLER( f1gp_gfxctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flipscreen = data & 0x20;
gfxctrl = data & 0xdf;
@@ -164,7 +164,7 @@ WRITE16_HANDLER( f1gp_gfxctrl_w )
WRITE16_HANDLER( f1gp2_gfxctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flipscreen = data & 0x20;
@@ -174,7 +174,7 @@ WRITE16_HANDLER( f1gp2_gfxctrl_w )
gfxctrl = data & 0xdf;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (f1gp2_roz_bank != (data >> 8))
{
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index 13748cdb1a9..d2cab8d0bde 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -179,7 +179,7 @@ WRITE16_HANDLER( gaiden_videoram3_w )
WRITE16_HANDLER( gaiden_flip_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
flip_screen_set(data & 1);
}
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index c969d925b55..c28886bef83 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -373,7 +373,7 @@ WRITE16_HANDLER( genesis_vdp_w )
if (mem_mask)
{
data &= ~mem_mask;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
data |= data >> 8;
else
data |= data << 8;
@@ -386,7 +386,7 @@ WRITE16_HANDLER( genesis_vdp_w )
if (mem_mask)
{
data &= ~mem_mask;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
data |= data >> 8;
else
data |= data << 8;
@@ -398,7 +398,7 @@ WRITE16_HANDLER( genesis_vdp_w )
case 0x09:
case 0x0a:
case 0x0b:
- if (ACCESSING_BYTE_0 && sndti_exists(SOUND_SN76496, 0))
+ if (ACCESSING_BITS_0_7 && sndti_exists(SOUND_SN76496, 0))
SN76496_0_w(machine, 0, data & 0xff);
break;
}
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index fe5810b320b..e180c240a92 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -21,7 +21,7 @@ WRITE16_HANDLER( goal92_fg_bank_w )
{
COMBINE_DATA(&fg_bank);
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
{
tilemap_mark_all_tiles_dirty(foreground_layer);
}
diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c
index 8b4da297aaa..22e13e48589 100644
--- a/src/mame/video/gotcha.c
+++ b/src/mame/video/gotcha.c
@@ -63,13 +63,13 @@ WRITE16_HANDLER( gotcha_bgvideoram_w )
WRITE16_HANDLER( gotcha_gfxbank_select_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
banksel = (data & 0x0300) >> 8;
}
WRITE16_HANDLER( gotcha_gfxbank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (gfxbank[banksel] != ((data & 0x0f00) >> 8))
{
diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c
index dc265018287..cab3459bbc1 100644
--- a/src/mame/video/gticlub.c
+++ b/src/mame/video/gticlub.c
@@ -117,7 +117,7 @@ static void K001006_w(int chip, int offset, UINT32 data, UINT32 mem_mask)
}
else if (offset == 2)
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
K001006_device_sel[chip] = (data >> 16) & 0xf;
}
diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c
index 53922abb36c..9ee6e8ab945 100644
--- a/src/mame/video/itech32.c
+++ b/src/mame/video/itech32.c
@@ -249,7 +249,7 @@ VIDEO_START( itech32 )
WRITE16_HANDLER( timekill_colora_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
enable_latch[0] = (~data >> 5) & 1;
enable_latch[1] = (~data >> 7) & 1;
@@ -260,14 +260,14 @@ WRITE16_HANDLER( timekill_colora_w )
WRITE16_HANDLER( timekill_colorbc_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
color_latch[1] = ((data & 0xf0) << 4) | 0x1000;
}
WRITE16_HANDLER( timekill_intensity_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
double intensity = (double)(data & 0xff) / (double)0x60;
int i;
@@ -279,21 +279,21 @@ WRITE16_HANDLER( timekill_intensity_w )
WRITE16_HANDLER( bloodstm_color1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
color_latch[0] = (data & 0x7f) << 8;
}
WRITE16_HANDLER( bloodstm_color2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
color_latch[1] = (data & 0x7f) << 8;
}
WRITE16_HANDLER( bloodstm_plane_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
enable_latch[0] = (~data >> 1) & 1;
enable_latch[1] = (~data >> 2) & 1;
@@ -303,28 +303,28 @@ WRITE16_HANDLER( bloodstm_plane_w )
WRITE32_HANDLER( drivedge_color0_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
color_latch[0] = ((data >> 16) & 0x7f) << 8;
}
WRITE32_HANDLER( itech020_color1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
color_latch[1] = (data & 0x7f) << 8;
}
WRITE32_HANDLER( itech020_color2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
color_latch[0] = (data & 0x7f) << 8;
}
WRITE32_HANDLER( itech020_plane_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
enable_latch[0] = (~data >> 9) & 1;
enable_latch[1] = (~data >> 10) & 1;
@@ -359,7 +359,7 @@ WRITE16_HANDLER( bloodstm_paletteram_w )
int r, g, b;
/* in test mode, the LSB is used; in game mode, the MSB is used */
- if (!ACCESSING_BYTE_0 && (offset & 1))
+ if (!ACCESSING_BITS_0_7 && (offset & 1))
data >>= 8, mem_mask >>= 8;
COMBINE_DATA(&paletteram16[offset]);
@@ -1422,7 +1422,7 @@ READ16_HANDLER( bloodstm_video_r )
WRITE32_HANDLER( itech020_video_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
itech32_video_w(machine, offset, data >> 16, mem_mask >> 16);
else
itech32_video_w(machine, offset, data, mem_mask);
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index 614c5bab644..a55f0ade791 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -224,12 +224,12 @@ WRITE16_HANDLER( pandora_spriteram_LSB_w )
return;
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
pandora_spriteram[offset] = (data>>8)&0xff;
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
pandora_spriteram[offset] = data&0xff;
}
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 59918542cba..68eb06064e0 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -694,7 +694,7 @@ WRITE16_HANDLER( kaneko16_sprites_regs_w )
switch (offset)
{
case 0:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
kaneko16_sprite_flipx = new_data & 2;
kaneko16_sprite_flipy = new_data & 1;
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 7c48e1f584b..94c7031903b 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -446,9 +446,9 @@ WRITE32_HANDLER( konamigx_555_palette_w )
COMBINE_DATA(&paletteram32[offset]);
paletteram16 = (UINT16 *)paletteram32;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
@@ -462,21 +462,21 @@ WRITE32_HANDLER( konamigx_555_palette2_w )
COMBINE_DATA(&paletteram32[offset]);
paletteram16 = (UINT16 *)paletteram32;
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2, data >> 16, mem_mask >> 16);
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
paletteram16_xRRRRRGGGGGBBBBB_word_w(machine, offset*2+1, data, mem_mask);
}
WRITE32_HANDLER( konamigx_tilebank_w )
{
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
gx_tilebanks[offset*4] = (data>>24)&0xff;
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
gx_tilebanks[offset*4+1] = (data>>16)&0xff;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
gx_tilebanks[offset*4+2] = (data>>8)&0xff;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
gx_tilebanks[offset*4+3] = data&0xff;
}
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index e26c73d7059..8adf641f09f 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -2252,9 +2252,9 @@ READ16_HANDLER( K052109_word_r )
WRITE16_HANDLER( K052109_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K052109_w(machine,offset,(data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K052109_w(machine,offset + 0x2000,data & 0xff);
}
@@ -2265,7 +2265,7 @@ READ16_HANDLER(K052109_lsb_r)
WRITE16_HANDLER(K052109_lsb_w)
{
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
K052109_w(machine, offset, data & 0xff);
}
@@ -2618,9 +2618,9 @@ READ16_HANDLER( K051960_word_r )
WRITE16_HANDLER( K051960_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051960_w(machine,offset*2,(data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051960_w(machine,offset*2 + 1,data & 0xff);
}
@@ -2691,9 +2691,9 @@ READ16_HANDLER( K051937_word_r )
WRITE16_HANDLER( K051937_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K051937_w(machine,offset*2,(data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K051937_w(machine,offset*2 + 1,data & 0xff);
}
@@ -3194,7 +3194,7 @@ READ16_HANDLER( K053244_lsb_r )
WRITE16_HANDLER( K053244_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053244_w(machine, offset, data & 0xff);
}
@@ -3205,9 +3205,9 @@ READ16_HANDLER( K053244_word_r )
WRITE16_HANDLER( K053244_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K053244_w(machine, offset*2, (data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053244_w(machine, offset*2+1, data & 0xff);
}
@@ -4134,9 +4134,9 @@ READ16_HANDLER( K053246_word_r )
WRITE16_HANDLER( K053246_word_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K053246_w(machine, offset<<1,(data >> 8) & 0xff);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053246_w(machine, (offset<<1) + 1,data & 0xff);
}
@@ -5155,13 +5155,13 @@ WRITE8_HANDLER( K053251_w )
WRITE16_HANDLER( K053251_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K053251_w(machine, offset, data & 0xff);
}
WRITE16_HANDLER( K053251_msb_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
K053251_w(machine, offset, (data >> 8) & 0xff);
}
@@ -5236,7 +5236,7 @@ READ16_HANDLER( K054000_lsb_r )
WRITE16_HANDLER( K054000_lsb_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
K054000_w(machine, offset, data & 0xff);
}
@@ -6419,11 +6419,11 @@ WRITE8_HANDLER( K056832_b_w )
WRITE32_HANDLER( K056832_b_long_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
K056832_b_word_w(machine, offset<<1, data>>16, mem_mask >> 16);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
K056832_b_word_w(machine, (offset<<1)+1, data, mem_mask);
}
@@ -7165,14 +7165,14 @@ WRITE32_HANDLER( K055555_long_w )
{
UINT8 regnum, regdat;
- if (ACCESSING_BYTE_3)
+ if (ACCESSING_BITS_24_31)
{
regnum = offset<<1;
regdat = data>>24;
}
else
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
regnum = (offset<<1)+1;
regdat = data>>8;
@@ -7525,7 +7525,7 @@ void K053250_vh_start(int chips, int *region)
WRITE16_HANDLER( K053250_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// start LVC DMA transfer at the falling edge of control register's bit1
if (offset == 4 && !(data & 2) && (K053250_info.chip[0].regs[4] & 2)) K053250_dma(0, 1);
@@ -7558,7 +7558,7 @@ READ16_HANDLER( K053250_0_rom_r )
WRITE16_HANDLER( K053250_1_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
// start LVC DMA transfer at the falling edge of control register's bit1
if (offset == 4 && !(data & 2) && (K053250_info.chip[1].regs[4] & 2)) K053250_dma(1, 1);
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 42e57ab081f..0ebecb804cd 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -123,7 +123,7 @@ VIDEO_START( madgear )
WRITE16_HANDLER( lastduel_flip_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flip_screen_set(data & 0x01);
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 1926409e745..43c2636b8a0 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -32,7 +32,7 @@ void denjinmk_setgfxbank(UINT16 data)
#ifdef UNUSED_FUNCTION
WRITE16_HANDLER( legionna_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
legionna_enable=data;
if ((legionna_enable&4)==4)
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index f0549a91a21..cfb304d4727 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -303,7 +303,7 @@ static void m107_screenrefresh(running_machine *machine, bitmap_t *bitmap, const
WRITE16_HANDLER( m107_spritebuffer_w )
{
- if (ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_0_7) {
// logerror("%04x: buffered spriteram\n",activecpu_get_pc());
memcpy(m107_spriteram,spriteram16,0x1000);
}
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index e0068b1f112..192f5cf4c6b 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -330,14 +330,14 @@ WRITE16_HANDLER( m72_scrolly2_w )
WRITE16_HANDLER( m72_dmaon_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
memcpy(m72_spriteram,spriteram16,spriteram_size);
}
WRITE16_HANDLER( m72_port02_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0xe0) logerror("write %02x to port 02\n",data);
@@ -363,7 +363,7 @@ WRITE16_HANDLER( m72_port02_w )
WRITE16_HANDLER( rtype2_port02_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0xe0) logerror("write %02x to port 02\n",data);
@@ -387,7 +387,7 @@ static int majtitle_rowscroll;
/* the following is mostly a kludge. This register seems to be used for something else */
WRITE16_HANDLER( majtitle_gfx_ctrl_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
if (data & 0xff00) majtitle_rowscroll = 1;
else majtitle_rowscroll = 0;
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index 0c67c91bc7b..b09ee96a7a0 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -80,7 +80,7 @@ WRITE16_HANDLER( m92_spritecontrol_w )
/* Sprite list size register - used in spriteroutine */
/* Sprite control - display all sprites, or partial list */
- if (offset==2 && ACCESSING_BYTE_0)
+ if (offset==2 && ACCESSING_BITS_0_7)
{
if ((data & 0xff) == 8)
m92_sprite_list = (((0x100 - m92_spritecontrol[0]) & 0xff) * 4);
@@ -119,7 +119,7 @@ WRITE16_HANDLER( m92_videocontrol_w )
be a different motherboard revision (most games use M92-A-B top
pcb, a M92-A-A revision could exist...).
*/
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* Access to upper palette bank */
m92_palette_bank = (data >> 1) & 1;
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index bc99e4b96d9..585fdd9d8ec 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -156,16 +156,16 @@ WRITE16_HANDLER( midtunit_vram_w )
offset *= 2;
if (videobank_select)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (data & 0xff) | ((dma_register[DMA_PALETTE] & 0xff) << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = ((data >> 8) & 0xff) | (dma_register[DMA_PALETTE] & 0xff00);
}
else
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (local_videoram[offset] & 0xff) | ((data & 0xff) << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = (local_videoram[offset + 1] & 0xff) | (data & 0xff00);
}
}
@@ -174,9 +174,9 @@ WRITE16_HANDLER( midtunit_vram_w )
WRITE16_HANDLER( midtunit_vram_data_w )
{
offset *= 2;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (data & 0xff) | ((dma_register[DMA_PALETTE] & 0xff) << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = ((data >> 8) & 0xff) | (dma_register[DMA_PALETTE] & 0xff00);
}
@@ -184,9 +184,9 @@ WRITE16_HANDLER( midtunit_vram_data_w )
WRITE16_HANDLER( midtunit_vram_color_w )
{
offset *= 2;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (local_videoram[offset] & 0xff) | ((data & 0xff) << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = (local_videoram[offset + 1] & 0xff) | (data & 0xff00);
}
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index beaeb3c6928..b2df2e42476 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -172,16 +172,16 @@ WRITE16_HANDLER( midyunit_vram_w )
offset *= 2;
if (videobank_select)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (data & 0x00ff) | (dma_register[DMA_PALETTE] << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = (data >> 8) | (dma_register[DMA_PALETTE] & 0xff00);
}
else
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
local_videoram[offset] = (local_videoram[offset] & 0x00ff) | (data << 8);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
local_videoram[offset + 1] = (local_videoram[offset + 1] & 0x00ff) | (data & 0xff00);
}
}
@@ -239,7 +239,7 @@ WRITE16_HANDLER( midyunit_control_w )
*
*/
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* CMOS page is bits 6-7 */
midyunit_cmos_page = ((data >> 6) & 3) * 0x1000;
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 0e38b8bcddc..ecae1198906 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -659,20 +659,20 @@ static cached_texture *get_texture(int page, int texx, int texy, int texwidth, i
WRITE64_HANDLER( real3d_display_list_w )
{
- if(ACCESSING_DWORD_1) {
+ if(ACCESSING_BITS_32_63) {
display_list_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
}
- if(ACCESSING_DWORD_0) {
+ if(ACCESSING_BITS_0_31) {
display_list_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
}
}
WRITE64_HANDLER( real3d_polygon_ram_w )
{
- if(ACCESSING_DWORD_1) {
+ if(ACCESSING_BITS_32_63) {
polygon_ram[offset*2] = BYTE_REVERSE32((UINT32)(data >> 32));
}
- if(ACCESSING_DWORD_0) {
+ if(ACCESSING_BITS_0_31) {
polygon_ram[(offset*2)+1] = BYTE_REVERSE32((UINT32)(data));
}
}
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index c54abd97451..c0d813d1afc 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -220,7 +220,7 @@ WRITE32_HANDLER( ms32_priram_w )
WRITE32_HANDLER( ms32_gfxctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 1 = flip screen */
flipscreen = data & 0x02;
diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c
index 0bbed8e889c..a4ba270046c 100644
--- a/src/mame/video/mystwarr.c
+++ b/src/mame/video/mystwarr.c
@@ -395,7 +395,7 @@ VIDEO_UPDATE(martchmp)
WRITE16_HANDLER(ddd_053936_enable_w)
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
roz_enable = data & 0x0100;
roz_rombank = (data & 0xc000)>>14;
@@ -410,7 +410,7 @@ WRITE16_HANDLER(ddd_053936_clip_w)
if (offset == 1)
{
- if (ACCESSING_BYTE_1) K053936GP_clip_enable(0, data & 0x0100);
+ if (ACCESSING_BITS_8_15) K053936GP_clip_enable(0, data & 0x0100);
}
else
{
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index 0043459e6a4..18ae219185a 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -231,7 +231,7 @@ WRITE16_HANDLER( namcos2_68k_video_palette_w )
if( (offset&0x1800) == 0x1800 )
{
offset &= 0x180f;
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
namcos2_68k_palette_ram[offset] = data;
}
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index a6a0f8d0402..043f86c5881 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -81,7 +81,7 @@ static TILE_GET_INFO( get_fg_tile_info )
WRITE16_HANDLER( nemesis_gfx_flipx_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flipscreen = data & 0x01;
if (flipscreen)
@@ -100,7 +100,7 @@ WRITE16_HANDLER( nemesis_gfx_flipx_w )
WRITE16_HANDLER( nemesis_gfx_flipy_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data & 0x01)
tilemap_flip |= TILEMAP_FLIPY;
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index f2bc4328c41..232c6309bf9 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -62,7 +62,7 @@ WRITE16_HANDLER( niyanpai_palette_w )
offs_h = (offset / 0x180);
offs_l = (offset & 0x7f);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
r = ((niyanpai_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
g = ((niyanpai_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0xff00) >> 8);
@@ -71,7 +71,7 @@ WRITE16_HANDLER( niyanpai_palette_w )
palette_set_color(Machine, ((offs_h << 8) + (offs_l << 1) + 0), MAKE_RGB(r, g, b));
}
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
r = ((niyanpai_palette[(0x000 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
g = ((niyanpai_palette[(0x080 + (offs_h * 0x180) + offs_l)] & 0x00ff) >> 0);
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index e335fa73e95..95264b83d9a 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -297,7 +297,7 @@ WRITE16_HANDLER( bioshipbg_scroll_w )
{
static UINT8 scroll[4];
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
scroll[offset] = (data >> 8) & 0xff;
@@ -310,7 +310,7 @@ WRITE16_HANDLER( bioshipbg_scroll_w )
WRITE16_HANDLER( nmk_scroll_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static UINT8 scroll[4];
@@ -325,7 +325,7 @@ WRITE16_HANDLER( nmk_scroll_w )
WRITE16_HANDLER( nmk_scroll_2_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static UINT8 scroll[4];
@@ -369,13 +369,13 @@ WRITE16_HANDLER( manybloc_scroll_w )
WRITE16_HANDLER( nmk_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
flip_screen_set(data & 0x01);
}
WRITE16_HANDLER( nmk_tilebank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (bgbank != (data & 0xff))
{
@@ -387,13 +387,13 @@ WRITE16_HANDLER( nmk_tilebank_w )
WRITE16_HANDLER( bioship_scroll_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
bioship_scroll[offset]=data>>8;
}
WRITE16_HANDLER( bioship_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (bioship_background_bank != data)
{
diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c
index 9e2ebb05f4b..575bb377583 100644
--- a/src/mame/video/ohmygod.c
+++ b/src/mame/video/ohmygod.c
@@ -54,7 +54,7 @@ WRITE16_HANDLER( ohmygod_videoram_w )
WRITE16_HANDLER( ohmygod_spritebank_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
spritebank = data & 0x8000;
}
diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c
index 0c14575f265..b38d0115cee 100644
--- a/src/mame/video/policetr.c
+++ b/src/mame/video/policetr.c
@@ -203,7 +203,7 @@ WRITE32_HANDLER( policetr_video_w )
/* latch 0x50 allows a direct write to the destination bitmap */
case 0x50:
- if (ACCESSING_BYTE_3 && dst_xoffs < DSTBITMAP_WIDTH && dst_yoffs < DSTBITMAP_HEIGHT)
+ if (ACCESSING_BITS_24_31 && dst_xoffs < DSTBITMAP_WIDTH && dst_yoffs < DSTBITMAP_HEIGHT)
dstbitmap[dst_yoffs * DSTBITMAP_WIDTH + dst_xoffs] = data >> 24;
break;
@@ -331,7 +331,7 @@ READ32_HANDLER( policetr_video_r )
WRITE32_HANDLER( policetr_palette_offset_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
palette_offset = (data >> 16) & 0xff;
palette_index = 0;
@@ -341,7 +341,7 @@ WRITE32_HANDLER( policetr_palette_offset_w )
WRITE32_HANDLER( policetr_palette_data_w )
{
- if (ACCESSING_BYTE_2)
+ if (ACCESSING_BITS_16_23)
{
palette_data[palette_index] = (data >> 16) & 0xff;
if (++palette_index == 3)
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index 39cd6d4a783..1320c81631c 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -60,12 +60,12 @@ static int tile_bank;
WRITE16_HANDLER( powerins_flipscreen_w )
{
- if (ACCESSING_BYTE_0) flip_screen_set( data & 1 );
+ if (ACCESSING_BITS_0_7) flip_screen_set( data & 1 );
}
WRITE16_HANDLER( powerins_tilebank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (data != tile_bank)
{
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index b441ec33833..6a99ca7ad7f 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -105,7 +105,7 @@ static TILE_GET_INFO( get_tile_info_1 )
WRITE32_HANDLER( psikyo_vram_0_w )
{
COMBINE_DATA(&psikyo_vram_0[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
tilemap_mark_tile_dirty(tilemap_0_size0, offset*2);
tilemap_mark_tile_dirty(tilemap_0_size1, offset*2);
@@ -113,7 +113,7 @@ WRITE32_HANDLER( psikyo_vram_0_w )
tilemap_mark_tile_dirty(tilemap_0_size3, offset*2);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
tilemap_mark_tile_dirty(tilemap_0_size0, offset*2+1);
tilemap_mark_tile_dirty(tilemap_0_size1, offset*2+1);
@@ -125,7 +125,7 @@ WRITE32_HANDLER( psikyo_vram_0_w )
WRITE32_HANDLER( psikyo_vram_1_w )
{
COMBINE_DATA(&psikyo_vram_1[offset]);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
tilemap_mark_tile_dirty(tilemap_1_size0, offset*2);
tilemap_mark_tile_dirty(tilemap_1_size1, offset*2);
@@ -133,7 +133,7 @@ WRITE32_HANDLER( psikyo_vram_1_w )
tilemap_mark_tile_dirty(tilemap_1_size3, offset*2);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
tilemap_mark_tile_dirty(tilemap_1_size0, offset*2+1);
tilemap_mark_tile_dirty(tilemap_1_size1, offset*2+1);
diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c
index c1da48b84c0..8d0301b5744 100644
--- a/src/mame/video/quizpani.c
+++ b/src/mame/video/quizpani.c
@@ -55,7 +55,7 @@ WRITE16_HANDLER( quizpani_txt_videoram_w )
WRITE16_HANDLER( quizpani_tilesbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if(quizpani_txtbank != (data & 0x30)>>4)
{
diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c
index 03e8335ba76..b57a5600c3e 100644
--- a/src/mame/video/raiden.c
+++ b/src/mame/video/raiden.c
@@ -94,7 +94,7 @@ WRITE16_HANDLER( raiden_control_w )
/* All other bits unknown - could be playfield enables */
/* Flipscreen */
- if (offset==3 && ACCESSING_BYTE_0) {
+ if (offset==3 && ACCESSING_BITS_0_7) {
flipscreen=data&0x2;
tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
}
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 6fb6876e343..54122bab601 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -32,7 +32,7 @@ static int disable_video;
WRITE16_HANDLER( realbrk_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
coin_counter_w(0, data & 0x0001);
coin_counter_w(1, data & 0x0004);
@@ -40,7 +40,7 @@ WRITE16_HANDLER( realbrk_flipscreen_w )
flip_screen_set( data & 0x0080);
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
disable_video = data & 0x8000;
}
diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c
index 28e8320c9f3..b68fc1f3a16 100644
--- a/src/mame/video/rpunch.c
+++ b/src/mame/video/rpunch.c
@@ -134,7 +134,7 @@ WRITE16_HANDLER( rpunch_videoreg_w )
WRITE16_HANDLER( rpunch_scrollreg_w )
{
- if (ACCESSING_BYTE_0 && ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_0_7 && ACCESSING_BITS_8_15)
switch (offset)
{
case 0:
@@ -158,7 +158,7 @@ WRITE16_HANDLER( rpunch_scrollreg_w )
WRITE16_HANDLER( rpunch_crtc_data_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xff;
switch (crtc_register)
@@ -178,14 +178,14 @@ WRITE16_HANDLER( rpunch_crtc_data_w )
WRITE16_HANDLER( rpunch_crtc_register_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
crtc_register = data & 0xff;
}
WRITE16_HANDLER( rpunch_ins_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (offset == 0)
{
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index a486afd6cca..b8a4e2e5b7d 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -3445,7 +3445,7 @@ READ16_HANDLER( segaic16_road_control_0_r )
WRITE16_HANDLER( segaic16_road_control_0_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
road[0].control = data & ((road[0].type == SEGAIC16_ROAD_OUTRUN) ? 3 : 7);
}
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 0dce5f5dccd..3f68160383d 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -503,9 +503,9 @@ READ32_HANDLER( multi32_paletteram_0_r )
WRITE32_HANDLER( multi32_paletteram_0_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
common_paletteram_w(0, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
common_paletteram_w(0, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -519,9 +519,9 @@ READ32_HANDLER( multi32_paletteram_1_r )
WRITE32_HANDLER( multi32_paletteram_1_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
common_paletteram_w(1, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
common_paletteram_w(1, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -567,9 +567,9 @@ READ32_HANDLER( multi32_videoram_r )
WRITE32_HANDLER( multi32_videoram_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
system32_videoram_w(machine, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
system32_videoram_w(machine, offset*2+1, data >> 16, mem_mask >> 16);
}
@@ -641,7 +641,7 @@ READ16_HANDLER( system32_sprite_control_r )
WRITE16_HANDLER( system32_sprite_control_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
sprite_control[offset & 7] = data;
}
@@ -655,9 +655,9 @@ READ32_HANDLER( multi32_sprite_control_r )
WRITE32_HANDLER( multi32_sprite_control_w )
{
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
system32_sprite_control_w(machine, offset*2+0, data, mem_mask);
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
system32_sprite_control_w(machine, offset*2+1, data >> 16, mem_mask >> 16);
}
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 9e64e6ea426..30aeb53caa0 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -277,7 +277,7 @@ WRITE16_HANDLER( seta_vregs_w )
---- ---- ---- -2-- Coin #0 Lock Out
---- ---- ---- --1- Coin #1 Counter
---- ---- ---- ---0 Coin #0 Counter */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
seta_coin_lockout_w (data & 0x0f);
if (sndti_exists(SOUND_X1_010, 0))
@@ -288,7 +288,7 @@ WRITE16_HANDLER( seta_vregs_w )
break;
case 2/2:
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int new_bank;
@@ -419,7 +419,7 @@ WRITE16_HANDLER( seta_vram_2_w )
WRITE16_HANDLER( twineagl_tilebank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xff;
if (twineagl_tilebank[offset] != data)
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 32a80ec882e..0b04d74d2ee 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -106,7 +106,7 @@ WRITE16_HANDLER( sf_gfxctrl_w )
/* b5 = active background plane */
/* b6 = active middle plane */
/* b7 = active sprites */
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
sf_active = data & 0xff;
flip_screen_set(data & 0x04);
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index 6d30e4aeea5..d4b0aee9b87 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -94,7 +94,7 @@ VIDEO_START( shangha3 )
WRITE16_HANDLER( shangha3_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 7 flips screen, the rest seems to always be set to 0x7e */
flip_screen_set(data & 0x80);
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index a558eb5e207..0a811de93b3 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -107,7 +107,7 @@ VIDEO_START( ikari3 )
WRITE16_HANDLER( pow_flipscreen16_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flip_screen_set(data & 0x08);
sprite_flip=data&0x4;
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index bd40110b231..9b2f6b05f64 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -287,7 +287,7 @@ WRITE32_HANDLER( stv_vdp1_regs_w )
if ( offset == 0 )
{
stv_set_framebuffer_config();
- if ( ACCESSING_WORD_0 )
+ if ( ACCESSING_BITS_0_15 )
{
if ( vdp1_sprite_log ) logerror( "VDP1: Access to register FBCR = %1X\n", STV_VDP1_FBCR );
stv_vdp1_fbcr_accessed = 1;
@@ -309,7 +309,7 @@ WRITE32_HANDLER( stv_vdp1_regs_w )
}
else if ( offset == 1 )
{
- if ( ACCESSING_WORD_1 )
+ if ( ACCESSING_BITS_16_31 )
{
if ( STV_VDP1_PTMR == 1 )
{
@@ -323,18 +323,18 @@ WRITE32_HANDLER( stv_vdp1_regs_w )
}
}
}
- else if ( ACCESSING_WORD_0 )
+ else if ( ACCESSING_BITS_0_15 )
{
if ( vdp1_sprite_log ) logerror( "VDP1: Erase data set %08X\n", data );
}
}
else if ( offset == 2 )
{
- if ( ACCESSING_WORD_1 )
+ if ( ACCESSING_BITS_16_31 )
{
if ( vdp1_sprite_log ) logerror( "VDP1: Erase upper-left coord set: %08X\n", data );
}
- else if ( ACCESSING_WORD_0 )
+ else if ( ACCESSING_BITS_0_15 )
{
if ( vdp1_sprite_log ) logerror( "VDP1: Erase lower-right coord set: %08X\n", data );
}
@@ -377,11 +377,11 @@ WRITE32_HANDLER ( stv_vdp1_framebuffer0_w )
else
{
/* 16-bit mode */
- if ( ACCESSING_WORD_1 )
+ if ( ACCESSING_BITS_16_31 )
{
stv_framebuffer[stv_vdp1_current_draw_framebuffer][offset*2] = (data >> 16) & 0xffff;
}
- if ( ACCESSING_WORD_0 )
+ if ( ACCESSING_BITS_0_15 )
{
stv_framebuffer[stv_vdp1_current_draw_framebuffer][offset*2+1] = data & 0xffff;
}
@@ -399,11 +399,11 @@ READ32_HANDLER ( stv_vdp1_framebuffer0_r )
else
{
/* 16-bit mode */
- if ( ACCESSING_WORD_1 )
+ if ( ACCESSING_BITS_16_31 )
{
result |= (stv_framebuffer[stv_vdp1_current_draw_framebuffer][offset*2] << 16);
}
- if ( ACCESSING_WORD_0 )
+ if ( ACCESSING_BITS_0_15 )
{
result |= stv_framebuffer[stv_vdp1_current_draw_framebuffer][offset*2+1];
}
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 812b73af538..3e29109417a 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -64,7 +64,7 @@ static int color_bank;
WRITE16_HANDLER( suna16_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flip_screen_set( data & 1 );
color_bank = ( data & 4 ) >> 2;
@@ -74,7 +74,7 @@ WRITE16_HANDLER( suna16_flipscreen_w )
WRITE16_HANDLER( bestbest_flipscreen_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
flip_screen_set( data & 0x10 );
// color_bank = ( data & 0x07 );
diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c
index f1255e54171..b4fc86c5b6c 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -98,7 +98,7 @@ WRITE16_HANDLER( tail2nos_zoomdata_w )
WRITE16_HANDLER( tail2nos_gfxbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
int bank;
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index f3998796c85..1dbf70fdeed 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -95,7 +95,7 @@ WRITE16_HANDLER( taitob_v_control_w )
COMBINE_DATA (&TC0180VCU_ctrl[offset]);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
switch(offset)
{
@@ -143,7 +143,7 @@ WRITE16_HANDLER( hitice_pixelram_w )
COMBINE_DATA(&taitob_pixelram[offset]);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 15 of pixel_scroll[0] is probably flip screen */
@@ -320,9 +320,9 @@ WRITE16_HANDLER( TC0180VCU_framebuffer_word_w )
int sy = offset >> 8;
int sx = 2*(offset & 0xff);
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
*BITMAP_ADDR16(framebuffer[sy >> 8], sy & 0xff, sx + 0) = data >> 8;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
*BITMAP_ADDR16(framebuffer[sy >> 8], sy & 0xff, sx + 1) = data & 0xff;
}
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 0bbd4174671..049207d5f8e 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -828,7 +828,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks);
WRITE16_HANDLER( contcirc_out_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 = reset sub CPU */
cpunum_set_input_line(Machine, 1, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index c98f8426f0b..c3737672724 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -2615,8 +2615,8 @@ READ32_HANDLER( TC0100SCN_ctrl_long_r )
WRITE32_HANDLER( TC0100SCN_ctrl_long_w )
{
- if (ACCESSING_WORD_1) TC0100SCN_ctrl_word_w(0,offset*2,data>>16,mem_mask>>16);
- if (ACCESSING_WORD_0) TC0100SCN_ctrl_word_w(0,(offset*2)+1,data&0xffff,mem_mask&0xffff);
+ if (ACCESSING_BITS_16_31) TC0100SCN_ctrl_word_w(0,offset*2,data>>16,mem_mask>>16);
+ if (ACCESSING_BITS_0_15) TC0100SCN_ctrl_word_w(0,(offset*2)+1,data&0xffff,mem_mask&0xffff);
}
READ32_HANDLER( TC0100SCN_long_r )
@@ -2626,23 +2626,23 @@ READ32_HANDLER( TC0100SCN_long_r )
WRITE32_HANDLER( TC0100SCN_long_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
int oldword = TC0100SCN_word_0_r(machine,offset*2,0);
int newword = data>>16;
- if (!ACCESSING_BYTE_2)
+ if (!ACCESSING_BITS_16_23)
newword |= (oldword &0x00ff);
- if (!ACCESSING_BYTE_3)
+ if (!ACCESSING_BITS_24_31)
newword |= (oldword &0xff00);
TC0100SCN_word_0_w(machine,offset*2,newword,0);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
int oldword = TC0100SCN_word_0_r(machine,(offset*2)+1,0);
int newword = data&0xffff;
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
newword |= (oldword &0x00ff);
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
newword |= (oldword &0xff00);
TC0100SCN_word_0_w(machine,(offset*2)+1,newword,0);
}
@@ -2917,7 +2917,7 @@ if (offset >= 0x0a)
WRITE16_HANDLER( TC0360PRI_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
TC0360PRI_w(machine,offset,data & 0xff);
#if 0
@@ -2931,7 +2931,7 @@ if (data & 0xff00)
WRITE16_HANDLER( TC0360PRI_halfword_swap_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
TC0360PRI_w(machine,offset,(data >> 8) & 0xff);
#if 0
@@ -3282,8 +3282,8 @@ READ32_HANDLER( TC0480SCP_ctrl_long_r )
WRITE32_HANDLER( TC0480SCP_ctrl_long_w )
{
- if (ACCESSING_WORD_1) TC0480SCP_ctrl_word_w(machine,offset*2,data>>16,mem_mask>>16);
- if (ACCESSING_WORD_0) TC0480SCP_ctrl_word_w(machine,(offset*2)+1,data&0xffff,mem_mask&0xffff);
+ if (ACCESSING_BITS_16_31) TC0480SCP_ctrl_word_w(machine,offset*2,data>>16,mem_mask>>16);
+ if (ACCESSING_BITS_0_15) TC0480SCP_ctrl_word_w(machine,(offset*2)+1,data&0xffff,mem_mask&0xffff);
}
READ32_HANDLER( TC0480SCP_long_r )
@@ -3293,23 +3293,23 @@ READ32_HANDLER( TC0480SCP_long_r )
WRITE32_HANDLER( TC0480SCP_long_w )
{
- if (ACCESSING_WORD_1)
+ if (ACCESSING_BITS_16_31)
{
int oldword = TC0480SCP_word_r(machine,offset*2,0);
int newword = data>>16;
- if (!ACCESSING_BYTE_2)
+ if (!ACCESSING_BITS_16_23)
newword |= (oldword &0x00ff);
- if (!ACCESSING_BYTE_3)
+ if (!ACCESSING_BITS_24_31)
newword |= (oldword &0xff00);
TC0480SCP_word_w(machine,offset*2,newword,0);
}
- if (ACCESSING_WORD_0)
+ if (ACCESSING_BITS_0_15)
{
int oldword = TC0480SCP_word_r(machine,(offset*2)+1,0);
int newword = data&0xffff;
- if (!ACCESSING_BYTE_0)
+ if (!ACCESSING_BITS_0_7)
newword |= (oldword &0x00ff);
- if (!ACCESSING_BYTE_1)
+ if (!ACCESSING_BITS_8_15)
newword |= (oldword &0xff00);
TC0480SCP_word_w(machine,(offset*2)+1,newword,0);
}
@@ -5022,7 +5022,7 @@ READ16_HANDLER( TC0220IOC_halfword_port_r )
WRITE16_HANDLER( TC0220IOC_halfword_port_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
TC0220IOC_port_w( machine, offset, data & 0xff );
}
@@ -5033,7 +5033,7 @@ READ16_HANDLER( TC0220IOC_halfword_portreg_r )
WRITE16_HANDLER( TC0220IOC_halfword_portreg_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
TC0220IOC_portreg_w( machine, offset, data & 0xff );
}
@@ -5044,7 +5044,7 @@ READ16_HANDLER( TC0220IOC_halfword_byteswap_port_r )
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_port_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
TC0220IOC_port_w( machine, offset, (data>>8) & 0xff );
}
@@ -5055,7 +5055,7 @@ READ16_HANDLER( TC0220IOC_halfword_byteswap_portreg_r )
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_portreg_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
TC0220IOC_portreg_w( machine, offset, (data>>8) & 0xff );
}
@@ -5066,7 +5066,7 @@ READ16_HANDLER( TC0220IOC_halfword_r )
WRITE16_HANDLER( TC0220IOC_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
TC0220IOC_w(machine,offset,data & 0xff);
else
{
@@ -5085,7 +5085,7 @@ READ16_HANDLER( TC0220IOC_halfword_byteswap_r )
WRITE16_HANDLER( TC0220IOC_halfword_byteswap_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
TC0220IOC_w(machine,offset,(data >> 8) & 0xff);
else
{
@@ -5159,7 +5159,7 @@ READ16_HANDLER( TC0510NIO_halfword_r )
WRITE16_HANDLER( TC0510NIO_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
TC0510NIO_w(machine,offset,data & 0xff);
else
{
@@ -5242,7 +5242,7 @@ READ16_HANDLER( TC0640FIO_halfword_r )
WRITE16_HANDLER( TC0640FIO_halfword_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
TC0640FIO_w(machine,offset,data & 0xff);
else
{
@@ -5258,7 +5258,7 @@ READ16_HANDLER( TC0640FIO_halfword_byteswap_r )
WRITE16_HANDLER( TC0640FIO_halfword_byteswap_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
TC0640FIO_w(machine,offset,(data >> 8) & 0xff);
else
{
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index 07329330d57..22a8687e3ed 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -25,9 +25,9 @@ static UINT16 *taotaido_spriteram2_old, *taotaido_spriteram2_older;
/* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */
WRITE16_HANDLER( taotaido_sprite_character_bank_select_w )
{
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
taotaido_sprite_character_bank_select[offset*2] = data >> 8;
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
taotaido_sprite_character_bank_select[offset*2+1] = data &0xff;
}
@@ -153,9 +153,9 @@ WRITE16_HANDLER( taotaido_tileregs_w )
case 5:
case 6:
case 7:
- if(ACCESSING_BYTE_1)
+ if(ACCESSING_BITS_8_15)
taotaido_video_bank_select[(offset-4)*2] = data >> 8;
- if(ACCESSING_BYTE_0)
+ if(ACCESSING_BITS_0_7)
taotaido_video_bank_select[(offset-4)*2+1] = data &0xff;
tilemap_mark_all_tiles_dirty(bg_tilemap);
break;
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index 23c66a85cb7..caff49bd763 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -155,9 +155,9 @@ WRITE16_HANDLER( cyclwarr_videoram1_w )
WRITE16_HANDLER( roundup5_crt_w )
{
- if (offset==0 && ACCESSING_BYTE_0)
+ if (offset==0 && ACCESSING_BITS_0_7)
roundupt_crt_selected_reg=data&0x3f;
- if (offset==1 && ACCESSING_BYTE_0) {
+ if (offset==1 && ACCESSING_BITS_0_7) {
roundupt_crt_reg[roundupt_crt_selected_reg]=data;
// if (roundupt_crt_selected_reg!=0xa && roundupt_crt_selected_reg!=0xb && roundupt_crt_selected_reg!=29)
// logerror("%08x: Crt write %02x %02x\n",activecpu_get_pc(),roundupt_crt_selected_reg,data);
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index ef210347612..717db45d0ca 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -165,7 +165,7 @@ WRITE16_HANDLER( amazon_foreground_w )
WRITE16_HANDLER( amazon_flipscreen_w )
{
- if( ACCESSING_BYTE_0 )
+ if( ACCESSING_BITS_0_7 )
{
coin_counter_w( 0, data&0x01 );
coin_counter_w( 1, (data&0x02)>>1 );
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index c6299fce53e..ca7033b8613 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -105,7 +105,7 @@ READ16_HANDLER( rocknms_sub_priority_r )
WRITE16_HANDLER( tetrisp2_priority_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data |= ((data & 0xff00) >> 8);
tetrisp2_priority[offset] = data;
@@ -115,7 +115,7 @@ WRITE16_HANDLER( tetrisp2_priority_w )
WRITE16_HANDLER( rockn_priority_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
tetrisp2_priority[offset] = data;
}
@@ -123,7 +123,7 @@ WRITE16_HANDLER( rockn_priority_w )
WRITE16_HANDLER( rocknms_sub_priority_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
rocknms_sub_priority[offset] = data;
}
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index f54561271f2..f4caec47c84 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -13,7 +13,7 @@ WRITE16_HANDLER( tigeroad_videoctrl_w )
{
int bank;
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
data = (data >> 8) & 0xff;
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index cb48dd56c05..3a0cd338648 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -330,7 +330,7 @@ WRITE16_HANDLER( tmnt_paletteram_word_w )
WRITE16_HANDLER( tmnt_0a0000_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static int last;
@@ -356,7 +356,7 @@ WRITE16_HANDLER( tmnt_0a0000_w )
WRITE16_HANDLER( punkshot_0a0020_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static int last;
@@ -377,7 +377,7 @@ WRITE16_HANDLER( punkshot_0a0020_w )
WRITE16_HANDLER( lgtnfght_0a0018_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
static int last;
@@ -399,7 +399,7 @@ WRITE16_HANDLER( lgtnfght_0a0018_w )
WRITE16_HANDLER( blswhstl_700300_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
coin_counter_w(0,data & 0x01);
@@ -433,7 +433,7 @@ READ16_HANDLER( glfgreat_rom_r )
WRITE16_HANDLER( glfgreat_122000_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
coin_counter_w(0,data & 0x01);
@@ -454,7 +454,7 @@ WRITE16_HANDLER( glfgreat_122000_w )
/* other bits unknown */
}
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
/* bit 8 = 53596 char/rom selection for ROM test */
glfgreat_roz_rom_mode = data & 0x100;
@@ -464,7 +464,7 @@ WRITE16_HANDLER( glfgreat_122000_w )
WRITE16_HANDLER( ssriders_eeprom_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0 is data */
/* bit 1 is cs (active low) */
@@ -485,7 +485,7 @@ WRITE16_HANDLER( ssriders_eeprom_w )
WRITE16_HANDLER( ssriders_1c0300_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
coin_counter_w(0,data & 0x01);
@@ -501,7 +501,7 @@ WRITE16_HANDLER( ssriders_1c0300_w )
WRITE16_HANDLER( prmrsocr_122000_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0,1 = coin counter */
coin_counter_w(0,data & 0x01);
@@ -531,7 +531,7 @@ READ16_HANDLER( prmrsocr_rom_r )
WRITE16_HANDLER( tmnt_priority_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 2/3 = priority; other bits unused */
/* bit2 = PRI bit3 = PRI2
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 74b19a6992f..26bba39debb 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -451,7 +451,7 @@ WRITE16_HANDLER( toaplan1_tile_offsets_w )
WRITE16_HANDLER( rallybik_bcu_flipscreen_w )
{
- if (ACCESSING_BYTE_0 && (data != bcu_flipscreen))
+ if (ACCESSING_BITS_0_7 && (data != bcu_flipscreen))
{
logerror("Setting BCU controller flipscreen port to %04x\n",data);
bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
@@ -478,7 +478,7 @@ WRITE16_HANDLER( rallybik_bcu_flipscreen_w )
WRITE16_HANDLER( toaplan1_bcu_flipscreen_w )
{
- if (ACCESSING_BYTE_0 && (data != bcu_flipscreen))
+ if (ACCESSING_BITS_0_7 && (data != bcu_flipscreen))
{
logerror("Setting BCU controller flipscreen port to %04x\n",data);
bcu_flipscreen = data & 0x01; /* 0x0001 = flip, 0x0000 = no flip */
@@ -505,7 +505,7 @@ WRITE16_HANDLER( toaplan1_bcu_flipscreen_w )
WRITE16_HANDLER( toaplan1_fcu_flipscreen_w )
{
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
{
logerror("Setting FCU controller flipscreen port to %04x\n",data);
fcu_flipscreen = data & 0x8000; /* 0x8000 = flip, 0x0000 = no flip */
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 06664dcb74b..9a7f0678b73 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -705,7 +705,7 @@ WRITE16_HANDLER( batrider_textdata_decode )
WRITE16_HANDLER( batrider_objectbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
data &= 0xf;
if (batrider_object_bank[offset] != data)
@@ -813,7 +813,7 @@ WRITE16_HANDLER( toaplan2_1_videoram16_w )
static void toaplan2_scroll_reg_select_w(offs_t offset, UINT16 data, UINT32 mem_mask, int controller)
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
toaplan2_scroll_reg[controller] = data & 0x8f;
if (data & 0x70)
@@ -1045,7 +1045,7 @@ WRITE16_HANDLER( toaplan2_1_scroll_reg_data_w )
WRITE16_HANDLER( pipibibi_scroll_w )
{
- if (ACCESSING_BYTE_1 && ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7)
{
switch(offset)
{
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index 6c51e56ca7f..04484e3a824 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -140,7 +140,7 @@ WRITE16_HANDLER( toobin_intensity_w )
{
int i;
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
brightness = (double)(~data & 0x1f) / 31.0;
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index b2155f0678a..f9d0a28784f 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -167,10 +167,10 @@ READ16_HANDLER( toypop_merged_background_r )
WRITE16_HANDLER( toypop_merged_background_w )
{
// 0xabcd is written as 0x0a0b0c0d in the background image
- if (ACCESSING_BYTE_1)
+ if (ACCESSING_BITS_8_15)
toypop_bg_image[2*offset] = ((data & 0xf00) >> 8) | ((data & 0xf000) >> 4);
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
toypop_bg_image[2*offset+1] = (data & 0xf) | ((data & 0xf0) << 4);
}
diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c
index 76c4823b985..9d5ff7313e7 100644
--- a/src/mame/video/ultraman.c
+++ b/src/mame/video/ultraman.c
@@ -83,7 +83,7 @@ VIDEO_START( ultraman )
WRITE16_HANDLER( ultraman_gfxctrl_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
/* bit 0: enable wraparound for scr #1
bit 1: msb of code for scr #1
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index 7d9978bc903..7b5eb7caf7d 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -856,7 +856,7 @@ WRITE16_HANDLER( wecleman_videostatus_w )
// bit0-6: background transition, 0=off, 1=on
// bit7: palette being changed, 0=no, 1=yes
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if ((data & 0x7f) == 0 && !cloud_ds)
cloud_ds = BLEND_INC;
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index e20d6c3a963..8bc6122e3a2 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -167,7 +167,7 @@ static void setbank(tilemap *tmap, int num, int bank)
WRITE16_HANDLER( welltris_palette_bank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
if (charpalettebank != (data & 0x03))
{
@@ -184,7 +184,7 @@ WRITE16_HANDLER( welltris_palette_bank_w )
WRITE16_HANDLER( welltris_gfxbank_w )
{
- if (ACCESSING_BYTE_0)
+ if (ACCESSING_BITS_0_7)
{
setbank(char_tilemap, 0, (data & 0xf0) >> 4);
setbank(char_tilemap, 1, data & 0x0f);
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index f55655207d1..0a79e646082 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -24,9 +24,9 @@ static int sprite_xoff, bg0_dx, bg1_dx[2];
WRITE16_HANDLER( wwfwfest_fg0_videoram_w )
{
/* Videoram is 8 bit, upper & lower byte writes end up in the same place */
- if (ACCESSING_BYTE_1 && ACCESSING_BYTE_0) {
+ if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) {
COMBINE_DATA(&wwfwfest_fg0_videoram[offset]);
- } else if (ACCESSING_BYTE_1) {
+ } else if (ACCESSING_BITS_8_15) {
wwfwfest_fg0_videoram[offset]=(data>>8)&0xff;
} else {
wwfwfest_fg0_videoram[offset]=data&0xff;
diff --git a/src/osd/windows/winwork.c b/src/osd/windows/winwork.c
index 016f4bee05c..5d3ff1d9b0b 100644
--- a/src/osd/windows/winwork.c
+++ b/src/osd/windows/winwork.c
@@ -26,6 +26,7 @@
//============================================================
#define KEEP_STATISTICS (0)
+#define USE_SCALABLE_LOCKS (0)
@@ -74,12 +75,16 @@ INLINE void YieldProcessor(void)
typedef struct _scalable_lock scalable_lock;
struct _scalable_lock
{
+#if USE_SCALABLE_LOCKS
struct
{
volatile INT32 haslock; // do we have the lock?
INT32 filler[64/4-1]; // assumes a 64-byte cache line
} slot[WORK_MAX_THREADS]; // one slot per thread
volatile INT32 nextindex; // index of next slot to use
+#else
+ CRITICAL_SECTION section;
+#endif
};
@@ -197,12 +202,17 @@ INLINE INT32 interlocked_add(INT32 volatile *ptr, INT32 add)
INLINE void scalable_lock_init(scalable_lock *lock)
{
memset(lock, 0, sizeof(*lock));
+#if USE_SCALABLE_LOCKS
lock->slot[0].haslock = TRUE;
+#else
+ InitializeCriticalSection(&lock->section);
+#endif
}
INLINE INT32 scalable_lock_acquire(scalable_lock *lock)
{
+#if USE_SCALABLE_LOCKS
INT32 myslot = (interlocked_increment(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
INT32 backoff = 1;
@@ -215,12 +225,20 @@ INLINE INT32 scalable_lock_acquire(scalable_lock *lock)
}
lock->slot[myslot].haslock = FALSE;
return myslot;
+#else
+ EnterCriticalSection(&lock->section);
+ return 0;
+#endif
}
INLINE void scalable_lock_release(scalable_lock *lock, INT32 myslot)
{
+#if USE_SCALABLE_LOCKS
interlocked_exchange32(&lock->slot[(myslot + 1) & (WORK_MAX_THREADS - 1)].haslock, TRUE);
+#else
+ LeaveCriticalSection(&lock->section);
+#endif
}