summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-07-23 07:18:56 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-07-23 07:18:56 +0000
commit14629cbcb42fb824f71120ca93fcb7d53a360390 (patch)
tree4d8b9459d6e98a677927c934c5322c328819de3a
parentd3f32a1ba70fe3edf112059b6319fbfe218fe8d6 (diff)
Cleanups and version bumpmame0149u1
-rw-r--r--src/build/makemak.c97
-rw-r--r--src/emu/addrmap.h2
-rw-r--r--src/emu/cpu/alph8201/alph8201.c1
-rw-r--r--src/emu/cpu/am29000/am29000.c25
-rw-r--r--src/emu/cpu/apexc/apexc.c3
-rw-r--r--src/emu/cpu/apexc/apexc.h2
-rw-r--r--src/emu/cpu/arm/arm.c17
-rw-r--r--src/emu/cpu/arm/arm.h4
-rw-r--r--src/emu/cpu/arm7/arm7.c23
-rw-r--r--src/emu/cpu/arm7/arm7.h2
-rw-r--r--src/emu/cpu/arm7/arm7core.c1
-rw-r--r--src/emu/cpu/arm7/arm7drc.c8
-rw-r--r--src/emu/cpu/arm7/arm7ops.c4
-rw-r--r--src/emu/cpu/arm7/arm7tdrc.c1
-rw-r--r--src/emu/cpu/ccpu/ccpu.c4
-rw-r--r--src/emu/cpu/cop400/cop400.c1
-rw-r--r--src/emu/cpu/cop400/cop400.h2
-rw-r--r--src/emu/cpu/cp1610/cp1610.c2
-rw-r--r--src/emu/cpu/cpu.mak2
-rw-r--r--src/emu/cpu/dsp16/dsp16.c204
-rw-r--r--src/emu/cpu/dsp16/dsp16.h16
-rw-r--r--src/emu/cpu/dsp16/dsp16ops.c78
-rw-r--r--src/emu/cpu/es5510/es5510.c14
-rw-r--r--src/emu/cpu/es5510/es5510.h2
-rw-r--r--src/emu/cpu/hcd62121/hcd62121.c3
-rw-r--r--src/emu/cpu/i386/i386ops.h78
-rw-r--r--src/emu/cpu/i386/pentops.c20
-rw-r--r--src/emu/cpu/i4004/i4004.c6
-rw-r--r--src/emu/cpu/lr35902/lr35902.h4
-rw-r--r--src/emu/cpu/m68000/m68000.h18
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c145
-rw-r--r--src/emu/cpu/mcs48/mcs48.h2
-rw-r--r--src/emu/cpu/rsp/rspdrc.c136
-rw-r--r--src/emu/cpu/tms0980/tms0980.c11
-rw-r--r--src/emu/cpu/tms0980/tms0980.h6
-rw-r--r--src/emu/cpu/tms32082/dis32082.c376
-rw-r--r--src/emu/cpu/tms32082/mp_ops.c186
-rw-r--r--src/emu/cpu/tms32082/tms32082.c8
-rw-r--r--src/emu/cpu/tms32082/tms32082.h4
-rw-r--r--src/emu/debug/debugcpu.c24
-rw-r--r--src/emu/debug/debugcpu.h28
-rw-r--r--src/emu/debug/dvbpoints.c36
-rw-r--r--src/emu/debug/dvbpoints.h38
-rw-r--r--src/emu/driver.c2
-rw-r--r--src/emu/driver.h2
-rw-r--r--src/emu/drivlgcy.h12
-rw-r--r--src/emu/machine/68307.c2
-rw-r--r--src/emu/machine/68307.h2
-rw-r--r--src/emu/machine/68340.c2
-rw-r--r--src/emu/machine/68340.h2
-rw-r--r--src/emu/machine/ds2404.c4
-rw-r--r--src/emu/machine/jvsdev.c2
-rw-r--r--src/emu/machine/jvshost.c4
-rw-r--r--src/emu/machine/k053252.h2
-rw-r--r--src/emu/machine/tmp68301.c4
-rw-r--r--src/emu/machine/tmp68301.h4
-rw-r--r--src/emu/memory.h2
-rw-r--r--src/emu/scrlegcy.h4
-rw-r--r--src/emu/sound/es5506.c2
-rw-r--r--src/emu/sound/hc55516.h10
-rw-r--r--src/emu/sound/k007232.c3
-rw-r--r--src/emu/sound/k007232.h20
-rw-r--r--src/emu/sound/k056800.c4
-rw-r--r--src/emu/sound/k056800.h10
-rw-r--r--src/emu/sound/msm5232.c2
-rw-r--r--src/emu/sound/msm5232.h4
-rw-r--r--src/emu/sound/namco.c44
-rw-r--r--src/emu/sound/namco.h160
-rw-r--r--src/emu/sound/sound.mak2
-rw-r--r--src/emu/sound/upd7759.c10
-rw-r--r--src/emu/sound/upd7759.h20
-rw-r--r--src/emu/sound/vlm5030.c2
-rw-r--r--src/emu/sound/vlm5030.h60
-rw-r--r--src/emu/sound/x1_010.c6
-rw-r--r--src/emu/sound/x1_010.h2
-rw-r--r--src/emu/sound/ymf271.c30
-rw-r--r--src/emu/sound/ymf271.h8
-rw-r--r--src/emu/sound/ymz280b.c2
-rw-r--r--src/emu/tilemap.c96
-rw-r--r--src/emu/tilemap.h100
-rw-r--r--src/emu/video/generic.c2
-rw-r--r--src/emu/video/tms34061.h6
-rw-r--r--src/mame/audio/atarijsa.c168
-rw-r--r--src/mame/audio/atarijsa.h47
-rw-r--r--src/mame/audio/beezer.c4
-rw-r--r--src/mame/audio/exidy440.h8
-rw-r--r--src/mame/audio/hyprolyb.h4
-rw-r--r--src/mame/audio/irem.h6
-rw-r--r--src/mame/audio/m72.h6
-rw-r--r--src/mame/audio/phoenix.c2
-rw-r--r--src/mame/audio/timeplt.h4
-rw-r--r--src/mame/audio/trackfld.h2
-rw-r--r--src/mame/audio/tx1.c4
-rw-r--r--src/mame/audio/wiping.h4
-rw-r--r--src/mame/drivers/aristmk5.c2
-rw-r--r--src/mame/drivers/arkanoid.c36
-rw-r--r--src/mame/drivers/atarig1.c14
-rw-r--r--src/mame/drivers/atarig42.c2
-rw-r--r--src/mame/drivers/atarigx2.c2
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/beathead.c6
-rw-r--r--src/mame/drivers/bfm_sc4h.c2
-rw-r--r--src/mame/drivers/bking.c4
-rw-r--r--src/mame/drivers/bloodbro.c2
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/boogwing.c10
-rw-r--r--src/mame/drivers/capbowl.c2
-rw-r--r--src/mame/drivers/cavepc.c9
-rw-r--r--src/mame/drivers/chihiro.c42
-rw-r--r--src/mame/drivers/cninja.c36
-rw-r--r--src/mame/drivers/commando.c2
-rw-r--r--src/mame/drivers/cps1.c88
-rw-r--r--src/mame/drivers/cshooter.c4
-rw-r--r--src/mame/drivers/csplayh5.c2
-rw-r--r--src/mame/drivers/cupidon.c2
-rw-r--r--src/mame/drivers/cyberbal.c2
-rw-r--r--src/mame/drivers/dblewing.c6
-rw-r--r--src/mame/drivers/de_2.c22
-rw-r--r--src/mame/drivers/de_3.c108
-rw-r--r--src/mame/drivers/deco32.c54
-rw-r--r--src/mame/drivers/deco_mlc.c2
-rw-r--r--src/mame/drivers/dietgo.c4
-rw-r--r--src/mame/drivers/eolith.c1
-rw-r--r--src/mame/drivers/eprom.c6
-rw-r--r--src/mame/drivers/feversoc.c2
-rw-r--r--src/mame/drivers/foodf.c2
-rw-r--r--src/mame/drivers/funkyjet.c25
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/guab.c4
-rw-r--r--src/mame/drivers/harddriv.c16
-rw-r--r--src/mame/drivers/hyhoo.c4
-rw-r--r--src/mame/drivers/igs017.c4
-rw-r--r--src/mame/drivers/itech32.c2
-rw-r--r--src/mame/drivers/itech8.c10
-rw-r--r--src/mame/drivers/jackal.c18
-rw-r--r--src/mame/drivers/jpmsys5.c6
-rw-r--r--src/mame/drivers/legionna.c8
-rw-r--r--src/mame/drivers/lemmings.c4
-rw-r--r--src/mame/drivers/lindbergh.c10
-rw-r--r--src/mame/drivers/megasys1.c4
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/miniboy7.c1
-rw-r--r--src/mame/drivers/mpu4vid.c2
-rw-r--r--src/mame/drivers/naomi.c2
-rw-r--r--src/mame/drivers/nbmj8688.c48
-rw-r--r--src/mame/drivers/nbmj8891.c40
-rw-r--r--src/mame/drivers/nmk16.c2
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/overdriv.c16
-rw-r--r--src/mame/drivers/pcat_nit.c6
-rw-r--r--src/mame/drivers/pktgaldx.c1
-rw-r--r--src/mame/drivers/plygonet.c80
-rw-r--r--src/mame/drivers/polepos.c2
-rw-r--r--src/mame/drivers/psikyo.c44
-rw-r--r--src/mame/drivers/raiden2.c12
-rw-r--r--src/mame/drivers/realbrk.c2
-rw-r--r--src/mame/drivers/rohga.c10
-rw-r--r--src/mame/drivers/savquest.c26
-rw-r--r--src/mame/drivers/seabattl.c4
-rw-r--r--src/mame/drivers/seibuspi.c2
-rw-r--r--src/mame/drivers/sengokmj.c2
-rw-r--r--src/mame/drivers/seta.c4
-rw-r--r--src/mame/drivers/seta2.c4
-rw-r--r--src/mame/drivers/shanghai.c30
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/snowbros.c20
-rw-r--r--src/mame/drivers/stfight.c18
-rw-r--r--src/mame/drivers/stv.c6
-rw-r--r--src/mame/drivers/suna8.c106
-rw-r--r--src/mame/drivers/taito_h.c2
-rw-r--r--src/mame/drivers/taitotx.c124
-rw-r--r--src/mame/drivers/taitotz.c116
-rw-r--r--src/mame/drivers/tasman.c6
-rw-r--r--src/mame/drivers/thedeep.c18
-rw-r--r--src/mame/drivers/thepit.c56
-rw-r--r--src/mame/drivers/thunderj.c26
-rw-r--r--src/mame/drivers/toaplan1.c2
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/twincobr.c12
-rw-r--r--src/mame/drivers/vindictr.c4
-rw-r--r--src/mame/drivers/volfied.c16
-rw-r--r--src/mame/drivers/wardner.c2
-rw-r--r--src/mame/drivers/xybots.c8
-rw-r--r--src/mame/drivers/zn.c4
-rw-r--r--src/mame/includes/40love.h2
-rw-r--r--src/mame/includes/atarigt.h6
-rw-r--r--src/mame/includes/atarigx2.h6
-rw-r--r--src/mame/includes/atarisy2.h2
-rw-r--r--src/mame/includes/baraduke.h4
-rw-r--r--src/mame/includes/beezer.h9
-rw-r--r--src/mame/includes/boogwing.h2
-rw-r--r--src/mame/includes/buggychl.h2
-rw-r--r--src/mame/includes/cinemat.h1
-rw-r--r--src/mame/includes/ddribble.h2
-rw-r--r--src/mame/includes/dec8.h2
-rw-r--r--src/mame/includes/deco_mlc.h2
-rw-r--r--src/mame/includes/exidy440.h4
-rw-r--r--src/mame/includes/gauntlet.h6
-rw-r--r--src/mame/includes/groundfx.h4
-rw-r--r--src/mame/includes/hexion.h2
-rw-r--r--src/mame/includes/hyhoo.h2
-rw-r--r--src/mame/includes/hyperspt.h2
-rw-r--r--src/mame/includes/jailbrek.h2
-rw-r--r--src/mame/includes/jpmsys5.h6
-rw-r--r--src/mame/includes/klax.h4
-rw-r--r--src/mame/includes/ladyfrog.h2
-rw-r--r--src/mame/includes/m72.h2
-rw-r--r--src/mame/includes/m90.h6
-rw-r--r--src/mame/includes/madmotor.h2
-rw-r--r--src/mame/includes/msisaac.h2
-rw-r--r--src/mame/includes/mystwarr.h2
-rw-r--r--src/mame/includes/nb1413m3.h6
-rw-r--r--src/mame/includes/nbmj8688.h6
-rw-r--r--src/mame/includes/nbmj8891.h4
-rw-r--r--src/mame/includes/nbmj8900.h6
-rw-r--r--src/mame/includes/nbmj8991.h4
-rw-r--r--src/mame/includes/pacland.h2
-rw-r--r--src/mame/includes/pastelg.h6
-rw-r--r--src/mame/includes/phoenix.h2
-rw-r--r--src/mame/includes/polepos.h2
-rw-r--r--src/mame/includes/punchout.h4
-rw-r--r--src/mame/includes/redalert.h6
-rw-r--r--src/mame/includes/sbasketb.h2
-rw-r--r--src/mame/includes/seta2.h4
-rw-r--r--src/mame/includes/shisen.h4
-rw-r--r--src/mame/includes/snes.h6
-rw-r--r--src/mame/includes/sshangha.h2
-rw-r--r--src/mame/includes/stfight.h2
-rw-r--r--src/mame/includes/toobin.h2
-rw-r--r--src/mame/includes/trackfld.h2
-rw-r--r--src/mame/includes/tx1.h10
-rw-r--r--src/mame/includes/vigilant.h4
-rw-r--r--src/mame/includes/xybots.h6
-rw-r--r--src/mame/includes/yiear.h2
-rw-r--r--src/mame/machine/atarigen.c208
-rw-r--r--src/mame/machine/atarigen.h52
-rw-r--r--src/mame/machine/deco104.c422
-rw-r--r--src/mame/machine/deco146.c52
-rw-r--r--src/mame/machine/deco146.h2
-rw-r--r--src/mame/machine/decopincpu.c61
-rw-r--r--src/mame/machine/megadriv.c2
-rw-r--r--src/mame/machine/namcos1.c4
-rw-r--r--src/mame/machine/nb1413m3.c2
-rw-r--r--src/mame/machine/stfight.c2
-rw-r--r--src/mame/mame.lst18
-rw-r--r--src/mame/video/bking.c2
-rw-r--r--src/mame/video/bloodbro.c6
-rw-r--r--src/mame/video/cps1.c4
-rw-r--r--src/mame/video/decbac06.c6
-rw-r--r--src/mame/video/decbac06.h4
-rw-r--r--src/mame/video/deco16ic.c3
-rw-r--r--src/mame/video/deco16ic.h18
-rw-r--r--src/mame/video/decocomn.c6
-rw-r--r--src/mame/video/decocomn.h2
-rw-r--r--src/mame/video/decodmd1.c8
-rw-r--r--src/mame/video/decodmd2.c12
-rw-r--r--src/mame/video/galaxian.c2
-rw-r--r--src/mame/video/itech8.c2
-rw-r--r--src/mame/video/k001005.c2
-rw-r--r--src/mame/video/k001006.c3
-rw-r--r--src/mame/video/k001006.h2
-rw-r--r--src/mame/video/k001604.c4
-rw-r--r--src/mame/video/k001604.h4
-rw-r--r--src/mame/video/k007121.c4
-rw-r--r--src/mame/video/k007121.h6
-rw-r--r--src/mame/video/k007342.c4
-rw-r--r--src/mame/video/k007420.c4
-rw-r--r--src/mame/video/k037122.c6
-rw-r--r--src/mame/video/k037122.h2
-rw-r--r--src/mame/video/k051316.c4
-rw-r--r--src/mame/video/k051316.h2
-rw-r--r--src/mame/video/k051733.c2
-rw-r--r--src/mame/video/k051960.c3
-rw-r--r--src/mame/video/k051960.h2
-rw-r--r--src/mame/video/k052109.c2
-rw-r--r--src/mame/video/k052109.h6
-rw-r--r--src/mame/video/k053244_k053245.c8
-rw-r--r--src/mame/video/k053244_k053245.h4
-rw-r--r--src/mame/video/k053246_k053247_k055673.c16
-rw-r--r--src/mame/video/k053246_k053247_k055673.h34
-rw-r--r--src/mame/video/k053251.h2
-rw-r--r--src/mame/video/k053936.c4
-rw-r--r--src/mame/video/k053936.h2
-rw-r--r--src/mame/video/k054000.c1
-rw-r--r--src/mame/video/k054156_k054157_k056832.c11
-rw-r--r--src/mame/video/k054156_k054157_k056832.h14
-rw-r--r--src/mame/video/k054338.c7
-rw-r--r--src/mame/video/k054338.h11
-rw-r--r--src/mame/video/k055555.c4
-rw-r--r--src/mame/video/k055555.h3
-rw-r--r--src/mame/video/konami_helper.c1
-rw-r--r--src/mame/video/konamigx.c42
-rw-r--r--src/mame/video/pc080sn.c9
-rw-r--r--src/mame/video/pc080sn.h20
-rw-r--r--src/mame/video/pc090oj.c2
-rw-r--r--src/mame/video/pc090oj.h12
-rw-r--r--src/mame/video/powervr2.c18
-rw-r--r--src/mame/video/ppu2c0x.c2
-rw-r--r--src/mame/video/raiden.c38
-rw-r--r--src/mame/video/sega16sp.h4
-rw-r--r--src/mame/video/segaic16.c3
-rw-r--r--src/mame/video/segaic16.h13
-rw-r--r--src/mame/video/segaic16_road.c5
-rw-r--r--src/mame/video/segaic16_road.h5
-rw-r--r--src/mame/video/seibu_crtc.c3
-rw-r--r--src/mame/video/seibu_crtc.h4
-rw-r--r--src/mame/video/seibuspi.c52
-rw-r--r--src/mame/video/seta001.h2
-rw-r--r--src/mame/video/stfight.c3
-rw-r--r--src/mame/video/taito_helper.c1
-rw-r--r--src/mame/video/taito_helper.h2
-rw-r--r--src/mame/video/taitoic.h74
-rw-r--r--src/mame/video/tc0080vco.c18
-rw-r--r--src/mame/video/tc0080vco.h2
-rw-r--r--src/mame/video/tc0100scn.c6
-rw-r--r--src/mame/video/tc0100scn.h8
-rw-r--r--src/mame/video/tc0110pcr.c2
-rw-r--r--src/mame/video/tc0110pcr.h6
-rw-r--r--src/mame/video/tc0150rod.c2
-rw-r--r--src/mame/video/tc0150rod.h6
-rw-r--r--src/mame/video/tc0180vcu.c2
-rw-r--r--src/mame/video/tc0180vcu.h4
-rw-r--r--src/mame/video/tc0280grd.c4
-rw-r--r--src/mame/video/tc0280grd.h6
-rw-r--r--src/mame/video/tc0360pri.h2
-rw-r--r--src/mame/video/tc0480scp.c10
-rw-r--r--src/mame/video/tc0480scp.h10
-rw-r--r--src/mame/video/thepit.c1
-rw-r--r--src/mame/video/toaplan1.c4
-rw-r--r--src/mame/video/toaplan_scu.c5
-rw-r--r--src/mame/video/toaplan_scu.h6
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/williams.c20
-rw-r--r--src/mame/video/ygv608.c2
-rw-r--r--src/mess/drivers/apollo.c1
-rw-r--r--src/mess/drivers/bml3.c70
-rw-r--r--src/mess/drivers/c900.c18
-rw-r--r--src/mess/drivers/esq5505.c8
-rw-r--r--src/mess/drivers/evmbug.c4
-rw-r--r--src/mess/drivers/gb.c8
-rw-r--r--src/mess/drivers/harriet.c22
-rw-r--r--src/mess/drivers/mac.c2
-rw-r--r--src/mess/drivers/nes.c2
-rw-r--r--src/mess/drivers/pc1512.c12
-rw-r--r--src/mess/drivers/pc9801.c2
-rw-r--r--src/mess/drivers/pdp11.c50
-rw-r--r--src/mess/drivers/softbox.c8
-rw-r--r--src/mess/drivers/vtech1.c2
-rw-r--r--src/mess/includes/nes.h2
-rw-r--r--src/mess/includes/softbox.h4
-rw-r--r--src/mess/machine/apollo.c4
-rw-r--r--src/mess/machine/bml3mp1805.c2
-rw-r--r--src/mess/machine/corvushd.c2
-rw-r--r--src/mess/machine/cs4031.c50
-rw-r--r--src/mess/machine/dccons.c6
-rw-r--r--src/mess/machine/esqpanel.c40
-rw-r--r--src/mess/machine/esqpanel.h2
-rw-r--r--src/mess/machine/gb.c2
-rw-r--r--src/mess/machine/gb_slot.c2
-rw-r--r--src/mess/machine/gb_slot.h2
-rw-r--r--src/mess/machine/imi5000h.c150
-rw-r--r--src/mess/machine/kb_pc83.c288
-rw-r--r--src/mess/machine/kb_pc83.h2
-rw-r--r--src/mess/machine/kb_pcat84.c176
-rw-r--r--src/mess/machine/kb_pcat84.h2
-rw-r--r--src/mess/machine/kb_pcxt83.c82
-rw-r--r--src/mess/machine/kb_pcxt83.h2
-rw-r--r--src/mess/machine/macpds.c2
-rw-r--r--src/mess/machine/nes.c172
-rw-r--r--src/mess/machine/pc_keyboards.h8
-rw-r--r--src/mess/machine/shark.c2
-rw-r--r--src/mess/machine/shark.h2
-rw-r--r--src/mess/machine/sms.c2
-rw-r--r--src/mess/machine/sms_lphaser.c2
-rw-r--r--src/mess/machine/sms_paddle.c1
-rw-r--r--src/mess/machine/sms_rfu.c1
-rw-r--r--src/mess/machine/sms_sports.c1
-rw-r--r--src/mess/machine/smsctrl.c22
-rw-r--r--src/mess/machine/sns_sa1.c76
-rw-r--r--src/mess/machine/softbox.c8
-rw-r--r--src/mess/machine/softbox.h4
-rw-r--r--src/mess/tools/imgtool/filtbas.c1
-rw-r--r--src/mess/video/gb_lcd.c88
-rw-r--r--src/mess/video/gb_lcd.h36
-rw-r--r--src/mess/video/isa_pc1640_iga.c14
-rw-r--r--src/mess/video/pds_tpdfpd.c28
-rw-r--r--src/targets/mame.lst1460
-rw-r--r--src/targets/mess.lst428
-rw-r--r--src/tools/chdman.c2
-rw-r--r--src/tools/pngcmp.c24
-rw-r--r--src/tools/tools.mak2
-rw-r--r--src/version.c2
392 files changed, 4513 insertions, 4661 deletions
diff --git a/src/build/makemak.c b/src/build/makemak.c
index 1711fe6175b..bcc78efea95 100644
--- a/src/build/makemak.c
+++ b/src/build/makemak.c
@@ -182,7 +182,7 @@ int include_mapping(const char *srcfile)
filename[pos] = *srcptr++;
filename[pos+1] = 0;
}
- srcptr++; // skip comma
+ srcptr++; // skip comma
char mapping[256];
mapping[0] = 0;
for (int pos = 0; srcptr < endptr && pos < ARRAY_LENGTH(mapping) - 1 && (*srcptr!=10) && (*srcptr!=13); pos++)
@@ -296,23 +296,23 @@ int parse_file(const char *srcfile)
drivname[pos] = *srcptr++;
drivname[pos+1] = 0;
}
-
+
librarylist_entry *lentry = new librarylist_entry;
lentry->name.cpy(drivname);
lentry->next = NULL;
lentry->sourcefiles = NULL;
if (last_libraryitem!=NULL)
{
- last_libraryitem->next = lentry;
- }
- last_libraryitem = lentry;
+ last_libraryitem->next = lentry;
+ }
+ last_libraryitem = lentry;
last_sourceitem = NULL;
if (librarylist==NULL)
{
librarylist = lentry;
}
-
+
continue;
}
@@ -331,9 +331,9 @@ int parse_file(const char *srcfile)
lentry->next = NULL;
if (last_sourceitem!=NULL)
{
- last_sourceitem->next = lentry;
- }
- last_sourceitem = lentry;
+ last_sourceitem->next = lentry;
+ }
+ last_sourceitem = lentry;
if (last_libraryitem->sourcefiles==NULL)
{
last_libraryitem->sourcefiles = lentry;
@@ -361,7 +361,7 @@ int parse_for_drivers(const char *srcfile)
while (core_fgets(buffer, ARRAY_LENGTH(buffer), file) != NULL)
{
astring line;
-
+
// rip through it to find all drivers
char *srcptr = (char *)buffer;
char *endptr = srcptr + strlen(buffer);
@@ -408,7 +408,7 @@ int parse_for_drivers(const char *srcfile)
line.cat(*srcptr++);
}
}
-
+
if ((line.find(0,"GAME(")==0) || (line.find(0,"GAMEL(")==0) ||
(line.find(0,"COMP(")==0) || (line.find(0,"CONS(")==0) ||
(line.find(0,"SYST(")==0))
@@ -417,7 +417,7 @@ int parse_for_drivers(const char *srcfile)
if (p1<0) continue;
int p2 = line.find(p1+1,",");
if (p2<0) continue;
-
+
printf("%s\n",line.substr(p1+1,p2-p1-1).cstr());
}
}
@@ -445,14 +445,14 @@ int main(int argc, char *argv[])
exclude_path **excpathhead = &excpaths;
astring srcdir;
int unadorned = 0;
-
+
librarylist = NULL;
last_libraryitem = NULL;
last_sourceitem = NULL;
-
-
+
+
// extract arguments
- const char *srcfile = argv[1];
+ const char *srcfile = argv[1];
if (parse_file(srcfile))
return 1;
@@ -500,16 +500,16 @@ int main(int argc, char *argv[])
// generate list of drivers
if (srcdir.len() == 0)
{
- for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
+ for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
{
- for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
+ for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
{
printf("// Drivers from %s.c\n",src->name.cstr());
astring srcfile;
// build the source filename
srcfile.printf("%s%c%s.c", "src", PATH_SEPARATOR[0], src->name.cstr());
parse_for_drivers(srcfile);
-
+
astring srcfile_inc;
// build the source filename
srcfile_inc.printf("%s%c%s.inc", "src", PATH_SEPARATOR[0], src->name.cstr());
@@ -518,15 +518,15 @@ int main(int argc, char *argv[])
}
}
return 0;
- }
- else
+ }
+ else
{
include_mapping("src/emu/cpu/cpu.mak");
include_mapping("src/emu/video/video.mak");
include_mapping("src/emu/sound/sound.mak");
include_mapping("src/emu/machine/machine.mak");
- if (librarylist!=NULL)
- {
+ if (librarylist!=NULL)
+ {
printf("OBJDIRS += \\\n");
printf("\t$(OBJ)/target \\\n");
printf("\t$(OBJ)/mame/audio \\\n");
@@ -541,13 +541,13 @@ int main(int argc, char *argv[])
printf("\t$(OBJ)/mess/video \\\n");
printf("\n\n");
printf("DRVLIBS += \\\n");
-
- for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
+
+ for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
{
printf("\t$(OBJ)/target/%s.a \\\n",lib->name.cstr());
}
printf("\n");
- }
+ }
// recurse over subdirectories
return recurse_dir(srcdir);
@@ -593,24 +593,23 @@ static int recurse_dir(astring &srcdir)
{
int result = 0;
- // iterate through each file
- for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
+ // iterate through each file
+ for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
{
- for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
+ for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
{
-
astring srcfile;
// build the source filename
srcfile.printf("%s%s.c", srcdir.cstr(), src->name.cstr());
-
+
dependency_map depend_map;
// find dependencies
file_entry &file = compute_dependencies(srcfile);
recurse_dependencies(file, depend_map);
-
- for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
+
+ for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
{
astring t(entry->tag());
if (core_filename_ends_with(t, ".h"))
@@ -623,19 +622,19 @@ static int recurse_dir(astring &srcdir)
}
}
}
- }
+ }
}
-
+
// iterate through each file
- for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
+ for (librarylist_entry *lib = librarylist; lib != NULL; lib = lib->next)
{
// convert the target from source to object (makes assumptions about rules)
astring target("$(OBJ)/target/",lib->name.cstr());
target.cat(".a");
printf("\n%s : \\\n", target.cstr());
-
- for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
+
+ for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
{
astring srcfile;
@@ -648,7 +647,7 @@ static int recurse_dir(astring &srcdir)
recurse_dependencies(file, depend_map);
// iterate over the hashed dependencies and output them as well
- for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
+ for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
{
astring t(entry->tag());
t.replace(0, "src/", "$(OBJ)/");
@@ -659,8 +658,8 @@ static int recurse_dir(astring &srcdir)
}
}
}
- printf("\n");
- for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
+ printf("\n");
+ for (list_entry *src = lib->sourcefiles; src != NULL; src = src->next)
{
astring srcfile;
@@ -670,8 +669,8 @@ static int recurse_dir(astring &srcdir)
// find dependencies
file_entry &file = compute_dependencies(srcfile);
- recurse_dependencies(file, depend_map);
- for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
+ recurse_dependencies(file, depend_map);
+ for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
{
astring t(entry->tag());
if (core_filename_ends_with(t, ".lay"))
@@ -682,8 +681,8 @@ static int recurse_dir(astring &srcdir)
t.replace(0, "src/", "$(OBJ)/");
t.replace(0, ".lay", ".lh");
-
- printf("%s: %s\n", target2.cstr(), t.cstr());
+
+ printf("%s: %s\n", target2.cstr(), t.cstr());
}
if (core_filename_ends_with(t, ".inc"))
{
@@ -691,7 +690,7 @@ static int recurse_dir(astring &srcdir)
target2.replace(0, "src/", "$(OBJ)/");
target2.replace(0, ".c", ".o");
- printf("%s: %s\n", target2.cstr(), t.cstr());
+ printf("%s: %s\n", target2.cstr(), t.cstr());
}
}
}
@@ -747,7 +746,7 @@ static file_entry &compute_dependencies(astring &srcfile)
file.deplist = dep;
dep->file = &compute_dependencies(machinefile);
}
-
+
astring videofile = astring(srcfile);
videofile.replace("drivers","video");
if (check_file(videofile))
@@ -757,7 +756,7 @@ static file_entry &compute_dependencies(astring &srcfile)
file.deplist = dep;
dep->file = &compute_dependencies(videofile);
}
-
+
// find the #include directives in this file
for (int index = 0; index < filelength; index++)
@@ -795,7 +794,7 @@ static file_entry &compute_dependencies(astring &srcfile)
astring target;
filename.replace(".lh",".lay");
-
+
// create a new dependency
if (find_include_file(target, srcfile, filename))
{
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h
index e8749ed40b6..d9b7929931e 100644
--- a/src/emu/addrmap.h
+++ b/src/emu/addrmap.h
@@ -441,7 +441,7 @@ void _class :: _name(::address_map &map, device_t &device) \
#define AM_WRITE_LEGACY(_handler) \
curentry->set_handler(_handler, #_handler);
-
+
// legacy space reads/writes
#define AM_READWRITE_LEGACY(_rhandler, _whandler) \
curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler);
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index b575728ed8f..63fa0c66818 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -645,4 +645,3 @@ offs_t alpha8201_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const U
extern CPU_DISASSEMBLE( alpha8201 );
return CPU_DISASSEMBLE_NAME(alpha8201)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c
index ae8ebe8d7d4..f8f025c2578 100644
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@@ -196,9 +196,9 @@ void am29000_cpu_device::device_start()
state_add( AM29000_IPB, "IPB", m_ipb ).formatstr("%08X");
state_add( AM29000_Q, "Q", m_q ).formatstr("%08X");
state_add( AM29000_ALU, "ALU", m_alu ).formatstr("%08X");
-// state_add( AM29000_BP, "BP", GET_ALU_BP).formatstr("%08X");
-// state_add( AM29000_FC, "FC", GET_ALU_FC).formatstr("%08X");
-// state_add( AM29000_CR, "CR", GET_CHC_CR).formatstr("%08X");
+// state_add( AM29000_BP, "BP", GET_ALU_BP).formatstr("%08X");
+// state_add( AM29000_FC, "FC", GET_ALU_FC).formatstr("%08X");
+// state_add( AM29000_CR, "CR", GET_CHC_CR).formatstr("%08X");
state_add( AM29000_FPE, "FPE", m_fpe ).formatstr("%08X");
state_add( AM29000_INTE, "INTE", m_inte ).formatstr("%08X");
state_add( AM29000_FPS, "FPS", m_fps ).formatstr("%08X");
@@ -409,15 +409,15 @@ void am29000_cpu_device::state_string_export(const device_state_entry &entry, as
{
case STATE_GENFLAGS:
string.printf("%c%c%c%c%c%c%c%c%c|%3d", m_alu & ALU_V ? 'V' : '.',
- m_alu & ALU_Z ? 'Z' : '.',
- m_alu & ALU_N ? 'N' : '.',
- m_alu & ALU_C ? 'C' : '.',
- m_cps & CPS_IP ? 'I' : '.',
- m_cps & CPS_FZ ? 'F' : '.',
- m_cps & CPS_SM ? 'S' : 'U',
- m_cps & CPS_DI ? 'I' : '.',
- m_cps & CPS_DA ? 'D' : '.',
- (m_r[1] >> 2) & 0x7f);
+ m_alu & ALU_Z ? 'Z' : '.',
+ m_alu & ALU_N ? 'N' : '.',
+ m_alu & ALU_C ? 'C' : '.',
+ m_cps & CPS_IP ? 'I' : '.',
+ m_cps & CPS_FZ ? 'F' : '.',
+ m_cps & CPS_SM ? 'S' : 'U',
+ m_cps & CPS_DI ? 'I' : '.',
+ m_cps & CPS_DA ? 'D' : '.',
+ (m_r[1] >> 2) & 0x7f);
break;
}
}
@@ -675,4 +675,3 @@ offs_t am29000_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UIN
extern CPU_DISASSEMBLE( am29000 );
return CPU_DISASSEMBLE_NAME(am29000)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index b802ed38b05..8ec78c15e74 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -825,7 +825,7 @@ void apexc_cpu_device::device_reset()
/* next two lines are just the product of my bold fantasy */
m_cr = 0; /* first instruction executed will be a stop */
m_running = TRUE; /* this causes the CPU to load the instruction at 0/0,
- which enables easy booting (just press run on the panel) */
+ which enables easy booting (just press run on the panel) */
m_a = 0;
m_r = 0;
m_pc = 0;
@@ -854,4 +854,3 @@ offs_t apexc_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8
extern CPU_DISASSEMBLE( apexc );
return CPU_DISASSEMBLE_NAME(apexc)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/apexc/apexc.h b/src/emu/cpu/apexc/apexc.h
index 9a1d5a92ed1..1f18757dd51 100644
--- a/src/emu/cpu/apexc/apexc.h
+++ b/src/emu/cpu/apexc/apexc.h
@@ -73,7 +73,7 @@ protected:
int m_current_word; /* current word position within track (0-31) */
int m_running; /* 1 flag: */
- /* running: flag implied by the existence of the stop instruction */
+ /* running: flag implied by the existence of the stop instruction */
UINT32 m_pc; /* address of next instruction for the disassembler */
address_space *m_program;
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index a8e1b83d31d..6463f7c2c18 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -320,7 +320,7 @@ void arm_cpu_device::device_reset()
m_coproRegister[i] = 0;
}
m_pendingIrq = 0;
- m_pendingFiq = 0;
+ m_pendingFiq = 0;
/* start up in SVC mode with interrupts disabled. */
R15 = eARM_MODE_SVC|I_MASK|F_MASK;
@@ -549,13 +549,13 @@ void arm_cpu_device::state_string_export(const device_state_entry &entry, astrin
{
case STATE_GENFLAGS:
string.printf("%c%c%c%c%c%c %s",
- (m_sArmRegister[15] & N_MASK) ? 'N' : '-',
- (m_sArmRegister[15] & Z_MASK) ? 'Z' : '-',
- (m_sArmRegister[15] & C_MASK) ? 'C' : '-',
- (m_sArmRegister[15] & V_MASK) ? 'V' : '-',
- (m_sArmRegister[15] & I_MASK) ? 'I' : '-',
- (m_sArmRegister[15] & F_MASK) ? 'F' : '-',
- s[m_sArmRegister[15] & 3] );
+ (m_sArmRegister[15] & N_MASK) ? 'N' : '-',
+ (m_sArmRegister[15] & Z_MASK) ? 'Z' : '-',
+ (m_sArmRegister[15] & C_MASK) ? 'C' : '-',
+ (m_sArmRegister[15] & V_MASK) ? 'V' : '-',
+ (m_sArmRegister[15] & I_MASK) ? 'I' : '-',
+ (m_sArmRegister[15] & F_MASK) ? 'F' : '-',
+ s[m_sArmRegister[15] & 3] );
break;
}
}
@@ -1470,4 +1470,3 @@ offs_t arm_be_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT
extern CPU_DISASSEMBLE( arm_be );
return CPU_DISASSEMBLE_NAME(arm_be)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/arm/arm.h b/src/emu/cpu/arm/arm.h
index 44a15e31978..5cfde924337 100644
--- a/src/emu/cpu/arm/arm.h
+++ b/src/emu/cpu/arm/arm.h
@@ -95,8 +95,8 @@ protected:
class arm_be_cpu_device : public arm_cpu_device
{
public:
- // construction/destruction
- arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ // construction/destruction
+ arm_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options);
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 759716bc2c3..a58b8655392 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -132,7 +132,7 @@ sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *
}
-void arm7_cpu_device::set_cpsr(UINT32 val)
+void arm7_cpu_device::set_cpsr(UINT32 val)
{
if (m_archFlags & eARM_ARCHFLAGS_MODE26)
{
@@ -558,7 +558,7 @@ void arm7_cpu_device::device_start()
state_add( ARM7_UR14, "UR14", m_r[eR14_UND] ).formatstr("%08X");
state_add( ARM7_USPSR, "UR16", m_r[eSPSR_UND]).formatstr("%08X");
- state_add(STATE_GENFLAGS, "GENFLAGS", m_r[eCPSR]).formatstr("%13s").noshow();
+ state_add(STATE_GENFLAGS, "GENFLAGS", m_r[eCPSR]).formatstr("%13s").noshow();
}
@@ -579,15 +579,15 @@ void arm7_cpu_device::state_string_export(const device_state_entry &entry, astri
{
case STATE_GENFLAGS:
string.printf("%c%c%c%c%c%c%c%c %s",
- (ARM7REG(eCPSR) & N_MASK) ? 'N' : '-',
- (ARM7REG(eCPSR) & Z_MASK) ? 'Z' : '-',
- (ARM7REG(eCPSR) & C_MASK) ? 'C' : '-',
- (ARM7REG(eCPSR) & V_MASK) ? 'V' : '-',
- (ARM7REG(eCPSR) & Q_MASK) ? 'Q' : '-',
- (ARM7REG(eCPSR) & I_MASK) ? 'I' : '-',
- (ARM7REG(eCPSR) & F_MASK) ? 'F' : '-',
- (ARM7REG(eCPSR) & T_MASK) ? 'T' : '-',
- GetModeText(ARM7REG(eCPSR)) );
+ (ARM7REG(eCPSR) & N_MASK) ? 'N' : '-',
+ (ARM7REG(eCPSR) & Z_MASK) ? 'Z' : '-',
+ (ARM7REG(eCPSR) & C_MASK) ? 'C' : '-',
+ (ARM7REG(eCPSR) & V_MASK) ? 'V' : '-',
+ (ARM7REG(eCPSR) & Q_MASK) ? 'Q' : '-',
+ (ARM7REG(eCPSR) & I_MASK) ? 'I' : '-',
+ (ARM7REG(eCPSR) & F_MASK) ? 'F' : '-',
+ (ARM7REG(eCPSR) & T_MASK) ? 'T' : '-',
+ GetModeText(ARM7REG(eCPSR)) );
break;
}
}
@@ -1219,4 +1219,3 @@ UINT8 arm7_cpu_device::arm7_cpu_read8(UINT32 addr)
}
#include "arm7drc.c"
-
diff --git a/src/emu/cpu/arm7/arm7.h b/src/emu/cpu/arm7/arm7.h
index f7e82632a48..81fbbf14c2d 100644
--- a/src/emu/cpu/arm7/arm7.h
+++ b/src/emu/cpu/arm7/arm7.h
@@ -131,7 +131,7 @@ protected:
UINT8 m_archFlags; // architecture flags
//#if ARM7_MMU_ENABLE_HACK
-// UINT32 mmu_enable_addr; // workaround for "MMU is enabled when PA != VA" problem
+// UINT32 mmu_enable_addr; // workaround for "MMU is enabled when PA != VA" problem
//#endif
UINT32 m_copro_id;
diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c
index a00fe88cf3d..9b4f02f868e 100644
--- a/src/emu/cpu/arm7/arm7core.c
+++ b/src/emu/cpu/arm7/arm7core.c
@@ -228,4 +228,3 @@ void arm7_cpu_device::arm7_check_irq_state()
return;
}
}
-
diff --git a/src/emu/cpu/arm7/arm7drc.c b/src/emu/cpu/arm7/arm7drc.c
index d418c1b4380..2086f2238d1 100644
--- a/src/emu/cpu/arm7/arm7drc.c
+++ b/src/emu/cpu/arm7/arm7drc.c
@@ -358,8 +358,8 @@ void arm7_cpu_device::code_compile_block(UINT8 mode, offs_t pc)
/* get a description of this sequence */
// TODO FIXME
const opcode_desc *desclist = NULL; //m_impstate.drcfe->describe_code(pc); // TODO
-// if (LOG_UML || LOG_NATIVE)
-// log_opcode_desc(drcuml, desclist, 0);
+// if (LOG_UML || LOG_NATIVE)
+// log_opcode_desc(drcuml, desclist, 0);
/* if we get an error back, flush the cache and try again */
bool succeeded = false;
@@ -1281,8 +1281,8 @@ void arm7_cpu_device::generate_sequence_instruction(drcuml_block *block, compile
/* add an entry for the log */
// TODO FIXME
-// if (LOG_UML && !(desc->flags & OPFLAG_VIRTUAL_NOOP))
-// log_add_disasm_comment(block, desc->pc, desc->opptr.l[0]);
+// if (LOG_UML && !(desc->flags & OPFLAG_VIRTUAL_NOOP))
+// log_add_disasm_comment(block, desc->pc, desc->opptr.l[0]);
/* set the PC map variable */
//expc = (desc->flags & OPFLAG_IN_DELAY_SLOT) ? desc->pc - 3 : desc->pc;
diff --git a/src/emu/cpu/arm7/arm7ops.c b/src/emu/cpu/arm7/arm7ops.c
index 6aeb0c035ba..808c254f599 100644
--- a/src/emu/cpu/arm7/arm7ops.c
+++ b/src/emu/cpu/arm7/arm7ops.c
@@ -22,8 +22,8 @@ INT64 arm7_cpu_device::saturate_qbit_overflow(INT64 res)
void arm7_cpu_device::SwitchMode(UINT32 cpsr_mode_val)
{
- UINT32 cspr = m_r[eCPSR] & ~MODE_FLAG;
- set_cpsr(cspr | cpsr_mode_val);
+ UINT32 cspr = m_r[eCPSR] & ~MODE_FLAG;
+ set_cpsr(cspr | cpsr_mode_val);
}
diff --git a/src/emu/cpu/arm7/arm7tdrc.c b/src/emu/cpu/arm7/arm7tdrc.c
index 9163326269d..148ebcb099b 100644
--- a/src/emu/cpu/arm7/arm7tdrc.c
+++ b/src/emu/cpu/arm7/arm7tdrc.c
@@ -1589,4 +1589,3 @@ void arm7_cpu_device::drctg0f_1(drcuml_block *block, compiler_state *compiler, c
UML_OR(block, DRC_REG(14), DRC_REG(14), 1);
UML_MOV(block, DRC_PC, uml::I0);
}
-
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index 7a7bbbb8703..5570ce55def 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -142,7 +142,7 @@ void ccpu_cpu_device::state_string_export(const device_state_entry &entry, astri
switch (entry.index())
{
case STATE_GENFLAGS:
- string.printf("%c%c%c%c%c%c",
+ string.printf("%c%c%c%c%c%c",
TEST_A0 ? '0' : 'o',
TEST_NC ? 'N' : 'n',
TEST_LT ? 'L' : 'l',
@@ -685,5 +685,3 @@ offs_t ccpu_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8
extern CPU_DISASSEMBLE( ccpu );
return CPU_DISASSEMBLE_NAME(ccpu)(this, buffer, pc, oprom, opram, options);
}
-
-
diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c
index f77c5a15e8f..c7cbd8c5c4c 100644
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@@ -1270,4 +1270,3 @@ offs_t cop400_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT
return CPU_DISASSEMBLE_NAME(cop410)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/cop400/cop400.h b/src/emu/cpu/cop400/cop400.h
index 6e594133ee2..957038c73e2 100644
--- a/src/emu/cpu/cop400/cop400.h
+++ b/src/emu/cpu/cop400/cop400.h
@@ -131,7 +131,7 @@ protected:
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config :
- ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ) );
+ ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : NULL ) );
}
// device_state_interface overrides
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 9e38476a9e6..7e0870aec93 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -3442,5 +3442,3 @@ offs_t cp1610_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT
extern CPU_DISASSEMBLE( cp1610 );
return CPU_DISASSEMBLE_NAME(cp1610)(this, buffer, pc, oprom, opram, options);
}
-
-
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index c5e107d8309..519f15a04ea 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -566,7 +566,7 @@ $(CPUOBJ)/sh2/sh2fe.o: $(CPUSRC)/sh2/sh2fe.c \
#-------------------------------------------------
# Hitachi SH4
-#@src/emu/cpu/sh4/sh4.h,CPUS += SH4
+#@src/emu/cpu/sh4/sh4.h,CPUS += SH4
#-------------------------------------------------
ifneq ($(filter SH4,$(CPUS)),)
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c
index 411496ec88b..3ceb0e26014 100644
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@@ -18,7 +18,7 @@
// * Handle virtual shift addressing using RB & RE (when RE is enabled) (page 2-6)
// * The ALU sign-extends 32-bit operands from y or p to 36 bits and produces a 36-bit output
// * Interrupt lines (page 2-15)
-//
+//
//**************************************************************************
// DEVICE INTERFACE
@@ -176,13 +176,13 @@ void dsp16_device::device_reset()
m_pc = 0x0000;
m_pi = 0x0000;
m_sioc = 0x0000; // (page 5-4)
-
+
// SRTA is unaltered by reset
m_pioc = 0x0008;
m_rb = 0x0000;
m_re = 0x0000;
-
- // AUC is not affected by reset
+
+ // AUC is not affected by reset
m_ppc = m_pc;
// Hacky cache emulation.
@@ -202,8 +202,8 @@ void dsp16_device::device_reset()
const address_space_config *dsp16_device::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config :
- (spacenum == AS_DATA) ? &m_data_config :
- NULL;
+ (spacenum == AS_DATA) ? &m_data_config :
+ NULL;
}
@@ -220,101 +220,101 @@ void dsp16_device::state_string_export(const device_state_entry &entry, astring
string.printf("(below)");
break;
- case DSP16_AUC:
- {
- astring alignString;
- const UINT8 align = m_auc & 0x03;
- switch (align)
- {
- case 0x00: alignString.printf("xy"); break;
- case 0x01: alignString.printf("/4"); break;
- case 0x02: alignString.printf("x4"); break;
- case 0x03: alignString.printf(",,"); break;
- }
- string.printf("%c%c%c%c%c%s",
- m_auc & 0x40 ? 'Y':'.',
- m_auc & 0x20 ? '1':'.',
- m_auc & 0x10 ? '0':'.',
- m_auc & 0x08 ? '1':'.',
- m_auc & 0x04 ? '0':'.',
- alignString.cstr());
- break;
- }
-
- case DSP16_PSW:
- string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
- m_psw & 0x8000 ? 'M':'.',
- m_psw & 0x4000 ? 'E':'.',
- m_psw & 0x2000 ? 'L':'.',
- m_psw & 0x1000 ? 'V':'.',
- m_psw & 0x0800 ? ',':',',
- m_psw & 0x0400 ? ',':',',
- m_psw & 0x0200 ? 'O':'.',
- m_psw & 0x0100 ? '1':'.',
- m_psw & 0x0080 ? '1':'.',
- m_psw & 0x0040 ? '1':'.',
- m_psw & 0x0020 ? '1':'.',
- m_psw & 0x0010 ? 'O':'.',
- m_psw & 0x0008 ? '1':'.',
- m_psw & 0x0004 ? '1':'.',
- m_psw & 0x0002 ? '1':'.',
- m_psw & 0x0001 ? '1':'.');
- break;
-
- case DSP16_PIOC:
- {
- astring strobeString;
- const UINT8 strobe = (m_pioc & 0x6000) >> 13;
- switch (strobe)
- {
- case 0x00: strobeString.printf("1T"); break;
- case 0x01: strobeString.printf("2T"); break;
- case 0x02: strobeString.printf("3T"); break;
- case 0x03: strobeString.printf("4T"); break;
- }
- string.printf("%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
- m_pioc & 0x8000 ? 'I':'.',
- strobeString.cstr(),
- m_pioc & 0x1000 ? 'O':'I',
- m_pioc & 0x0800 ? 'O':'I',
- m_pioc & 0x0400 ? 'S':'.',
- m_pioc & 0x0200 ? 'I':'.',
- m_pioc & 0x0100 ? 'O':'.',
- m_pioc & 0x0080 ? 'P':'.',
- m_pioc & 0x0040 ? 'P':'.',
- m_pioc & 0x0020 ? 'I':'.',
- m_pioc & 0x0010 ? 'I':'.',
- m_pioc & 0x0008 ? 'O':'.',
- m_pioc & 0x0004 ? 'P':'.',
- m_pioc & 0x0002 ? 'P':'.',
- m_pioc & 0x0001 ? 'I':'.');
- break;
- }
-
+ case DSP16_AUC:
+ {
+ astring alignString;
+ const UINT8 align = m_auc & 0x03;
+ switch (align)
+ {
+ case 0x00: alignString.printf("xy"); break;
+ case 0x01: alignString.printf("/4"); break;
+ case 0x02: alignString.printf("x4"); break;
+ case 0x03: alignString.printf(",,"); break;
+ }
+ string.printf("%c%c%c%c%c%s",
+ m_auc & 0x40 ? 'Y':'.',
+ m_auc & 0x20 ? '1':'.',
+ m_auc & 0x10 ? '0':'.',
+ m_auc & 0x08 ? '1':'.',
+ m_auc & 0x04 ? '0':'.',
+ alignString.cstr());
+ break;
+ }
+
+ case DSP16_PSW:
+ string.printf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
+ m_psw & 0x8000 ? 'M':'.',
+ m_psw & 0x4000 ? 'E':'.',
+ m_psw & 0x2000 ? 'L':'.',
+ m_psw & 0x1000 ? 'V':'.',
+ m_psw & 0x0800 ? ',':',',
+ m_psw & 0x0400 ? ',':',',
+ m_psw & 0x0200 ? 'O':'.',
+ m_psw & 0x0100 ? '1':'.',
+ m_psw & 0x0080 ? '1':'.',
+ m_psw & 0x0040 ? '1':'.',
+ m_psw & 0x0020 ? '1':'.',
+ m_psw & 0x0010 ? 'O':'.',
+ m_psw & 0x0008 ? '1':'.',
+ m_psw & 0x0004 ? '1':'.',
+ m_psw & 0x0002 ? '1':'.',
+ m_psw & 0x0001 ? '1':'.');
+ break;
+
+ case DSP16_PIOC:
+ {
+ astring strobeString;
+ const UINT8 strobe = (m_pioc & 0x6000) >> 13;
+ switch (strobe)
+ {
+ case 0x00: strobeString.printf("1T"); break;
+ case 0x01: strobeString.printf("2T"); break;
+ case 0x02: strobeString.printf("3T"); break;
+ case 0x03: strobeString.printf("4T"); break;
+ }
+ string.printf("%c%s%c%c%c%c%c%c%c%c%c%c%c%c%c",
+ m_pioc & 0x8000 ? 'I':'.',
+ strobeString.cstr(),
+ m_pioc & 0x1000 ? 'O':'I',
+ m_pioc & 0x0800 ? 'O':'I',
+ m_pioc & 0x0400 ? 'S':'.',
+ m_pioc & 0x0200 ? 'I':'.',
+ m_pioc & 0x0100 ? 'O':'.',
+ m_pioc & 0x0080 ? 'P':'.',
+ m_pioc & 0x0040 ? 'P':'.',
+ m_pioc & 0x0020 ? 'I':'.',
+ m_pioc & 0x0010 ? 'I':'.',
+ m_pioc & 0x0008 ? 'O':'.',
+ m_pioc & 0x0004 ? 'P':'.',
+ m_pioc & 0x0002 ? 'P':'.',
+ m_pioc & 0x0001 ? 'I':'.');
+ break;
+ }
+
// Placeholder for a better view later (TODO)
case DSP16_SIOC:
- {
- astring clkString;
- const UINT8 clk = (m_sioc & 0x0180) >> 7;
- switch (clk)
- {
- case 0x00: clkString.printf("/4"); break;
- case 0x01: clkString.printf("12"); break;
- case 0x02: clkString.printf("16"); break;
- case 0x03: clkString.printf("20"); break;
- }
- string.printf("%c%s%c%c%c%c%c%c%c",
- m_sioc & 0x0200 ? 'I':'O',
- clkString.cstr(),
- m_sioc & 0x0040 ? 'L':'M',
- m_sioc & 0x0020 ? 'I':'O',
- m_sioc & 0x0010 ? 'I':'O',
- m_sioc & 0x0008 ? 'I':'O',
- m_sioc & 0x0004 ? 'I':'O',
- m_sioc & 0x0002 ? '2':'1',
- m_sioc & 0x0001 ? '2':'1');
- break;
- }
+ {
+ astring clkString;
+ const UINT8 clk = (m_sioc & 0x0180) >> 7;
+ switch (clk)
+ {
+ case 0x00: clkString.printf("/4"); break;
+ case 0x01: clkString.printf("12"); break;
+ case 0x02: clkString.printf("16"); break;
+ case 0x03: clkString.printf("20"); break;
+ }
+ string.printf("%c%s%c%c%c%c%c%c%c",
+ m_sioc & 0x0200 ? 'I':'O',
+ clkString.cstr(),
+ m_sioc & 0x0040 ? 'L':'M',
+ m_sioc & 0x0020 ? 'I':'O',
+ m_sioc & 0x0010 ? 'I':'O',
+ m_sioc & 0x0008 ? 'I':'O',
+ m_sioc & 0x0004 ? 'I':'O',
+ m_sioc & 0x0002 ? '2':'1',
+ m_sioc & 0x0001 ? '2':'1');
+ break;
+ }
}
}
@@ -441,9 +441,9 @@ void dsp16_device::execute_run()
m_pc += pcAdvance;
m_icount -= cycles;
- // The 16 bit PI "shadow" register gets set to PC on each instruction except
- // when an interrupt service routine is active (TODO: Interrupt check) (page 2-4)
- m_pi = m_pc;
+ // The 16 bit PI "shadow" register gets set to PC on each instruction except
+ // when an interrupt service routine is active (TODO: Interrupt check) (page 2-4)
+ m_pi = m_pc;
} while (m_icount > 0);
}
diff --git a/src/emu/cpu/dsp16/dsp16.h b/src/emu/cpu/dsp16/dsp16.h
index b32f564e9dc..8ab6834bec2 100644
--- a/src/emu/cpu/dsp16/dsp16.h
+++ b/src/emu/cpu/dsp16/dsp16.h
@@ -60,7 +60,7 @@ protected:
UINT16 m_pt;
UINT16 m_pr;
UINT16 m_pi;
-
+
// RAM Address Arithmetic Unit (YAAU) (page 2-6)
UINT16 m_j; // Signed
UINT16 m_k; // Signed
@@ -70,8 +70,8 @@ protected:
UINT16 m_r1;
UINT16 m_r2;
UINT16 m_r3;
-
- // Data Arithmetic Unit (DAU) (page 2-6)
+
+ // Data Arithmetic Unit (DAU) (page 2-6)
UINT16 m_x;
UINT32 m_y;
UINT32 m_p;
@@ -82,8 +82,8 @@ protected:
UINT8 m_c0;
UINT8 m_c1;
UINT8 m_c2;
-
- // Serial and parallel interfaces (TODO: More here (page 2-13))
+
+ // Serial and parallel interfaces (TODO: More here (page 2-13))
UINT16 m_sioc;
UINT16 m_srta;
UINT16 m_sdx;
@@ -133,12 +133,12 @@ protected:
void* addressYL();
void writeRegister(void* reg, const UINT16& value);
bool conditionTest(const UINT8& CON);
-
+
// flags
bool lmi();
bool leq();
- bool llv();
- bool lmv();
+ bool llv();
+ bool lmv();
};
diff --git a/src/emu/cpu/dsp16/dsp16ops.c b/src/emu/cpu/dsp16/dsp16ops.c
index 8386c506d88..ffa7d008168 100644
--- a/src/emu/cpu/dsp16/dsp16ops.c
+++ b/src/emu/cpu/dsp16/dsp16ops.c
@@ -4,19 +4,19 @@
// TODO:
// * AUC has a CLR field for writing to A0 & A1 + sign extension + psw + zero lower bits
-// implement as a clean function (page 2-7)
+// implement as a clean function (page 2-7)
// * Implement saturation overflow (SAT on AUC) (page 2-8)
// * Implement p alignment (ALIGN on AUC) (page 2-9)
-// * When a register is used as a memory pointer. its value is compared with re. If its value is
-// equal to the contents of re and the postincrement is +1, then the value in rb is copied into
+// * When a register is used as a memory pointer. its value is compared with re. If its value is
+// equal to the contents of re and the postincrement is +1, then the value in rb is copied into
// the register after the memory access is complete. See Section 4.2.3.
// * CPU flags go to the PSW & conditionTest() works on that (Page 3-4)
// * Some instructions are not interruptible.
-//
+//
// NOTES:
-// When y is used in an assembly-language instruction, the DSPI6/DSPI6A device will read
+// When y is used in an assembly-language instruction, the DSPI6/DSPI6A device will read
// or write the high half (bits 16-31) of the y register (page 2-7)
// The YL register is the lower half of the 32 bit Y register
@@ -34,17 +34,17 @@ bool dsp16_device::lmi()
bool dsp16_device::leq()
{
- return m_psw & 0x4000;
+ return m_psw & 0x4000;
}
bool dsp16_device::llv()
{
- return m_psw & 0x2000;
+ return m_psw & 0x2000;
}
bool dsp16_device::lmv()
{
- return m_psw & 0x1000;
+ return m_psw & 0x1000;
}
@@ -78,7 +78,7 @@ void dsp16_device::writeRegister(void* reg, const UINT16 &value)
}
else if (reg == &m_y)
{
- // Y register
+ // Y register
// TODO - Automatic clearing of yl may be selected (according to the CLR field of the auc register) (page 2-7)
m_y = (value << 16) | (m_y & 0x0000ffff);
}
@@ -119,9 +119,9 @@ bool dsp16_device::conditionTest(const UINT8& CON)
case 0x11: return (lmi() || leq()); // le (result <= 0)
default: logerror("Unrecognized condition at PC=0x%04x\n", m_pc); break;
}
-
+
// Testing each of these conditions (*) increments the respective counter being tested (page 3-5)
-
+
return false;
}
@@ -187,7 +187,7 @@ void* dsp16_device::registerFromRTable(const UINT8 &R)
void dsp16_device::executeF1Field(const UINT8& F1, const UINT8& D, const UINT8& S)
{
// TODO: I'm pretty sure we need to feed X into these as well - Double check
-
+
// Note these instructions read right-to-left, so act accordingly (page 3-6)
// y & p are sign extended (page 3-9)
// implementation details (page 3-9)
@@ -223,7 +223,7 @@ void dsp16_device::executeF1Field(const UINT8& F1, const UINT8& D, const UINT8&
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x01:
+ case 0x01:
{
// Ad = aS+p p = x*y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
@@ -238,112 +238,112 @@ void dsp16_device::executeF1Field(const UINT8& F1, const UINT8& D, const UINT8&
justATest = true;
break;
}
- case 0x03:
+ case 0x03:
{
// Ad = aS-p p = x*y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x04:
+ case 0x04:
{
// Ad = p
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x05:
+ case 0x05:
{
// Ad = aS+p
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x06:
+ case 0x06:
{
// nop
justATest = true;
break;
}
- case 0x07:
+ case 0x07:
{
// Ad = aS-p
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x08:
+ case 0x08:
{
// Ad = aS|y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x09:
+ case 0x09:
{
// Ad = aS^y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x0a:
+ case 0x0a:
{
// aS&y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
justATest = true;
break;
}
- case 0x0b:
+ case 0x0b:
{
// aS-y
INT64 aS = *sourceReg;
if (aS & U64(0x800000000))
aS |= U64(0xfffffff000000000);
-
+
INT64 y = (m_y & 0xffff0000) >> 16;
if (y & 0x8000)
y |= U64(0xffffffffffff0000);
-
+
result = aS-y;
justATest = true;
break;
}
- case 0x0c:
+ case 0x0c:
{
// Ad = y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x0d:
+ case 0x0d:
{
// Ad = aS+y
INT64 aS = *sourceReg;
- if (aS & U64(0x800000000))
+ if (aS & U64(0x800000000))
aS |= U64(0xfffffff000000000);
-
+
INT64 y = (m_y & 0xffff0000) >> 16;
- if (y & 0x8000)
+ if (y & 0x8000)
y |= U64(0xffffffffffff0000);
-
+
result = aS+y;
break;
}
- case 0x0e:
+ case 0x0e:
{
// Ad = aS&y
printf("UNIMPLEMENTED F1 operation @ PC 0x%04x (%d)\n", m_pc, __LINE__);
break;
}
- case 0x0f:
+ case 0x0f:
{
// Ad = aS-y
INT64 aS = *sourceReg;
if (aS & U64(0x800000000))
aS |= U64(0xfffffff000000000);
-
+
INT64 y = (m_y & 0xffff0000) >> 16;
- if (y & 0x8000)
+ if (y & 0x8000)
y |= U64(0xffffffffffff0000);
-
+
result = aS-y;
break;
}
}
-
+
// CPU Flags (page 3-4)
// LMI (logical minus)
if (result & U64(0x800000000))
@@ -359,7 +359,7 @@ void dsp16_device::executeF1Field(const UINT8& F1, const UINT8& D, const UINT8&
// LLV (logical overflow)
// TODO
-
+
// LMV (mathematical overflow)
if ((result | U64(0xf00000000)) != U64(0xf00000000) &&
(result | U64(0xf00000000)) != U64(0x000000000))
@@ -369,7 +369,7 @@ void dsp16_device::executeF1Field(const UINT8& F1, const UINT8& D, const UINT8&
// If it was a real operation, make sure the data goes where it should
if (!justATest)
- *destinationReg = (UINT64)result & U64(0x0000000fffffffff);
+ *destinationReg = (UINT64)result & U64(0x0000000fffffffff);
}
@@ -570,7 +570,7 @@ void dsp16_device::execute_one(const UINT16& op, UINT8& cycles, UINT8& pcAdvance
case 0x14:
{
DSP_LINE("3-53")
- // F1, Y = y[l] : (page 3-53)
+ // F1, Y = y[l] : (page 3-53)
const UINT8 Y = (op & 0x000f);
const UINT8 X = (op & 0x0010) >> 4;
const UINT8 S = (op & 0x0200) >> 9;
diff --git a/src/emu/cpu/es5510/es5510.c b/src/emu/cpu/es5510/es5510.c
index d101ead70d9..bfe0e4dfef9 100644
--- a/src/emu/cpu/es5510/es5510.c
+++ b/src/emu/cpu/es5510/es5510.c
@@ -559,7 +559,7 @@ void es5510_device::execute_set_input(int linenum, int state) {
void es5510_device::list_program(void(p)(const char *, ...)) {
LOG(("ES5501: Starting!\n"));
-
+
UINT8 addr;
char buf[1024];
for (addr = 0; addr < 0xa0; addr++) {
@@ -802,14 +802,14 @@ void es5510_device::run_once()
{
// turn HALT off
set_HALT(false);
-
- // run for one instruction
+
+ // run for one instruction
icount = 1;
execute_run();
-
- // turn HALT on again
+
+ // turn HALT on again
set_HALT(true);
-
+
// run ESP to the end of its program, a few instructions at a time
while (state != STATE_HALTED) {
icount = 1;
@@ -898,7 +898,7 @@ void es5510_device::write_to_dol(INT32 value) {
}
void es5510_device::alu_operation_end() {
- // Handle the END instruction separately
+ // Handle the END instruction separately
LOG(("ES5510: END\n"));
// sample the HALT line
if (halt_asserted) {
diff --git a/src/emu/cpu/es5510/es5510.h b/src/emu/cpu/es5510/es5510.h
index 8120d204081..20fec32cc11 100644
--- a/src/emu/cpu/es5510/es5510.h
+++ b/src/emu/cpu/es5510/es5510.h
@@ -104,7 +104,7 @@ public:
ram_cycle_t cycle; // cycle type
};
- // direct access to the 'HALT' pin - not just through the
+ // direct access to the 'HALT' pin - not just through the
void set_HALT(bool halt) { halt_asserted = halt; }
bool get_HALT() { return halt_asserted; }
diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/emu/cpu/hcd62121/hcd62121.c
index 832c3e37c2a..de8b5ff3b2c 100644
--- a/src/emu/cpu/hcd62121/hcd62121.c
+++ b/src/emu/cpu/hcd62121/hcd62121.c
@@ -287,7 +287,7 @@ int hcd62121_cpu_device::check_cond( UINT8 op )
void hcd62121_cpu_device::device_start()
{
-// m_irq_callback = irqcallback;
+// m_irq_callback = irqcallback;
m_program = &space(AS_PROGRAM);
m_io = &space(AS_IO);
@@ -519,4 +519,3 @@ offs_t hcd62121_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UI
extern CPU_DISASSEMBLE( hcd62121 );
return CPU_DISASSEMBLE_NAME(hcd62121)(this, buffer, pc, oprom, opram, options);
}
-
diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h
index 8fdfe9b509d..00a6528cd06 100644
--- a/src/emu/cpu/i386/i386ops.h
+++ b/src/emu/cpu/i386/i386ops.h
@@ -321,26 +321,26 @@ static const X86_OPCODE x86_opcode_table[] =
{ 0x2c, OP_2BYTE|OP_SSE, SSEOP(cvttps2pi_r64_r128m64), SSEOP(cvttps2pi_r64_r128m64),},
{ 0x2d, OP_2BYTE|OP_SSE, SSEOP(cvtps2pi_r64_r128m64), SSEOP(cvtps2pi_r64_r128m64),},
{ 0x2e, OP_2BYTE|OP_SSE, SSEOP(ucomiss_r128_r128m32), SSEOP(ucomiss_r128_r128m32),},
- { 0x2f, OP_2BYTE|OP_SSE, SSEOP(comiss_r128_r128m32), SSEOP(comiss_r128_r128m32), },
+ { 0x2f, OP_2BYTE|OP_SSE, SSEOP(comiss_r128_r128m32), SSEOP(comiss_r128_r128m32), },
{ 0x30, OP_2BYTE|OP_PENTIUM, PENTIUMOP(wrmsr), PENTIUMOP(wrmsr), },
{ 0x31, OP_2BYTE|OP_PENTIUM, PENTIUMOP(rdtsc), PENTIUMOP(rdtsc), },
{ 0x32, OP_2BYTE|OP_PENTIUM, PENTIUMOP(rdmsr), PENTIUMOP(rdmsr), },
- { 0x40, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovo_r16_rm16), PENTIUMOP(cmovo_r32_rm32), },
- { 0x41, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovno_r16_rm16), PENTIUMOP(cmovno_r32_rm32), },
- { 0x42, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovb_r16_rm16), PENTIUMOP(cmovb_r32_rm32), },
- { 0x43, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovae_r16_rm16), PENTIUMOP(cmovae_r32_rm32), },
- { 0x44, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmove_r16_rm16), PENTIUMOP(cmove_r32_rm32), },
- { 0x45, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovne_r16_rm16), PENTIUMOP(cmovne_r32_rm32), },
- { 0x46, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovbe_r16_rm16), PENTIUMOP(cmovbe_r32_rm32), },
- { 0x47, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmova_r16_rm16), PENTIUMOP(cmova_r32_rm32), },
- { 0x48, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovs_r16_rm16), PENTIUMOP(cmovs_r32_rm32), },
- { 0x49, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovns_r16_rm16), PENTIUMOP(cmovns_r32_rm32), },
- { 0x4a, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovp_r16_rm16), PENTIUMOP(cmovp_r32_rm32), },
- { 0x4b, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovnp_r16_rm16), PENTIUMOP(cmovnp_r32_rm32), },
- { 0x4c, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovl_r16_rm16), PENTIUMOP(cmovl_r32_rm32), },
- { 0x4d, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovge_r16_rm16), PENTIUMOP(cmovge_r32_rm32), },
- { 0x4e, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovle_r16_rm16), PENTIUMOP(cmovle_r32_rm32), },
- { 0x4f, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovg_r16_rm16), PENTIUMOP(cmovg_r32_rm32), },
+ { 0x40, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovo_r16_rm16), PENTIUMOP(cmovo_r32_rm32), },
+ { 0x41, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovno_r16_rm16), PENTIUMOP(cmovno_r32_rm32), },
+ { 0x42, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovb_r16_rm16), PENTIUMOP(cmovb_r32_rm32), },
+ { 0x43, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovae_r16_rm16), PENTIUMOP(cmovae_r32_rm32), },
+ { 0x44, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmove_r16_rm16), PENTIUMOP(cmove_r32_rm32), },
+ { 0x45, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovne_r16_rm16), PENTIUMOP(cmovne_r32_rm32), },
+ { 0x46, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovbe_r16_rm16), PENTIUMOP(cmovbe_r32_rm32), },
+ { 0x47, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmova_r16_rm16), PENTIUMOP(cmova_r32_rm32), },
+ { 0x48, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovs_r16_rm16), PENTIUMOP(cmovs_r32_rm32), },
+ { 0x49, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovns_r16_rm16), PENTIUMOP(cmovns_r32_rm32), },
+ { 0x4a, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovp_r16_rm16), PENTIUMOP(cmovp_r32_rm32), },
+ { 0x4b, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovnp_r16_rm16), PENTIUMOP(cmovnp_r32_rm32), },
+ { 0x4c, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovl_r16_rm16), PENTIUMOP(cmovl_r32_rm32), },
+ { 0x4d, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovge_r16_rm16), PENTIUMOP(cmovge_r32_rm32), },
+ { 0x4e, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovle_r16_rm16), PENTIUMOP(cmovle_r32_rm32), },
+ { 0x4f, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmovg_r16_rm16), PENTIUMOP(cmovg_r32_rm32), },
{ 0x50, OP_2BYTE|OP_SSE, SSEOP(movmskps_r16_r128), SSEOP(movmskps_r32_r128), },
{ 0x51, OP_2BYTE|OP_SSE, SSEOP(sqrtps_r128_rm128), SSEOP(sqrtps_r128_rm128), },
{ 0x52, OP_2BYTE|OP_SSE, SSEOP(rsqrtps_r128_rm128), SSEOP(rsqrtps_r128_rm128), },
@@ -363,8 +363,8 @@ static const X86_OPCODE x86_opcode_table[] =
{ 0x63, OP_2BYTE|OP_MMX, MMXOP(packsswb_r64_rm64), MMXOP(packsswb_r64_rm64), },
{ 0x64, OP_2BYTE|OP_MMX, MMXOP(pcmpgtb_r64_rm64), MMXOP(pcmpgtb_r64_rm64), },
{ 0x65, OP_2BYTE|OP_MMX, MMXOP(pcmpgtw_r64_rm64), MMXOP(pcmpgtw_r64_rm64), },
- { 0x66, OP_2BYTE|OP_MMX, MMXOP(pcmpgtd_r64_rm64), MMXOP(pcmpgtd_r64_rm64), },
- { 0x67, OP_2BYTE|OP_MMX, MMXOP(packuswb_r64_rm64), MMXOP(packuswb_r64_rm64), },
+ { 0x66, OP_2BYTE|OP_MMX, MMXOP(pcmpgtd_r64_rm64), MMXOP(pcmpgtd_r64_rm64), },
+ { 0x67, OP_2BYTE|OP_MMX, MMXOP(packuswb_r64_rm64), MMXOP(packuswb_r64_rm64), },
{ 0x68, OP_2BYTE|OP_MMX, MMXOP(punpckhbw_r64_rm64), MMXOP(punpckhbw_r64_rm64), },
{ 0x69, OP_2BYTE|OP_MMX, MMXOP(punpckhwd_r64_rm64), MMXOP(punpckhwd_r64_rm64), },
{ 0x6a, OP_2BYTE|OP_MMX, MMXOP(punpckhdq_r64_rm64), MMXOP(punpckhdq_r64_rm64), },
@@ -444,8 +444,8 @@ static const X86_OPCODE x86_opcode_table[] =
{ 0xBF, OP_2BYTE|OP_I386, I386OP(invalid), I386OP(movsx_r32_rm16), },
{ 0xC0, OP_2BYTE|OP_I486, I486OP(xadd_rm8_r8), I486OP(xadd_rm8_r8), },
{ 0xC1, OP_2BYTE|OP_I486, I486OP(xadd_rm16_r16), I486OP(xadd_rm32_r32), },
- { 0xC2, OP_2BYTE|OP_SSE, SSEOP(cmpps_r128_rm128_i8), SSEOP(cmpps_r128_rm128_i8), },
- { 0xC3, OP_2BYTE|OP_PENTIUM, PENTIUMOP(movnti_m16_r16), PENTIUMOP(movnti_m32_r32), },
+ { 0xC2, OP_2BYTE|OP_SSE, SSEOP(cmpps_r128_rm128_i8), SSEOP(cmpps_r128_rm128_i8), },
+ { 0xC3, OP_2BYTE|OP_PENTIUM, PENTIUMOP(movnti_m16_r16), PENTIUMOP(movnti_m32_r32), },
{ 0xC4, OP_2BYTE|OP_SSE, SSEOP(pinsrw_r64_r16m16_i8), SSEOP(pinsrw_r64_r32m16_i8),},
{ 0xC5, OP_2BYTE|OP_SSE, SSEOP(pextrw_r16_r64_i8), SSEOP(pextrw_r32_r64_i8), },
{ 0xC6, OP_2BYTE|OP_SSE, SSEOP(shufps), SSEOP(shufps), },
@@ -502,30 +502,30 @@ static const X86_OPCODE x86_opcode_table[] =
{ 0xFD, OP_2BYTE|OP_MMX, MMXOP(paddw_r64_rm64), MMXOP(paddw_r64_rm64), },
{ 0xFE, OP_2BYTE|OP_MMX, MMXOP(paddd_r64_rm64), MMXOP(paddd_r64_rm64), },
/* F3 0F ?? */
- { 0x10, OP_3BYTEF3|OP_SSE, SSEOP(movss_r128_rm128), SSEOP(movss_r128_rm128), },
- { 0x11, OP_3BYTEF3|OP_SSE, SSEOP(movss_rm128_r128), SSEOP(movss_rm128_r128), },
- { 0x12, OP_3BYTEF3|OP_SSE, SSEOP(movsldup_r128_rm128), SSEOP(movsldup_r128_rm128), },
- { 0x16, OP_3BYTEF3|OP_SSE, SSEOP(movshdup_r128_rm128), SSEOP(movshdup_r128_rm128), },
+ { 0x10, OP_3BYTEF3|OP_SSE, SSEOP(movss_r128_rm128), SSEOP(movss_r128_rm128), },
+ { 0x11, OP_3BYTEF3|OP_SSE, SSEOP(movss_rm128_r128), SSEOP(movss_rm128_r128), },
+ { 0x12, OP_3BYTEF3|OP_SSE, SSEOP(movsldup_r128_rm128), SSEOP(movsldup_r128_rm128), },
+ { 0x16, OP_3BYTEF3|OP_SSE, SSEOP(movshdup_r128_rm128), SSEOP(movshdup_r128_rm128), },
{ 0x2A, OP_3BYTEF3|OP_SSE, SSEOP(cvtsi2ss_r128_rm32), SSEOP(cvtsi2ss_r128_rm32), },
{ 0x2C, OP_3BYTEF3|OP_SSE, SSEOP(cvttss2si_r32_r128m32), SSEOP(cvttss2si_r32_r128m32),},
- { 0x2D, OP_3BYTEF3|OP_SSE, SSEOP(cvtss2si_r32_r128m32), SSEOP(cvtss2si_r32_r128m32),},
- { 0x51, OP_3BYTEF3|OP_SSE, SSEOP(sqrtss_r128_r128m32), SSEOP(sqrtss_r128_r128m32), },
- { 0x52, OP_3BYTEF3|OP_SSE, SSEOP(rsqrtss_r128_r128m32), SSEOP(rsqrtss_r128_r128m32),},
+ { 0x2D, OP_3BYTEF3|OP_SSE, SSEOP(cvtss2si_r32_r128m32), SSEOP(cvtss2si_r32_r128m32),},
+ { 0x51, OP_3BYTEF3|OP_SSE, SSEOP(sqrtss_r128_r128m32), SSEOP(sqrtss_r128_r128m32), },
+ { 0x52, OP_3BYTEF3|OP_SSE, SSEOP(rsqrtss_r128_r128m32), SSEOP(rsqrtss_r128_r128m32),},
{ 0x53, OP_3BYTEF3|OP_SSE, SSEOP(rcpss_r128_r128m32), SSEOP(rcpss_r128_r128m32), },
{ 0x58, OP_3BYTEF3|OP_SSE, SSEOP(addss), SSEOP(addss), },
{ 0x59, OP_3BYTEF3|OP_SSE, SSEOP(mulss), SSEOP(mulss), },
- { 0x5A, OP_3BYTEF3|OP_SSE, SSEOP(cvtss2sd_r128_r128m32), SSEOP(cvtss2sd_r128_r128m32),},
- { 0x5B, OP_3BYTEF3|OP_SSE, SSEOP(cvttps2dq_r128_rm128), SSEOP(cvttps2dq_r128_rm128),},
+ { 0x5A, OP_3BYTEF3|OP_SSE, SSEOP(cvtss2sd_r128_r128m32), SSEOP(cvtss2sd_r128_r128m32),},
+ { 0x5B, OP_3BYTEF3|OP_SSE, SSEOP(cvttps2dq_r128_rm128), SSEOP(cvttps2dq_r128_rm128),},
{ 0x5C, OP_3BYTEF3|OP_SSE, SSEOP(subss), SSEOP(subss), },
{ 0x5D, OP_3BYTEF3|OP_SSE, SSEOP(minss_r128_r128m32), SSEOP(minss_r128_r128m32), },
{ 0x5E, OP_3BYTEF3|OP_SSE, SSEOP(divss), SSEOP(divss), },
- { 0x5F, OP_3BYTEF3|OP_SSE, SSEOP(maxss_r128_r128m32), SSEOP(maxss_r128_r128m32), },
- { 0x6F, OP_3BYTEF3|OP_SSE, SSEOP(movdqu_r128_rm128), SSEOP(movdqu_r128_rm128), },
- { 0x70, OP_3BYTEF3|OP_SSE, SSEOP(pshufhw_r128_rm128_i8), SSEOP(pshufhw_r128_rm128_i8),},
- { 0x7E, OP_3BYTEF3|OP_SSE, SSEOP(movq_r128_r128m64), SSEOP(movq_r128_r128m64), },
- { 0x7F, OP_3BYTEF3|OP_SSE, SSEOP(movdqu_rm128_r128), SSEOP(movdqu_rm128_r128), },
- { 0xB8, OP_3BYTEF3|OP_PENTIUM, PENTIUMOP(popcnt_r16_rm16), PENTIUMOP(popcnt_r32_rm32), },
- { 0xC2, OP_3BYTEF3|OP_SSE, SSEOP(cmpss_r128_r128m32_i8), SSEOP(cmpss_r128_r128m32_i8),},
- { 0xD6, OP_3BYTEF3|OP_SSE, SSEOP(movq2dq_r128_r64), SSEOP(movq2dq_r128_r64), },
- { 0xE6, OP_3BYTEF3|OP_SSE, SSEOP(cvtdq2pd_r128_r128m64), SSEOP(cvtdq2pd_r128_r128m64)}
+ { 0x5F, OP_3BYTEF3|OP_SSE, SSEOP(maxss_r128_r128m32), SSEOP(maxss_r128_r128m32), },
+ { 0x6F, OP_3BYTEF3|OP_SSE, SSEOP(movdqu_r128_rm128), SSEOP(movdqu_r128_rm128), },
+ { 0x70, OP_3BYTEF3|OP_SSE, SSEOP(pshufhw_r128_rm128_i8), SSEOP(pshufhw_r128_rm128_i8),},
+ { 0x7E, OP_3BYTEF3|OP_SSE, SSEOP(movq_r128_r128m64), SSEOP(movq_r128_r128m64), },
+ { 0x7F, OP_3BYTEF3|OP_SSE, SSEOP(movdqu_rm128_r128), SSEOP(movdqu_rm128_r128), },
+ { 0xB8, OP_3BYTEF3|OP_PENTIUM, PENTIUMOP(popcnt_r16_rm16), PENTIUMOP(popcnt_r32_rm32), },
+ { 0xC2, OP_3BYTEF3|OP_SSE, SSEOP(cmpss_r128_r128m32_i8), SSEOP(cmpss_r128_r128m32_i8),},
+ { 0xD6, OP_3BYTEF3|OP_SSE, SSEOP(movq2dq_r128_r64), SSEOP(movq2dq_r128_r64), },
+ { 0xE6, OP_3BYTEF3|OP_SSE, SSEOP(cvtdq2pd_r128_r128m64), SSEOP(cvtdq2pd_r128_r128m64)}
};
diff --git a/src/emu/cpu/i386/pentops.c b/src/emu/cpu/i386/pentops.c
index 9cd2119eff3..146dc4f006e 100644
--- a/src/emu/cpu/i386/pentops.c
+++ b/src/emu/cpu/i386/pentops.c
@@ -1467,17 +1467,17 @@ static void MMXOP(pmaddwd_r64_rm64)(i386_state *cpustate) // Opcode 0f f5
UINT8 modrm = FETCH(cpustate);
if( modrm >= 0xc0 ) {
MMX((modrm >> 3) & 0x7).i[0]=(INT32)MMX((modrm >> 3) & 0x7).s[0]*(INT32)MMX(modrm & 7).s[0]+
- (INT32)MMX((modrm >> 3) & 0x7).s[1]*(INT32)MMX(modrm & 7).s[1];
+ (INT32)MMX((modrm >> 3) & 0x7).s[1]*(INT32)MMX(modrm & 7).s[1];
MMX((modrm >> 3) & 0x7).i[1]=(INT32)MMX((modrm >> 3) & 0x7).s[2]*(INT32)MMX(modrm & 7).s[2]+
- (INT32)MMX((modrm >> 3) & 0x7).s[3]*(INT32)MMX(modrm & 7).s[3];
+ (INT32)MMX((modrm >> 3) & 0x7).s[3]*(INT32)MMX(modrm & 7).s[3];
} else {
MMX_REG s;
UINT32 ea = GetEA(cpustate, modrm, 0);
READMMX(cpustate, ea, s);
MMX((modrm >> 3) & 0x7).i[0]=(INT32)MMX((modrm >> 3) & 0x7).s[0]*(INT32)s.s[0]+
- (INT32)MMX((modrm >> 3) & 0x7).s[1]*(INT32)s.s[1];
+ (INT32)MMX((modrm >> 3) & 0x7).s[1]*(INT32)s.s[1];
MMX((modrm >> 3) & 0x7).i[1]=(INT32)MMX((modrm >> 3) & 0x7).s[2]*(INT32)s.s[2]+
- (INT32)MMX((modrm >> 3) & 0x7).s[3]*(INT32)s.s[3];
+ (INT32)MMX((modrm >> 3) & 0x7).s[3]*(INT32)s.s[3];
}
CYCLES(cpustate,1); // TODO: correct cycle count
}
@@ -2772,11 +2772,11 @@ static void SSEOP(subps)(i386_state *cpustate) // Opcode 0f 5c
INLINE float sse_min_single(float src1, float src2)
{
/*if ((src1 == 0) && (src2 == 0))
- return src2;
+ return src2;
if (src1 = SNaN)
- return src2;
+ return src2;
if (src2 = SNaN)
- return src2;*/
+ return src2;*/
if (src1 < src2)
return src1;
return src2;
@@ -2825,11 +2825,11 @@ static void SSEOP(divps)(i386_state *cpustate) // Opcode 0f 5e
INLINE float sse_max_single(float src1, float src2)
{
/*if ((src1 == 0) && (src2 == 0))
- return src2;
+ return src2;
if (src1 = SNaN)
- return src2;
+ return src2;
if (src2 = SNaN)
- return src2;*/
+ return src2;*/
if (src1 > src2)
return src1;
return src2;
diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c
index 753e4607f70..7d508d4e36e 100644
--- a/src/emu/cpu/i4004/i4004.c
+++ b/src/emu/cpu/i4004/i4004.c
@@ -501,8 +501,8 @@ void i4004_cpu_device::state_export(const device_state_entry &entry)
{
case STATE_GENFLAGS:
m_flags = ((m_A == 0) ? 0x04 : 0x00) |
- (m_C ? 0x02 : 0x00) |
- (m_TEST ? 0x01 : 0x00);
+ (m_C ? 0x02 : 0x00) |
+ (m_TEST ? 0x01 : 0x00);
break;
}
}
@@ -526,4 +526,4 @@ offs_t i4004_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8
return CPU_DISASSEMBLE_NAME(i4004)(this, buffer, pc, oprom, opram, options);
}
-// case CPUINFO_IS_OCTAL: info->i = true; break;
+// case CPUINFO_IS_OCTAL: info->i = true; break;
diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/emu/cpu/lr35902/lr35902.h
index e33af3038a5..ab07b658555 100644
--- a/src/emu/cpu/lr35902/lr35902.h
+++ b/src/emu/cpu/lr35902/lr35902.h
@@ -77,7 +77,7 @@ protected:
protected:
address_space_config m_program_config;
-
+
UINT8 m_A;
UINT8 m_F;
UINT8 m_B;
@@ -110,7 +110,7 @@ protected:
UINT8 m_features;
const UINT16 *c_regs;
const struct lr35902_config *m_config;
-
+
/* Flag bit definitions */
static const UINT8 LR35902_FLAG_Z = 0x80;
static const UINT8 LR35902_FLAG_N = 0x40;
diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h
index 38f7b315981..2cffb1058a7 100644
--- a/src/emu/cpu/m68000/m68000.h
+++ b/src/emu/cpu/m68000/m68000.h
@@ -182,7 +182,7 @@ public:
UINT32 cpu_type; /* CPU Type: 68000, 68008, 68010, 68EC020, 68020, 68EC030, 68030, 68EC040, or 68040 */
-// UINT32 dasm_type; /* disassembly type */
+// UINT32 dasm_type; /* disassembly type */
UINT32 dar[16]; /* Data and Address Registers */
UINT32 ppc; /* Previous program counter */
UINT32 pc; /* Program Counter */
@@ -272,8 +272,8 @@ public:
typedef delegate<void (offs_t, UINT16)> m68k_write16_delegate;
typedef delegate<void (offs_t, UINT32)> m68k_write32_delegate;
-// class m68k_memory_interface
-// {
+// class m68k_memory_interface
+// {
public:
void init8(address_space &space);
void init16(address_space &space);
@@ -312,15 +312,15 @@ public:
UINT32 readlong_d32_hmmu(offs_t address);
void writelong_d32_hmmu(offs_t address, UINT32 data);
-// m68000_base_device *m_cpustate;
-// };
+// m68000_base_device *m_cpustate;
+// };
public:
-// m68k_memory_interface memory;
+// m68k_memory_interface memory;
address_space *m_space;
direct_read_data *m_direct;
-
+
offs_t encrypted_start;
offs_t encrypted_end;
@@ -390,7 +390,7 @@ public:
void reset_cpu(void);
inline void cpu_execute(void);
-
+
// device_state_interface overrides
virtual void state_import(const device_state_entry &entry);
virtual void state_export(const device_state_entry &entry);
@@ -720,7 +720,7 @@ class fscpu32_device : public m68000_base_device
public:
// construction/destruction
fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source);
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 24f74cce3a4..94526192d7d 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -774,7 +774,7 @@ inline void m68000_base_device::cpu_execute(void)
m_address_error = 0;
try {
m68ki_exception_address_error(this);
- }
+ }
catch(int error)
{
if (error==10)
@@ -1199,7 +1199,7 @@ void m68000_base_device::init8(address_space &space)
{
m_space = &space;
m_direct = &space.direct();
-// m_cpustate = this;
+// m_cpustate = this;
opcode_xor = 0;
readimm16 = m68k_readimm16_delegate(FUNC(m68000_base_device::m68008_read_immediate_16), this);
@@ -1698,8 +1698,8 @@ void m68000_base_device::init_cpu_m68000(void)
init_cpu_common();
cpu_type = CPU_TYPE_000;
-// dasm_type = M68K_CPU_TYPE_68000;
-
+// dasm_type = M68K_CPU_TYPE_68000;
+
init16(*program);
sr_mask = 0xa71f; /* T1 -- S -- -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[0];
@@ -1725,12 +1725,11 @@ void m68000_base_device::init_cpu_m68000(void)
void m68000_base_device::init_cpu_m68008(void)
{
-
init_cpu_common();
cpu_type = CPU_TYPE_008;
-// dasm_type = M68K_CPU_TYPE_68008;
-
+// dasm_type = M68K_CPU_TYPE_68008;
+
init8(*program);
sr_mask = 0xa71f; /* T1 -- S -- -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[0];
@@ -1755,11 +1754,10 @@ void m68000_base_device::init_cpu_m68008(void)
void m68000_base_device::init_cpu_m68010(void)
{
-
init_cpu_common();
cpu_type = CPU_TYPE_010;
-// dasm_type = M68K_CPU_TYPE_68010;
-
+// dasm_type = M68K_CPU_TYPE_68010;
+
init16(*program);
sr_mask = 0xa71f; /* T1 -- S -- -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[1];
@@ -1785,8 +1783,8 @@ void m68000_base_device::init_cpu_m68020(void)
{
init_cpu_common();
cpu_type = CPU_TYPE_020;
-// dasm_type = M68K_CPU_TYPE_68020;
-
+// dasm_type = M68K_CPU_TYPE_68020;
+
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[2];
@@ -1813,7 +1811,7 @@ void m68000_base_device::init_cpu_m68020pmmu(void)
has_pmmu = 1;
has_fpu = 1;
-
+
init32mmu(*program);
}
@@ -1826,7 +1824,7 @@ void m68000_base_device::init_cpu_m68020hmmu(void)
has_hmmu = 1;
has_fpu = 1;
-
+
init32hmmu(*program);
}
@@ -1835,9 +1833,9 @@ void m68000_base_device::init_cpu_m68ec020(void)
init_cpu_common();
cpu_type = CPU_TYPE_EC020;
-// dasm_type = M68K_CPU_TYPE_68EC020;
+// dasm_type = M68K_CPU_TYPE_68EC020;
+
-
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[2];
@@ -1864,9 +1862,9 @@ void m68000_base_device::init_cpu_m68030(void)
init_cpu_common();
cpu_type = CPU_TYPE_030;
-// dasm_type = M68K_CPU_TYPE_68030;
+// dasm_type = M68K_CPU_TYPE_68030;
+
-
init32mmu(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[3];
@@ -1892,11 +1890,11 @@ void m68000_base_device::init_cpu_m68030(void)
void m68000_base_device::init_cpu_m68ec030(void)
{
init_cpu_common();
-
+
cpu_type = CPU_TYPE_EC030;
-// dasm_type = M68K_CPU_TYPE_68EC030;
+// dasm_type = M68K_CPU_TYPE_68EC030;
+
-
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[3];
@@ -1924,9 +1922,9 @@ void m68000_base_device::init_cpu_m68040(void)
init_cpu_common();
cpu_type = CPU_TYPE_040;
-// dasm_type = M68K_CPU_TYPE_68040;
+// dasm_type = M68K_CPU_TYPE_68040;
+
-
init32mmu(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[4];
@@ -1953,9 +1951,9 @@ void m68000_base_device::init_cpu_m68ec040(void)
init_cpu_common();
cpu_type = CPU_TYPE_EC040;
-// dasm_type = M68K_CPU_TYPE_68EC040;
+// dasm_type = M68K_CPU_TYPE_68EC040;
+
-
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[4];
@@ -1982,9 +1980,9 @@ void m68000_base_device::init_cpu_m68lc040(void)
init_cpu_common();
cpu_type = CPU_TYPE_LC040;
-// dasm_type = M68K_CPU_TYPE_68LC040;
+// dasm_type = M68K_CPU_TYPE_68LC040;
+
-
init32mmu(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[4];
@@ -2018,9 +2016,9 @@ void m68000_base_device::init_cpu_fscpu32(void)
init_cpu_common();
cpu_type = CPU_TYPE_FSCPU32;
-// dasm_type = M68K_CPU_TYPE_FSCPU32;
+// dasm_type = M68K_CPU_TYPE_FSCPU32;
+
-
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[5];
@@ -2044,11 +2042,11 @@ void m68000_base_device::init_cpu_fscpu32(void)
void m68000_base_device::init_cpu_coldfire(void)
{
init_cpu_common();
-
+
cpu_type = CPU_TYPE_COLDFIRE;
-// dasm_type = M68K_CPU_TYPE_COLDFIRE;
+// dasm_type = M68K_CPU_TYPE_COLDFIRE;
+
-
init32(*program);
sr_mask = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
jump_table = m68ki_instruction_jump_table[6];
@@ -2073,25 +2071,25 @@ void m68000_base_device::init_cpu_coldfire(void)
/*
- case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break;
- case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break;
+ case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break;
+ case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break;
- case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
- case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case CPUINFO_INT_INPUT_STATE + 0: info->i = 0; // there is no level 0
- case CPUINFO_INT_INPUT_STATE + 1: info->i = (m68k->virq_state >> 1) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 2: info->i = (m68k->virq_state >> 2) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 3: info->i = (m68k->virq_state >> 3) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 4: info->i = (m68k->virq_state >> 4) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 5: info->i = (m68k->virq_state >> 5) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 6: info->i = (m68k->virq_state >> 6) & 1; break;
- case CPUINFO_INT_INPUT_STATE + 7: info->i = (m68k->virq_state >> 7) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 0: info->i = 0; // there is no level 0
+ case CPUINFO_INT_INPUT_STATE + 1: info->i = (m68k->virq_state >> 1) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 2: info->i = (m68k->virq_state >> 2) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 3: info->i = (m68k->virq_state >> 3) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 4: info->i = (m68k->virq_state >> 4) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 5: info->i = (m68k->virq_state >> 5) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 6: info->i = (m68k->virq_state >> 6) & 1; break;
+ case CPUINFO_INT_INPUT_STATE + 7: info->i = (m68k->virq_state >> 7) & 1; break;
- case CPUINFO_STR_FAMILY: strcpy(info->s, "Motorola 68K"); break;
- case CPUINFO_STR_VERSION: strcpy(info->s, "4.95"); break;
- case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
- case CPUINFO_STR_CREDITS: strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB, FPU+MMU by RB+HO+OG)"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "Motorola 68K"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "4.95"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB, FPU+MMU by RB+HO+OG)"); break;
*/
@@ -2196,7 +2194,7 @@ void m68000_base_device::m68ki_exception_interrupt(m68000_base_device *m68k, UIN
/* Acknowledge the interrupt */
vector = (*int_ack_callback)(this, int_level);
-
+
/* Get the interrupt vector */
if(vector == M68K_INT_ACK_AUTOVECTOR)
/* Use the autovectors. This is the most commonly used implementation */
@@ -2273,7 +2271,7 @@ m68000_base_device::m68000_base_device(const machine_config &mconfig, const char
void m68000_base_device::clear_all()
{
cpu_type= 0;
-// dasm_type= 0;
+// dasm_type= 0;
for (int i=0;i<16;i++)
dar[i]= 0;
ppc= 0;
@@ -2286,8 +2284,8 @@ void m68000_base_device::clear_all()
cacr= 0;
caar= 0;
ir= 0;
-// for (int i=0;i<8;i++)
-// fpr[i]= 0;
+// for (int i=0;i<8;i++)
+// fpr[i]= 0;
fpiar= 0;
fpsr= 0;
fpcr= 0;
@@ -2352,13 +2350,13 @@ void m68000_base_device::clear_all()
program = 0;
opcode_xor = 0;
-// readimm16 = 0;
-// read8 = 0;
-// read16 = 0;
-// read32 = 0;
-// write8 = 0;
-// write16 = 0;
-// write32 = 0;
+// readimm16 = 0;
+// read8 = 0;
+// read16 = 0;
+// read32 = 0;
+// write8 = 0;
+// write16 = 0;
+// write32 = 0;
m_space = 0;
m_direct = 0;
@@ -2383,7 +2381,7 @@ void m68000_base_device::clear_all()
for (int i=0; i<MMU_ATC_ENTRIES;i++)
mmu_atc_tag[i] = mmu_atc_data[i] = 0;
-
+
mmu_atc_rr = 0;
mmu_tt0 = mmu_tt1 = 0;
mmu_itt0 = mmu_itt1 = mmu_dtt0 = mmu_dtt1 = 0;
@@ -2398,7 +2396,7 @@ void m68000_base_device::clear_all()
for (int i=0;i<M68K_IC_SIZE;i++)
ic_address[i] = 0;
-
+
for (int i=0;i<M68K_IC_SIZE;i++)
ic_data[i] = 0;
@@ -2415,7 +2413,6 @@ void m68000_base_device::execute_run()
void m68000_base_device::device_start()
{
-
}
void m68000_base_device::device_reset()
@@ -2425,7 +2422,6 @@ void m68000_base_device::device_reset()
void m68000_base_device::device_stop()
{
-
}
@@ -2491,7 +2487,6 @@ const device_type MCF5206E = &device_creator<mcf5206e_device>;
m68000_device::m68000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68000", tag, owner, clock, M68000, 16,24, "m68000", __FILE__)
{
-
}
void m68000_device::device_start()
@@ -2503,7 +2498,6 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *name, co
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
-
}
@@ -2513,7 +2507,6 @@ m68000_device::m68000_device(const machine_config &mconfig, const char *name, co
m68301_device::m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68301", tag, owner, clock, M68301, 16,24, "m68301", __FILE__)
{
-
}
@@ -2532,7 +2525,6 @@ void m68301_device::device_start()
m68008_device::m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68008", tag, owner, clock, M68008, 8,20, "m68008", __FILE__)
{
-
}
void m68008_device::device_start()
@@ -2544,7 +2536,6 @@ void m68008_device::device_start()
m68008plcc_device::m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68008PLCC", tag, owner, clock, M68008, 8,22, "m68008plcc", __FILE__)
{
-
}
void m68008plcc_device::device_start()
@@ -2557,7 +2548,6 @@ void m68008plcc_device::device_start()
m68010_device::m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68010", tag, owner, clock, M68010, 16,24, "m68010", __FILE__)
{
-
}
void m68010_device::device_start()
@@ -2570,7 +2560,6 @@ void m68010_device::device_start()
m68020_device::m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020", tag, owner, clock, M68020, 32,32, "m68020", __FILE__)
{
-
}
void m68020_device::device_start()
@@ -2582,7 +2571,6 @@ void m68020_device::device_start()
m68020pmmu_device::m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020PMMU", tag, owner, clock, M68020PMMU, 32,32, "m68020pmmu", __FILE__)
{
-
}
void m68020pmmu_device::device_start()
@@ -2605,11 +2593,10 @@ bool m68020hmmu_device::memory_translate(address_spacenum space, int intention,
// 68020 with Apple HMMU & 68881 FPU
-// case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break;
+// case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m68khmmu); break;
m68020hmmu_device::m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68020HMMU", tag, owner, clock, M68020HMMU, 32,32, "m68020hmmu", __FILE__)
{
-
}
void m68020hmmu_device::device_start()
@@ -2621,7 +2608,6 @@ void m68020hmmu_device::device_start()
m68ec020_device::m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC020", tag, owner, clock, M68EC020, 32,24, "m68ec020", __FILE__)
{
-
}
void m68ec020_device::device_start()
@@ -2632,7 +2618,6 @@ void m68ec020_device::device_start()
m68030_device::m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68030", tag, owner, clock, M68030, 32,32, "m68030", __FILE__)
{
-
}
void m68030_device::device_start()
@@ -2643,7 +2628,6 @@ void m68030_device::device_start()
m68ec030_device::m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC030", tag, owner, clock, M68EC030, 32,32, "m68ec030", __FILE__)
{
-
}
void m68ec030_device::device_start()
@@ -2654,7 +2638,6 @@ void m68ec030_device::device_start()
m68040_device::m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68040", tag, owner, clock, M68040, 32,32, "m68040", __FILE__)
{
-
}
@@ -2668,7 +2651,6 @@ void m68040_device::device_start()
m68ec040_device::m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68EC040", tag, owner, clock, M68EC040, 32,32, "m68ec040", __FILE__)
{
-
}
void m68ec040_device::device_start()
@@ -2681,7 +2663,6 @@ void m68ec040_device::device_start()
m68lc040_device::m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "M68LC040", tag, owner, clock, M68LC040, 32,32, "m68lc040", __FILE__)
{
-
}
void m68lc040_device::device_start()
@@ -2693,7 +2674,6 @@ void m68lc040_device::device_start()
scc68070_device::scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "SCC68070", tag, owner, clock, SCC68070, 16,32, "scc68070", __FILE__)
{
-
}
void scc68070_device::device_start()
@@ -2705,14 +2685,12 @@ void scc68070_device::device_start()
fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "Freescale CPU32 Core", tag, owner, clock, FSCPU32, 32,32, "fscpu32", __FILE__)
{
-
}
fscpu32_device::fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock,
const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source)
: m68000_base_device(mconfig, name, tag, owner, clock, type, prg_data_width, prg_address_bits, internal_map, shortname, source)
{
-
}
@@ -2726,10 +2704,9 @@ void fscpu32_device::device_start()
mcf5206e_device::mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: m68000_base_device(mconfig, "MCF5206E", tag, owner, clock, MCF5206E, 32,32, "mcf5206e", __FILE__)
{
-
}
void mcf5206e_device::device_start()
{
init_cpu_coldfire();
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h
index 52a32815bda..590eb7f9152 100644
--- a/src/emu/cpu/mcs48/mcs48.h
+++ b/src/emu/cpu/mcs48/mcs48.h
@@ -88,7 +88,7 @@ enum
***************************************************************************/
#define MCS48_LC_CLOCK(_L, _C) \
- (1 / (2 * 3.14159265358979323846 * sqrt(_L * _C)))
+ (1 / (2 * 3.14159265358979323846 * sqrt(_L * _C)))
#define MCS48_ALE_CLOCK(_clock) \
attotime::from_hz(_clock/(3*5))
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index 0d75a8fdda8..1c9a8c5e188 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -238,9 +238,9 @@ static void log_add_disasm_comment(rsp_state *rsp, drcuml_block *block, UINT32 p
}
-#define VREG_B(reg, offset) rsp->v[(reg)].b[(offset)^1]
-#define W_VREG_S(reg, offset) rsp->v[(reg)].s[(offset)]
-#define VREG_S(reg, offset) (INT16)rsp->v[(reg)].s[(offset)]
+#define VREG_B(reg, offset) rsp->v[(reg)].b[(offset)^1]
+#define W_VREG_S(reg, offset) rsp->v[(reg)].s[(offset)]
+#define VREG_S(reg, offset) (INT16)rsp->v[(reg)].s[(offset)]
#define VEC_EL_2(x,z) (vector_elements_2[(x)][(z)])
@@ -1192,7 +1192,7 @@ static void cfunc_rsp_lwv(void *param)
#if USE_SIMD
rsp->xv[dest] = _mm_set_epi8(val[15], val[14], val[13], val[12], val[11], val[10], val[ 9], val[ 8],
- val[ 7], val[ 6], val[ 5], val[ 4], val[ 3], val[ 2], val[ 1], val[ 0]);
+ val[ 7], val[ 6], val[ 5], val[ 4], val[ 3], val[ 2], val[ 1], val[ 0]);
#endif
}
@@ -2850,67 +2850,67 @@ INLINE void cfunc_rsp_vmadh(void *param)
vres[i] = C_SATURATE_ACCUM1(caccumh, caccumm, i, 0x8000, 0x7fff);*/
}
-/* printf("%08x\n", rsp->pc);
- for (int i = 0; i < 8; i++)
- {
- if ((UINT16)vres[i] != vresult[i])
- {
- printf("Result mismatch:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
- printf("High accumulator:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
- printf("Mid accumulator:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
- printf("VS1:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
- printf("VS2:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
- fatalerror("asdf");
- }
- if (caccumh[i] != (UINT16)ACCUM_H(i))
- {
- printf("Result:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
- printf("High accumulator mismatch:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
- printf("Mid accumulator:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
- printf("VS1:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
- printf("VS2:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
- fatalerror("asdf");
- }
- if (caccumm[i] != (UINT16)ACCUM_M(i))
- {
- printf("Result:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
- printf("High accumulator:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
- printf("Mid accumulator mismatch:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
- printf("VS1:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
- printf("VS2:\n");
- printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
- printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
- fatalerror("asdf");
- }
- }*/
+/* printf("%08x\n", rsp->pc);
+ for (int i = 0; i < 8; i++)
+ {
+ if ((UINT16)vres[i] != vresult[i])
+ {
+ printf("Result mismatch:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
+ printf("High accumulator:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
+ printf("Mid accumulator:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
+ printf("VS1:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
+ printf("VS2:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
+ fatalerror("asdf");
+ }
+ if (caccumh[i] != (UINT16)ACCUM_H(i))
+ {
+ printf("Result:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
+ printf("High accumulator mismatch:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
+ printf("Mid accumulator:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
+ printf("VS1:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
+ printf("VS2:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
+ fatalerror("asdf");
+ }
+ if (caccumm[i] != (UINT16)ACCUM_M(i))
+ {
+ printf("Result:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vres[0], vres[1], vres[2], vres[3], vres[4], vres[5], vres[6], vres[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", vresult[0], vresult[1], vresult[2], vresult[3], vresult[4], vresult[5], vresult[6], vresult[7]);
+ printf("High accumulator:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumh[0], caccumh[1], caccumh[2], caccumh[3], caccumh[4], caccumh[5], caccumh[6], caccumh[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_H(0), ACCUM_H(1), ACCUM_H(2), ACCUM_H(3), ACCUM_H(4), ACCUM_H(5), ACCUM_H(6), ACCUM_H(7));
+ printf("Mid accumulator mismatch:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", caccumm[0], caccumm[1], caccumm[2], caccumm[3], caccumm[4], caccumm[5], caccumm[6], caccumm[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", ACCUM_M(0), ACCUM_M(1), ACCUM_M(2), ACCUM_M(3), ACCUM_M(4), ACCUM_M(5), ACCUM_M(6), ACCUM_M(7));
+ printf("VS1:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs1[0], vs1[1], vs1[2], vs1[3], vs1[4], vs1[5], vs1[6], vs1[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs1[0], svs1[1], svs1[2], svs1[3], svs1[4], svs1[5], svs1[6], svs1[7]);
+ printf("VS2:\n");
+ printf(" C: %04x %04x %04x %04x %04x %04x %04x %04x\n", vs2[0], vs2[1], vs2[2], vs2[3], vs2[4], vs2[5], vs2[6], vs2[7]);
+ printf("SIMD: %04x %04x %04x %04x %04x %04x %04x %04x\n", svs2[0], svs2[1], svs2[2], svs2[3], svs2[4], svs2[5], svs2[6], svs2[7]);
+ fatalerror("asdf");
+ }
+ }*/
WRITEBACK_RESULT();
#endif
}
@@ -2930,7 +2930,7 @@ INLINE void cfunc_rsp_vadd(void *param)
__m128i shuffled = _mm_shuffle_epi8(rsp->xv[VS2REG], vec_shuf_inverse[EL]);
__m128i unsat = rsp->xv[VS1REG];
__m128i carry = _mm_set_epi16(CARRY_FLAG(7), CARRY_FLAG(6), CARRY_FLAG(5), CARRY_FLAG(4),
- CARRY_FLAG(3), CARRY_FLAG(2), CARRY_FLAG(1), CARRY_FLAG(0));
+ CARRY_FLAG(3), CARRY_FLAG(2), CARRY_FLAG(1), CARRY_FLAG(0));
unsat = _mm_add_epi16(unsat, shuffled);
unsat = _mm_add_epi16(unsat, carry);
@@ -3011,7 +3011,7 @@ INLINE void cfunc_rsp_vsub(void *param)
__m128i shuffled = _mm_shuffle_epi8(rsp->xv[VS2REG], vec_shuf_inverse[EL]);
__m128i unsat = rsp->xv[VS1REG];
__m128i carry = _mm_set_epi16(CARRY_FLAG(7), CARRY_FLAG(6), CARRY_FLAG(5), CARRY_FLAG(4),
- CARRY_FLAG(3), CARRY_FLAG(2), CARRY_FLAG(1), CARRY_FLAG(0));
+ CARRY_FLAG(3), CARRY_FLAG(2), CARRY_FLAG(1), CARRY_FLAG(0));
unsat = _mm_sub_epi16(unsat, shuffled);
unsat = _mm_sub_epi16(unsat, carry);
@@ -3142,7 +3142,7 @@ INLINE void cfunc_rsp_vaddc(void *param)
#if USE_SIMD
__m128i shuf2 = _mm_shuffle_epi8(rsp->xv[VS2REG], vec_shuf_inverse[EL]);
- __m128i vec7531 = _mm_and_si128(rsp->xv[VS1REG], vec_lomask);
+ __m128i vec7531 = _mm_and_si128(rsp->xv[VS1REG], vec_lomask);
__m128i vec6420 = _mm_srli_epi32(rsp->xv[VS1REG], 16);
__m128i shuf7531 = _mm_and_si128(shuf2, vec_lomask);
__m128i shuf6420 = _mm_srli_epi32(shuf2, 16);
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index 82a2684a1e0..bf95bccca8d 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -1042,7 +1042,7 @@ void tms1100_cpu_device::state_string_export(const device_state_entry &entry, as
tms0980_cpu_device::tms0980_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms1xxx_cpu_device( mconfig, TMS0980, "TMS0980", tag, owner, clock, tms0980_decode, 0x00ff, 0x07ff, 7, 9, 4
- , 12, ADDRESS_MAP_NAME( tms0980_internal_rom ), 7, ADDRESS_MAP_NAME( tms0980_internal_ram ), "tms0980", __FILE__)
+ , 12, ADDRESS_MAP_NAME( tms0980_internal_rom ), 7, ADDRESS_MAP_NAME( tms0980_internal_ram ), "tms0980", __FILE__)
{
}
@@ -1056,14 +1056,14 @@ offs_t tms0980_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UIN
tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms1xxx_cpu_device( mconfig, TMS1000, "TMS1000", tag, owner, clock, tms1000_default_decode, 0x00ff, 0x07ff, 6, 8, 2
- , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), "tms1000", __FILE__)
+ , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), "tms1000", __FILE__)
{
}
tms1000_cpu_device::tms1000_cpu_device(const machine_config &mconfig, device_type type, const char*name, const char *tag, device_t *owner, UINT32 clock, UINT16 o_mask, UINT16 r_mask, const char *shortname, const char *source)
: tms1xxx_cpu_device( mconfig, type, name, tag, owner, clock, tms1000_default_decode, o_mask, r_mask, 6, 8, 2
- , 10, ADDRESS_MAP_NAME( program_10bit_8 ), 6, ADDRESS_MAP_NAME( data_6bit ), shortname, source )
+ , 10, ADDRESS_MAP_NAME( program_10bit_8 ), 6, ADDRESS_MAP_NAME( data_6bit ), shortname, source )
{
}
@@ -1095,14 +1095,14 @@ tms1270_cpu_device::tms1270_cpu_device(const machine_config &mconfig, const char
tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: tms1xxx_cpu_device( mconfig, TMS1100, "TMS1100", tag, owner, clock, tms1100_default_decode, 0x00ff, 0x07ff, 6, 8, 3
- , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), "tms1100", __FILE__ )
+ , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), "tms1100", __FILE__ )
{
}
tms1100_cpu_device::tms1100_cpu_device(const machine_config &mconfig, device_type type, const char*name, const char *tag, device_t *owner, UINT32 clock, UINT16 o_mask, UINT16 r_mask, const char *shortname, const char *source)
: tms1xxx_cpu_device( mconfig, type, name, tag, owner, clock, tms1100_default_decode, o_mask, r_mask, 6, 8, 3
- , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), shortname, source )
+ , 11, ADDRESS_MAP_NAME( program_11bit_8 ), 7, ADDRESS_MAP_NAME( data_7bit ), shortname, source )
{
}
@@ -1118,4 +1118,3 @@ tms1300_cpu_device::tms1300_cpu_device(const machine_config &mconfig, const char
: tms1100_cpu_device( mconfig, TMS1300, "TMS1300", tag, owner, clock, 0x00ff, 0xffff, "tms1300", __FILE__ )
{
}
-
diff --git a/src/emu/cpu/tms0980/tms0980.h b/src/emu/cpu/tms0980/tms0980.h
index 3a76d7e16c2..c600d81b44f 100644
--- a/src/emu/cpu/tms0980/tms0980.h
+++ b/src/emu/cpu/tms0980/tms0980.h
@@ -27,8 +27,8 @@ class tms1xxx_cpu_device : public cpu_device
public:
// construction/destruction
tms1xxx_cpu_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock
- , const UINT32* decode_table, UINT16 o_mask, UINT16 r_mask, UINT8 pc_size, UINT8 byte_size, UINT8 x_bits
- , int program_addrbus_width, address_map_constructor program, int data_addrbus_width, address_map_constructor data, const char *shortname, const char *source)
+ , const UINT32* decode_table, UINT16 o_mask, UINT16 r_mask, UINT8 pc_size, UINT8 byte_size, UINT8 x_bits
+ , int program_addrbus_width, address_map_constructor program, int data_addrbus_width, address_map_constructor data, const char *shortname, const char *source)
: cpu_device( mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, byte_size > 8 ? 16 : 8, program_addrbus_width, 0, program )
, m_data_config("data", ENDIANNESS_BIG, 8, data_addrbus_width, 0, data )
@@ -72,7 +72,7 @@ protected:
void set_cki_bus();
address_space_config m_program_config;
- address_space_config m_data_config;
+ address_space_config m_data_config;
UINT8 m_prev_pc; /* previous program counter */
UINT8 m_prev_pa; /* previous page address register */
diff --git a/src/emu/cpu/tms32082/dis32082.c b/src/emu/cpu/tms32082/dis32082.c
index 98b1fa3a82b..fc9f3e0e1d5 100644
--- a/src/emu/cpu/tms32082/dis32082.c
+++ b/src/emu/cpu/tms32082/dis32082.c
@@ -7,10 +7,10 @@
static const char *BCND_CONDITION[32] =
{
- "nev.b", "gt0.b", "eq0.b", "ge0.b", "lt0.b", "ne0.b", "le0.b", "alw.b",
- "nev.h", "gt0.h", "eq0.h", "ge0.h", "lt0.h", "ne0.h", "le0.h", "alw.h",
- "nev.w", "gt0.w", "eq0.w", "ge0.w", "lt0.w", "ne0.w", "le0.w", "alw.w",
- "nev.d", "gt0.d", "eq0.d", "ge0.d", "lt0.d", "ne0.d", "le0.d", "alw.d",
+ "nev.b", "gt0.b", "eq0.b", "ge0.b", "lt0.b", "ne0.b", "le0.b", "alw.b",
+ "nev.h", "gt0.h", "eq0.h", "ge0.h", "lt0.h", "ne0.h", "le0.h", "alw.h",
+ "nev.w", "gt0.w", "eq0.w", "ge0.w", "lt0.w", "ne0.w", "le0.w", "alw.w",
+ "nev.d", "gt0.d", "eq0.d", "ge0.d", "lt0.d", "ne0.d", "le0.d", "alw.d",
};
static char *output;
@@ -40,33 +40,33 @@ static char* get_creg_name(UINT32 reg)
switch (reg)
{
- case 0x0000: sprintf(buffer, "EPC"); break;
- case 0x0001: sprintf(buffer, "EIP"); break;
- case 0x0002: sprintf(buffer, "CONFIG"); break;
- case 0x0004: sprintf(buffer, "INTPEN"); break;
- case 0x0006: sprintf(buffer, "IE"); break;
- case 0x0008: sprintf(buffer, "FPST"); break;
- case 0x000a: sprintf(buffer, "PPERROR"); break;
- case 0x000d: sprintf(buffer, "PKTREQ"); break;
- case 0x000e: sprintf(buffer, "TCOUNT"); break;
- case 0x000f: sprintf(buffer, "TSCALE"); break;
- case 0x0010: sprintf(buffer, "FLTOP"); break;
- case 0x0011: sprintf(buffer, "FLTADR"); break;
- case 0x0012: sprintf(buffer, "FLTTAG"); break;
- case 0x0013: sprintf(buffer, "FLTDTL"); break;
- case 0x0014: sprintf(buffer, "FLTDTH"); break;
- case 0x0020: sprintf(buffer, "SYSSTK"); break;
- case 0x0021: sprintf(buffer, "SYSTMP"); break;
- case 0x0030: sprintf(buffer, "MPC"); break;
- case 0x0031: sprintf(buffer, "MIP"); break;
- case 0x0033: sprintf(buffer, "ECOMCNTL"); break;
- case 0x0034: sprintf(buffer, "ANASTAT"); break;
- case 0x0039: sprintf(buffer, "BRK1"); break;
- case 0x003a: sprintf(buffer, "BRK2"); break;
- case 0x4000: sprintf(buffer, "IN0P"); break;
- case 0x4001: sprintf(buffer, "IN1P"); break;
- case 0x4002: sprintf(buffer, "OUTP"); break;
- default: sprintf(buffer, "CR %04X\n", reg);
+ case 0x0000: sprintf(buffer, "EPC"); break;
+ case 0x0001: sprintf(buffer, "EIP"); break;
+ case 0x0002: sprintf(buffer, "CONFIG"); break;
+ case 0x0004: sprintf(buffer, "INTPEN"); break;
+ case 0x0006: sprintf(buffer, "IE"); break;
+ case 0x0008: sprintf(buffer, "FPST"); break;
+ case 0x000a: sprintf(buffer, "PPERROR"); break;
+ case 0x000d: sprintf(buffer, "PKTREQ"); break;
+ case 0x000e: sprintf(buffer, "TCOUNT"); break;
+ case 0x000f: sprintf(buffer, "TSCALE"); break;
+ case 0x0010: sprintf(buffer, "FLTOP"); break;
+ case 0x0011: sprintf(buffer, "FLTADR"); break;
+ case 0x0012: sprintf(buffer, "FLTTAG"); break;
+ case 0x0013: sprintf(buffer, "FLTDTL"); break;
+ case 0x0014: sprintf(buffer, "FLTDTH"); break;
+ case 0x0020: sprintf(buffer, "SYSSTK"); break;
+ case 0x0021: sprintf(buffer, "SYSTMP"); break;
+ case 0x0030: sprintf(buffer, "MPC"); break;
+ case 0x0031: sprintf(buffer, "MIP"); break;
+ case 0x0033: sprintf(buffer, "ECOMCNTL"); break;
+ case 0x0034: sprintf(buffer, "ANASTAT"); break;
+ case 0x0039: sprintf(buffer, "BRK1"); break;
+ case 0x003a: sprintf(buffer, "BRK2"); break;
+ case 0x4000: sprintf(buffer, "IN0P"); break;
+ case 0x4001: sprintf(buffer, "IN1P"); break;
+ case 0x4002: sprintf(buffer, "OUTP"); break;
+ default: sprintf(buffer, "CR %04X\n", reg);
}
return buffer;
@@ -92,36 +92,36 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
switch ((op >> 20) & 3)
{
- case 0: case 1: case 2: // Short immediate
+ case 0: case 1: case 2: // Short immediate
{
int subop = (op >> 15) & 0x7f;
switch (subop)
{
- case 0x00: print("illop0 "); break;
- case 0x01: print("trap %d", UIMM15(uimm15)); break;
- case 0x02: print("cmnd 0x%04X", UIMM15(uimm15)); break;
- case 0x04: print("rdcr R%d, %s", rd, get_creg_name(UIMM15(uimm15))); break;
- case 0x05: print("swcr %s, R%d, R%d", get_creg_name(UIMM15(uimm15)), rs, rd); break;
- case 0x06: print("brcr 0x%04X", UIMM15(uimm15)); break;
- case 0x08: print("shift%s.dz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x09: print("shift%s.dm %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0a: print("shift%s.ds %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0b: print("shift%s.ez %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0c: print("shift%s.em %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0d: print("shift%s.es %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0e: print("shift%s.iz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x0f: print("shift%s.im %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x11: print("and 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x12: print("and.tf 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x14: print("and.ft 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x16: print("xor 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x17: print("or 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x18: print("and.ff 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x19: print("xnor 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x1b: print("or.tf 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x1d: print("or.ft 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
- case 0x1e: print("or.ff 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x00: print("illop0 "); break;
+ case 0x01: print("trap %d", UIMM15(uimm15)); break;
+ case 0x02: print("cmnd 0x%04X", UIMM15(uimm15)); break;
+ case 0x04: print("rdcr R%d, %s", rd, get_creg_name(UIMM15(uimm15))); break;
+ case 0x05: print("swcr %s, R%d, R%d", get_creg_name(UIMM15(uimm15)), rs, rd); break;
+ case 0x06: print("brcr 0x%04X", UIMM15(uimm15)); break;
+ case 0x08: print("shift%s.dz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x09: print("shift%s.dm %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0a: print("shift%s.ds %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0b: print("shift%s.ez %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0c: print("shift%s.em %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0d: print("shift%s.es %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0e: print("shift%s.iz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x0f: print("shift%s.im %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x11: print("and 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x12: print("and.tf 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x14: print("and.ft 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x16: print("xor 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x17: print("or 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x18: print("and.ff 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x19: print("xnor 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x1b: print("or.tf 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x1d: print("or.ft 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
+ case 0x1e: print("or.ff 0x%04X, R%d, R%d", UIMM15(uimm15), rs, rd); break;
case 0x24: case 0x20:
print("ld.b 0x%04X(R%d), R%d", UIMM15(uimm15), rs, rd);
@@ -155,76 +155,76 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
print("st.d R%d, 0x%04X(R%d)", rd, UIMM15(uimm15), rs);
break;
- case 0x40: print("bsr 0x%08X, R%d", pc + (SIMM15(uimm15) * 4), link); break;
- case 0x41: print("bsr.a 0x%08X, R%d", pc + (SIMM15(uimm15) * 4), link); break;
- case 0x44: print("jsr 0x%04X(R%d), R%d", SIMM15(uimm15), rs, link); break;
- case 0x45: print("jsr.a 0x%04X(R%d), R%d", SIMM15(uimm15), rs, link); break;
- case 0x48: print("bbz 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
- case 0x49: print("bbz.a 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
- case 0x4a: print("bbo 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
- case 0x4b: print("bbo.a 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
- case 0x4c: print("bcnd 0x%08X, R%d, %s", pc + (SIMM15(uimm15) * 4), rs, BCND_CONDITION[rd]); break;
- case 0x4d: print("bcnd.a 0x%08X, R%d, %s", pc + (SIMM15(uimm15) * 4), rs, BCND_CONDITION[rd]); break;
- case 0x50: print("cmp 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
- case 0x58: print("add 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
- case 0x59: print("addu 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
- case 0x5a: print("sub 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
- case 0x5b: print("subu 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
+ case 0x40: print("bsr 0x%08X, R%d", pc + (SIMM15(uimm15) * 4), link); break;
+ case 0x41: print("bsr.a 0x%08X, R%d", pc + (SIMM15(uimm15) * 4), link); break;
+ case 0x44: print("jsr 0x%04X(R%d), R%d", SIMM15(uimm15), rs, link); break;
+ case 0x45: print("jsr.a 0x%04X(R%d), R%d", SIMM15(uimm15), rs, link); break;
+ case 0x48: print("bbz 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
+ case 0x49: print("bbz.a 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
+ case 0x4a: print("bbo 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
+ case 0x4b: print("bbo.a 0x%08X, R%d, #%d", pc + (SIMM15(uimm15) * 4), rs, bitnum); break;
+ case 0x4c: print("bcnd 0x%08X, R%d, %s", pc + (SIMM15(uimm15) * 4), rs, BCND_CONDITION[rd]); break;
+ case 0x4d: print("bcnd.a 0x%08X, R%d, %s", pc + (SIMM15(uimm15) * 4), rs, BCND_CONDITION[rd]); break;
+ case 0x50: print("cmp 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
+ case 0x58: print("add 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
+ case 0x59: print("addu 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
+ case 0x5a: print("sub 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
+ case 0x5b: print("subu 0x%08X, R%d, R%d", SIMM15(uimm15), rs, rd); break;
}
break;
}
- case 3: // Register / Long immediate
+ case 3: // Register / Long immediate
{
int subop = (op >> 12) & 0xff;
UINT32 imm32 = 0;
- if (op & (1 << 12)) // fetch 32-bit immediate if needed
+ if (op & (1 << 12)) // fetch 32-bit immediate if needed
imm32 = fetch();
switch (subop)
{
- case 0x02: print("trap %d", src1); break;
- case 0x03: print("trap %d", imm32); break;
- case 0x04: print("cmnd R%d", src1); break;
- case 0x05: print("cmnd 0x%08X", imm32); break;
- case 0x08: print("rdcr R%d, R%d", rd, src1); break;
- case 0x09: print("rdcr R%d, %s", rd, get_creg_name(imm32)); break;
- case 0x0a: print("swcr R%d, R%d, R%d", src1, rs, rd); break;
- case 0x0b: print("swcr %s, R%d, R%d", get_creg_name(imm32), rs, rd); break;
- case 0x0c: print("brcr R%d", src1); break;
- case 0x0d: print("brcr 0x%08X", imm32); break;
-
- case 0x10: print("shift%s.dz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x12: print("shift%s.dm %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x14: print("shift%s.ds %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x16: print("shift%s.ez %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x18: print("shift%s.em %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x1a: print("shift%s.es %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x1c: print("shift%s.iz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
- case 0x1e: print("shift%s.im %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
-
- case 0x22: print("and R%d, R%d, R%d", src1, rs, rd); break;
- case 0x23: print("and 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x24: print("and.tf R%d, R%d, R%d", src1, rs, rd); break;
- case 0x25: print("and.tf 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x28: print("and.ft R%d, R%d, R%d", src1, rs, rd); break;
- case 0x29: print("and.ft 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x2c: print("xor R%d, R%d, R%d", src1, rs, rd); break;
- case 0x2d: print("xor 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x2e: print("or R%d, R%d, R%d", src1, rs, rd); break;
- case 0x2f: print("or 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x30: print("and.ff R%d, R%d, R%d", src1, rs, rd); break;
- case 0x31: print("and.ff 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x32: print("xnor R%d, R%d, R%d", src1, rs, rd); break;
- case 0x33: print("xnor 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x36: print("or.tf R%d, R%d, R%d", src1, rs, rd); break;
- case 0x37: print("or.tf 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x3a: print("or.ft R%d, R%d, R%d", src1, rs, rd); break;
- case 0x3b: print("or.ft 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0x3c: print("or.ff R%d, R%d, R%d", src1, rs, rd); break;
- case 0x3d: print("or.ff 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x02: print("trap %d", src1); break;
+ case 0x03: print("trap %d", imm32); break;
+ case 0x04: print("cmnd R%d", src1); break;
+ case 0x05: print("cmnd 0x%08X", imm32); break;
+ case 0x08: print("rdcr R%d, R%d", rd, src1); break;
+ case 0x09: print("rdcr R%d, %s", rd, get_creg_name(imm32)); break;
+ case 0x0a: print("swcr R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x0b: print("swcr %s, R%d, R%d", get_creg_name(imm32), rs, rd); break;
+ case 0x0c: print("brcr R%d", src1); break;
+ case 0x0d: print("brcr 0x%08X", imm32); break;
+
+ case 0x10: print("shift%s.dz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x12: print("shift%s.dm %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x14: print("shift%s.ds %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x16: print("shift%s.ez %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x18: print("shift%s.em %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x1a: print("shift%s.es %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x1c: print("shift%s.iz %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+ case 0x1e: print("shift%s.im %d, %d, R%d, R%d", (op & (1 << 10)) ? "r" : "l", rotate, endmask, rs, rd); break;
+
+ case 0x22: print("and R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x23: print("and 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x24: print("and.tf R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x25: print("and.tf 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x28: print("and.ft R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x29: print("and.ft 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x2c: print("xor R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x2d: print("xor 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x2e: print("or R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x2f: print("or 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x30: print("and.ff R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x31: print("and.ff 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x32: print("xnor R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x33: print("xnor 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x36: print("or.tf R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x37: print("or.tf 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x3a: print("or.ft R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x3b: print("or.ft 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x3c: print("or.ff R%d, R%d, R%d", src1, rs, rd); break;
+ case 0x3d: print("or.ff 0x%08X, R%d, R%d", imm32, rs, rd); break;
case 0x48: case 0x40:
print("ld.b R%d(R%d), R%d", src1, rs, rd);
@@ -232,22 +232,22 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
case 0x49: case 0x41:
print("ld.b 0x%08X(R%d), R%d", imm32, rs, rd);
break;
- case 0x4a: case 0x42:
+ case 0x4a: case 0x42:
print("ld.h R%d(R%d), R%d", src1, rs, rd);
break;
- case 0x4b: case 0x43:
+ case 0x4b: case 0x43:
print("ld.h 0x%08X(R%d), R%d", imm32, rs, rd);
break;
- case 0x4c: case 0x44:
+ case 0x4c: case 0x44:
print("ld R%d(R%d), R%d", src1, rs, rd);
break;
- case 0x4d: case 0x45:
+ case 0x4d: case 0x45:
print("ld 0x%08X(R%d), R%d", imm32, rs, rd);
break;
- case 0x4e: case 0x46:
+ case 0x4e: case 0x46:
print("ld.d R%d(R%d), R%d", src1, rs, rd);
break;
- case 0x4f: case 0x47:
+ case 0x4f: case 0x47:
print("ld.d 0x%08X(R%d), R%d", imm32, rs, rd);
break;
case 0x58: case 0x50:
@@ -256,7 +256,7 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
case 0x59: case 0x51:
print("ld.ub 0x%08X(R%d), R%d", imm32, rs, rd);
break;
- case 0x5a: case 0x52:
+ case 0x5a: case 0x52:
print("ld.uh R%d(R%d), R%d", src1, rs, rd);
break;
case 0x5b: case 0x53:
@@ -272,66 +272,66 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
case 0x6a: case 0x62:
print("st.h R%d, R%d(R%d)", rd, src1, rs);
break;
- case 0x6b: case 0x63:
+ case 0x6b: case 0x63:
print("st.h R%d, 0x%08X(R%d)", rd, imm32, rs);
break;
- case 0x6c: case 0x64:
+ case 0x6c: case 0x64:
print("st R%d, R%d(R%d)", rd, src1, rs);
break;
- case 0x6d: case 0x65:
+ case 0x6d: case 0x65:
print("st R%d, 0x%08X(R%d)", rd, imm32, rs);
break;
case 0x6e: case 0x66:
print("st.d R%d, R%d(R%d)", rd, src1, rs);
break;
- case 0x6f: case 0x67:
+ case 0x6f: case 0x67:
print("st.d R%d, 0x%08X(R%d)", rd, imm32, rs);
break;
case 0x78: case 0x70:
print("dcache R%d(R%d)", src1, rs);
break;
- case 0x79: case 0x71:
+ case 0x79: case 0x71:
print("dcache 0x%08X(R%d)", imm32, rs);
break;
- case 0x80: print("bsr R%d, R%d", src1, link); break;
- case 0x81: print("bsr 0x%08X, R%d", imm32, link); break;
- case 0x82: print("bsr.a R%d, R%d", src1, rd); break;
- case 0x83: print("bsr.a 0x%08X, R%d", imm32, link); break;
- case 0x88: print("jsr R%d, R%d", src1, link); break;
- case 0x89: print("jsr 0x%08X, R%d", imm32, link); break;
- case 0x8a: print("jsr.a R%d, R%d", src1, link); break;
- case 0x8b: print("jsr.a 0x%08X, R%d", imm32, link); break;
- case 0x90: print("bbz R%d, R%d, #%d", src1, rs, bitnum); break;
- case 0x91: print("bbz 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
- case 0x92: print("bbz.a R%d, R%d, #%d", src1, rs, bitnum); break;
- case 0x93: print("bbz.a 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
- case 0x94: print("bbo R%d, R%d, #%d", src1, rs, bitnum); break;
- case 0x95: print("bbo 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
- case 0x96: print("bbo.a R%d, R%d, #%d", src1, rs, bitnum); break;
- case 0x97: print("bbo.a 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
- case 0x98: print("bcnd R%d, R%d, %s", src1, rs, BCND_CONDITION[rd]); break;
- case 0x99: print("bcnd 0x%08X, R%d, %s", imm32, rs, BCND_CONDITION[rd]); break;
- case 0x9a: print("bcnd.a R%d, R%d, %s", src1, rs, BCND_CONDITION[rd]); break;
- case 0x9b: print("bcnd.a 0x%08X, R%d, %s", imm32, rs, BCND_CONDITION[rd]); break;
- case 0xa0: print("cmp R%d, R%d, R%d", src1, rs, rd); break;
- case 0xa1: print("cmp 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xb0: print("add R%d, R%d, R%d", src1, rs, rd); break;
- case 0xb1: print("add 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xb2: print("addu R%d, R%d, R%d", src1, rs, rd); break;
- case 0xb3: print("addu 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xb4: print("sub R%d, R%d, R%d", src1, rs, rd); break;
- case 0xb5: print("sub 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xb6: print("subu R%d, R%d, R%d", src1, rs, rd); break;
- case 0xb7: print("subu 0x%08X, R%d, R%d", imm32, rs, rd); break;
-
- case 0xc0: print("vadd R%d, R%d, R%d", src1, rs, rd); break;
- case 0xc1: print("vadd 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xc2: print("vsub R%d, R%d, R%d", src1, rs, rd); break;
- case 0xc3: print("vsub 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xc4: print("vmpy R%d, R%d, R%d", src1, rs, rd); break;
- case 0xc5: print("vmpy 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0x80: print("bsr R%d, R%d", src1, link); break;
+ case 0x81: print("bsr 0x%08X, R%d", imm32, link); break;
+ case 0x82: print("bsr.a R%d, R%d", src1, rd); break;
+ case 0x83: print("bsr.a 0x%08X, R%d", imm32, link); break;
+ case 0x88: print("jsr R%d, R%d", src1, link); break;
+ case 0x89: print("jsr 0x%08X, R%d", imm32, link); break;
+ case 0x8a: print("jsr.a R%d, R%d", src1, link); break;
+ case 0x8b: print("jsr.a 0x%08X, R%d", imm32, link); break;
+ case 0x90: print("bbz R%d, R%d, #%d", src1, rs, bitnum); break;
+ case 0x91: print("bbz 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
+ case 0x92: print("bbz.a R%d, R%d, #%d", src1, rs, bitnum); break;
+ case 0x93: print("bbz.a 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
+ case 0x94: print("bbo R%d, R%d, #%d", src1, rs, bitnum); break;
+ case 0x95: print("bbo 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
+ case 0x96: print("bbo.a R%d, R%d, #%d", src1, rs, bitnum); break;
+ case 0x97: print("bbo.a 0x%08X, R%d, #%d", imm32, rs, bitnum); break;
+ case 0x98: print("bcnd R%d, R%d, %s", src1, rs, BCND_CONDITION[rd]); break;
+ case 0x99: print("bcnd 0x%08X, R%d, %s", imm32, rs, BCND_CONDITION[rd]); break;
+ case 0x9a: print("bcnd.a R%d, R%d, %s", src1, rs, BCND_CONDITION[rd]); break;
+ case 0x9b: print("bcnd.a 0x%08X, R%d, %s", imm32, rs, BCND_CONDITION[rd]); break;
+ case 0xa0: print("cmp R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xa1: print("cmp 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xb0: print("add R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xb1: print("add 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xb2: print("addu R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xb3: print("addu 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xb4: print("sub R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xb5: print("sub 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xb6: print("subu R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xb7: print("subu 0x%08X, R%d, R%d", imm32, rs, rd); break;
+
+ case 0xc0: print("vadd R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xc1: print("vadd 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xc2: print("vsub R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xc3: print("vsub 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xc4: print("vmpy R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xc5: print("vmpy 0x%08X, R%d, R%d", imm32, rs, rd); break;
case 0xd6: case 0xc6:
print("vmsub R%d, R%d, R%d", src1, rs, rd);
@@ -342,34 +342,34 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
case 0xd8: case 0xc8:
print("vrnd R%d, R%d, R%d", src1, rs, rd);
break;
- case 0xd9: case 0xc9:
+ case 0xd9: case 0xc9:
print("vrnd 0x%08X, R%d, R%d", imm32, rs, rd);
break;
- case 0xca: print("vrnd R%d, R%d, R%d", src1, rs, rd); break;
- case 0xcb: print("vrnd 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xcc: print("vmac R%d, R%d, R%d", src1, rs, rd); break;
- case 0xcd: print("vmac 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xce: print("vmsc R%d, R%d, R%d", src1, rs, rd); break;
- case 0xcf: print("vmsc 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xe0: print("fadd R%d, R%d, R%d", src1, rs, rd); break;
- case 0xe1: print("fadd 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xe2: print("fsub R%d, R%d, R%d", src1, rs, rd); break;
- case 0xe3: print("fsub 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xe4: print("fmpy R%d, R%d, R%d", src1, rs, rd); break;
- case 0xe5: print("fmpy 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xe6: print("fdiv R%d, R%d, R%d", src1, rs, rd); break;
- case 0xe7: print("fdiv 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xe8: print("frndx R%d, R%d", src1, rd); break;
- case 0xe9: print("frndx 0x%08X, R%d", imm32, rd); break;
- case 0xea: print("fcmp R%d, R%d, R%d", src1, rs, rd); break;
- case 0xeb: print("fcmp 0x%08X, R%d, R%d", imm32, rs, rd); break;
- case 0xee: print("fsqrt R%d, R%d", src1, rd); break;
- case 0xef: print("fsqrt 0x%08X, R%d", imm32, rd); break;
- case 0xf0: print("lmo R%d, R%d", rs, rd); break;
- case 0xf2: print("rmo R%d, R%d", rs, rd); break;
- case 0xfc: print("estop "); break;
-
+ case 0xca: print("vrnd R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xcb: print("vrnd 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xcc: print("vmac R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xcd: print("vmac 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xce: print("vmsc R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xcf: print("vmsc 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xe0: print("fadd R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xe1: print("fadd 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xe2: print("fsub R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xe3: print("fsub 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xe4: print("fmpy R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xe5: print("fmpy 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xe6: print("fdiv R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xe7: print("fdiv 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xe8: print("frndx R%d, R%d", src1, rd); break;
+ case 0xe9: print("frndx 0x%08X, R%d", imm32, rd); break;
+ case 0xea: print("fcmp R%d, R%d, R%d", src1, rs, rd); break;
+ case 0xeb: print("fcmp 0x%08X, R%d, R%d", imm32, rs, rd); break;
+ case 0xee: print("fsqrt R%d, R%d", src1, rd); break;
+ case 0xef: print("fsqrt 0x%08X, R%d", imm32, rd); break;
+ case 0xf0: print("lmo R%d, R%d", rs, rd); break;
+ case 0xf2: print("rmo R%d, R%d", rs, rd); break;
+ case 0xfc: print("estop "); break;
+
case 0xfe: case 0xff:
print("illopF ");
break;
@@ -384,4 +384,4 @@ static offs_t tms32082_disasm_mp(char *buffer, offs_t pc, const UINT8 *oprom)
CPU_DISASSEMBLE(tms32082_mp)
{
return tms32082_disasm_mp(buffer, pc, oprom);
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/tms32082/mp_ops.c b/src/emu/cpu/tms32082/mp_ops.c
index 03292557cd3..404f9e8a32d 100644
--- a/src/emu/cpu/tms32082/mp_ops.c
+++ b/src/emu/cpu/tms32082/mp_ops.c
@@ -18,15 +18,15 @@
#define ROTATE_L(x, r) ((x << r) | (x >> (32-r)))
#define ROTATE_R(x, r) ((x >> r) | (x << (32-r)))
-#define CMP_OVERFLOW32(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x80000000) ? 1 : 0)
-#define CMP_OVERFLOW16(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x8000) ? 1 : 0)
-#define CMP_OVERFLOW8(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x80) ? 1 : 0)
-#define CARRY32(x) (((x) & (((UINT64)1) << 32)) ? 1 : 0)
-#define CARRY16(x) (((x) & 0x10000) ? 1 : 0)
-#define CARRY8(x) (((x) & 0x100) ? 1 : 0)
-#define SIGN32(x) (((x) & 0x80000000) ? 1 : 0)
-#define SIGN16(x) (((x) & 0x8000) ? 1 : 0)
-#define SIGN8(x) (((x) & 0x80) ? 1 : 0)
+#define CMP_OVERFLOW32(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x80000000) ? 1 : 0)
+#define CMP_OVERFLOW16(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x8000) ? 1 : 0)
+#define CMP_OVERFLOW8(r, s, d) ((((d) ^ (s)) & ((d) ^ (r)) & 0x80) ? 1 : 0)
+#define CARRY32(x) (((x) & (((UINT64)1) << 32)) ? 1 : 0)
+#define CARRY16(x) (((x) & 0x10000) ? 1 : 0)
+#define CARRY8(x) (((x) & 0x100) ? 1 : 0)
+#define SIGN32(x) (((x) & 0x80000000) ? 1 : 0)
+#define SIGN16(x) (((x) & 0x8000) ? 1 : 0)
+#define SIGN8(x) (((x) & 0x80) ? 1 : 0)
@@ -34,31 +34,31 @@ bool tms32082_mp_device::test_condition(int condition, UINT32 value)
{
switch (condition)
{
- case 0x00: return false; // never, byte
- case 0x01: return (INT8)(value) > 0; // greater than zero, byte
- case 0x02: return (INT8)(value) == 0; // equals zero, byte
- case 0x03: return (INT8)(value) >= 0; // greater than or equal to zero, byte
- case 0x04: return (INT8)(value) < 0; // less than zero, byte
- case 0x05: return (INT8)(value) != 0; // not equal to zero, byte
- case 0x06: return (INT8)(value) <= 0; // less than or equal to zero, byte
- case 0x07: return true; // always, byte
- case 0x08: return false; // never, word
- case 0x09: return (INT16)(value) > 0; // greater than zero, word
- case 0x0a: return (INT16)(value) == 0; // equals zero, word
- case 0x0b: return (INT16)(value) >= 0; // greater than or equal to zero, word
- case 0x0c: return (INT16)(value) < 0; // less than zero, word
- case 0x0d: return (INT16)(value) != 0; // not equal to zero, word
- case 0x0e: return (INT16)(value) <= 0; // less than or equal to zero, word
- case 0x0f: return true; // always, word
- case 0x10: return false; // never, dword
- case 0x11: return (INT32)(value) > 0; // greater than zero, dword
- case 0x12: return (INT32)(value) == 0; // equals zero, dword
- case 0x13: return (INT32)(value) >= 0; // greater than or equal to zero, dword
- case 0x14: return (INT32)(value) < 0; // less than zero, dword
- case 0x15: return (INT32)(value) != 0; // not equal to zero, dword
- case 0x16: return (INT32)(value) <= 0; // less than or equal to zero, dword
- case 0x17: return true; // always, dword
- default: return false; // reserved
+ case 0x00: return false; // never, byte
+ case 0x01: return (INT8)(value) > 0; // greater than zero, byte
+ case 0x02: return (INT8)(value) == 0; // equals zero, byte
+ case 0x03: return (INT8)(value) >= 0; // greater than or equal to zero, byte
+ case 0x04: return (INT8)(value) < 0; // less than zero, byte
+ case 0x05: return (INT8)(value) != 0; // not equal to zero, byte
+ case 0x06: return (INT8)(value) <= 0; // less than or equal to zero, byte
+ case 0x07: return true; // always, byte
+ case 0x08: return false; // never, word
+ case 0x09: return (INT16)(value) > 0; // greater than zero, word
+ case 0x0a: return (INT16)(value) == 0; // equals zero, word
+ case 0x0b: return (INT16)(value) >= 0; // greater than or equal to zero, word
+ case 0x0c: return (INT16)(value) < 0; // less than zero, word
+ case 0x0d: return (INT16)(value) != 0; // not equal to zero, word
+ case 0x0e: return (INT16)(value) <= 0; // less than or equal to zero, word
+ case 0x0f: return true; // always, word
+ case 0x10: return false; // never, dword
+ case 0x11: return (INT32)(value) > 0; // greater than zero, dword
+ case 0x12: return (INT32)(value) == 0; // equals zero, dword
+ case 0x13: return (INT32)(value) >= 0; // greater than or equal to zero, dword
+ case 0x14: return (INT32)(value) < 0; // less than zero, dword
+ case 0x15: return (INT32)(value) != 0; // not equal to zero, dword
+ case 0x16: return (INT32)(value) <= 0; // less than or equal to zero, dword
+ case 0x17: return true; // always, dword
+ default: return false; // reserved
}
}
@@ -66,7 +66,7 @@ void tms32082_mp_device::execute_short_imm()
{
switch ((m_ir >> 15) & 0x7f)
{
- case 0x04: // rdcr
+ case 0x04: // rdcr
{
int rd = OP_RD();
INT32 imm = OP_SIMM15();
@@ -78,7 +78,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x05: // swcr
+ case 0x05: // swcr
{
int rd = OP_RD();
int rs = OP_RS();
@@ -92,7 +92,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x0b: // shift.ez
+ case 0x0b: // shift.ez
{
int r = (m_ir & (1 << 10));
int inv = (m_ir & (1 << 11));
@@ -109,11 +109,11 @@ void tms32082_mp_device::execute_short_imm()
UINT32 compmask = endmask & shiftmask;
UINT32 res = 0;
- if (r) // right
+ if (r) // right
{
res = ROTATE_R(source, rot) & compmask;
}
- else // left
+ else // left
{
res = ROTATE_L(source, rot) & compmask;
}
@@ -123,7 +123,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x0e: // shift.iz
+ case 0x0e: // shift.iz
{
int r = (m_ir & (1 << 10));
int inv = (m_ir & (1 << 11));
@@ -139,11 +139,11 @@ void tms32082_mp_device::execute_short_imm()
UINT32 compmask = endmask & ~shiftmask;
UINT32 res = 0;
- if (r) // right
+ if (r) // right
{
res = ROTATE_R(source, rot) & compmask;
}
- else // left
+ else // left
{
res = ROTATE_L(source, rot) & compmask;
}
@@ -153,7 +153,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x11: // and
+ case 0x11: // and
{
int rd = OP_RD();
int rs = OP_RS();
@@ -164,7 +164,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x17: // or
+ case 0x17: // or
{
int rd = OP_RD();
int rs = OP_RS();
@@ -176,7 +176,7 @@ void tms32082_mp_device::execute_short_imm()
}
case 0x36:
- case 0x32: // st
+ case 0x32: // st
{
int rd = OP_RD();
int base = OP_BASE();
@@ -192,7 +192,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x49: // bbz.a
+ case 0x49: // bbz.a
{
int bitnum = OP_BITNUM();
INT32 offset = OP_SIMM15();
@@ -205,7 +205,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x4b: // bbo.a
+ case 0x4b: // bbo.a
{
int bitnum = OP_BITNUM();
INT32 offset = OP_SIMM15();
@@ -218,7 +218,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x4d: // bcnd.a
+ case 0x4d: // bcnd.a
{
INT32 offset = OP_SIMM15();
int code = OP_RD();
@@ -231,7 +231,7 @@ void tms32082_mp_device::execute_short_imm()
break;
}
- case 0x50: // cmp
+ case 0x50: // cmp
{
UINT32 src1 = OP_SIMM15();
UINT32 src2 = m_reg[OP_RS()];
@@ -262,45 +262,45 @@ void tms32082_mp_device::execute_short_imm()
UINT32 flags = 0;
// 32-bits (bits 20-29)
- flags |= ((c32) & 1) << 29; // higher than or same (C)
- flags |= ((~c32) & 1) << 28; // lower than (~C)
- flags |= ((~c32|z32) & 1) << 27; // lower than or same (~C|Z)
- flags |= ((c32&~z32) & 1) << 26; // higher than (C&~Z)
- flags |= (((n32&v32)|(~n32&~v32)) & 1) << 25; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n32&~v32)|(~n32&v32)) & 1) << 24; // less than (N&~V)|(~N&V)
- flags |= (((n32&~v32)|(~n32&v32)|(z32)) & 1) << 23; // less than or equal (N&~V)|(~N&V)|Z
- flags |= (((n32&v32&~z32)|(~n32&~v32&~z32)) & 1) << 22; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z32) & 1) << 21; // not equal (~Z)
- flags |= ((z32) & 1) << 20; // equal (Z)
+ flags |= ((c32) & 1) << 29; // higher than or same (C)
+ flags |= ((~c32) & 1) << 28; // lower than (~C)
+ flags |= ((~c32|z32) & 1) << 27; // lower than or same (~C|Z)
+ flags |= ((c32&~z32) & 1) << 26; // higher than (C&~Z)
+ flags |= (((n32&v32)|(~n32&~v32)) & 1) << 25; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n32&~v32)|(~n32&v32)) & 1) << 24; // less than (N&~V)|(~N&V)
+ flags |= (((n32&~v32)|(~n32&v32)|(z32)) & 1) << 23; // less than or equal (N&~V)|(~N&V)|Z
+ flags |= (((n32&v32&~z32)|(~n32&~v32&~z32)) & 1) << 22; // greater than (N&V&~Z)|(~N&~V&~Z)
+ flags |= ((~z32) & 1) << 21; // not equal (~Z)
+ flags |= ((z32) & 1) << 20; // equal (Z)
// 16-bits (bits 10-19)
- flags |= ((c16) & 1) << 19; // higher than or same (C)
- flags |= ((~c16) & 1) << 18; // lower than (~C)
- flags |= ((~c16|z16) & 1) << 17; // lower than or same (~C|Z)
- flags |= ((c16&~z16) & 1) << 16; // higher than (C&~Z)
- flags |= (((n16&v16)|(~n16&~v16)) & 1) << 15; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n16&~v16)|(~n16&v16)) & 1) << 14; // less than (N&~V)|(~N&V)
- flags |= (((n16&~v16)|(~n16&v16)|(z16)) & 1) << 13; // less than or equal (N&~V)|(~N&V)|Z
- flags |= (((n16&v16&~z16)|(~n16&~v16&~z16)) & 1) << 12; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z16) & 1) << 11; // not equal (~Z)
- flags |= ((z16) & 1) << 10; // equal (Z)
+ flags |= ((c16) & 1) << 19; // higher than or same (C)
+ flags |= ((~c16) & 1) << 18; // lower than (~C)
+ flags |= ((~c16|z16) & 1) << 17; // lower than or same (~C|Z)
+ flags |= ((c16&~z16) & 1) << 16; // higher than (C&~Z)
+ flags |= (((n16&v16)|(~n16&~v16)) & 1) << 15; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n16&~v16)|(~n16&v16)) & 1) << 14; // less than (N&~V)|(~N&V)
+ flags |= (((n16&~v16)|(~n16&v16)|(z16)) & 1) << 13; // less than or equal (N&~V)|(~N&V)|Z
+ flags |= (((n16&v16&~z16)|(~n16&~v16&~z16)) & 1) << 12; // greater than (N&V&~Z)|(~N&~V&~Z)
+ flags |= ((~z16) & 1) << 11; // not equal (~Z)
+ flags |= ((z16) & 1) << 10; // equal (Z)
// 8-bits (bits 0-9)
- flags |= ((c8) & 1) << 9; // higher than or same (C)
- flags |= ((~c8) & 1) << 8; // lower than (~C)
- flags |= ((~c8|z8) & 1) << 7; // lower than or same (~C|Z)
- flags |= ((c8&~z8) & 1) << 6; // higher than (C&~Z)
- flags |= (((n8&v8)|(~n8&~v8)) & 1) << 5; // greater than or equal (N&V)|(~N&~V)
- flags |= (((n8&~v8)|(~n8&v8)) & 1) << 4; // less than (N&~V)|(~N&V)
- flags |= (((n8&~v8)|(~n8&v8)|(z8)) & 1) << 3; // less than or equal (N&~V)|(~N&V)|Z
- flags |= (((n8&v8&~z8)|(~n8&~v8&~z8)) & 1) << 2; // greater than (N&V&~Z)|(~N&~V&~Z)
- flags |= ((~z8) & 1) << 1; // not equal (~Z)
- flags |= ((z8) & 1) << 0; // equal (Z)
+ flags |= ((c8) & 1) << 9; // higher than or same (C)
+ flags |= ((~c8) & 1) << 8; // lower than (~C)
+ flags |= ((~c8|z8) & 1) << 7; // lower than or same (~C|Z)
+ flags |= ((c8&~z8) & 1) << 6; // higher than (C&~Z)
+ flags |= (((n8&v8)|(~n8&~v8)) & 1) << 5; // greater than or equal (N&V)|(~N&~V)
+ flags |= (((n8&~v8)|(~n8&v8)) & 1) << 4; // less than (N&~V)|(~N&V)
+ flags |= (((n8&~v8)|(~n8&v8)|(z8)) & 1) << 3; // less than or equal (N&~V)|(~N&V)|Z
+ flags |= (((n8&v8&~z8)|(~n8&~v8&~z8)) & 1) << 2; // greater than (N&V&~Z)|(~N&~V&~Z)
+ flags |= ((~z8) & 1) << 1; // not equal (~Z)
+ flags |= ((z8) & 1) << 0; // equal (Z)
if (rd)
m_reg[rd] = flags;
break;
}
- case 0x59: // addu
+ case 0x59: // addu
{
INT32 imm = OP_SIMM15();
int rd = OP_RD();
@@ -327,7 +327,7 @@ void tms32082_mp_device::execute_reg_long_imm()
switch ((m_ir >> 12) & 0xff)
{
- case 0x04: // cmnd
+ case 0x04: // cmnd
{
UINT32 data = has_imm ? imm32 : m_reg[OP_SRC1()];
@@ -335,7 +335,7 @@ void tms32082_mp_device::execute_reg_long_imm()
break;
}
- case 0x16: // shift.ez
+ case 0x16: // shift.ez
{
int r = (m_ir & (1 << 10));
int inv = (m_ir & (1 << 11));
@@ -352,11 +352,11 @@ void tms32082_mp_device::execute_reg_long_imm()
UINT32 compmask = endmask & shiftmask;
UINT32 res = 0;
- if (r) // right
+ if (r) // right
{
res = ROTATE_R(source, rot) & compmask;
}
- else // left
+ else // left
{
res = ROTATE_L(source, rot) & compmask;
}
@@ -367,7 +367,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0x24:
- case 0x25: // and.tf
+ case 0x25: // and.tf
{
int rd = OP_RD();
int rs = OP_RS();
@@ -379,7 +379,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0x2e:
- case 0x2f: // or
+ case 0x2f: // or
{
int rd = OP_RD();
int rs = OP_RS();
@@ -389,7 +389,7 @@ void tms32082_mp_device::execute_reg_long_imm()
break;
}
- case 0x43: // ld.h
+ case 0x43: // ld.h
case 0x4b:
{
int shift = (m_ir & (1 << 11)) ? 1 : 0;
@@ -401,7 +401,7 @@ void tms32082_mp_device::execute_reg_long_imm()
UINT32 address = m_reg[base] + ((has_imm ? imm32 : m_reg[OP_SRC1()]) << shift);
UINT32 r = m_program->read_word(address);
if (r & 0x8000) r |= 0xffff0000;
-
+
if (rd)
m_reg[rd] = r;
@@ -411,7 +411,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0x6d:
- case 0x65: // st
+ case 0x65: // st
{
int shift = (m_ir & (1 << 11)) ? 2 : 0;
int m = m_ir & (1 << 15);
@@ -427,7 +427,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0x88:
- case 0x89: // jsr
+ case 0x89: // jsr
{
int link = OP_LINK();
int base = OP_BASE();
@@ -445,7 +445,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0x8a:
- case 0x8b: // jsr.a
+ case 0x8b: // jsr.a
{
int link = OP_LINK();
int base = OP_BASE();
@@ -458,7 +458,7 @@ void tms32082_mp_device::execute_reg_long_imm()
}
case 0xb2:
- case 0xb3: // addu
+ case 0xb3: // addu
{
int rd = OP_RD();
int rs = OP_RS();
@@ -488,4 +488,4 @@ void tms32082_mp_device::execute()
execute_reg_long_imm();
break;
}
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/tms32082/tms32082.c b/src/emu/cpu/tms32082/tms32082.c
index 9c8996e6ff5..dfffe66c501 100644
--- a/src/emu/cpu/tms32082/tms32082.c
+++ b/src/emu/cpu/tms32082/tms32082.c
@@ -1,7 +1,7 @@
/*
- Texas Instruments TMS320C82 DSP Emulator
+ Texas Instruments TMS320C82 DSP Emulator
- Written by Ville Linde
+ Written by Ville Linde
*/
@@ -213,7 +213,7 @@ UINT32 tms32082_mp_device::read_creg(int reg)
{
switch (reg)
{
- case 0xa: // PPERROR
+ case 0xa: // PPERROR
return 0;
default:
@@ -258,4 +258,4 @@ void tms32082_mp_device::execute_run()
};
return;
-} \ No newline at end of file
+}
diff --git a/src/emu/cpu/tms32082/tms32082.h b/src/emu/cpu/tms32082/tms32082.h
index 28fcfb36f59..890729fb77e 100644
--- a/src/emu/cpu/tms32082/tms32082.h
+++ b/src/emu/cpu/tms32082/tms32082.h
@@ -64,7 +64,7 @@ protected:
virtual UINT32 execute_max_cycles() const { return 1; }
virtual UINT32 execute_input_lines() const { return 0; }
virtual void execute_run();
-
+
// device_memory_interface overrides
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const
{
@@ -114,4 +114,4 @@ protected:
extern const device_type TMS32082_MP;
-#endif /* __TMS32082_H__ */ \ No newline at end of file
+#endif /* __TMS32082_H__ */
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index a7e9f2f4272..9094d3e70c1 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -3278,19 +3278,19 @@ void device_debug::set_state(symbol_table &table, void *ref, UINT64 value)
// breakpoint - constructor
//-------------------------------------------------
-device_debug::breakpoint::breakpoint(device_debug* debugInterface,
- symbol_table &symbols,
- int index,
- offs_t address,
- const char *condition,
- const char *action)
+device_debug::breakpoint::breakpoint(device_debug* debugInterface,
+ symbol_table &symbols,
+ int index,
+ offs_t address,
+ const char *condition,
+ const char *action)
: m_debugInterface(debugInterface),
- m_next(NULL),
- m_index(index),
- m_enabled(true),
- m_address(address),
- m_condition(&symbols, (condition != NULL) ? condition : "1"),
- m_action((action != NULL) ? action : "")
+ m_next(NULL),
+ m_index(index),
+ m_enabled(true),
+ m_address(address),
+ m_condition(&symbols, (condition != NULL) ? condition : "1"),
+ m_action((action != NULL) ? action : "")
{
}
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 0d69afb951a..676c424a6cb 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -80,11 +80,11 @@ public:
public:
// construction/destruction
breakpoint(device_debug* debugInterface,
- symbol_table &symbols,
- int index,
- offs_t address,
- const char *condition = NULL,
- const char *action = NULL);
+ symbol_table &symbols,
+ int index,
+ offs_t address,
+ const char *condition = NULL,
+ const char *action = NULL);
// getters
const device_debug *debugInterface() const { return m_debugInterface; }
@@ -118,14 +118,14 @@ public:
public:
// construction/destruction
- watchpoint(symbol_table &symbols,
- int index,
- address_space &space,
- int type,
- offs_t address,
- offs_t length,
- const char *condition = NULL,
- const char *action = NULL);
+ watchpoint(symbol_table &symbols,
+ int index,
+ address_space &space,
+ int type,
+ offs_t address,
+ offs_t length,
+ const char *condition = NULL,
+ const char *action = NULL);
// getters
watchpoint *next() const { return m_next; }
@@ -193,7 +193,7 @@ public:
int logaddrchars(address_spacenum spacenum = AS_0) const { return (m_memory != NULL && m_memory->has_space(spacenum)) ? m_memory->space(spacenum).logaddrchars() : 8; }
int min_opcode_bytes() const { return (m_disasm != NULL) ? m_disasm->max_opcode_bytes() : 1; }
int max_opcode_bytes() const { return (m_disasm != NULL) ? m_disasm->max_opcode_bytes() : 1; }
- device_t& device() const { return m_device; }
+ device_t& device() const { return m_device; }
// hooks used by the rest of the system
diff --git a/src/emu/debug/dvbpoints.c b/src/emu/debug/dvbpoints.c
index 990e5974155..de04e24c101 100644
--- a/src/emu/debug/dvbpoints.c
+++ b/src/emu/debug/dvbpoints.c
@@ -2,7 +2,7 @@
dvpoints.c
- Breakpoint debugger view.
+ Breakpoint debugger view.
****************************************************************************
@@ -52,7 +52,7 @@
debug_view_breakpoints::debug_view_breakpoints(running_machine &machine, debug_view_osd_update_func osdupdate, void *osdprivate)
: debug_view(machine, DVT_BREAK_POINTS, osdupdate, osdprivate),
- m_sortType(SORT_INDEX_ASCENDING)
+ m_sortType(SORT_INDEX_ASCENDING)
{
// fail if no available sources
enumerate_sources();
@@ -126,7 +126,7 @@ void debug_view_breakpoints::view_char(int chval)
void debug_view_breakpoints::view_click(const int button, const debug_view_xy& pos)
{
bool clickedTopRow = (m_topleft.y == pos.y);
-
+
if (clickedTopRow)
{
if (pos.x < 5 && m_sortType == SORT_INDEX_ASCENDING)
@@ -163,13 +163,13 @@ void debug_view_breakpoints::view_click(const int button, const debug_view_xy& p
const int bpIndex = pos.y-1;
if (bpIndex > numBPs || bpIndex < 0)
return;
-
+
// Enable / disable
if (bpList[bpIndex]->enabled())
bpList[bpIndex]->setEnabled(false);
else
bpList[bpIndex]->setEnabled(true);
-
+
delete[] bpList;
}
@@ -295,7 +295,7 @@ int debug_view_breakpoints::breakpoints(SortMode sort, device_debug::breakpoint*
numBPs++;
bpList = new device_debug::breakpoint*[numBPs];
}
-
+
int bpAddIndex = 1;
for (const debug_view_source *source = m_source_list.head(); source != NULL; source = source->next())
{
@@ -310,7 +310,7 @@ int debug_view_breakpoints::breakpoints(SortMode sort, device_debug::breakpoint*
}
}
}
-
+
// And now for the sort
switch (m_sortType)
{
@@ -353,7 +353,7 @@ int debug_view_breakpoints::breakpoints(SortMode sort, device_debug::breakpoint*
qsort(bpList, numBPs, sizeof(device_debug::breakpoint*), cActionDescending);
break;
}
-
+
return numBPs;
}
@@ -368,7 +368,7 @@ void debug_view_breakpoints::view_update()
// Gather a list of all the breakpoints for all the CPUs
device_debug::breakpoint** bpList = NULL;
const int numBPs = breakpoints(SORT_NONE, bpList);
-
+
// Set the view region so the scroll bars update
m_total.y = numBPs+1;
@@ -377,7 +377,7 @@ void debug_view_breakpoints::view_update()
for (int row = 0; row < m_visible.y; row++)
{
UINT32 effrow = m_topleft.y + row;
-
+
// Header
if (row == 0)
{
@@ -406,7 +406,7 @@ void debug_view_breakpoints::view_update()
if (m_sortType == SORT_ACTION_ASCENDING) header.catprintf("\\");
else if (m_sortType == SORT_ACTION_DESCENDING) header.catprintf("/");
pad_astring_to_length(header, 80);
-
+
for (int i = 0; i < m_visible.x; i++)
{
dest->byte = (i < header.len()) ? header[i] : ' ';
@@ -421,8 +421,8 @@ void debug_view_breakpoints::view_update()
if (bpi < numBPs && bpi >= 0)
{
device_debug::breakpoint* bp = bpList[bpi];
-
- astring buffer;
+
+ astring buffer;
buffer.printf("%x", bp->index());
pad_astring_to_length(buffer, 5);
buffer.catprintf("%c", bp->enabled() ? 'X' : 'O');
@@ -441,21 +441,21 @@ void debug_view_breakpoints::view_update()
buffer.catprintf("%s", bp->action());
pad_astring_to_length(buffer, 80);
}
-
+
for (int i = 0; i < m_visible.x; i++)
{
dest->byte = (i < buffer.len()) ? buffer[i] : ' ';
dest->attrib = DCA_NORMAL;
-
+
// Color disabled breakpoints red
if (i == 5 && dest->byte == 'O')
dest->attrib = DCA_CHANGED;
-
+
dest++;
}
continue;
}
-
+
// Fill the remaining vertical space
for (int i = 0; i < m_visible.x; i++)
{
@@ -464,6 +464,6 @@ void debug_view_breakpoints::view_update()
dest++;
}
}
-
+
delete[] bpList;
}
diff --git a/src/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h
index d20e03fa49a..c64d80f44d1 100644
--- a/src/emu/debug/dvbpoints.h
+++ b/src/emu/debug/dvbpoints.h
@@ -2,7 +2,7 @@
dvpoints.h
- Breakpoint debugger view.
+ Breakpoint debugger view.
****************************************************************************
@@ -64,23 +64,23 @@ class debug_view_breakpoints : public debug_view
virtual ~debug_view_breakpoints();
public:
- enum SortMode
- {
- SORT_NONE,
- SORT_INDEX_ASCENDING,
- SORT_INDEX_DESCENDING,
- SORT_ENABLED_ASCENDING,
- SORT_ENABLED_DESCENDING,
- SORT_CPU_ASCENDING,
- SORT_CPU_DESCENDING,
- SORT_ADDRESS_ASCENDING,
- SORT_ADDRESS_DESCENDING,
- SORT_CONDITION_ASCENDING,
- SORT_CONDITION_DESCENDING,
- SORT_ACTION_ASCENDING,
- SORT_ACTION_DESCENDING
- };
-
+ enum SortMode
+ {
+ SORT_NONE,
+ SORT_INDEX_ASCENDING,
+ SORT_INDEX_DESCENDING,
+ SORT_ENABLED_ASCENDING,
+ SORT_ENABLED_DESCENDING,
+ SORT_CPU_ASCENDING,
+ SORT_CPU_DESCENDING,
+ SORT_ADDRESS_ASCENDING,
+ SORT_ADDRESS_DESCENDING,
+ SORT_CONDITION_ASCENDING,
+ SORT_CONDITION_DESCENDING,
+ SORT_ACTION_ASCENDING,
+ SORT_ACTION_DESCENDING
+ };
+
// getters
// setters
@@ -100,7 +100,7 @@ private:
// internal state
- SortMode m_sortType;
+ SortMode m_sortType;
};
diff --git a/src/emu/driver.c b/src/emu/driver.c
index 224d658a5e9..deab4dbe73b 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -919,4 +919,4 @@ PALETTE_INIT_MEMBER(driver_device, RRRRR_GGGGGG_BBBBB)
for (i = 0; i < 0x10000; i++)
palette_set_color(machine(), i, MAKE_RGB(pal5bit(i >> 11), pal6bit(i >> 5), pal5bit(i >> 0)));
-} \ No newline at end of file
+}
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 8bec8eaa820..5f614d5aa70 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -381,7 +381,7 @@ public:
// general fatal error handlers
DECLARE_READ8_MEMBER( fatal_generic_read );
DECLARE_WRITE8_MEMBER( fatal_generic_write );
-
+
// generic palette init routines
DECLARE_PALETTE_INIT( all_black );
DECLARE_PALETTE_INIT( black_and_white );
diff --git a/src/emu/drivlgcy.h b/src/emu/drivlgcy.h
index 86612245708..2cfe59f180a 100644
--- a/src/emu/drivlgcy.h
+++ b/src/emu/drivlgcy.h
@@ -51,23 +51,23 @@
#define MCFG_MACHINE_RESET(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_RESET, MACHINE_RESET_NAME(_func));
-
+
#define MCFG_SOUND_START(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_SOUND_START, SOUND_START_NAME(_func));
-
+
#define MCFG_SOUND_RESET(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_SOUND_RESET, SOUND_RESET_NAME(_func));
-
+
#define MCFG_PALETTE_INIT(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, PALETTE_INIT_NAME(_func));
-
+
#define MCFG_VIDEO_START(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_START, VIDEO_START_NAME(_func));
-
+
#define MCFG_VIDEO_RESET(_func) \
driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func));
-
+
#define MACHINE_START_CALL(name) MACHINE_START_NAME(name)(machine)
#define MACHINE_RESET_CALL(name) MACHINE_RESET_NAME(name)(machine)
diff --git a/src/emu/machine/68307.c b/src/emu/machine/68307.c
index ce82c7132fe..ecb663f2c2a 100644
--- a/src/emu/machine/68307.c
+++ b/src/emu/machine/68307.c
@@ -205,7 +205,7 @@ void m68307cpu_device::device_start()
/* basic CS logic, timers, mbus, serial logic
set via remappable register
*/
-
+
init16_m68307(*program);
m68307SIM = new m68307_sim();
diff --git a/src/emu/machine/68307.h b/src/emu/machine/68307.h
index 969138559cb..99e71d66e6e 100644
--- a/src/emu/machine/68307.h
+++ b/src/emu/machine/68307.h
@@ -96,4 +96,4 @@ extern void m68307_serial_interrupt(m68307cpu_device *cpudev, int vector);
extern void m68307_mbus_interrupt(m68307cpu_device *cpudev);
extern void m68307_licr2_interrupt(m68307cpu_device *cpudev);
-#endif \ No newline at end of file
+#endif
diff --git a/src/emu/machine/68340.c b/src/emu/machine/68340.c
index bf02cb92a88..ec6f5bbf6bd 100644
--- a/src/emu/machine/68340.c
+++ b/src/emu/machine/68340.c
@@ -146,5 +146,3 @@ void m68340cpu_device::device_start()
internal = &this->space(AS_PROGRAM);
}
-
-
diff --git a/src/emu/machine/68340.h b/src/emu/machine/68340.h
index 5ba3dc2b643..fdcd43e1520 100644
--- a/src/emu/machine/68340.h
+++ b/src/emu/machine/68340.h
@@ -65,4 +65,4 @@ extern UINT16 m68340_get_cs(m68340cpu_device *device, offs_t address);
-#endif \ No newline at end of file
+#endif
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index 70bea84c0ce..1f335583a37 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -96,7 +96,7 @@ void ds2404_device::device_start()
m_rtc[2] = (current_time >> 8) & 0xff;
m_rtc[3] = (current_time >> 16) & 0xff;
m_rtc[4] = (current_time >> 24) & 0xff;
-
+
for (int i = 0; i < 8; i++)
m_state[i] = DS2404_STATE_IDLE;
@@ -361,7 +361,7 @@ void ds2404_device::device_timer(emu_timer &timer, device_timer_id id, int param
break;
}
}
-
+
break;
}
diff --git a/src/emu/machine/jvsdev.c b/src/emu/machine/jvsdev.c
index 5402bb81118..d85cb23a2cd 100644
--- a/src/emu/machine/jvsdev.c
+++ b/src/emu/machine/jvsdev.c
@@ -8,7 +8,7 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_
}
jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
jvs_host_tag = 0;
next_device = 0;
diff --git a/src/emu/machine/jvshost.c b/src/emu/machine/jvshost.c
index 11351d66e7d..96fba6c1acb 100644
--- a/src/emu/machine/jvshost.c
+++ b/src/emu/machine/jvshost.c
@@ -26,8 +26,8 @@ void jvs_host::device_reset()
memset(recv_buffer, 0, sizeof(recv_buffer));
}
-jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+ : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
{
first_device = 0;
}
diff --git a/src/emu/machine/k053252.h b/src/emu/machine/k053252.h
index e89caabbe9a..1eef2e67b36 100644
--- a/src/emu/machine/k053252.h
+++ b/src/emu/machine/k053252.h
@@ -19,7 +19,7 @@ struct k053252_interface
};
class k053252_device : public device_t,
- public k053252_interface
+ public k053252_interface
{
public:
k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 5aa882318cd..53443da9a0e 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -14,7 +14,7 @@
const device_type TMP68301 = &device_creator<tmp68301_device>;
tmp68301_device::tmp68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
- : device_t(mconfig, TMP68301, "TMP68301", tag, owner, clock, "tmp68301", __FILE__)
+ : device_t(mconfig, TMP68301, "TMP68301", tag, owner, clock, "tmp68301", __FILE__)
{
}
@@ -50,7 +50,7 @@ void tmp68301_device::device_reset()
for (i = 0; i < 3; i++)
m_IE[i] = 0;
- machine().firstcpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(tmp68301_device::irq_callback),this));
+ machine().firstcpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(tmp68301_device::irq_callback),this));
}
diff --git a/src/emu/machine/tmp68301.h b/src/emu/machine/tmp68301.h
index 81643718cdc..c6e5df93ca3 100644
--- a/src/emu/machine/tmp68301.h
+++ b/src/emu/machine/tmp68301.h
@@ -21,7 +21,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
private:
// internal state
UINT16 m_regs[0x400];
@@ -30,7 +30,7 @@ private:
emu_timer *m_tmp68301_timer[3]; // 3 Timers
int m_irq_vector[8];
-
+
TIMER_CALLBACK_MEMBER( timer_callback );
void update_timer( int i );
IRQ_CALLBACK_MEMBER(irq_callback);
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 4dffb5868d7..49a304dcec7 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -753,7 +753,7 @@ private:
void * m_ptr; // pointer to the memory backing the region
size_t m_bytes; // size of the shared region in bytes
UINT8 m_width; // width of the shared region
- endianness_t m_endianness; // endianness of the memory
+ endianness_t m_endianness; // endianness of the memory
};
diff --git a/src/emu/scrlegcy.h b/src/emu/scrlegcy.h
index 60cefdfebaa..a2ee29d049b 100644
--- a/src/emu/scrlegcy.h
+++ b/src/emu/scrlegcy.h
@@ -55,8 +55,8 @@
screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func));
#define MCFG_SCREEN_VBLANK_STATIC(_func) \
screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&screen_vblank_##_func, "screen_vblank_" #_func));
-
-
+
+
//**************************************************************************
// INLINE HELPERS
//**************************************************************************
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index c6bf9e9359b..442e97bf733 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -194,7 +194,7 @@ struct es5506_state
UINT16 * volume_lookup;
device_t *device;
- int channels; /* the number of output stereo channels: 1..4 for 5505, 1..6 for 5506 */
+ int channels; /* the number of output stereo channels: 1..4 for 5505, 1..6 for 5506 */
#if MAKE_WAVS
void * wavraw; /* raw waveform */
diff --git a/src/emu/sound/hc55516.h b/src/emu/sound/hc55516.h
index 9d3ff155a67..31466822576 100644
--- a/src/emu/sound/hc55516.h
+++ b/src/emu/sound/hc55516.h
@@ -19,7 +19,7 @@ public:
/* returns whether the clock is currently LO or HI */
int clock_state_r();
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -28,9 +28,9 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
void start_common(UINT8 _shiftreg_mask, int _active_clock_hi);
-
+
// internal state
sound_stream *m_channel;
int m_active_clock_hi;
@@ -48,11 +48,11 @@ protected:
double m_filter;
double m_integrator;
-
+
double m_charge;
double m_decay;
double m_leak;
-
+
inline int is_external_oscillator();
inline int is_active_clock_transition(int clock_state);
inline int current_clock_state();
diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c
index ab6f2a9a1e7..fe1581b1b2b 100644
--- a/src/emu/sound/k007232.c
+++ b/src/emu/sound/k007232.c
@@ -149,7 +149,6 @@ k007232_device::k007232_device(const machine_config &mconfig, const char *tag, d
: device_t(mconfig, K007232, "K007232", tag, owner, clock, "k007232", __FILE__),
device_sound_interface(mconfig, *this)
{
-
}
//-------------------------------------------------
@@ -198,7 +197,7 @@ void k007232_device::device_start()
m_vol[1][0] = 0;
m_vol[1][1] = 255; /* channel B output to output B */
- for (int i = 0; i < 0x10; i++)
+ for (int i = 0; i < 0x10; i++)
m_wreg[i] = 0;
m_stream = machine().sound().stream_alloc(*this, 0 , 2, clock()/128, this);
diff --git a/src/emu/sound/k007232.h b/src/emu/sound/k007232.h
index eb79278178c..e0a72ad02b9 100644
--- a/src/emu/sound/k007232.h
+++ b/src/emu/sound/k007232.h
@@ -24,19 +24,19 @@ public:
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
-
+
/*
- The 007232 has two channels and produces two outputs. The volume control
- is external, however to make it easier to use we handle that inside the
- emulation. You can control volume and panning: for each of the two channels
- you can set the volume of the two outputs. If panning is not required,
- then volumeB will be 0 for channel 0, and volumeA will be 0 for channel 1.
- Volume is in the range 0-255.
+ The 007232 has two channels and produces two outputs. The volume control
+ is external, however to make it easier to use we handle that inside the
+ emulation. You can control volume and panning: for each of the two channels
+ you can set the volume of the two outputs. If panning is not required,
+ then volumeB will be 0 for channel 0, and volumeA will be 0 for channel 1.
+ Volume is in the range 0-255.
*/
void set_volume(int channel,int volumeA,int volumeB);
-
+
void set_bank( int chABank, int chBBank );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -44,7 +44,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
void KDAC_A_make_fncode();
private:
diff --git a/src/emu/sound/k056800.c b/src/emu/sound/k056800.c
index 73814558b86..d8e70b25f75 100644
--- a/src/emu/sound/k056800.c
+++ b/src/emu/sound/k056800.c
@@ -106,12 +106,12 @@ void k056800_device::sound_reg_w( int reg, UINT8 data )
void k056800_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (id)
- {
+ {
case TIMER_TICK_SOUND_CPU:
if (m_sound_cpu_irq1_enable)
m_irq_cb_func(machine(), 0);
break;
-
+
default:
assert_always(FALSE, "Unknown id in k056800_device::device_timer");
}
diff --git a/src/emu/sound/k056800.h b/src/emu/sound/k056800.h
index c0855e88039..25d24170e12 100644
--- a/src/emu/sound/k056800.h
+++ b/src/emu/sound/k056800.h
@@ -31,7 +31,7 @@ public:
{
TIMER_TICK_SOUND_CPU
};
-
+
DECLARE_READ32_MEMBER( host_r );
DECLARE_WRITE32_MEMBER( host_w );
DECLARE_READ16_MEMBER( sound_r );
@@ -42,7 +42,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
private:
@@ -51,13 +51,13 @@ private:
UINT8 m_sound_reg[8];
emu_timer *m_sound_cpu_timer;
UINT8 m_sound_cpu_irq1_enable;
- k056800_irq_cb m_irq_cb_func;
-
+ k056800_irq_cb m_irq_cb_func;
+
UINT8 host_reg_r( int reg );
void host_reg_w( int reg, UINT8 data );
UINT8 sound_reg_r( int reg );
void sound_reg_w( int reg, UINT8 data );
-
+
};
extern const device_type K056800;
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index 328920ea2c1..f30247e0dd9 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -29,7 +29,7 @@ void msm5232_device::device_config_complete()
const msm5232_interface *intf = reinterpret_cast<const msm5232_interface *>(static_config());
if (intf != NULL)
*static_cast<msm5232_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
diff --git a/src/emu/sound/msm5232.h b/src/emu/sound/msm5232.h
index 6f52e81df34..edcba5ef9a8 100644
--- a/src/emu/sound/msm5232.h
+++ b/src/emu/sound/msm5232.h
@@ -49,7 +49,7 @@ public:
~msm5232_device() {}
DECLARE_WRITE8_MEMBER( write );
- void set_clock(int clock);
+ void set_clock(int clock);
protected:
// device-level overrides
@@ -93,7 +93,7 @@ protected:
double m_external_capacity[8]; /* in Farads, eg 0.39e-6 = 0.36 uF (microFarads) */
devcb_resolved_write_line m_gate_handler_func;/* callback called when the GATE output pin changes state */
-
+
void init_tables();
void init_voice(int i);
void gate_update();
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index 1e4a8f78bf3..80c034a5b3a 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -72,7 +72,7 @@ namco_cus30_device::namco_cus30_device(const machine_config &mconfig, const char
void namco_audio_device::device_config_complete()
{
- // inherit a copy of the static data
+ // inherit a copy of the static data
const namco_interface *intf = reinterpret_cast<const namco_interface *>(static_config());
if (intf != NULL)
*static_cast<namco_interface *>(this) = *intf;
@@ -96,7 +96,7 @@ void namco_audio_device::device_start()
/* extract globals from the interface */
m_last_channel = m_channel_list + m_voices;
-
+
m_soundregs = auto_alloc_array_clear(machine(), UINT8, 0x400);
/* adjust internal clock */
@@ -559,7 +559,7 @@ WRITE8_MEMBER(namco_15xx_device::namco_15xx_w)
0x3c ch 0 noise sw
*/
- WRITE8_MEMBER(namco_cus30_device::namcos1_sound_w)
+ WRITE8_MEMBER(namco_cus30_device::namcos1_sound_w)
{
sound_channel *voice;
int ch;
@@ -664,7 +664,7 @@ WRITE8_MEMBER( namco_15xx_device::sharedram_w )
void namco_audio_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
- if (m_stereo)
+ if (m_stereo)
{
sound_channel *voice;
@@ -774,16 +774,16 @@ void namco_audio_device::sound_stream_update(sound_stream &stream, stream_sample
else
{
sound_channel *voice;
-
+
stream_sample_t *buffer = outputs[0];
/* zap the contents of the buffer */
memset(buffer, 0, samples * sizeof(*buffer));
-
+
/* if no sound, we're done */
-
+
if (m_sound_enable == 0)
return;
-
+
/* loop over each voice and add its contribution */
for (voice = m_channel_list; voice < m_last_channel; voice++)
{
@@ -801,25 +801,25 @@ void namco_audio_device::sound_stream_update(sound_stream &stream, stream_sample
UINT32 c = voice->noise_counter;
INT16 noise_data = OUTPUT_LEVEL(0x07 * (v >> 1));
int i;
-
+
/* add our contribution */
for (i = 0; i < samples; i++)
{
int cnt;
-
+
if (voice->noise_state)
*mix++ += noise_data;
else
*mix++ -= noise_data;
-
+
if (hold)
{
hold--;
continue;
}
-
+
hold = hold_time;
-
+
c += delta;
cnt = (c >> 12);
c &= (1 << 12) - 1;
@@ -830,7 +830,7 @@ void namco_audio_device::sound_stream_update(sound_stream &stream, stream_sample
voice->noise_seed >>= 1;
}
}
-
+
/* update the counter and hold time for this voice */
voice->noise_counter = c;
voice->noise_hold = hold;
@@ -842,26 +842,26 @@ void namco_audio_device::sound_stream_update(sound_stream &stream, stream_sample
if (v && voice->frequency)
{
const INT16 *w = &m_waveform[v][voice->waveform_select * 32];
-
+
/* generate sound into buffer and update the counter for this voice */
voice->counter = namco_update_one(mix, samples, w, voice->counter, voice->frequency);
}
}
}
- }
+ }
}
void namco_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
- namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
+ namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
}
-
+
void namco_15xx_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
- namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
+ namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
}
-
+
void namco_cus30_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
- namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
-} \ No newline at end of file
+ namco_audio_device::sound_stream_update(stream, inputs, outputs, samples);
+}
diff --git a/src/emu/sound/namco.h b/src/emu/sound/namco.h
index ec0483b0fd2..cd2a22c76ac 100644
--- a/src/emu/sound/namco.h
+++ b/src/emu/sound/namco.h
@@ -2,122 +2,122 @@
#ifndef __NAMCO_H__
#define __NAMCO_H__
-
+
/* 8 voices max */
#define MAX_VOICES 8
#define MAX_VOLUME 16
-
+
struct namco_interface
{
- int m_voices; /* number of voices */
+ int m_voices; /* number of voices */
int m_stereo; /* set to 1 to indicate stereo (e.g., System 1) */
};
-
+
/* this structure defines the parameters for a channel */
struct sound_channel
{
- UINT32 frequency;
- UINT32 counter;
- INT32 volume[2];
- INT32 noise_sw;
- INT32 noise_state;
- INT32 noise_seed;
- UINT32 noise_counter;
- INT32 noise_hold;
- INT32 waveform_select;
+ UINT32 frequency;
+ UINT32 counter;
+ INT32 volume[2];
+ INT32 noise_sw;
+ INT32 noise_state;
+ INT32 noise_seed;
+ UINT32 noise_counter;
+ INT32 noise_hold;
+ INT32 waveform_select;
};
-
+
class namco_audio_device : public device_t,
- public device_sound_interface,
- public namco_interface
+ public device_sound_interface,
+ public namco_interface
{
public:
- namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
- ~namco_audio_device() {}
-
- protected:
- // device-level overrides
- virtual void device_config_complete();
- virtual void device_start();
-
- // internal state
-
- void build_decoded_waveform( UINT8 *rgnbase );
- void update_namco_waveform(int offset, UINT8 data);
- UINT32 namco_update_one(stream_sample_t *buffer, int length, const INT16 *wave, UINT32 counter, UINT32 freq);
-
- /* data about the sound system */
- sound_channel m_channel_list[MAX_VOICES];
- sound_channel *m_last_channel;
- UINT8 *m_soundregs;
- UINT8 *m_wavedata;
-
- /* global sound parameters */
- int m_wave_size;
- INT32 m_sound_enable;
- sound_stream *m_stream;
- int m_namco_clock;
- int m_sample_rate;
- int m_f_fracbits;
-
+ namco_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ ~namco_audio_device() {}
+
+ protected:
+ // device-level overrides
+ virtual void device_config_complete();
+ virtual void device_start();
+
+ // internal state
+
+ void build_decoded_waveform( UINT8 *rgnbase );
+ void update_namco_waveform(int offset, UINT8 data);
+ UINT32 namco_update_one(stream_sample_t *buffer, int length, const INT16 *wave, UINT32 counter, UINT32 freq);
+
+ /* data about the sound system */
+ sound_channel m_channel_list[MAX_VOICES];
+ sound_channel *m_last_channel;
+ UINT8 *m_soundregs;
+ UINT8 *m_wavedata;
+
+ /* global sound parameters */
+ int m_wave_size;
+ INT32 m_sound_enable;
+ sound_stream *m_stream;
+ int m_namco_clock;
+ int m_sample_rate;
+ int m_f_fracbits;
+
/* decoded waveform table */
- INT16 *m_waveform[MAX_VOLUME];
-
+ INT16 *m_waveform[MAX_VOLUME];
+
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
};
-
+
class namco_device : public namco_audio_device
{
public:
- namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- DECLARE_WRITE8_MEMBER( pacman_sound_enable_w );
- DECLARE_WRITE8_MEMBER( pacman_sound_w );
-
- void polepos_sound_enable(int enable);
-
- DECLARE_READ8_MEMBER( polepos_sound_r );
- DECLARE_WRITE8_MEMBER( polepos_sound_w );
-
+ namco_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ DECLARE_WRITE8_MEMBER( pacman_sound_enable_w );
+ DECLARE_WRITE8_MEMBER( pacman_sound_w );
+
+ void polepos_sound_enable(int enable);
+
+ DECLARE_READ8_MEMBER( polepos_sound_r );
+ DECLARE_WRITE8_MEMBER( polepos_sound_w );
+
protected:
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
};
-
+
extern const device_type NAMCO;
-
+
class namco_15xx_device : public namco_audio_device
{
public:
- namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- DECLARE_WRITE8_MEMBER( namco_15xx_w );
- DECLARE_READ8_MEMBER( sharedram_r );
- DECLARE_WRITE8_MEMBER( sharedram_w );
-
- void mappy_sound_enable(int enable);
-
+ namco_15xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ DECLARE_WRITE8_MEMBER( namco_15xx_w );
+ DECLARE_READ8_MEMBER( sharedram_r );
+ DECLARE_WRITE8_MEMBER( sharedram_w );
+
+ void mappy_sound_enable(int enable);
+
protected:
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
};
-
+
extern const device_type NAMCO_15XX;
-
+
class namco_cus30_device : public namco_audio_device
{
public:
- namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- DECLARE_WRITE8_MEMBER( namcos1_cus30_w ); /* wavedata + sound registers + RAM */
- DECLARE_READ8_MEMBER( namcos1_cus30_r );
- DECLARE_WRITE8_MEMBER( namcos1_sound_w );
-
+ namco_cus30_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ DECLARE_WRITE8_MEMBER( namcos1_cus30_w ); /* wavedata + sound registers + RAM */
+ DECLARE_READ8_MEMBER( namcos1_cus30_r );
+ DECLARE_WRITE8_MEMBER( namcos1_sound_w );
+
DECLARE_WRITE8_MEMBER( pacman_sound_w );
-
+
protected:
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
};
-
+
extern const device_type NAMCO_CUS30;
#endif /* __NAMCO_H__ */
diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak
index 168fe815c43..538278a67f7 100644
--- a/src/emu/sound/sound.mak
+++ b/src/emu/sound/sound.mak
@@ -157,7 +157,7 @@ endif
#-------------------------------------------------
# Excellent Systems ADPCM sound chip
-#@src/emu/sound/es8712.h,SOUNDS += ES8712
+#@src/emu/sound/es8712.h,SOUNDS += ES8712
#-------------------------------------------------
ifneq ($(filter ES8712,$(SOUNDS)),)
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index 5bd7659d63c..14249c69da6 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -189,7 +189,7 @@ upd775x_device::upd775x_device(const machine_config &mconfig, device_type type,
m_rom(NULL),
m_rombase(NULL),
m_romoffset(0),
- m_rommask(0)
+ m_rommask(0)
{
}
@@ -260,7 +260,7 @@ void upd7759_device::device_start()
{
assert(type() == UPD7759); // other chips do not support slave mode
m_timer = timer_alloc(TIMER_SLAVE_UPDATE);
- m_rommask = 0;
+ m_rommask = 0;
}
else
{
@@ -331,7 +331,7 @@ void upd7756_device::device_start()
m_rom = m_rombase = *region();
if (m_rombase == NULL)
{
- m_rommask = 0;
+ m_rommask = 0;
}
else
{
@@ -707,11 +707,11 @@ void upd775x_device::advance_state()
void upd7759_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
UINT8 olddrq = m_drq;
-
+
switch (id)
{
case TIMER_SLAVE_UPDATE:
-
+
/* update the stream */
m_channel->update();
diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h
index 93b31a12571..83e9d0f62c5 100644
--- a/src/emu/sound/upd7759.h
+++ b/src/emu/sound/upd7759.h
@@ -33,7 +33,7 @@ public:
int busy_r();
DECLARE_WRITE8_MEMBER( port_w );
void postload();
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -42,7 +42,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
// internal state
sound_stream *m_channel; /* stream channel for playback */
@@ -53,13 +53,13 @@ protected:
UINT32 m_pos; /* current output sample position */
UINT32 m_step; /* step value per output sample */
attotime m_clock_period; /* clock period */
-
+
/* I/O lines */
UINT8 m_fifo_in; /* last data written to the sound chip */
UINT8 m_reset; /* current state of the RESET line */
UINT8 m_start; /* current state of the START line */
UINT8 m_drq; /* current state of the DRQ line */
-
+
/* internal state machine */
INT8 m_state; /* current overall chip state */
INT32 m_clocks_left; /* number of clocks left in this state */
@@ -85,7 +85,7 @@ protected:
UINT8 * m_rombase; /* pointer to ROM data or NULL for slave mode */
UINT32 m_romoffset; /* ROM offset to make save/restore easier */
UINT32 m_rommask; /* maximum address offset */
-
+
void update_adpcm(int data);
void advance_state();
};
@@ -94,19 +94,19 @@ class upd7759_device : public upd775x_device
{
public:
upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
enum
{
TIMER_SLAVE_UPDATE
};
-
+
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
emu_timer *m_timer; /* timer */
-
+
void start_w(UINT8 data);
};
@@ -118,7 +118,7 @@ public:
virtual void device_start();
virtual void device_reset();
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
void start_w(UINT8 data);
};
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index bba37820388..40beb652868 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -225,7 +225,7 @@ void vlm5030_device::device_config_complete()
void vlm5030_device::device_start()
{
m_coeff = &vlm5030_coeff;
-
+
/* reset input pins */
m_pin_RST = m_pin_ST = m_pin_VCU= 0;
m_latch_data = 0;
diff --git a/src/emu/sound/vlm5030.h b/src/emu/sound/vlm5030.h
index f066764938a..5ae9c1d6054 100644
--- a/src/emu/sound/vlm5030.h
+++ b/src/emu/sound/vlm5030.h
@@ -4,35 +4,35 @@
#define __VLM5030_H__
- struct vlm5030_interface
- {
- int m_memory_size; /* memory size of speech rom (0=memory region length) */
- };
-
- class vlm5030_device : public device_t,
- public device_sound_interface,
- public vlm5030_interface
- {
- public:
- vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- ~vlm5030_device() {}
-
- /* set speech rom address */
- void set_rom(void *speech_rom);
-
- /* get BSY pin level */
- int bsy();
-
- /* latch contoll data */
- DECLARE_WRITE8_MEMBER( data_w );
-
- /* set RST pin level : reset / set table address A8-A15 */
- void rst (int pin );
-
- /* set VCU pin level : ?? unknown */
- void vcu( int pin );
-
- /* set ST pin level : set table address A0-A7 / start speech */
+ struct vlm5030_interface
+ {
+ int m_memory_size; /* memory size of speech rom (0=memory region length) */
+ };
+
+ class vlm5030_device : public device_t,
+ public device_sound_interface,
+ public vlm5030_interface
+ {
+ public:
+ vlm5030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ ~vlm5030_device() {}
+
+ /* set speech rom address */
+ void set_rom(void *speech_rom);
+
+ /* get BSY pin level */
+ int bsy();
+
+ /* latch contoll data */
+ DECLARE_WRITE8_MEMBER( data_w );
+
+ /* set RST pin level : reset / set table address A8-A15 */
+ void rst (int pin );
+
+ /* set VCU pin level : ?? unknown */
+ void vcu( int pin );
+
+ /* set ST pin level : set table address A0-A7 / start speech */
void st( int pin );
protected:
@@ -92,7 +92,7 @@ private:
int m_current_k[10];
INT32 m_x[10];
-
+
int get_bits(int sbit,int bits);
int parse_frame();
void update();
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 1351a0095b0..e0d0103667f 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -109,7 +109,7 @@ void x1_010_device::device_config_complete()
const x1_010_interface *intf = reinterpret_cast<const x1_010_interface *>(static_config());
if (intf != NULL)
*static_cast<x1_010_interface *>(this) = *intf;
-
+
// or initialize to defaults if none provided
else
{
@@ -128,7 +128,7 @@ void x1_010_device::device_start()
m_region = *region();
m_base_clock = clock();
m_rate = clock() / 1024;
-
+
for( i = 0; i < SETA_NUM_CHANNELS; i++ ) {
m_smp_offset[i] = 0;
m_env_offset[i] = 0;
@@ -138,7 +138,7 @@ void x1_010_device::device_start()
/* get stream channels */
m_stream = machine().sound().stream_alloc(*this, 0, 2, m_rate, this);
-
+
save_item(NAME(m_rate));
save_item(NAME(m_sound_enable));
save_item(NAME(m_reg));
diff --git a/src/emu/sound/x1_010.h b/src/emu/sound/x1_010.h
index c2a7a60f0ac..8f3830f7090 100644
--- a/src/emu/sound/x1_010.h
+++ b/src/emu/sound/x1_010.h
@@ -36,7 +36,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
private:
// internal state
-
+
/* Variables only used here */
int m_rate; // Output sampling rate (Hz)
sound_stream * m_stream; // Stream handle
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index 3e72444e8be..b1008dd3df6 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -497,7 +497,7 @@ void ymf271_device::update_pcm(int slotnum, INT32 *mixp, int length)
*mixp++ += (sample * ch0_vol) >> 16;
*mixp++ += (sample * ch1_vol) >> 16;
-
+
// go to next step
slot->stepptr += slot->step;
}
@@ -508,11 +508,11 @@ INT64 ymf271_device::calculate_op(int slotnum, INT64 inp)
{
YMF271Slot *slot = &m_slots[slotnum];
INT64 env, slot_output, slot_input = 0;
-
+
update_envelope(slot);
update_lfo(slot);
env = calculate_slot_volume(slot);
-
+
if (inp == OP_INPUT_FEEDBACK)
{
// from own feedback
@@ -524,11 +524,11 @@ INT64 ymf271_device::calculate_op(int slotnum, INT64 inp)
// from previous slot output
slot_input = ((inp << (SIN_BITS-2)) * modulation_level[slot->feedback]);
}
-
+
slot_output = m_lut_waves[slot->waveform][((slot->stepptr + slot_input) >> 16) & SIN_MASK];
slot_output = (slot_output * env) >> 16;
slot->stepptr += slot->step;
-
+
return slot_output;
}
@@ -702,7 +702,7 @@ void ymf271_device::sound_stream_update(sound_stream &stream, stream_sample_t **
// --[S4]--|
// --[S2]--|
// <--------| |
- // +--[S1]--|--+--[S3]--+-->
+ // +--[S1]--|--+--[S3]--+-->
case 10:
phase_mod1 = calculate_op(slot1, OP_INPUT_FEEDBACK);
set_feedback(slot1, phase_mod1);
@@ -714,7 +714,7 @@ void ymf271_device::sound_stream_update(sound_stream &stream, stream_sample_t **
// --[S4]-----|
// --[S2]-----|
// <-----------------| |
- // +--[S1]--+--[S3]--|--+-->
+ // +--[S1]--+--[S3]--|--+-->
case 11:
phase_mod1 = calculate_op(slot1, OP_INPUT_FEEDBACK);
phase_mod3 = calculate_op(slot3, phase_mod1);
@@ -1298,7 +1298,7 @@ void ymf271_device::device_timer(emu_timer &timer, device_timer_id id, int param
// reload timer
m_timB->adjust(attotime::from_hz(m_clock) * (384 * 16 * (256 - m_timerB)), 0);
break;
-
+
default:
assert_always(FALSE, "Unknown id in ymf271_device::device_timer");
break;
@@ -1416,7 +1416,7 @@ void ymf271_device::ymf271_write_timer(UINT8 address, UINT8 data)
if (!m_ext_rw && !m_ext_write_handler.isnull())
m_ext_write_handler(m_ext_address, data);
break;
-
+
case 0x20:
case 0x21:
case 0x22:
@@ -1432,7 +1432,7 @@ void ymf271_device::ymf271_write_timer(UINT8 address, UINT8 data)
WRITE8_MEMBER( ymf271_device::write )
{
m_stream->update();
-
+
m_regs_main[offset & 0xf] = data;
switch (offset & 0xf)
@@ -1481,7 +1481,7 @@ READ8_MEMBER( ymf271_device::read )
{
case 0x0:
return m_status;
-
+
case 0x1:
// statusreg 2
return 0;
@@ -1496,7 +1496,7 @@ READ8_MEMBER( ymf271_device::read )
m_ext_readlatch = ymf271_read_memory(m_ext_address);
return ret;
}
-
+
default:
break;
}
@@ -1507,10 +1507,10 @@ READ8_MEMBER( ymf271_device::read )
void ymf271_device::init_tables()
{
int i, j;
-
+
for (i = 0; i < 8; i++)
m_lut_waves[i] = auto_alloc_array(machine(), INT16, SIN_LEN);
-
+
for (i = 0; i < 4*8; i++)
m_lut_plfo[i>>3][i&7] = auto_alloc_array(machine(), double, LFO_LENGTH);
@@ -1607,7 +1607,7 @@ void ymf271_device::init_tables()
double db = 0.75 * (double)i;
m_lut_total_level[i] = (int)(65536.0 / pow(10.0, db / 20.0));
}
-
+
// timing may use a non-standard XTAL
double clock_correction = (double)(STD_CLOCK) / (double)(m_clock);
for (i = 0; i < 256; i++)
diff --git a/src/emu/sound/ymf271.h b/src/emu/sound/ymf271.h
index e118d571015..1408716f4b2 100644
--- a/src/emu/sound/ymf271.h
+++ b/src/emu/sound/ymf271.h
@@ -112,12 +112,12 @@ private:
void ymf271_write_pcm(UINT8 address, UINT8 data);
void ymf271_write_timer(UINT8 address, UINT8 data);
UINT8 ymf271_read_memory(UINT32 offset);
-
+
inline int get_keyscaled_rate(int rate, int keycode, int keyscale);
inline int get_internal_keycode(int block, int fns);
inline int get_external_keycode(int block, int fns);
inline bool check_envelope_end(YMF271Slot *slot);
-
+
// lookup tables
INT16 *m_lut_waves[8];
double *m_lut_plfo[4][8];
@@ -128,11 +128,11 @@ private:
int m_lut_attenuation[16];
int m_lut_total_level[128];
int m_lut_env_volume[256];
-
+
// internal state
YMF271Slot m_slots[48];
YMF271Group m_groups[12];
-
+
UINT8 m_regs_main[0x10];
UINT32 m_timerA;
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 0aff27d09cf..71563b48d41 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -22,7 +22,7 @@
- Is memory handling 100% correct? At the moment, Konami firebeat.c is the only
hardware currently emulated that uses external handlers.
It also happens to be the only one using 16-bit PCM.
-
+
Some other drivers (eg. bishi.c, bfm_sc4/5.c) also use ROM readback.
*/
diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c
index a11380f78ef..58a722ce97c 100644
--- a/src/emu/tilemap.c
+++ b/src/emu/tilemap.c
@@ -379,7 +379,7 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, tilemap_get_info_delegate t
m_device = dynamic_cast<tilemap_device *>(this);
m_next = NULL;
m_user_data = NULL;
-
+
// populate tilemap metrics
m_rows = rows;
m_cols = cols;
@@ -387,14 +387,14 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, tilemap_get_info_delegate t
m_tileheight = tileheight;
m_width = cols * tilewidth;
m_height = rows * tileheight;
-
+
// populate logical <-> memory mappings
m_mapper = mapper;
m_memory_to_logical = NULL;
m_max_logical_index = 0;
m_logical_to_memory = NULL;
m_max_memory_index = 0;
-
+
// initialize tile information geters
m_tile_get_info = tile_get_info;
@@ -422,7 +422,7 @@ tilemap_t &tilemap_t::init(tilemap_manager &manager, tilemap_get_info_delegate t
// allocate pixmap
m_pixmap.allocate(m_width, m_height);
-
+
// allocate transparency mapping
m_flagsmap.allocate(m_width, m_height);
m_tileflags = NULL;
@@ -1498,9 +1498,9 @@ void tilemap_t::draw_debug(bitmap_rgb32 &dest, UINT32 scrollx, UINT32 scrolly)
tilemap_memory::tilemap_memory()
: m_base(NULL),
- m_bytes(0),
- m_membits(0),
- m_bytes_per_entry(0)
+ m_bytes(0),
+ m_membits(0),
+ m_bytes_per_entry(0)
{
}
@@ -1516,45 +1516,45 @@ void tilemap_memory::set(void *base, UINT32 bytes, int membits, endianness_t end
assert(bytes > 0);
assert(membits == 8 || membits == 16 || membits == 32 || membits == 64);
assert(bpe == 1 || bpe == 2 || bpe == 4);
-
+
// populate direct data
m_base = base;
m_bytes = bytes;
m_membits = membits;
m_endianness = endianness;
m_bytes_per_entry = bpe;
-
+
// derive data
switch (bpe*1000 + membits*10 + endianness)
{
- case 1*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_8; m_writer = &tilemap_memory::write8_to_8; break;
- case 1*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_8; m_writer = &tilemap_memory::write8_to_8; break;
- case 1*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_16le; m_writer = &tilemap_memory::write8_to_16le; break;
- case 1*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_16be; m_writer = &tilemap_memory::write8_to_16be; break;
- case 1*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_32le; m_writer = &tilemap_memory::write8_to_32le; break;
- case 1*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_32be; m_writer = &tilemap_memory::write8_to_32be; break;
- case 1*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_64le; m_writer = &tilemap_memory::write8_to_64le; break;
- case 1*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_64be; m_writer = &tilemap_memory::write8_to_64be; break;
-
- case 2*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_8le; m_writer = &tilemap_memory::write16_to_8le; break;
- case 2*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_8be; m_writer = &tilemap_memory::write16_to_8be; break;
- case 2*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_16; m_writer = &tilemap_memory::write16_to_16; break;
- case 2*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_16; m_writer = &tilemap_memory::write16_to_16; break;
- case 2*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_32le; m_writer = &tilemap_memory::write16_to_32le; break;
- case 2*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_32be; m_writer = &tilemap_memory::write16_to_32be; break;
- case 2*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_64le; m_writer = &tilemap_memory::write16_to_64le; break;
- case 2*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_64be; m_writer = &tilemap_memory::write16_to_64be; break;
-
- case 4*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_8le; m_writer = &tilemap_memory::write32_to_8le; break;
- case 4*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_8be; m_writer = &tilemap_memory::write32_to_8be; break;
- case 4*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_16le; m_writer = &tilemap_memory::write32_to_16le; break;
- case 4*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_16be; m_writer = &tilemap_memory::write32_to_16be; break;
- case 4*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_32; m_writer = &tilemap_memory::write32_to_32; break;
- case 4*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_32; m_writer = &tilemap_memory::write32_to_32; break;
- case 4*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_64le; m_writer = &tilemap_memory::write32_to_64le; break;
- case 4*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_64be; m_writer = &tilemap_memory::write32_to_64be; break;
-
- default: throw emu_fatalerror("Illegal memory bits/bus width combo in tilemap_memory");
+ case 1*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_8; m_writer = &tilemap_memory::write8_to_8; break;
+ case 1*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_8; m_writer = &tilemap_memory::write8_to_8; break;
+ case 1*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_16le; m_writer = &tilemap_memory::write8_to_16le; break;
+ case 1*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_16be; m_writer = &tilemap_memory::write8_to_16be; break;
+ case 1*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_32le; m_writer = &tilemap_memory::write8_to_32le; break;
+ case 1*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_32be; m_writer = &tilemap_memory::write8_to_32be; break;
+ case 1*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read8_from_64le; m_writer = &tilemap_memory::write8_to_64le; break;
+ case 1*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read8_from_64be; m_writer = &tilemap_memory::write8_to_64be; break;
+
+ case 2*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_8le; m_writer = &tilemap_memory::write16_to_8le; break;
+ case 2*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_8be; m_writer = &tilemap_memory::write16_to_8be; break;
+ case 2*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_16; m_writer = &tilemap_memory::write16_to_16; break;
+ case 2*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_16; m_writer = &tilemap_memory::write16_to_16; break;
+ case 2*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_32le; m_writer = &tilemap_memory::write16_to_32le; break;
+ case 2*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_32be; m_writer = &tilemap_memory::write16_to_32be; break;
+ case 2*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read16_from_64le; m_writer = &tilemap_memory::write16_to_64le; break;
+ case 2*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read16_from_64be; m_writer = &tilemap_memory::write16_to_64be; break;
+
+ case 4*1000 + 8*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_8le; m_writer = &tilemap_memory::write32_to_8le; break;
+ case 4*1000 + 8*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_8be; m_writer = &tilemap_memory::write32_to_8be; break;
+ case 4*1000 + 16*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_16le; m_writer = &tilemap_memory::write32_to_16le; break;
+ case 4*1000 + 16*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_16be; m_writer = &tilemap_memory::write32_to_16be; break;
+ case 4*1000 + 32*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_32; m_writer = &tilemap_memory::write32_to_32; break;
+ case 4*1000 + 32*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_32; m_writer = &tilemap_memory::write32_to_32; break;
+ case 4*1000 + 64*10 + ENDIANNESS_LITTLE: m_reader = &tilemap_memory::read32_from_64le; m_writer = &tilemap_memory::write32_to_64le; break;
+ case 4*1000 + 64*10 + ENDIANNESS_BIG: m_reader = &tilemap_memory::read32_from_64be; m_writer = &tilemap_memory::write32_to_64be; break;
+
+ default: throw emu_fatalerror("Illegal memory bits/bus width combo in tilemap_memory");
}
}
@@ -1581,7 +1581,7 @@ void tilemap_memory::set(const tilemap_memory &helper)
//-------------------------------------------------
// read8_from_*/write8_to_* - entry read/write
-// heleprs for 1 byte-per-entry
+// heleprs for 1 byte-per-entry
//-------------------------------------------------
UINT32 tilemap_memory::read8_from_8(int index) { return reinterpret_cast<UINT8 *>(m_base)[index]; }
@@ -1605,7 +1605,7 @@ void tilemap_memory::write8_to_64be(int index, UINT32 data) { reinterpret_cast<U
//-------------------------------------------------
// read16_from_*/write16_to_* - entry read/write
-// heleprs for 2 bytes-per-entry
+// heleprs for 2 bytes-per-entry
//-------------------------------------------------
UINT32 tilemap_memory::read16_from_8le(int index) { return read8_from_8(index*2) | (read8_from_8(index*2+1) << 8); }
@@ -1629,7 +1629,7 @@ void tilemap_memory::write16_to_64be(int index, UINT32 data) { reinterpret_cast<
//-------------------------------------------------
// read32_from_*/write32_to_* - entry read/write
-// heleprs for 4 bytes-per-entry
+// heleprs for 4 bytes-per-entry
//-------------------------------------------------
UINT32 tilemap_memory::read32_from_8le(int index) { return read16_from_8le(index*2) | (read16_from_8le(index*2+1) << 16); }
@@ -1756,8 +1756,8 @@ tilemap_device::tilemap_device(const machine_config &mconfig, const char *tag, d
//-------------------------------------------------
-// static_set_bytes_per_entry: Set the
-// transparent pen
+// static_set_bytes_per_entry: Set the
+// transparent pen
//-------------------------------------------------
void tilemap_device::static_set_bytes_per_entry(device_t &device, int bpe)
@@ -1768,7 +1768,7 @@ void tilemap_device::static_set_bytes_per_entry(device_t &device, int bpe)
//-------------------------------------------------
// static_set_info_callback: Set the get info
-// callback delegate
+// callback delegate
//-------------------------------------------------
void tilemap_device::static_set_info_callback(device_t &device, tilemap_get_info_delegate get_info)
@@ -1779,7 +1779,7 @@ void tilemap_device::static_set_info_callback(device_t &device, tilemap_get_info
//-------------------------------------------------
// static_set_layout: Set the tilemap size and
-// layout
+// layout
//-------------------------------------------------
void tilemap_device::static_set_layout(device_t &device, tilemap_standard_mapper mapper, int columns, int rows)
@@ -1813,8 +1813,8 @@ void tilemap_device::static_set_tile_size(device_t &device, int width, int heigh
//-------------------------------------------------
-// static_set_transparent_pen: Set the
-// transparent pen
+// static_set_transparent_pen: Set the
+// transparent pen
//-------------------------------------------------
void tilemap_device::static_set_transparent_pen(device_t &device, pen_t pen)
@@ -1914,7 +1914,7 @@ void tilemap_device::device_start()
// bind our callbacks
m_get_info.bind_relative_to(*owner());
m_mapper.bind_relative_to(*owner());
-
+
// allocate the tilemap
if (m_standard_mapper == TILEMAP_STANDARD_COUNT)
machine().tilemap().create(m_get_info, m_mapper, m_tile_width, m_tile_height, m_num_columns, m_num_rows, this);
@@ -1933,7 +1933,7 @@ void tilemap_device::device_start()
if (share != NULL)
m_extmem.set(*share, m_bytes_per_entry);
}
-
+
// configure the device and set the pen
if (m_transparent_pen_set)
set_transparent_pen(m_transparent_pen);
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index ac4b2ae0cd3..0d95eaeee62 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -411,31 +411,27 @@ enum tilemap_standard_mapper
MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \
MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \
MCFG_TILEMAP_LAYOUT_STANDARD(_mapper, _columns, _rows) \
- MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) \
-
+ MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight)
#define MCFG_TILEMAP_ADD_CUSTOM(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows) \
MCFG_TILEMAP_ADD(_tag) \
MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \
MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \
MCFG_TILEMAP_LAYOUT_CB_DRIVER(_class, _mapper, _columns, _rows) \
- MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) \
-
+ MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight)
#define MCFG_TILEMAP_ADD_STANDARD_TRANSPEN(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \
MCFG_TILEMAP_ADD(_tag) \
MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \
MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \
MCFG_TILEMAP_LAYOUT_STANDARD(_mapper, _columns, _rows) \
MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) \
- MCFG_TILEMAP_TRANSPARENT_PEN(_transpen) \
-
+ MCFG_TILEMAP_TRANSPARENT_PEN(_transpen)
#define MCFG_TILEMAP_ADD_CUSTOM_TRANSPEN(_tag, _bytes_per_entry, _class, _method, _tilewidth, _tileheight, _mapper, _columns, _rows, _transpen) \
MCFG_TILEMAP_ADD(_tag) \
MCFG_TILEMAP_BYTES_PER_ENTRY(_bytes_per_entry) \
MCFG_TILEMAP_INFO_CB_DRIVER(_class, _method) \
MCFG_TILEMAP_LAYOUT_CB_DRIVER(_columns, _mapper, _rows, _class) \
MCFG_TILEMAP_TILE_SIZE(_tilewidth, _tileheight) \
- MCFG_TILEMAP_TRANSPARENT_PEN(_transpen) \
-
+ MCFG_TILEMAP_TRANSPARENT_PEN(_transpen)
//**************************************************************************
@@ -498,59 +494,59 @@ class tilemap_memory
// construction/destruction
tilemap_memory();
-
+
public:
// configuration
void set(void *base, UINT32 bytes, int membits, endianness_t endianness, int bpe);
void set(const address_space &space, void *base, UINT32 bytes, int bpe);
void set(const memory_share &share, int bpe);
void set(const tilemap_memory &helper);
-
+
// getters
void *base() const { return m_base; }
UINT32 bytes() const { return m_bytes; }
int membits() const { return m_membits; }
endianness_t endianness() const { return m_endianness; }
int bytes_per_entry() const { return m_bytes_per_entry; }
-
+
private:
// readers and writers
UINT32 read(int index) { return (this->*m_reader)(index); }
void write(int index, UINT32 data) { (this->*m_writer)(index, data); }
// internal read/write helpers for 1 byte entries
- UINT32 read8_from_8(int index); void write8_to_8(int index, UINT32 data);
- UINT32 read8_from_16le(int index); void write8_to_16le(int index, UINT32 data);
- UINT32 read8_from_16be(int index); void write8_to_16be(int index, UINT32 data);
- UINT32 read8_from_32le(int index); void write8_to_32le(int index, UINT32 data);
- UINT32 read8_from_32be(int index); void write8_to_32be(int index, UINT32 data);
- UINT32 read8_from_64le(int index); void write8_to_64le(int index, UINT32 data);
- UINT32 read8_from_64be(int index); void write8_to_64be(int index, UINT32 data);
+ UINT32 read8_from_8(int index); void write8_to_8(int index, UINT32 data);
+ UINT32 read8_from_16le(int index); void write8_to_16le(int index, UINT32 data);
+ UINT32 read8_from_16be(int index); void write8_to_16be(int index, UINT32 data);
+ UINT32 read8_from_32le(int index); void write8_to_32le(int index, UINT32 data);
+ UINT32 read8_from_32be(int index); void write8_to_32be(int index, UINT32 data);
+ UINT32 read8_from_64le(int index); void write8_to_64le(int index, UINT32 data);
+ UINT32 read8_from_64be(int index); void write8_to_64be(int index, UINT32 data);
// internal read/write helpers for 2 byte entries
- UINT32 read16_from_8le(int index); void write16_to_8le(int index, UINT32 data);
- UINT32 read16_from_8be(int index); void write16_to_8be(int index, UINT32 data);
- UINT32 read16_from_16(int index); void write16_to_16(int index, UINT32 data);
- UINT32 read16_from_32le(int index); void write16_to_32le(int index, UINT32 data);
- UINT32 read16_from_32be(int index); void write16_to_32be(int index, UINT32 data);
- UINT32 read16_from_64le(int index); void write16_to_64le(int index, UINT32 data);
- UINT32 read16_from_64be(int index); void write16_to_64be(int index, UINT32 data);
+ UINT32 read16_from_8le(int index); void write16_to_8le(int index, UINT32 data);
+ UINT32 read16_from_8be(int index); void write16_to_8be(int index, UINT32 data);
+ UINT32 read16_from_16(int index); void write16_to_16(int index, UINT32 data);
+ UINT32 read16_from_32le(int index); void write16_to_32le(int index, UINT32 data);
+ UINT32 read16_from_32be(int index); void write16_to_32be(int index, UINT32 data);
+ UINT32 read16_from_64le(int index); void write16_to_64le(int index, UINT32 data);
+ UINT32 read16_from_64be(int index); void write16_to_64be(int index, UINT32 data);
// internal read/write helpers for 4 byte entries
- UINT32 read32_from_8le(int index); void write32_to_8le(int index, UINT32 data);
- UINT32 read32_from_8be(int index); void write32_to_8be(int index, UINT32 data);
- UINT32 read32_from_16le(int index); void write32_to_16le(int index, UINT32 data);
- UINT32 read32_from_16be(int index); void write32_to_16be(int index, UINT32 data);
- UINT32 read32_from_32(int index); void write32_to_32(int index, UINT32 data);
- UINT32 read32_from_64le(int index); void write32_to_64le(int index, UINT32 data);
- UINT32 read32_from_64be(int index); void write32_to_64be(int index, UINT32 data);
+ UINT32 read32_from_8le(int index); void write32_to_8le(int index, UINT32 data);
+ UINT32 read32_from_8be(int index); void write32_to_8be(int index, UINT32 data);
+ UINT32 read32_from_16le(int index); void write32_to_16le(int index, UINT32 data);
+ UINT32 read32_from_16be(int index); void write32_to_16be(int index, UINT32 data);
+ UINT32 read32_from_32(int index); void write32_to_32(int index, UINT32 data);
+ UINT32 read32_from_64le(int index); void write32_to_64le(int index, UINT32 data);
+ UINT32 read32_from_64be(int index); void write32_to_64be(int index, UINT32 data);
// internal state
- void * m_base;
- UINT32 m_bytes;
- int m_membits;
- endianness_t m_endianness;
- int m_bytes_per_entry;
+ void * m_base;
+ UINT32 m_bytes;
+ int m_membits;
+ endianness_t m_endianness;
+ int m_bytes_per_entry;
UINT32 (tilemap_memory::*m_reader)(int);
void (tilemap_memory::*m_writer)(int, UINT32);
};
@@ -675,7 +671,7 @@ private:
UINT8 value;
UINT8 alpha;
};
-
+
// inline helpers
INT32 effective_rowscroll(int index, UINT32 screen_width);
INT32 effective_colscroll(int index, UINT32 screen_height);
@@ -710,13 +706,13 @@ private:
// managers and devices
tilemap_manager * m_manager; // reference to the owning manager
- tilemap_device * m_device; // pointer to our owning device
+ tilemap_device * m_device; // pointer to our owning device
tilemap_t * m_next; // pointer to next tilemap
void * m_user_data; // user data value
// optional memory info
- tilemap_memory m_basemem; // info about base memory
- tilemap_memory m_extmem; // info about extension memory
+ tilemap_memory m_basemem; // info about base memory
+ tilemap_memory m_extmem; // info about extension memory
// basic tilemap metrics
UINT32 m_rows; // number of tile rows
@@ -815,7 +811,7 @@ class tilemap_device : public device_t,
public:
// construction/destruction
tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// static configuration
static void static_set_bytes_per_entry(device_t &device, int bpe);
static void static_set_info_callback(device_t &device, tilemap_get_info_delegate tile_get_info);
@@ -823,7 +819,7 @@ public:
static void static_set_layout(device_t &device, tilemap_mapper_delegate mapper, int columns, int rows);
static void static_set_tile_size(device_t &device, int width, int height);
static void static_set_transparent_pen(device_t &device, pen_t pen);
-
+
// write handlers
DECLARE_WRITE8_HANDLER(write);
DECLARE_WRITE16_HANDLER(write);
@@ -831,10 +827,10 @@ public:
DECLARE_WRITE8_HANDLER(write_ext);
DECLARE_WRITE16_HANDLER(write_ext);
DECLARE_WRITE32_HANDLER(write_ext);
-
+
// pick one to use to avoid ambiguity errors
using device_t::machine;
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -844,13 +840,13 @@ private:
tilemap_get_info_delegate m_get_info;
tilemap_standard_mapper m_standard_mapper;
tilemap_mapper_delegate m_mapper;
- int m_bytes_per_entry;
- int m_tile_width;
- int m_tile_height;
- int m_num_columns;
- int m_num_rows;
- bool m_transparent_pen_set;
- pen_t m_transparent_pen;
+ int m_bytes_per_entry;
+ int m_tile_width;
+ int m_tile_height;
+ int m_num_columns;
+ int m_num_rows;
+ bool m_transparent_pen_set;
+ pen_t m_transparent_pen;
};
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index dfc345ddbd8..13c7eae3dd8 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -154,4 +154,4 @@ const rgb_t RGB_MONOCHROME_YELLOW[] =
{
RGB_BLACK,
MAKE_RGB(0xff, 0xff, 0x00)
-}; \ No newline at end of file
+};
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index 89c0af737e9..745c0e76ccb 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -76,7 +76,7 @@ public:
/* video update handling */
void get_display_state();
-
+
struct tms34061_display m_display;
protected:
@@ -84,7 +84,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
private:
UINT16 m_regs[TMS34061_REGCOUNT];
UINT16 m_xmask;
@@ -96,7 +96,7 @@ private:
UINT8 * m_shiftreg;
emu_timer * m_timer;
screen_device *m_screen;
-
+
void update_interrupts(void);
TIMER_CALLBACK_MEMBER( interrupt );
void register_w(address_space &space, offs_t offset, UINT8 data);
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index dfcd6990afc..fa53815e061 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -1,7 +1,7 @@
/***************************************************************************
- audio/atarijsa.c
-
+ audio/atarijsa.c
+
Functions to emulate the Atari "JSA" audio boards
****************************************************************************
@@ -37,31 +37,31 @@
****************************************************************************
- JSA I (stereo): used by:
- * Blasteroids (YM2151 only)
- * Toobin' (YM2151 + POKEY)
- * Vindicators (YM2151 + POKEY)
- * Escape from the Planets of the Robot Monsters (YM2151 + TMS5220)
-
- JSA II (mono), used by:
- * Cyberball 2072
- * STUN Runner
- * Skull & Crossbones
- * ThunderJaws
- * Hydra
- * Pit Fighter
-
- JSA III (mono), used by:
- * Off the Wall (YM2151 only)
- * Batman
- * Guardians of the 'Hood
- * Road Riot 4WD
- * Steel Talons
-
- JSA IIIs (stereo), used by:
- * Space Lords
- * Moto Frenzy
- * Road Riot's Revenge Rally
+ JSA I (stereo): used by:
+ * Blasteroids (YM2151 only)
+ * Toobin' (YM2151 + POKEY)
+ * Vindicators (YM2151 + POKEY)
+ * Escape from the Planets of the Robot Monsters (YM2151 + TMS5220)
+
+ JSA II (mono), used by:
+ * Cyberball 2072
+ * STUN Runner
+ * Skull & Crossbones
+ * ThunderJaws
+ * Hydra
+ * Pit Fighter
+
+ JSA III (mono), used by:
+ * Off the Wall (YM2151 only)
+ * Batman
+ * Guardians of the 'Hood
+ * Road Riot 4WD
+ * Steel Talons
+
+ JSA IIIs (stereo), used by:
+ * Space Lords
+ * Moto Frenzy
+ * Road Riot's Revenge Rally
****************************************************************************
@@ -127,14 +127,14 @@ extern const device_type ATARI_JSA_IIIS = &device_creator<atari_jsa_iiis_device>
static ADDRESS_MAP_START( atarijsa1_map, AS_PROGRAM, 8, atari_jsa_i_device )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym2151", ym2151_device, read, write)
- AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x01f9) // N/C
- AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x01f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
- AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x01f9) AM_READ(rdio_r) // /RDIO
- AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x01f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
- AM_RANGE(0x2a00, 0x2a00) AM_MIRROR(0x01f9) AM_WRITE(tms5220_voice) // /VOICE
- AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x01f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
- AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x01f9) AM_WRITE(wrio_w) // /WRIO
- AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x01f9) AM_WRITE(mix_w) // /MIX
+ AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x01f9) // N/C
+ AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x01f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
+ AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x01f9) AM_READ(rdio_r) // /RDIO
+ AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x01f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
+ AM_RANGE(0x2a00, 0x2a00) AM_MIRROR(0x01f9) AM_WRITE(tms5220_voice) // /VOICE
+ AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x01f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
+ AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x01f9) AM_WRITE(wrio_w) // /WRIO
+ AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x01f9) AM_WRITE(mix_w) // /MIX
AM_RANGE(0x2c00, 0x2c0f) AM_MIRROR(0x03f0) AM_READWRITE(pokey_r, pokey_w)
AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("cpubank")
AM_RANGE(0x4000, 0xffff) AM_ROM
@@ -144,14 +144,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atarijsa2_map, AS_PROGRAM, 8, atari_jsa_ii_device )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym2151", ym2151_device, read, write)
- AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x01f9) AM_READ(oki_r) // /RDV
- AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x01f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
- AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x01f9) AM_READ(rdio_r) // /RDIO
- AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x01f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
- AM_RANGE(0x2a00, 0x2a00) AM_MIRROR(0x01f9) AM_WRITE(oki_w) // /WRV
- AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x01f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
- AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x01f9) AM_WRITE(wrio_w) // /WRIO
- AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x01f9) AM_WRITE(mix_w) // /MIX
+ AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x01f9) AM_READ(oki_r) // /RDV
+ AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x01f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
+ AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x01f9) AM_READ(rdio_r) // /RDIO
+ AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x01f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
+ AM_RANGE(0x2a00, 0x2a00) AM_MIRROR(0x01f9) AM_WRITE(oki_w) // /WRV
+ AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x01f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
+ AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x01f9) AM_WRITE(wrio_w) // /WRIO
+ AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x01f9) AM_WRITE(mix_w) // /MIX
AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("cpubank")
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -161,14 +161,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( atarijsa3_map, AS_PROGRAM, 8, atari_jsa_iii_device )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ym2151", ym2151_device, read, write)
- AM_RANGE(0x2800, 0x2801) AM_MIRROR(0x05f8) AM_READWRITE(oki_r, overall_volume_w) // /RDV
- AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x05f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
- AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x05f9) AM_READ(rdio_r) // /RDIO
- AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x05f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
- AM_RANGE(0x2a00, 0x2a01) AM_MIRROR(0x05f8) AM_WRITE(oki_w) // /WRV
- AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x05f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
- AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x05f9) AM_WRITE(wrio_w) // /WRIO
- AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x05f9) AM_WRITE(mix_w) // /MIX
+ AM_RANGE(0x2800, 0x2801) AM_MIRROR(0x05f8) AM_READWRITE(oki_r, overall_volume_w) // /RDV
+ AM_RANGE(0x2802, 0x2802) AM_MIRROR(0x05f9) AM_DEVREAD("soundcomm", atari_sound_comm_device, sound_command_r) // /RDP
+ AM_RANGE(0x2804, 0x2804) AM_MIRROR(0x05f9) AM_READ(rdio_r) // /RDIO
+ AM_RANGE(0x2806, 0x2806) AM_MIRROR(0x05f9) AM_DEVREADWRITE("soundcomm", atari_sound_comm_device, sound_irq_ack_r, sound_irq_ack_w) // R/W=/IRQACK
+ AM_RANGE(0x2a00, 0x2a01) AM_MIRROR(0x05f8) AM_WRITE(oki_w) // /WRV
+ AM_RANGE(0x2a02, 0x2a02) AM_MIRROR(0x05f9) AM_DEVWRITE("soundcomm", atari_sound_comm_device, sound_response_w) // /WRP
+ AM_RANGE(0x2a04, 0x2a04) AM_MIRROR(0x05f9) AM_WRITE(wrio_w) // /WRIO
+ AM_RANGE(0x2a06, 0x2a06) AM_MIRROR(0x05f9) AM_WRITE(mix_w) // /MIX
AM_RANGE(0x3000, 0x3fff) AM_ROMBANK("cpubank")
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -342,7 +342,7 @@ void atari_jsa_base_device::device_start()
// resolve devices
m_test_read_cb.resolve_safe(0);
m_main_int_cb.resolve_safe();
-
+
// save states
save_item(NAME(m_ym2151_volume));
save_item(NAME(m_ym2151_ct1));
@@ -398,7 +398,7 @@ WRITE16_MEMBER( atari_jsa_base_device::sound_reset_w )
//-------------------------------------------------
// ym2151_port_w: Handle writes from the YM2151
-// output port
+// output port
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_base_device::ym2151_port_w )
@@ -411,7 +411,7 @@ WRITE8_MEMBER( atari_jsa_base_device::ym2151_port_w )
//-------------------------------------------------
// main_test_read_line: Return the state of the
-// main's test line, provided by a callback
+// main's test line, provided by a callback
//-------------------------------------------------
READ_LINE_MEMBER(atari_jsa_base_device::main_test_read_line)
@@ -422,7 +422,7 @@ READ_LINE_MEMBER(atari_jsa_base_device::main_test_read_line)
//-------------------------------------------------
// main_int_write_line: Forward interrupt signals
-// from the comm device to the owning callback
+// from the comm device to the owning callback
//-------------------------------------------------
WRITE_LINE_MEMBER( atari_jsa_base_device::main_int_write_line )
@@ -456,7 +456,7 @@ atari_jsa_oki_base_device::atari_jsa_oki_base_device(const machine_config &mconf
//-------------------------------------------------
// oki_r: Handle reads from the OKI chip(s)
-// on the JSA II, III, and IIIs boards
+// on the JSA II, III, and IIIs boards
//-------------------------------------------------
READ8_MEMBER( atari_jsa_oki_base_device::oki_r )
@@ -465,7 +465,7 @@ READ8_MEMBER( atari_jsa_oki_base_device::oki_r )
if (m_oki2 != NULL && offset == 1)
return m_oki2->read(space, offset);
- // OKI may not be populated at all
+ // OKI may not be populated at all
else if (m_oki1 != NULL)
return m_oki1->read(space, offset);
@@ -476,7 +476,7 @@ READ8_MEMBER( atari_jsa_oki_base_device::oki_r )
//-------------------------------------------------
// oki_w: Handle writes to the OKI chip(s)
-// on the JSA II, III, and IIIs boards
+// on the JSA II, III, and IIIs boards
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_oki_base_device::oki_w )
@@ -485,7 +485,7 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::oki_w )
if (m_oki2 != NULL && offset == 1)
m_oki2->write(space, offset, data);
- // OKI may not be populated at all
+ // OKI may not be populated at all
else if (m_oki1 != NULL)
m_oki1->write(space, offset, data);
}
@@ -493,7 +493,7 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::oki_w )
//-------------------------------------------------
// wrio_w: Handle writes to the general
-// I/O port on JSA II, III, and IIIs boards
+// I/O port on JSA II, III, and IIIs boards
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w )
@@ -522,7 +522,7 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w )
if ((data & 4) == 0)
m_oki1->reset();
}
-
+
// same for the 2nd OKI (JSA IIIs only)
if (m_oki2 != NULL)
{
@@ -530,7 +530,7 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w )
if ((data & 4) == 0)
m_oki2->reset();
}
-
+
// update the (left) OKI bank (JSA III/IIIs only)
if (m_oki1_banklo != NULL)
m_oki1_banklo->set_entry((m_oki1_banklo->entry() & 2) | ((data >> 1) & 1));
@@ -543,7 +543,7 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w )
//-------------------------------------------------
// mix_w: Handle writes to the mixing
-// register on JSA II, III, and IIIs boards
+// register on JSA II, III, and IIIs boards
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_oki_base_device::mix_w )
@@ -572,8 +572,8 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::mix_w )
//-------------------------------------------------
-// overall_volume_w: Handle writes to control the
-// total sound volume on JSA III/IIIs boards
+// overall_volume_w: Handle writes to control the
+// total sound volume on JSA III/IIIs boards
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_oki_base_device::overall_volume_w )
@@ -591,7 +591,7 @@ void atari_jsa_oki_base_device::device_start()
{
// call the parent
atari_jsa_base_device::device_start();
-
+
// save states
save_item(NAME(m_oki6295_volume));
save_item(NAME(m_overall_volume));
@@ -622,7 +622,7 @@ void atari_jsa_oki_base_device::device_reset()
{
// call the parent
atari_jsa_base_device::device_reset();
-
+
// reset the static states
m_oki6295_volume = 1.0;
m_overall_volume = 1.0;
@@ -631,8 +631,8 @@ void atari_jsa_oki_base_device::device_reset()
//-------------------------------------------------
-// update_all_volumes: Update volumes for all
-// chips
+// update_all_volumes: Update volumes for all
+// chips
//-------------------------------------------------
void atari_jsa_oki_base_device::update_all_volumes()
@@ -666,7 +666,7 @@ atari_jsa_i_device::atari_jsa_i_device(const machine_config &mconfig, const char
//-------------------------------------------------
// rdio_r: Handle reads from the general I/O
-// port on a JSA I board
+// port on a JSA I board
//-------------------------------------------------
READ8_MEMBER( atari_jsa_i_device::rdio_r )
@@ -689,14 +689,14 @@ READ8_MEMBER( atari_jsa_i_device::rdio_r )
result |= 0x10;
else
result &= ~0x10;
-
+
return result;
}
//-------------------------------------------------
// wrio_w: Handle writes to the general I/O
-// port on a JSA I board
+// port on a JSA I board
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_i_device::wrio_w )
@@ -734,8 +734,8 @@ WRITE8_MEMBER( atari_jsa_i_device::wrio_w )
//-------------------------------------------------
-// mix_w: Handle writes to the mixing register
-// on a JSA I board
+// mix_w: Handle writes to the mixing register
+// on a JSA I board
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_i_device::mix_w )
@@ -756,7 +756,7 @@ WRITE8_MEMBER( atari_jsa_i_device::mix_w )
//-------------------------------------------------
// tms5220_voice: Handle writes to the TMS5220
-// voice data register
+// voice data register
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_i_device::tms5220_voice )
@@ -768,7 +768,7 @@ WRITE8_MEMBER( atari_jsa_i_device::tms5220_voice )
//-------------------------------------------------
// pokey_r: Handle reads from the POKEY if
-// present
+// present
//-------------------------------------------------
READ8_MEMBER( atari_jsa_i_device::pokey_r )
@@ -781,7 +781,7 @@ READ8_MEMBER( atari_jsa_i_device::pokey_r )
//-------------------------------------------------
// pokey_w: Handle writes to the POKEY if
-// present
+// present
//-------------------------------------------------
WRITE8_MEMBER( atari_jsa_i_device::pokey_w )
@@ -821,7 +821,7 @@ void atari_jsa_i_device::device_start()
{
// call the parent
atari_jsa_base_device::device_start();
-
+
// save states
save_item(NAME(m_pokey_volume));
save_item(NAME(m_tms5220_volume));
@@ -836,7 +836,7 @@ void atari_jsa_i_device::device_reset()
{
// call the parent
atari_jsa_base_device::device_reset();
-
+
// reset the static states
m_pokey_volume = 1.0;
m_tms5220_volume = 1.0;
@@ -845,8 +845,8 @@ void atari_jsa_i_device::device_reset()
//-------------------------------------------------
-// update_all_volumes: Update volumes for all
-// chips
+// update_all_volumes: Update volumes for all
+// chips
//-------------------------------------------------
void atari_jsa_i_device::update_all_volumes()
@@ -876,7 +876,7 @@ atari_jsa_ii_device::atari_jsa_ii_device(const machine_config &mconfig, const ch
//-------------------------------------------------
// rdio_r: Handle reads from the general I/O
-// port on a JSA II board
+// port on a JSA II board
//-------------------------------------------------
READ8_MEMBER( atari_jsa_ii_device::rdio_r )
@@ -895,7 +895,7 @@ READ8_MEMBER( atari_jsa_ii_device::rdio_r )
UINT8 result = ioport("JSAII")->read();
if (!m_test_read_cb())
result ^= 0x80;
-
+
return result;
}
@@ -944,7 +944,7 @@ atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, device
//-------------------------------------------------
// jsa_iii_rdio: Handle reads from the general I/O
-// port on a JSA III/IIIs board
+// port on a JSA III/IIIs board
//-------------------------------------------------
READ8_MEMBER( atari_jsa_iii_device::rdio_r )
diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h
index 8a40d82090b..225a9113e1b 100644
--- a/src/mame/audio/atarijsa.h
+++ b/src/mame/audio/atarijsa.h
@@ -1,7 +1,7 @@
/***************************************************************************
- audio/atarijsa.h
-
+ audio/atarijsa.h
+
Functions to emulate the Atari "JSA" audio boards
****************************************************************************
@@ -83,8 +83,7 @@ extern const device_type ATARI_JSA_IIIS;
#define MCFG_ATARI_JSA_TEST_PORT(_port, _bitnum) \
devcb = &atari_jsa_base_device::static_set_test_read_cb(*device, DEVCB2_IOPORT(_port)); \
- MCFG_DEVCB_RSHIFT(_bitnum); \
-
+ MCFG_DEVCB_RSHIFT(_bitnum);
//**************************************************************************
@@ -105,7 +104,7 @@ extern const device_type ATARI_JSA_IIIS;
// ======================> atari_jsa_base_device
-class atari_jsa_base_device : public device_t,
+class atari_jsa_base_device : public device_t,
public device_mixer_interface
{
protected:
@@ -126,7 +125,7 @@ public:
DECLARE_WRITE8_MEMBER(main_command_w);
DECLARE_READ8_MEMBER(main_response_r);
DECLARE_WRITE16_MEMBER(sound_reset_w);
-
+
// read/write handlers
DECLARE_WRITE8_MEMBER(ym2151_port_w);
DECLARE_READ_LINE_MEMBER(main_test_read_line);
@@ -138,7 +137,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// internal helpers
virtual void update_all_volumes() = 0;
@@ -146,18 +145,18 @@ protected:
required_device<atari_sound_comm_device> m_soundcomm;
required_device<m6502_device> m_jsacpu;
required_device<ym2151_device> m_ym2151;
-
+
// memory banks
required_memory_bank m_cpu_bank;
// configuration state
- devcb2_read_line m_test_read_cb;
- devcb2_write_line m_main_int_cb;
+ devcb2_read_line m_test_read_cb;
+ devcb2_write_line m_main_int_cb;
// internal state
- double m_ym2151_volume;
- UINT8 m_ym2151_ct1;
- UINT8 m_ym2151_ct2;
+ double m_ym2151_volume;
+ UINT8 m_ym2151_ct1;
+ UINT8 m_ym2151_ct2;
};
@@ -187,17 +186,17 @@ protected:
// devices
optional_device<okim6295_device> m_oki1;
- optional_device<okim6295_device> m_oki2; // JSA IIIs only
+ optional_device<okim6295_device> m_oki2; // JSA IIIs only
// memory banks
- optional_memory_bank m_oki1_banklo; // JSA III(s) only
- optional_memory_bank m_oki1_bankhi; // JSA III(s)
- optional_memory_bank m_oki2_banklo; // JSA IIIs only
- optional_memory_bank m_oki2_bankhi; // JSA IIIs only
+ optional_memory_bank m_oki1_banklo; // JSA III(s) only
+ optional_memory_bank m_oki1_bankhi; // JSA III(s)
+ optional_memory_bank m_oki2_banklo; // JSA IIIs only
+ optional_memory_bank m_oki2_bankhi; // JSA IIIs only
// internal state
- double m_oki6295_volume;
- double m_overall_volume; // JSA III(s) only
+ double m_oki6295_volume;
+ double m_overall_volume; // JSA III(s) only
};
@@ -223,7 +222,7 @@ protected:
virtual ioport_constructor device_input_ports() const;
virtual void device_start();
virtual void device_reset();
-
+
// internal helpers
virtual void update_all_volumes();
@@ -231,9 +230,9 @@ protected:
optional_device<pokey_device> m_pokey;
optional_device<tms5220_device> m_tms5220;
- // internal state
- double m_pokey_volume;
- double m_tms5220_volume;
+ // internal state
+ double m_pokey_volume;
+ double m_tms5220_volume;
};
diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c
index d1d4f2e2c17..e9e3ccb4b79 100644
--- a/src/mame/audio/beezer.c
+++ b/src/mame/audio/beezer.c
@@ -82,7 +82,7 @@ beezer_sound_device::beezer_sound_device(const machine_config &mconfig, const ch
m_sh6840_noiselatch1(0),
m_sh6840_noiselatch3(0),
m_stream(NULL)/*,
- m_freq_to_step(0)*/
+ m_freq_to_step(0)*/
{
memset(m_sh6840_timer, 0, sizeof(m_sh6840_timer));
m_sh6840_volume[0] = 0;
@@ -477,4 +477,4 @@ void beezer_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
sample += (((sample3*0x80)^(m_sh6840_volume[3]&0x80))?-1:1)*(m_sh6840_volume[3]&0x7F);
*buffer++ = sample*64; // adding 4 numbers ranging from -128 to 127 yields a range of -512 to 508; to scale that to '-32768 to 32767' we multiply by 64
}
-} \ No newline at end of file
+}
diff --git a/src/mame/audio/exidy440.h b/src/mame/audio/exidy440.h
index 2dcd3d7b304..00caa4f4903 100644
--- a/src/mame/audio/exidy440.h
+++ b/src/mame/audio/exidy440.h
@@ -44,10 +44,10 @@ public:
DECLARE_READ8_MEMBER( m6844_r );
DECLARE_WRITE8_MEMBER( m6844_w );
DECLARE_WRITE8_MEMBER( sound_banks_w );
-
+
void exidy440_sound_command(UINT8 param);
UINT8 exidy440_sound_command_ack();
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -86,7 +86,7 @@ private:
/* channel frequency is configurable */
int m_channel_frequency[4];
-
+
void m6844_update();
void m6844_finished(m6844_channel_data *channel);
void play_cvsd(int ch);
@@ -98,7 +98,7 @@ private:
void decode_and_filter_cvsd(UINT8 *data, int bytes, int maskbits, int frequency, INT16 *dest);
void fir_filter(INT32 *input, INT16 *output, int count);
-
+
void add_and_scale_samples(int ch, INT32 *dest, int samples, int volume);
void mix_to_16(int length, stream_sample_t *dest_left, stream_sample_t *dest_right);
};
diff --git a/src/mame/audio/hyprolyb.h b/src/mame/audio/hyprolyb.h
index 1574cc5ad95..33e61372c78 100644
--- a/src/mame/audio/hyprolyb.h
+++ b/src/mame/audio/hyprolyb.h
@@ -9,12 +9,12 @@ public:
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( busy_r );
-
+
WRITE8_MEMBER( msm_data_w );
READ8_MEMBER( msm_vck_r );
READ8_MEMBER( ready_r );
READ8_MEMBER( data_r );
-
+
void vck_callback( int st );
protected:
diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h
index d2adcb9ac68..12e3b871191 100644
--- a/src/mame/audio/irem.h
+++ b/src/mame/audio/irem.h
@@ -18,7 +18,7 @@ public:
DECLARE_WRITE8_MEMBER( sound_irq_ack_w );
DECLARE_WRITE8_MEMBER( m52_adpcm_w );
DECLARE_WRITE8_MEMBER( m62_adpcm_w );
-
+
void adpcm_int(int st);
protected:
@@ -31,8 +31,8 @@ protected:
private:
// internal state
- UINT8 m_port1;
- UINT8 m_port2;
+ UINT8 m_port1;
+ UINT8 m_port2;
ay8910_device *m_ay1;
ay8910_device *m_ay2;
diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h
index 8c8a42e3c07..10782d6d717 100644
--- a/src/mame/audio/m72.h
+++ b/src/mame/audio/m72.h
@@ -21,7 +21,7 @@ public:
Z80_ASSERT,
Z80_CLEAR
};
-
+
WRITE_LINE_MEMBER( ym2151_irq_handler );
DECLARE_WRITE8_MEMBER( sound_command_byte_w );
DECLARE_WRITE16_MEMBER( sound_command_w );
@@ -44,7 +44,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
private:
// internal state
UINT8 m_irqvector;
@@ -53,7 +53,7 @@ private:
UINT32 m_samples_size;
address_space *m_space;
dac_device *m_dac;
-
+
TIMER_CALLBACK_MEMBER( setvector_callback );
};
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index 1b7c46d238e..a3bde5f24ed 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -206,7 +206,7 @@ int phoenix_sound_device::noise(int samplerate)
int vc24 = update_c24(samplerate);
int vc25 = update_c25(samplerate);
int sum = 0, level, frequency;
-
+
/*
* The voltage levels are added and control I(CE) of transistor TR1
* (NPN) which then controls the noise clock frequency (linearily?).
diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h
index f981b25d975..4df9334db49 100644
--- a/src/mame/audio/timeplt.h
+++ b/src/mame/audio/timeplt.h
@@ -12,7 +12,7 @@ public:
DECLARE_WRITE8_MEMBER( sh_irqtrigger_w );
DECLARE_WRITE8_MEMBER( filter_w );
DECLARE_READ8_MEMBER( portB_r );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -32,7 +32,7 @@ private:
device_t *m_filter_1_0;
device_t *m_filter_1_1;
device_t *m_filter_1_2;
-
+
void filter_w( device_t *device, int data );
};
diff --git a/src/mame/audio/trackfld.h b/src/mame/audio/trackfld.h
index 9a81b0db229..4593e2ad37b 100644
--- a/src/mame/audio/trackfld.h
+++ b/src/mame/audio/trackfld.h
@@ -25,7 +25,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
private:
// internal state
int m_last_addr;
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index 7191e3d23c0..240fe2a6d71 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -496,7 +496,7 @@ WRITE8_MEMBER( buggyboy_sound_device::ym2_b_w )
void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
/* This is admittedly a bit of a hack job... */
-
+
UINT32 step_0, step_1;
int n1_en, n2_en;
double gain0, gain1_l, gain1_r;
@@ -572,4 +572,4 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
m_step0 += step_0;
m_step1 += step_1;
}
-} \ No newline at end of file
+}
diff --git a/src/mame/audio/wiping.h b/src/mame/audio/wiping.h
index 85d7c8f6676..896beae3343 100644
--- a/src/mame/audio/wiping.h
+++ b/src/mame/audio/wiping.h
@@ -20,7 +20,7 @@ public:
~wiping_sound_device() {}
DECLARE_WRITE8_MEMBER( sound_w );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -49,7 +49,7 @@ private:
short *m_mixer_buffer_2;
UINT8 m_soundregs[0x4000];
-
+
void make_mixer_table(int voices, int gain);
};
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 631f4e0c828..2cdaae67b26 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -530,7 +530,7 @@ MACHINE_CONFIG_END
ROM_REGION( 0x600, "gals", 0 ) \
ROM_LOAD( "a562837.u36", 0x000000, 0x000157, CRC(1f269234) SHA1(29940dd50fb55c632935f62ff44ca724379c7a43) ) \
ROM_LOAD( "a562838.u65", 0x000200, 0x000157, CRC(f2f3c40a) SHA1(b795dfa5cc4e8127c3f3a0906664910d1325ec92) ) \
- ROM_LOAD( "a562840.u22", 0x000400, 0x000157, CRC(941d4cdb) SHA1(1ca091fba69e92f262dbb3d40f515703c8981793) )
+ ROM_LOAD( "a562840.u22", 0x000400, 0x000157, CRC(941d4cdb) SHA1(1ca091fba69e92f262dbb3d40f515703c8981793) )
ROM_START( aristmk5 )
ARISTOCRAT_MK5_BIOS
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 38866d17267..0a10ada7356 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -53,7 +53,7 @@ PCB Layout
Note an original Taito Arkanoid PCB is approximately 10" square and is
painted white. The copper traces are not visible. The part type and
-location of each component is printed in green on the PCB on top of the
+location of each component is printed in green on the PCB on top of the
white paint.
The following MCU images were tested on an original Arkanoid PCB using sets
@@ -61,13 +61,13 @@ The following MCU images were tested on an original Arkanoid PCB using sets
(1) MCU image with CRC 0x389a8cfb
(2) MCU image with CRC 0x515d77b6
-An MCU found on a Tournament Arkanoid PCB was an unprotected type MC68705P3
-and when read the CRC matched (1). So we can assume the MCUs for Arkanoid and
+An MCU found on a Tournament Arkanoid PCB was an unprotected type MC68705P3
+and when read the CRC matched (1). So we can assume the MCUs for Arkanoid and
Tournament Arkanoid are the same.... or are at least interchangeable and work.
-"Tetris (D.R. Korea)" in MAME is a hack on an original Arkanoid PCB.
-The hack can be undone and returned to Arkanoid simply by removing the mod
-wires on the YM2149, replacing the ROMs with Arkanoid ROMs and replacing
+"Tetris (D.R. Korea)" in MAME is a hack on an original Arkanoid PCB.
+The hack can be undone and returned to Arkanoid simply by removing the mod
+wires on the YM2149, replacing the ROMs with Arkanoid ROMs and replacing
the PC030CM which was removed. A working Arkanoid 68705 MCU is also required.
The above 'tested' images can be used.
@@ -110,7 +110,7 @@ K1100181A (ROMSTAR version added sticker)
Notes:
Z80 - Zilog Z0840006 CPU. Clock input 6.000MHz (12/2)
YM2149F - Yamaha YM2149F software-controlled sound generator (SSG). Clock input 1.5MHz (12/8)
- A75_06.IC14 - Motorola MC68705P5 micro-controller. Clock input 3.000MHz (12/4). Labelled 'A75 06' for
+ A75_06.IC14 - Motorola MC68705P5 micro-controller. Clock input 3.000MHz (12/4). Labelled 'A75 06' for
ROMSTAR version. Note original Taito version 68705 and Tournament Arkanoid MCUs work fine.
A75_* - 27C256 EPROMs labelled 'A75 xx'. xx = 01, 03, 04, 05 etc. See ROM loading in the src for exact ROM usage.
A75-0* - MMI 63S241 bipolar PROMs. Compatible with MB7116, 7621, DM74S571N etc
@@ -126,8 +126,8 @@ Notes:
Note the G connector is the 22-way edge connector.
The Japanese manual states (translated to English).....
********
- The coin-SW of this Main PC Board does not work without wiring coin meter to
- coin meter pins of the G-connector.
+ The coin-SW of this Main PC Board does not work without wiring coin meter to
+ coin meter pins of the G-connector.
You need to modify as follows in case coin meter is not connected to Main PC Board.
Coin System A ..... Wire jumper JP4 on Main PC Board. Coin meter not used.
Coin System B ..... Wire jumper JP3 on Main PC Board. Coin meter used.
@@ -137,8 +137,8 @@ Notes:
--------------
HSync - 15.625kHz
VSync - 59.185Hz
-
-
+
+
POWER connector H
-----------------
1 Ground
@@ -153,8 +153,8 @@ Notes:
10 Post
11 NC
12 NC
-
-
+
+
22-way edge connector G
-----------------------
@@ -188,9 +188,9 @@ COIN LOCKOUT (A) |10 L | COIN LOCKOUT (B)
Note about spinner controller
-----------------------------
-This game requires a geared spinner to operate correctly. A trackball or other optical
+This game requires a geared spinner to operate correctly. A trackball or other optical
controller or home-made spinner built from a PC mouse will work but the player moves too
-slowly and the game is unplayable. The Taito geared spinner moves the optical wheel *very*
+slowly and the game is unplayable. The Taito geared spinner moves the optical wheel *very*
fast to ensure the player moves fast enough to follow and return the ball easily. The ratio of
the control knob rotation to the optical wheel rotation is 1:20 so for one rotation of the
control knob the optical wheel rotates 20 times.
@@ -202,14 +202,14 @@ Pin 2 - +5V
Pin 3 - Ground
Pin 4 - Right
-These pins are listed from the Japanese Taito manual and have been tested to be correct with
+These pins are listed from the Japanese Taito manual and have been tested to be correct with
the real Taito Arkanoid spinner.
The US ROMSTAR manual lists pin 4 as left and pin 1 as right. This information is probably
incorrect. Pins 2 and 3 are the same.
Spinner PCB Layout
------------------
-J9000024A
+J9000024A
K9000060A
|-----------|
| OPTO |
@@ -224,7 +224,7 @@ Notes:
POWER - Power input connector. Pin 1 is on the right.
S - Screw positions to show orientation of the PCB with reference to the power connector pin 1
-
+
DIP Switches
+-----------------------------+--------------------------------+
|FACTORY DEFAULT = * | 1 2 3 4 5 6 7 8 |
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 6fbdfe9a47d..1563732c39b 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -251,8 +251,8 @@ static INPUT_PORTS_START( hydra )
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
// todo:
-// PORT_MODIFY( "jsa:JSAII" )
-// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_MODIFY( "jsa:JSAII" )
+// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -296,8 +296,8 @@ static INPUT_PORTS_START( pitfight )
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
// todo:
-// PORT_MODIFY( "jsa:JSAII" )
-// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_MODIFY( "jsa:JSAII" )
+// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -334,8 +334,8 @@ static INPUT_PORTS_START( pitfightj )
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
// todo:
-// PORT_MODIFY( "jsa:JSAII" )
-// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_MODIFY( "jsa:JSAII" )
+// PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -466,7 +466,7 @@ static MACHINE_CONFIG_START( atarig1, atarig1_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 14)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 82d69d5dfe6..dac5afdd190 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( atarig42, atarig42_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN2", 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 71db72291aa..2977834df71 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1435,7 +1435,7 @@ static MACHINE_CONFIG_START( atarigx2, atarigx2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
+
MCFG_ATARI_JSA_IIIS_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("SERVICE", 6)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index d599a53caee..581cd372943 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -222,7 +222,7 @@ static MACHINE_CONFIG_START( batman, batman_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 51648299fff..fb89246d5be 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -375,9 +375,9 @@ static INPUT_PORTS_START( beathead )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNUSED )
// to do
-// PORT_MODIFY("jsa:JSAIII")
+// PORT_MODIFY("jsa:JSAIII")
// coin 1+2 import from JSAIII not used - set to unused
-// PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -410,7 +410,7 @@ static MACHINE_CONFIG_START( beathead, beathead_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN2", 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c
index 3304f5856d3..976697b9f69 100644
--- a/src/mame/drivers/bfm_sc4h.c
+++ b/src/mame/drivers/bfm_sc4h.c
@@ -613,7 +613,7 @@ MACHINE_START_MEMBER(sc4_state,sc4)
bfm_sc4_68307_portb_w );
m68307_set_duart68681(m_maincpu,machine().device("m68307_68681"));
-
+
int reels = 6;
m_reels=reels;
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 98d90fbf7db..aec6596cd6f 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -65,8 +65,8 @@ READ8_MEMBER(bking_state::bking3_extrarom_r)
WRITE8_MEMBER(bking_state::unk_w)
{
- // 0 = finished reading extra rom
- // 1 = started reading extra rom
+ // 0 = finished reading extra rom
+ // 1 = started reading extra rom
}
READ8_MEMBER(bking_state::bking3_ext_check_r)
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index 3a3d641c711..3758c386aff 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -141,7 +141,7 @@ static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16, bloodbro_state )
AM_RANGE(0x08e800, 0x08f7ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x08f800, 0x08ffff) AM_RAM
AM_RANGE(0x0a0000, 0x0a000d) AM_READWRITE_LEGACY(seibu_main_word_r, seibu_main_word_w)
-// AM_RANGE(0x0c0000, 0x0c007f) AM_RAM AM_SHARE("scroll")
+// AM_RANGE(0x0c0000, 0x0c007f) AM_RAM AM_SHARE("scroll")
AM_RANGE(0x0c0080, 0x0c0081) AM_WRITENOP // ??? IRQ Ack VBL?
AM_RANGE(0x0c00c0, 0x0c00c1) AM_WRITENOP // ??? watchdog?
AM_RANGE(0x0c0100, 0x0c0101) AM_WRITENOP // ??? written once
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 4d593ec19a2..8dc840e4334 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -196,7 +196,7 @@ static MACHINE_CONFIG_START( blstroid, blstroid_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
+
MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 7)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 7df42d2d9f6..e9408865ae0 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -96,7 +96,7 @@ READ16_MEMBER( boogwing_state::boogwing_protection_region_0_104_r )
}
WRITE16_MEMBER( boogwing_state::boogwing_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -116,10 +116,10 @@ static ADDRESS_MAP_START( boogwing_map, AS_PROGRAM, 16, boogwing_state )
AM_RANGE(0x244000, 0x244001) AM_DEVWRITE("spriteram2", buffered_spriteram16_device, write)
AM_RANGE(0x246000, 0x2467ff) AM_RAM AM_SHARE("spriteram2")
-// AM_RANGE(0x24e6c0, 0x24e6c1) AM_READ_PORT("DSW")
-// AM_RANGE(0x24e138, 0x24e139) AM_READ_PORT("SYSTEM")
-// AM_RANGE(0x24e344, 0x24e345) AM_READ_PORT("INPUTS")
-// /*READD AM_RANGE(0x24e000, 0x24e7ff) AM_WRITE_LEGACY(deco16_104_prot_w) AM_SHARE("prot16ram") */
+// AM_RANGE(0x24e6c0, 0x24e6c1) AM_READ_PORT("DSW")
+// AM_RANGE(0x24e138, 0x24e139) AM_READ_PORT("SYSTEM")
+// AM_RANGE(0x24e344, 0x24e345) AM_READ_PORT("INPUTS")
+// /*READD AM_RANGE(0x24e000, 0x24e7ff) AM_WRITE_LEGACY(deco16_104_prot_w) AM_SHARE("prot16ram") */
AM_RANGE(0x24e000, 0x24efff) AM_READWRITE(boogwing_protection_region_0_104_r,boogwing_protection_region_0_104_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x260000, 0x26000f) AM_DEVWRITE("tilegen1", deco16ic_device, pf_control_w)
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 25ba6717970..b1eb11b107e 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -400,7 +400,7 @@ static MACHINE_CONFIG_START( capbowl, capbowl_state )
MCFG_SCREEN_VISIBLE_AREA(0, 359, 0, 244)
MCFG_SCREEN_REFRESH_RATE(57)
MCFG_SCREEN_UPDATE_DRIVER(capbowl_state, screen_update_capbowl)
-
+
MCFG_TMS34061_ADD("tms34061", tms34061intf)
/* sound hardware */
diff --git a/src/mame/drivers/cavepc.c b/src/mame/drivers/cavepc.c
index fc554a98547..c9545cf102b 100644
--- a/src/mame/drivers/cavepc.c
+++ b/src/mame/drivers/cavepc.c
@@ -1,22 +1,22 @@
/***************************************************************************
CAVE PC hardware
- placeholder file for information
+ placeholder file for information
***************************************************************************
Cave used a one-off PC platform for
-
+
Deathsmiles II (c)2009
- According to
+ According to
http://forum.arcadeotaku.com/viewtopic.php?f=26&t=9851
It uses a ASUS M3A78-EM motherboard (boot screen is shown)
http://www.asus.com/Motherboards/M3A78EM/
fitted with
AMD Athlon 64 X2 5050e Brisbane 2.60GHz, 1024KB L2 Cache
- 2048MB (2GB) 800MHz DDR
+ 2048MB (2GB) 800MHz DDR
and a custom JVS I/O board providing security etc.
'CV2000XP Rev 2.0'
@@ -46,4 +46,3 @@
http://forum.arcadeotaku.com/viewtopic.php?f=26&t=14850&start=60
*/
-
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 08ec1c018b9..b3c071d358d 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -388,11 +388,11 @@ struct nvidia_object_data
class chihiro_state : public driver_device
{
public:
- chihiro_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- nvidia_nv2a(NULL),
- debug_irq_active(false),
- m_maincpu(*this, "maincpu") { }
+ chihiro_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
+ nvidia_nv2a(NULL),
+ debug_irq_active(false),
+ m_maincpu(*this, "maincpu") { }
DECLARE_READ32_MEMBER( geforce_r );
DECLARE_WRITE32_MEMBER( geforce_w );
@@ -435,7 +435,7 @@ public:
pic8259_device *pic8259_2;
bus_master_ide_controller_device *ide;
naomi_gdrom_board *dimmboard;
- } chihiro_devs;
+ } chihiro_devs;
struct smbus_state {
int status;
int control;
@@ -1006,16 +1006,16 @@ static void curthread_command(running_machine &machine, int ref, int params, con
address=(offs_t)kthrd+0x1c;
if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address))
return;
- topstack=space.read_dword_unaligned(address);
+ topstack=space.read_dword_unaligned(address);
debug_console_printf(machine,"Current thread stack top is %08X\n",topstack);
address=(offs_t)kthrd+0x28;
if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address))
return;
- tlsdata=space.read_dword_unaligned(address);
+ tlsdata=space.read_dword_unaligned(address);
if (tlsdata == 0)
address=(offs_t)topstack-0x210-8;
- else
- address=(offs_t)tlsdata-8;
+ else
+ address=(offs_t)tlsdata-8;
if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address))
return;
debug_console_printf(machine,"Current thread function is %08X\n",space.read_dword_unaligned(address));
@@ -1777,11 +1777,11 @@ void nv2a_renderer::geforce_exec_method(address_space & space,UINT32 chanel,UINT
offset=data;
texture[unit].buffer=space.get_read_ptr(offset);
/*if (dma0 != 0) {
- dmahand=channel[channel][subchannel].object.method[0x184/4];
- geforce_read_dma_object(dmahand,dmaoff,smasiz);
+ dmahand=channel[channel][subchannel].object.method[0x184/4];
+ geforce_read_dma_object(dmahand,dmaoff,smasiz);
} else if (dma1 != 0) {
- dmahand=channel[channel][subchannel].object.method[0x188/4];
- geforce_read_dma_object(dmahand,dmaoff,smasiz);
+ dmahand=channel[channel][subchannel].object.method[0x188/4];
+ geforce_read_dma_object(dmahand,dmaoff,smasiz);
}*/
}
if (maddress == 0x1b04) {
@@ -2629,7 +2629,7 @@ void chihiro_state::debug_generate_irq(int irq,bool active)
debug_irq_number=irq;
state=1;
}
- else
+ else
{
debug_irq_active=false;
state=0;
@@ -2896,7 +2896,7 @@ WRITE32_MEMBER( nv2a_renderer::geforce_w )
}
}
} else ;
-// logerror("NV_2A: write at %08X mask %08X value %08X\n",0xfd000000+offset*4,mem_mask,data);
+// logerror("NV_2A: write at %08X mask %08X value %08X\n",0xfd000000+offset*4,mem_mask,data);
}
READ32_MEMBER( chihiro_state::geforce_r )
@@ -2912,7 +2912,7 @@ WRITE32_MEMBER( chihiro_state::geforce_w )
static UINT32 geforce_pci_r(device_t *busdevice, device_t *device, int function, int reg, UINT32 mem_mask)
{
#ifdef LOG_PCI
-// logerror(" bus:1 device:NV_2A function:%d register:%d mask:%08X\n",function,reg,mem_mask);
+// logerror(" bus:1 device:NV_2A function:%d register:%d mask:%08X\n",function,reg,mem_mask);
#endif
return 0;
}
@@ -2920,7 +2920,7 @@ static UINT32 geforce_pci_r(device_t *busdevice, device_t *device, int function,
static void geforce_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
{
#ifdef LOG_PCI
-// logerror(" bus:1 device:NV_2A function:%d register:%d data:%08X mask:%08X\n",function,reg,data,mem_mask);
+// logerror(" bus:1 device:NV_2A function:%d register:%d data:%08X mask:%08X\n",function,reg,data,mem_mask);
#endif
}
@@ -3080,7 +3080,7 @@ TIMER_CALLBACK_MEMBER(chihiro_state::audio_apu_timer)
if (cmd == 3)
apust.space->write_dword(apust.memory0_address+0x800+0x10,0);
/*else
- logerror("Audio_APU: unexpected value at address %d\n",apust.memory0_address+0x800+0x10);*/
+ logerror("Audio_APU: unexpected value at address %d\n",apust.memory0_address+0x800+0x10);*/
}
/*
@@ -3090,7 +3090,7 @@ TIMER_CALLBACK_MEMBER(chihiro_state::audio_apu_timer)
static UINT32 dummy_pci_r(device_t *busdevice, device_t *device, int function, int reg, UINT32 mem_mask)
{
#ifdef LOG_PCI
-// logerror(" bus:0 function:%d register:%d mask:%08X\n",function,reg,mem_mask);
+// logerror(" bus:0 function:%d register:%d mask:%08X\n",function,reg,mem_mask);
#endif
return 0;
}
@@ -3188,7 +3188,7 @@ int ide_baseboard_device::read_sector(UINT32 lba, void *buffer)
0 0x40000-0x8000
...
4 0x400000-0x8000
- The size of the second one is always 0x8000 sectors, and is used as a special communication area
+ The size of the second one is always 0x8000 sectors, and is used as a special communication area
This is a list of the partitions in the minimum size case:
Name Start lba Size lba Size
\??\mbfs: 0x0 0x38000 112MB
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 9521fe13f84..176d19ec5ea 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -149,7 +149,7 @@ READ16_MEMBER( cninja_state::cninja_protection_region_0_104_r )
}
WRITE16_MEMBER( cninja_state::cninja_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -178,8 +178,8 @@ static ADDRESS_MAP_START( cninja_map, AS_PROGRAM, 16, cninja_state )
AM_RANGE(0x1a4000, 0x1a47ff) AM_RAM AM_SHARE("spriteram") /* Sprites */
AM_RANGE(0x1b4000, 0x1b4001) AM_DEVWRITE("spriteram", buffered_spriteram16_device, write) /* DMA flag */
-// AM_RANGE(0x1bc000, 0x1bc0ff) AM_WRITE_LEGACY(deco16_104_cninja_prot_w) AM_SHARE("prot16ram") /* Protection writes */
-// AM_RANGE(0x1bc000, 0x1bcfff) AM_READ_LEGACY(deco16_104_cninja_prot_r) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0x1bc000, 0x1bc0ff) AM_WRITE_LEGACY(deco16_104_cninja_prot_w) AM_SHARE("prot16ram") /* Protection writes */
+// AM_RANGE(0x1bc000, 0x1bcfff) AM_READ_LEGACY(deco16_104_cninja_prot_r) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x1bc000, 0x1bffff) AM_READWRITE(cninja_protection_region_0_104_r,cninja_protection_region_0_104_w) AM_SHARE("prot16ram") /* Protection device */
@@ -236,23 +236,23 @@ WRITE16_MEMBER( cninja_state::sshangha_protection_region_8_146_w )
READ16_MEMBER( cninja_state::sshangha_protection_region_6_146_r )
{
-// UINT16 realdat = deco16_60_prot_r(space,offset&0x3ff,mem_mask);
-
+// UINT16 realdat = deco16_60_prot_r(space,offset&0x3ff,mem_mask);
+
int real_address = 0x198000 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
UINT16 data = m_deco146->read_data( deco146_addr, mem_mask, cs );
-
-// if ((realdat & mem_mask) != (data & mem_mask))
-// printf("returned %04x instead of %04x (real address %08x)\n", data, realdat, real_address);
-
+
+// if ((realdat & mem_mask) != (data & mem_mask))
+// printf("returned %04x instead of %04x (real address %08x)\n", data, realdat, real_address);
+
return data;
}
WRITE16_MEMBER( cninja_state::sshangha_protection_region_6_146_w )
{
-// deco16_60_prot_w(space,offset&0x3ff,data,mem_mask);
+// deco16_60_prot_w(space,offset&0x3ff,data,mem_mask);
int real_address = 0x198000 + (offset *2);
@@ -278,11 +278,11 @@ static ADDRESS_MAP_START( edrandy_map, AS_PROGRAM, 16, cninja_state )
AM_RANGE(0x188000, 0x189fff) AM_RAM_DEVWRITE("deco_common", decocomn_device, nonbuffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x194000, 0x197fff) AM_RAM AM_SHARE("ram") /* Main ram */
-// AM_RANGE(0x198000, 0x1987ff) AM_READWRITE_LEGACY(deco16_60_prot_r, deco16_60_prot_w) AM_SHARE("prot16ram") /* Protection device */
-// AM_RANGE(0x199550, 0x199551) AM_WRITENOP /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */
-// AM_RANGE(0x199750, 0x199751) AM_WRITENOP /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */
+// AM_RANGE(0x198000, 0x1987ff) AM_READWRITE_LEGACY(deco16_60_prot_r, deco16_60_prot_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0x199550, 0x199551) AM_WRITENOP /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */
+// AM_RANGE(0x199750, 0x199751) AM_WRITENOP /* Looks like a bug in game code, a protection write is referenced off a5 instead of a6 and ends up here */
AM_RANGE(0x198000, 0x19bfff) AM_READWRITE(sshangha_protection_region_6_146_r,sshangha_protection_region_6_146_w) AM_SHARE("prot16ram") /* Protection device */
-// AM_RANGE(0x198000, 0x1987ff) AM_READWRITE(sshangha_protection_region_6_146_r,sshangha_protection_region_6_146_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0x198000, 0x1987ff) AM_READWRITE(sshangha_protection_region_6_146_r,sshangha_protection_region_6_146_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x1a0000, 0x1a3fff) AM_READWRITE(sshangha_protection_region_8_146_r,sshangha_protection_region_8_146_w)
@@ -310,8 +310,8 @@ static ADDRESS_MAP_START( robocop2_map, AS_PROGRAM, 16, cninja_state )
AM_RANGE(0x180000, 0x1807ff) AM_RAM AM_SHARE("spriteram")
// AM_RANGE(0x18c000, 0x18c0ff) AM_WRITE(cninja_loopback_w) /* Protection writes */
-// AM_RANGE(0x18c000, 0x18c7ff) AM_DEVREAD("ioprot", deco146_device,robocop2_prot_r) /* Protection device */
-// AM_RANGE(0x18c064, 0x18c065) AM_WRITE(cninja_sound_w)
+// AM_RANGE(0x18c000, 0x18c7ff) AM_DEVREAD("ioprot", deco146_device,robocop2_prot_r) /* Protection device */
+// AM_RANGE(0x18c064, 0x18c065) AM_WRITE(cninja_sound_w)
AM_RANGE(0x18c000, 0x18ffff) AM_READWRITE(mutantf_protection_region_0_146_r,mutantf_protection_region_0_146_w)AM_SHARE("prot16ram") /* Protection device */
@@ -336,7 +336,7 @@ READ16_MEMBER( cninja_state::mutantf_protection_region_0_146_r )
}
WRITE16_MEMBER( cninja_state::mutantf_protection_region_0_146_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -353,7 +353,7 @@ static ADDRESS_MAP_START( mutantf_map, AS_PROGRAM, 16, cninja_state )
AM_RANGE(0x160000, 0x161fff) AM_RAM_DEVWRITE("deco_common", decocomn_device, nonbuffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x180000, 0x180001) AM_DEVWRITE("deco_common", decocomn_device, priority_w)
AM_RANGE(0x180002, 0x180003) AM_WRITENOP /* VBL irq ack */
-// AM_RANGE(0x1a0000, 0x1a07ff) AM_READWRITE_LEGACY(deco16_66_prot_r, deco16_66_prot_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0x1a0000, 0x1a07ff) AM_READWRITE_LEGACY(deco16_66_prot_r, deco16_66_prot_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x1a0000, 0x1a3fff) AM_READWRITE(mutantf_protection_region_0_146_r,mutantf_protection_region_0_146_w)AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x1c0000, 0x1c0001) AM_DEVWRITE("spriteram", buffered_spriteram16_device, write) AM_DEVREAD("deco_common", decocomn_device, d_71_r)
AM_RANGE(0x1e0000, 0x1e0001) AM_DEVWRITE("spriteram2", buffered_spriteram16_device, write)
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 2fae7483b60..e8565c97e85 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -471,7 +471,7 @@ ROM_START( commandob2 )
/* There's a 16L8 PAL (with a 74LS245 and a 74LS08) on a tiny sub-board between the CPU1 ROMs
and the CPU1 (a Z80 compatible NEC D780C-1). This sub-board is plugged on what seems to be
a ROM socket.
-
+
PAL16L8 (SWELT-019A)
Pin 1 - Pin 12 of 27256 (D1) and Pin 3 of 74LS245 (A2) (Input)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index be4ffda3d9c..baea5637657 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -3907,55 +3907,55 @@ ROM_START( striderj )
ROM_LOAD16_BYTE( "sth_42.12h", 0x00001, 0x20000, CRC(4037f65f) SHA1(490b9fb15f80772316101ea15e61ab32f42feaec) )
ROM_LOAD16_BYTE( "sth_37.13f", 0x40000, 0x20000, CRC(80e8877d) SHA1(806a62c03007efe6d58fb24dac467d4fc39bb96a) )
ROM_LOAD16_BYTE( "sth_43.13h", 0x40001, 0x20000, CRC(6b3fa466) SHA1(6a3c9bd491eecf864971f7fdf02d01112d5ef7dd) )
- ROM_LOAD16_BYTE( "sth_34.10f", 0x80000, 0x20000, CRC(bea770b5) SHA1(b1d3111c8878708b6d0589d6bdfd3b380842d98b) ) // == st-14.8h
- ROM_LOAD16_BYTE( "sth_40.10h", 0x80001, 0x20000, CRC(43b922dc) SHA1(441c932080ae2b19e3834e7173d46be2e8762119) ) // == st-14.8h
- ROM_LOAD16_BYTE( "sth_35.11f", 0xc0000, 0x20000, CRC(5cc429da) SHA1(1d3593444d556fcb7b209ef254b7733cb32dc502) ) // == st-14.8h
- ROM_LOAD16_BYTE( "sth_41.11h", 0xc0001, 0x20000, CRC(50af457f) SHA1(fb7248e41c09f137c929a2bd9ef17591f48b7009) ) // == st-14.8h
+ ROM_LOAD16_BYTE( "sth_34.10f", 0x80000, 0x20000, CRC(bea770b5) SHA1(b1d3111c8878708b6d0589d6bdfd3b380842d98b) ) // == st-14.8h
+ ROM_LOAD16_BYTE( "sth_40.10h", 0x80001, 0x20000, CRC(43b922dc) SHA1(441c932080ae2b19e3834e7173d46be2e8762119) ) // == st-14.8h
+ ROM_LOAD16_BYTE( "sth_35.11f", 0xc0000, 0x20000, CRC(5cc429da) SHA1(1d3593444d556fcb7b209ef254b7733cb32dc502) ) // == st-14.8h
+ ROM_LOAD16_BYTE( "sth_41.11h", 0xc0001, 0x20000, CRC(50af457f) SHA1(fb7248e41c09f137c929a2bd9ef17591f48b7009) ) // == st-14.8h
ROM_REGION( 0x400000, "gfx", 0 )
- ROMX_LOAD( "sth_09.4b", 0x000000, 0x20000, CRC(1ef6bfbd) SHA1(5e66168e2526b4b4569d9dabacd5602181b23874) , ROM_SKIP(7) ) // == st-2.8a
- ROMX_LOAD( "sth_01.4a", 0x000001, 0x20000, CRC(1e21b0c1) SHA1(2ac543dccefa7e2438d7eb53cdf2e6aff09c735b) , ROM_SKIP(7) ) // == st-2.8a
- ROMX_LOAD( "sth_13.9b", 0x000002, 0x20000, CRC(063263ae) SHA1(38ea256f9a0f3fd6786d21c8b540030b73742971) , ROM_SKIP(7) ) // == st-11.10a
- ROMX_LOAD( "sth_05.9a", 0x000003, 0x20000, CRC(ec9f8714) SHA1(8eb2b92ad576849b8049f9c90b850f74c2a5cba2) , ROM_SKIP(7) ) // == st-11.10a
- ROMX_LOAD( "sth_24.5e", 0x000004, 0x20000, CRC(6356f4d2) SHA1(8d6786e07dba3e59a609c1a13be8685e4fdb8879) , ROM_SKIP(7) ) // == st-5.4a
- ROMX_LOAD( "sth_17.5c", 0x000005, 0x20000, CRC(b4f73d86) SHA1(0ffbcc93ce7eadfd29255a15bc5cbd6e24f98759) , ROM_SKIP(7) ) // == st-5.4a
- ROMX_LOAD( "sth_38.8h", 0x000006, 0x20000, CRC(ee5abfc2) SHA1(1c162bc09991f1082b4d9d22fbce13f2c08e0ceb) , ROM_SKIP(7) ) // == st-9.6a
- ROMX_LOAD( "sth_32.8f", 0x000007, 0x20000, CRC(44a206a3) SHA1(67ec4b9cf3ff181c8c4c4751a1d2e8ee8e56278a) , ROM_SKIP(7) ) // == st-9.6a
- ROMX_LOAD( "sth_10.5b", 0x100000, 0x20000, CRC(df3dd3bc) SHA1(648218f94ecda25873103ac4e2d7132c79f1c5b2) , ROM_SKIP(7) ) // == st-2.8a
- ROMX_LOAD( "sth_02.5a", 0x100001, 0x20000, CRC(c75f9ea0) SHA1(e9268bfa6f5254935fda726ab4b5d9acb0f1942a) , ROM_SKIP(7) ) // == st-2.8a
- ROMX_LOAD( "sth_14.10b", 0x100002, 0x20000, CRC(6c03e19d) SHA1(83f892df551ea79534288643b07613a3c595d526) , ROM_SKIP(7) ) // == st-11.10a
- ROMX_LOAD( "sth_06.10a", 0x100003, 0x20000, CRC(d84f5478) SHA1(c3812056ff2563a43d11746ec8327700f370a053) , ROM_SKIP(7) ) // == st-11.10a
- ROMX_LOAD( "sth_25.7e", 0x100004, 0x20000, CRC(921e506a) SHA1(fd2b5e2121c2adedcb0325b4159273506dab27e8) , ROM_SKIP(7) ) // == st-5.4a
- ROMX_LOAD( "sth_18.7c", 0x100005, 0x20000, CRC(5b318956) SHA1(b1415472bf45787219b3b7680057910b210d57f5) , ROM_SKIP(7) ) // == st-5.4a
- ROMX_LOAD( "sth_39.9h", 0x100006, 0x20000, CRC(9321d6aa) SHA1(acec3c880d29692cf010540c120b9092d7dd8ce9) , ROM_SKIP(7) ) // == st-9.6a
- ROMX_LOAD( "sth_33.9f", 0x100007, 0x20000, CRC(b47ddfc7) SHA1(12388c37abdde85d63305f86244fc3c07f8b6b0c) , ROM_SKIP(7) ) // == st-9.6a
- ROMX_LOAD( "sth_11.7b", 0x200000, 0x20000, CRC(2484f241) SHA1(28c48526ec2577119cc3207e92138749124b5959) , ROM_SKIP(7) ) // == st-1.7a
- ROMX_LOAD( "sth_03.7a", 0x200001, 0x20000, CRC(aaa07245) SHA1(64a1b75b7613c1949eee6f9ba865dbdd7ec34413) , ROM_SKIP(7) ) // == st-1.7a
- ROMX_LOAD( "sth_15.11b", 0x200002, 0x20000, CRC(e415d943) SHA1(12069d02d3a6afa9241222b48420daaf97874271) , ROM_SKIP(7) ) // == st-10.9a
- ROMX_LOAD( "sth_07.11a", 0x200003, 0x20000, CRC(97d072d2) SHA1(fb0e10464a878ec6c0f3e6c6ddb0ea542bfb87a8) , ROM_SKIP(7) ) // == st-10.9a
- ROMX_LOAD( "sth_26.8e", 0x200004, 0x20000, CRC(0ebfcb02) SHA1(a7238e1c76dbc2de1b7ae0d2cc532170cd1ab6c2) , ROM_SKIP(7) ) // == st-4.3a
- ROMX_LOAD( "sth_19.8c", 0x200005, 0x20000, CRC(257ce683) SHA1(762f22b5ba24864d69dda303310a310d8dbfcc1c) , ROM_SKIP(7) ) // == st-4.3a
- ROMX_LOAD( "sth_28.10e", 0x200006, 0x20000, CRC(98ac8cd1) SHA1(53dbe418d5cb7af5ef4be91e5e6bcd4474d2fdfe) , ROM_SKIP(7) ) // == st-8.5a
- ROMX_LOAD( "sth_21.10c", 0x200007, 0x20000, CRC(538d9423) SHA1(418ea54d6582723d3e568364787862a6df2d1523) , ROM_SKIP(7) ) // == st-8.5a
- ROMX_LOAD( "sth_12.8b", 0x300000, 0x20000, CRC(f670a477) SHA1(de5154ca093a9e5f9adb836d9a933d14e939180d) , ROM_SKIP(7) ) // == st-1.7a
- ROMX_LOAD( "sth_04.8a", 0x300001, 0x20000, CRC(853d3e01) SHA1(422cc9f539e79c2a9b3bda47eb1fc714d79838d1) , ROM_SKIP(7) ) // == st-1.7a
- ROMX_LOAD( "sth_16.12b", 0x300002, 0x20000, CRC(4092019f) SHA1(2173e72a8325d12da70666bdc279409b23fb7024) , ROM_SKIP(7) ) // == st-10.9a
- ROMX_LOAD( "sth_08.12a", 0x300003, 0x20000, CRC(2ce9b4c7) SHA1(f267d323c9310433852e3308b36100440bee33d7) , ROM_SKIP(7) ) // == st-10.9a
- ROMX_LOAD( "sth_27.9e", 0x300004, 0x20000, CRC(f82c88d9) SHA1(200bd025800eb20c4a15af17e7c3effbfa6f00fa) , ROM_SKIP(7) ) // == st-4.3a
- ROMX_LOAD( "sth_20.9c", 0x300005, 0x20000, CRC(eb584dd4) SHA1(aeee39c0fc9f234249253b14de88a8da494b18d0) , ROM_SKIP(7) ) // == st-4.3a
- ROMX_LOAD( "sth_29.11e", 0x300006, 0x20000, CRC(34ae2997) SHA1(9449eb9c85b7cb4a12aa06cb65a9d849a528e633) , ROM_SKIP(7) ) // == st-8.5a
- ROMX_LOAD( "sth_22.11c", 0x300007, 0x20000, CRC(78dd9c48) SHA1(35fbf3ca21f56c9899283ba08c89c0faf7a8f717) , ROM_SKIP(7) ) // == st-8.5a
+ ROMX_LOAD( "sth_09.4b", 0x000000, 0x20000, CRC(1ef6bfbd) SHA1(5e66168e2526b4b4569d9dabacd5602181b23874) , ROM_SKIP(7) ) // == st-2.8a
+ ROMX_LOAD( "sth_01.4a", 0x000001, 0x20000, CRC(1e21b0c1) SHA1(2ac543dccefa7e2438d7eb53cdf2e6aff09c735b) , ROM_SKIP(7) ) // == st-2.8a
+ ROMX_LOAD( "sth_13.9b", 0x000002, 0x20000, CRC(063263ae) SHA1(38ea256f9a0f3fd6786d21c8b540030b73742971) , ROM_SKIP(7) ) // == st-11.10a
+ ROMX_LOAD( "sth_05.9a", 0x000003, 0x20000, CRC(ec9f8714) SHA1(8eb2b92ad576849b8049f9c90b850f74c2a5cba2) , ROM_SKIP(7) ) // == st-11.10a
+ ROMX_LOAD( "sth_24.5e", 0x000004, 0x20000, CRC(6356f4d2) SHA1(8d6786e07dba3e59a609c1a13be8685e4fdb8879) , ROM_SKIP(7) ) // == st-5.4a
+ ROMX_LOAD( "sth_17.5c", 0x000005, 0x20000, CRC(b4f73d86) SHA1(0ffbcc93ce7eadfd29255a15bc5cbd6e24f98759) , ROM_SKIP(7) ) // == st-5.4a
+ ROMX_LOAD( "sth_38.8h", 0x000006, 0x20000, CRC(ee5abfc2) SHA1(1c162bc09991f1082b4d9d22fbce13f2c08e0ceb) , ROM_SKIP(7) ) // == st-9.6a
+ ROMX_LOAD( "sth_32.8f", 0x000007, 0x20000, CRC(44a206a3) SHA1(67ec4b9cf3ff181c8c4c4751a1d2e8ee8e56278a) , ROM_SKIP(7) ) // == st-9.6a
+ ROMX_LOAD( "sth_10.5b", 0x100000, 0x20000, CRC(df3dd3bc) SHA1(648218f94ecda25873103ac4e2d7132c79f1c5b2) , ROM_SKIP(7) ) // == st-2.8a
+ ROMX_LOAD( "sth_02.5a", 0x100001, 0x20000, CRC(c75f9ea0) SHA1(e9268bfa6f5254935fda726ab4b5d9acb0f1942a) , ROM_SKIP(7) ) // == st-2.8a
+ ROMX_LOAD( "sth_14.10b", 0x100002, 0x20000, CRC(6c03e19d) SHA1(83f892df551ea79534288643b07613a3c595d526) , ROM_SKIP(7) ) // == st-11.10a
+ ROMX_LOAD( "sth_06.10a", 0x100003, 0x20000, CRC(d84f5478) SHA1(c3812056ff2563a43d11746ec8327700f370a053) , ROM_SKIP(7) ) // == st-11.10a
+ ROMX_LOAD( "sth_25.7e", 0x100004, 0x20000, CRC(921e506a) SHA1(fd2b5e2121c2adedcb0325b4159273506dab27e8) , ROM_SKIP(7) ) // == st-5.4a
+ ROMX_LOAD( "sth_18.7c", 0x100005, 0x20000, CRC(5b318956) SHA1(b1415472bf45787219b3b7680057910b210d57f5) , ROM_SKIP(7) ) // == st-5.4a
+ ROMX_LOAD( "sth_39.9h", 0x100006, 0x20000, CRC(9321d6aa) SHA1(acec3c880d29692cf010540c120b9092d7dd8ce9) , ROM_SKIP(7) ) // == st-9.6a
+ ROMX_LOAD( "sth_33.9f", 0x100007, 0x20000, CRC(b47ddfc7) SHA1(12388c37abdde85d63305f86244fc3c07f8b6b0c) , ROM_SKIP(7) ) // == st-9.6a
+ ROMX_LOAD( "sth_11.7b", 0x200000, 0x20000, CRC(2484f241) SHA1(28c48526ec2577119cc3207e92138749124b5959) , ROM_SKIP(7) ) // == st-1.7a
+ ROMX_LOAD( "sth_03.7a", 0x200001, 0x20000, CRC(aaa07245) SHA1(64a1b75b7613c1949eee6f9ba865dbdd7ec34413) , ROM_SKIP(7) ) // == st-1.7a
+ ROMX_LOAD( "sth_15.11b", 0x200002, 0x20000, CRC(e415d943) SHA1(12069d02d3a6afa9241222b48420daaf97874271) , ROM_SKIP(7) ) // == st-10.9a
+ ROMX_LOAD( "sth_07.11a", 0x200003, 0x20000, CRC(97d072d2) SHA1(fb0e10464a878ec6c0f3e6c6ddb0ea542bfb87a8) , ROM_SKIP(7) ) // == st-10.9a
+ ROMX_LOAD( "sth_26.8e", 0x200004, 0x20000, CRC(0ebfcb02) SHA1(a7238e1c76dbc2de1b7ae0d2cc532170cd1ab6c2) , ROM_SKIP(7) ) // == st-4.3a
+ ROMX_LOAD( "sth_19.8c", 0x200005, 0x20000, CRC(257ce683) SHA1(762f22b5ba24864d69dda303310a310d8dbfcc1c) , ROM_SKIP(7) ) // == st-4.3a
+ ROMX_LOAD( "sth_28.10e", 0x200006, 0x20000, CRC(98ac8cd1) SHA1(53dbe418d5cb7af5ef4be91e5e6bcd4474d2fdfe) , ROM_SKIP(7) ) // == st-8.5a
+ ROMX_LOAD( "sth_21.10c", 0x200007, 0x20000, CRC(538d9423) SHA1(418ea54d6582723d3e568364787862a6df2d1523) , ROM_SKIP(7) ) // == st-8.5a
+ ROMX_LOAD( "sth_12.8b", 0x300000, 0x20000, CRC(f670a477) SHA1(de5154ca093a9e5f9adb836d9a933d14e939180d) , ROM_SKIP(7) ) // == st-1.7a
+ ROMX_LOAD( "sth_04.8a", 0x300001, 0x20000, CRC(853d3e01) SHA1(422cc9f539e79c2a9b3bda47eb1fc714d79838d1) , ROM_SKIP(7) ) // == st-1.7a
+ ROMX_LOAD( "sth_16.12b", 0x300002, 0x20000, CRC(4092019f) SHA1(2173e72a8325d12da70666bdc279409b23fb7024) , ROM_SKIP(7) ) // == st-10.9a
+ ROMX_LOAD( "sth_08.12a", 0x300003, 0x20000, CRC(2ce9b4c7) SHA1(f267d323c9310433852e3308b36100440bee33d7) , ROM_SKIP(7) ) // == st-10.9a
+ ROMX_LOAD( "sth_27.9e", 0x300004, 0x20000, CRC(f82c88d9) SHA1(200bd025800eb20c4a15af17e7c3effbfa6f00fa) , ROM_SKIP(7) ) // == st-4.3a
+ ROMX_LOAD( "sth_20.9c", 0x300005, 0x20000, CRC(eb584dd4) SHA1(aeee39c0fc9f234249253b14de88a8da494b18d0) , ROM_SKIP(7) ) // == st-4.3a
+ ROMX_LOAD( "sth_29.11e", 0x300006, 0x20000, CRC(34ae2997) SHA1(9449eb9c85b7cb4a12aa06cb65a9d849a528e633) , ROM_SKIP(7) ) // == st-8.5a
+ ROMX_LOAD( "sth_22.11c", 0x300007, 0x20000, CRC(78dd9c48) SHA1(35fbf3ca21f56c9899283ba08c89c0faf7a8f717) , ROM_SKIP(7) ) // == st-8.5a
ROM_REGION( 0x8000, "stars", 0 )
ROM_COPY( "gfx", 0x000000, 0x000000, 0x8000 )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "sth_23.13c", 0x00000, 0x08000, CRC(2ed403bc) SHA1(4ce863ea40d789db5a7cfce91d2c7c720deb9be5) ) // == 09.12b
+ ROM_LOAD( "sth_23.13c", 0x00000, 0x08000, CRC(2ed403bc) SHA1(4ce863ea40d789db5a7cfce91d2c7c720deb9be5) ) // == 09.12b
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
- ROM_LOAD( "sth_30.12e", 0x00000, 0x20000, CRC(4386bc80) SHA1(fb2b261995aeacfa13e7ee40b1a973dfb178f015) ) // == 18.11c
- ROM_LOAD( "sth_31.13e", 0x20000, 0x20000, CRC(444536d7) SHA1(a14f5de2f6b5b29ae5161dca1f8c08c566301a91) ) // == 19.12c
+ ROM_LOAD( "sth_30.12e", 0x00000, 0x20000, CRC(4386bc80) SHA1(fb2b261995aeacfa13e7ee40b1a973dfb178f015) ) // == 18.11c
+ ROM_LOAD( "sth_31.13e", 0x20000, 0x20000, CRC(444536d7) SHA1(a14f5de2f6b5b29ae5161dca1f8c08c566301a91) ) // == 19.12c
ROM_REGION( 0x0200, "aboardplds", 0 )
ROM_LOAD( "buf1", 0x0000, 0x0117, CRC(eb122de7) SHA1(b26b5bfe258e3e184f069719f9fd008d6b8f6b9b) )
@@ -6904,7 +6904,7 @@ ROM_START( wonder3 )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
ROM_LOAD( "rt_23.13b", 0x00000, 0x08000, CRC(abfca165) SHA1(428069d3bdc45775854cd0e8abe447f134fe5492) ) // == rt_9.12b
-// ROM_LOAD( "rt_23(__alt).13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* dumped from another board, 1 byte different, pcb verified */
+// ROM_LOAD( "rt_23(__alt).13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) /* dumped from another board, 1 byte different, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -8744,7 +8744,7 @@ ROM_START( cworld2j )
ROM_LOAD16_BYTE( "q5_34.10f", 0x80000, 0x20000, CRC(7fcc1317) SHA1(672ca45d3fad5eec4d65bbbbd1d21cbf6be4ec8b) )
ROM_LOAD16_BYTE( "q5_40.10h", 0x80001, 0x20000, CRC(7f14b7b4) SHA1(5564eb9f65dad76ebe40d12d5c39fec5e246adf0) )
ROM_LOAD16_BYTE( "q5_35.11f", 0xc0000, 0x20000, CRC(abacee26) SHA1(2f513c02f715ffeec12a6d1c292619e214155cbc) )
-// ROM_LOAD16_BYTE( "q5_35(__alt).11f", 0xc0000, 0x20000, CRC(59961612) SHA1(ded5144746dd9612f2db1415e96a826e215ad176) ) /* dumped from another board, 1 byte different, pcb verified */
+// ROM_LOAD16_BYTE( "q5_35(__alt).11f", 0xc0000, 0x20000, CRC(59961612) SHA1(ded5144746dd9612f2db1415e96a826e215ad176) ) /* dumped from another board, 1 byte different, pcb verified */
ROM_LOAD16_BYTE( "q5_41.11h", 0xc0001, 0x20000, CRC(d3654067) SHA1(0b597483e136ff19b031171941cb8439bcd7f145) )
ROM_REGION( 0x200000, "gfx", 0 )
@@ -9080,7 +9080,7 @@ ROM_END
is not a 92641C-1. A verification and a new fresh dump are needed to confirm if it's genuine or not. */
ROM_START( wofr1 )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_WORD_SWAP( "tk2e_23b.8f", 0x000000, 0x80000, CRC(11fb2ed1) SHA1(19e09ad6f9edc7997b030cddfe1d9c96d88135f2) ) // patched?
+ ROM_LOAD16_WORD_SWAP( "tk2e_23b.8f", 0x000000, 0x80000, CRC(11fb2ed1) SHA1(19e09ad6f9edc7997b030cddfe1d9c96d88135f2) ) // patched?
ROM_LOAD16_WORD_SWAP( "tk2e_22b.7f", 0x080000, 0x80000, CRC(479b3f24) SHA1(9fb8ae06856fe115addfb6794c28978a4f6716ec) )
ROM_REGION( 0x400000, "gfx", 0 )
@@ -9177,7 +9177,7 @@ ROM_END
is not a 92641C-1. A verification and a new fresh dump are needed to confirm if it's genuine or not. */
ROM_START( wofa )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */
- ROM_LOAD16_WORD_SWAP( "tk2a_23c.8f", 0x000000, 0x80000, CRC(2e024628) SHA1(647f8700fe3b410d798a823bac2e4a89cc9ad8d5) ) // patched?
+ ROM_LOAD16_WORD_SWAP( "tk2a_23c.8f", 0x000000, 0x80000, CRC(2e024628) SHA1(647f8700fe3b410d798a823bac2e4a89cc9ad8d5) ) // patched?
ROM_LOAD16_WORD_SWAP( "tk2a_22c.7f", 0x080000, 0x80000, CRC(900ad4cd) SHA1(988007447f93f3467029b9c29fd9670a7ecadaa3) )
ROM_REGION( 0x400000, "gfx", 0 )
@@ -11066,7 +11066,7 @@ GAME( 1991, 3wonders, 0, cps1_10MHz, 3wonders, cps_state, cps1,
GAME( 1991, 3wondersr1, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "Capcom", "Three Wonders (World 910513)", GAME_SUPPORTS_SAVE ) // "ETC"
GAME( 1991, 3wondersu, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "Capcom", "Three Wonders (USA 910520)", GAME_SUPPORTS_SAVE )
GAME( 1991, wonder3, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "Capcom", "Wonder 3 (Japan 910520)", GAME_SUPPORTS_SAVE )
-GAME( 1991, 3wondersb, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "bootleg", "Three Wonders (bootleg)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 910520 - based on World version
+GAME( 1991, 3wondersb, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "bootleg", "Three Wonders (bootleg)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 910520 - based on World version
GAME( 1991, 3wondersh, 3wonders, cps1_10MHz, 3wonders, cps_state, cps1, ROT0, "bootleg", "Three Wonders (hack)", GAME_SUPPORTS_SAVE ) // 910520 - based on World version
GAME( 1991, kod, 0, cps1_10MHz, kod, cps_state, cps1, ROT0, "Capcom", "The King of Dragons (World 910805)", GAME_SUPPORTS_SAVE ) // "ETC"
GAME( 1991, kodr1, kod, cps1_10MHz, kodr1, cps_state, cps1, ROT0, "Capcom", "The King of Dragons (World 910711)", GAME_SUPPORTS_SAVE ) // "ETC"
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 3c0b531ab33..02daf09c604 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -237,8 +237,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(cshooter_state::cshooter_scanline)
{
int scanline = param;
-// if(scanline == 240) // presumably a SW trap, not an irq
-// m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xd7); /* RST 10h */
+// if(scanline == 240) // presumably a SW trap, not an irq
+// m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xd7); /* RST 10h */
if(scanline == 240) // vblank-out irq
m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 08h */
diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c
index d79048f559f..72294c18f27 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -632,7 +632,7 @@ static MACHINE_CONFIG_START( csplayh5, csplayh5_state )
MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
MCFG_CPU_PROGRAM_MAP(csplayh5_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", csplayh5_state, csplayh5_irq, "screen", 0, 1)
-
+
MCFG_TMP68301_ADD("tmp68301")
#if USE_H8
diff --git a/src/mame/drivers/cupidon.c b/src/mame/drivers/cupidon.c
index c8ed0611604..b0d3d5defbd 100644
--- a/src/mame/drivers/cupidon.c
+++ b/src/mame/drivers/cupidon.c
@@ -37,7 +37,7 @@ public:
static ADDRESS_MAP_START( cupidon_map, AS_PROGRAM, 32, cupidon_state )
AM_RANGE(0x0000000, 0x07fffff) AM_ROM
AM_RANGE(0x1000000, 0x100ffff) AM_RAM
- AM_RANGE(0x1800000, 0x1800003) AM_READ(cupidon_return_ffffffff)
+ AM_RANGE(0x1800000, 0x1800003) AM_READ(cupidon_return_ffffffff)
AM_RANGE(0x2000074, 0x2000077) AM_RAM // port
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index fce28026b6d..5cade1e5bc6 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -477,7 +477,7 @@ static MACHINE_CONFIG_START( cyberbal2p, cyberbal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN2", 15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 084252c2e94..a4b0968f705 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -111,7 +111,7 @@ READ16_MEMBER( dblewing_state::wf_protection_region_0_104_r )
}
WRITE16_MEMBER( dblewing_state::wf_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START( dblewing_map, AS_PROGRAM, 16, dblewing_state )
AM_RANGE(0x104000, 0x104fff) AM_RAM AM_SHARE("pf1_rowscroll")
AM_RANGE(0x106000, 0x106fff) AM_RAM AM_SHARE("pf2_rowscroll")
-// AM_RANGE(0x280000, 0x2807ff) AM_DEVREADWRITE("ioprot104", deco104_device, dblewing_prot_r, dblewing_prot_w) AM_SHARE("prot16ram")
+// AM_RANGE(0x280000, 0x2807ff) AM_DEVREADWRITE("ioprot104", deco104_device, dblewing_prot_r, dblewing_prot_w) AM_SHARE("prot16ram")
AM_RANGE(0x280000, 0x283fff) AM_READWRITE(wf_protection_region_0_104_r,wf_protection_region_0_104_w) AM_SHARE("prot16ram") /* Protection device */
@@ -358,13 +358,11 @@ static const deco16ic_interface dblewing_deco16ic_tilegen1_intf =
void dblewing_state::machine_start()
{
-
save_item(NAME(m_sound_irq));
}
void dblewing_state::machine_reset()
{
-
m_sound_irq = 0;
}
diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c
index bda5b080a18..9183eec09d9 100644
--- a/src/mame/drivers/de_2.c
+++ b/src/mame/drivers/de_2.c
@@ -114,15 +114,15 @@ private:
};
/*static ADDRESS_MAP_START( de_2_map, AS_PROGRAM, 8, de_2_state )
- AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
- AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
- AM_RANGE(0x2200, 0x2200) AM_WRITE(sol3_w) // solenoids
- AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
- AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
- AM_RANGE(0x2c00, 0x2c03) AM_DEVREADWRITE("pia2c", pia6821_device, read, write) // alphanumeric display
- AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
- AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE("pia34", pia6821_device, read, write) // widget
- AM_RANGE(0x4000, 0xffff) AM_ROM
+ AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
+ AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
+ AM_RANGE(0x2200, 0x2200) AM_WRITE(sol3_w) // solenoids
+ AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps
+ AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display
+ AM_RANGE(0x2c00, 0x2c03) AM_DEVREADWRITE("pia2c", pia6821_device, read, write) // alphanumeric display
+ AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs
+ AM_RANGE(0x3400, 0x3403) AM_DEVREADWRITE("pia34", pia6821_device, read, write) // widget
+ AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
*/
static ADDRESS_MAP_START( de_2_audio_map, AS_PROGRAM, 8, de_2_state )
@@ -850,8 +850,8 @@ GAME(1990, bttf_a27, 0, de_type3, de_2, de_2_state, de_2,
GAME(1990, bttf_a20, bttf_a27, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.0)", GAME_IS_SKELETON_MECHANICAL)
GAME(1990, bttf_a21, bttf_a27, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To The Future (2.1)", GAME_IS_SKELETON_MECHANICAL)
GAME(199?, bttf_g27, bttf_a27, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.7 Germany)", GAME_IS_SKELETON_MECHANICAL)
-GAME(1987, lwar_a83, 0, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.3)", GAME_IS_SKELETON_MECHANICAL)
-GAME(1987, lwar_e90, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (9.0 Europe)", GAME_IS_SKELETON_MECHANICAL)
+GAME(1987, lwar_a83, 0, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.3)", GAME_IS_SKELETON_MECHANICAL)
+GAME(1987, lwar_e90, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (9.0 Europe)", GAME_IS_SKELETON_MECHANICAL)
GAME(1989, mnfb_c27, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "Monday Night Football (2.7, 50cts)", GAME_IS_SKELETON_MECHANICAL)
GAME(1990, poto_a32, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "The Phantom of the Opera (3.2)", GAME_IS_SKELETON_MECHANICAL)
GAME(1989, play_a24, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Playboy 35th Anniversary (2.4)", GAME_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c
index 03472b2eb76..8cc34ef2525 100644
--- a/src/mame/drivers/de_3.c
+++ b/src/mame/drivers/de_3.c
@@ -84,24 +84,24 @@ public:
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_READ8_MEMBER(dmd_status_r);
-// DECLARE_READ8_MEMBER(sound_latch_r);
-// DECLARE_WRITE8_MEMBER(sample_bank_w);
+// DECLARE_READ8_MEMBER(sound_latch_r);
+// DECLARE_WRITE8_MEMBER(sample_bank_w);
required_device<decobsmt_device> m_decobsmt;
-// required_device<msm5205_device> m_msm5205;
-// required_memory_bank m_sample_bank;
-// UINT8 m_sample_data;
-// bool m_more_data;
+// required_device<msm5205_device> m_msm5205;
+// required_memory_bank m_sample_bank;
+// UINT8 m_sample_data;
+// bool m_more_data;
bool m_nmi_enable;
-// bool m_is_alpha3;
+// bool m_is_alpha3;
protected:
// driver_device overrides
virtual void machine_reset();
private:
-// UINT32 m_segment1;
-// UINT32 m_segment2;
+// UINT32 m_segment1;
+// UINT32 m_segment2;
UINT8 m_strobe;
UINT8 m_kbdrow;
UINT8 m_diag;
@@ -326,27 +326,27 @@ static const pia6821_interface pia24_intf =
// 6821 PIA at 0x2800
WRITE8_MEMBER( de_3_state::dig0_w )
{
-// static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
-// data &= 0x7f;
-// m_strobe = data & 15;
-// m_diag = (data & 0x70) >> 4;
-// output_set_digit_value(60, patterns[data>>4]); // diag digit
-// m_segment1 = 0;
-// m_segment2 = 0;
+// static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
+// data &= 0x7f;
+// m_strobe = data & 15;
+// m_diag = (data & 0x70) >> 4;
+// output_set_digit_value(60, patterns[data>>4]); // diag digit
+// m_segment1 = 0;
+// m_segment2 = 0;
}
WRITE8_MEMBER( de_3_state::dig1_w )
{
-// m_segment2 |= data;
-// m_segment2 |= 0x30000;
-// if ((m_segment2 & 0x70000) == 0x30000)
-// {
-// if(m_is_alpha3) // Alphanumeric type 2 uses 7 segment LEDs on the bottom row, type 3 uses 14 segment LEDs
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
-// else
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
-// m_segment2 |= 0x40000;
-// }
+// m_segment2 |= data;
+// m_segment2 |= 0x30000;
+// if ((m_segment2 & 0x70000) == 0x30000)
+// {
+// if(m_is_alpha3) // Alphanumeric type 2 uses 7 segment LEDs on the bottom row, type 3 uses 14 segment LEDs
+// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// else
+// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 11, 15, 12, 10, 8, 14, 13, 9, 7, 6, 5, 4, 3, 2, 1, 0));
+// m_segment2 |= 0x40000;
+// }
}
READ8_MEMBER( de_3_state::pia28_w7_r )
@@ -392,13 +392,13 @@ WRITE8_MEMBER( de_3_state::pia2c_pa_w )
m_dmdtype1->data_w(space,offset,data);
logerror("DMD: Data write %02x\n", data);
}
-// m_segment1 |= (data<<8);
-// m_segment1 |= 0x10000;
-// if ((m_segment1 & 0x70000) == 0x30000)
-// {
-// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
-// m_segment1 |= 0x40000;
-// }
+// m_segment1 |= (data<<8);
+// m_segment1 |= 0x10000;
+// if ((m_segment1 & 0x70000) == 0x30000)
+// {
+// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// m_segment1 |= 0x40000;
+// }
}
READ8_MEMBER( de_3_state::pia2c_pb_r )
@@ -424,13 +424,13 @@ WRITE8_MEMBER( de_3_state::pia2c_pb_w )
logerror("DMD: Control write %02x\n", data);
}
-// m_segment1 |= data;
-// m_segment1 |= 0x20000;
-// if ((m_segment1 & 0x70000) == 0x30000)
-// {
-// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
-// m_segment1 |= 0x40000;
-// }
+// m_segment1 |= data;
+// m_segment1 |= 0x20000;
+// if ((m_segment1 & 0x70000) == 0x30000)
+// {
+// output_set_digit_value(m_strobe, BITSWAP16(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// m_segment1 |= 0x40000;
+// }
}
static const pia6821_interface pia2c_intf =
@@ -482,13 +482,13 @@ static const pia6821_interface pia30_intf =
WRITE8_MEMBER( de_3_state::pia34_pa_w )
{
// Not connected?
-// m_segment2 |= (data<<8);
-// m_segment2 |= 0x10000;
-// if ((m_segment2 & 0x70000) == 0x30000)
-// {
-// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
-// m_segment2 |= 0x40000;
-// }
+// m_segment2 |= (data<<8);
+// m_segment2 |= 0x10000;
+// if ((m_segment2 & 0x70000) == 0x30000)
+// {
+// output_set_digit_value(m_strobe+16, BITSWAP16(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0));
+// m_segment2 |= 0x40000;
+// }
}
READ8_MEMBER( de_3_state::dmd_status_r )
@@ -549,13 +549,13 @@ static MACHINE_CONFIG_START( de_3, de_3_state )
MCFG_DECOBSMT_ADD(DECOBSMT_TAG)
-// MCFG_SPEAKER_STANDARD_MONO("bg")
-// MCFG_YM2151_ADD("ym2151", 3580000)
-// MCFG_YM2151_IRQ_HANDLER(WRITELINE(de_2_state, ym2151_irq_w))
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
-// MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
-// MCFG_SOUND_CONFIG(msm5205_intf)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
+// MCFG_SPEAKER_STANDARD_MONO("bg")
+// MCFG_YM2151_ADD("ym2151", 3580000)
+// MCFG_YM2151_IRQ_HANDLER(WRITELINE(de_2_state, ym2151_irq_w))
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
+// MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
+// MCFG_SOUND_CONFIG(msm5205_intf)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 17091962c04..8329bc72174 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -679,8 +679,8 @@ static ADDRESS_MAP_START( captaven_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x110000, 0x111fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w)
AM_RANGE(0x120000, 0x127fff) AM_RAM AM_SHARE("ram") /* Main RAM */
-// AM_RANGE(0x128000, 0x128fff) AM_DEVREAD("ioprot", deco146_device,captaven_prot_r)
-// AM_RANGE(0x1280c8, 0x1280cb) AM_WRITE(deco32_sound_w)
+// AM_RANGE(0x128000, 0x128fff) AM_DEVREAD("ioprot", deco146_device,captaven_prot_r)
+// AM_RANGE(0x1280c8, 0x1280cb) AM_WRITE(deco32_sound_w)
AM_RANGE(0x128000, 0x12ffff) AM_READWRITE16(dg_protection_region_0_146_r, dg_protection_region_0_146_w, 0x0000ffff)
AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE(deco32_nonbuffered_palette_w) AM_SHARE("paletteram") /* Palette RAM */
@@ -689,7 +689,7 @@ static ADDRESS_MAP_START( captaven_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x168000, 0x168003) AM_READ(captaven_soundcpu_r)
AM_RANGE(0x178000, 0x178003) AM_WRITE(deco32_pri_w)
-
+
AM_RANGE(0x180000, 0x18001f) AM_DEVREADWRITE("tilegen1", deco16ic_device, pf_control_dword_r, pf_control_dword_w)
AM_RANGE(0x190000, 0x191fff) AM_DEVREADWRITE("tilegen1", deco16ic_device, pf1_data_dword_r, pf1_data_dword_w)
@@ -713,21 +713,21 @@ READ32_MEMBER( deco32_state::fghthist_protection_region_0_146_r )
if (mem_mask & 0xffff0000)
{
mem_mask >>=16;
-
+
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8,7,6,5,4,3,2,1, 0) & 0x7fff;
UINT8 cs = 0;
UINT16 data = m_deco146->read_data( deco146_addr, mem_mask, cs );
-
-
+
+
retdata |= data << 16;
}
return retdata;
}
WRITE32_MEMBER( deco32_state::fghthist_protection_region_0_146_w )
-{
+{
if (mem_mask & 0xffff0000)
{
data >>=16;
@@ -772,7 +772,7 @@ static ADDRESS_MAP_START( fghthist_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x16c000, 0x16c01f) AM_READNOP
AM_RANGE(0x17c000, 0x17c03f) AM_READNOP
-// AM_RANGE(0x200000, 0x200fff) AM_READWRITE_LEGACY(deco16_146_fghthist_prot_r, deco16_146_fghthist_prot_w) AM_SHARE("prot32ram")
+// AM_RANGE(0x200000, 0x200fff) AM_READWRITE_LEGACY(deco16_146_fghthist_prot_r, deco16_146_fghthist_prot_w) AM_SHARE("prot32ram")
AM_RANGE(0x200000, 0x207fff) AM_READWRITE(fghthist_protection_region_0_146_r, fghthist_protection_region_0_146_w) AM_SHARE("prot32ram") // only maps on 16-bits
AM_RANGE(0x208800, 0x208803) AM_WRITENOP /* ? */
ADDRESS_MAP_END
@@ -803,7 +803,7 @@ static ADDRESS_MAP_START( fghthsta_memmap, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x1d4000, 0x1d5fff) AM_RAM_WRITE(deco32_pf4_rowscroll_w) AM_SHARE("pf4_rowscroll32")
AM_RANGE(0x1e0000, 0x1e001f) AM_DEVREADWRITE("tilegen2", deco16ic_device, pf_control_dword_r, pf_control_dword_w)
-// AM_RANGE(0x200000, 0x200fff) AM_READWRITE_LEGACY(deco16_146_fghthist_prot_r, deco16_146_fghthist_prot_w) AM_SHARE("prot32ram")
+// AM_RANGE(0x200000, 0x200fff) AM_READWRITE_LEGACY(deco16_146_fghthist_prot_r, deco16_146_fghthist_prot_w) AM_SHARE("prot32ram")
AM_RANGE(0x200000, 0x207fff) AM_READWRITE(fghthist_protection_region_0_146_r, fghthist_protection_region_0_146_w) AM_SHARE("prot32ram") // only maps on 16-bits
ADDRESS_MAP_END
@@ -819,7 +819,7 @@ READ16_MEMBER( deco32_state::dg_protection_region_0_146_r )
}
WRITE16_MEMBER( deco32_state::dg_protection_region_0_146_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -836,10 +836,10 @@ READ32_MEMBER( dragngun_state::dragngun_unk_video_r)
static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x0000000, 0x00fffff) AM_ROM
AM_RANGE(0x0100000, 0x011ffff) AM_RAM AM_SHARE("ram")
-// AM_RANGE(0x0120000, 0x0120fff) AM_DEVREAD("ioprot", deco146_device, dragngun_prot_r)
+// AM_RANGE(0x0120000, 0x0120fff) AM_DEVREAD("ioprot", deco146_device, dragngun_prot_r)
AM_RANGE(0x0120000, 0x0127fff) AM_READWRITE16(dg_protection_region_0_146_r, dg_protection_region_0_146_w, 0x0000ffff)
-// AM_RANGE(0x01204c0, 0x01204c3) AM_WRITE(deco32_sound_w)
+// AM_RANGE(0x01204c0, 0x01204c3) AM_WRITE(deco32_sound_w)
AM_RANGE(0x0128000, 0x012800f) AM_READWRITE(deco32_irq_controller_r, deco32_irq_controller_w)
AM_RANGE(0x0130000, 0x0131fff) AM_RAM_WRITE(deco32_buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x0138000, 0x0138003) AM_NOP /* Palette dma complete in bit 0x8? ack? return 0 else tight loop */
@@ -884,22 +884,22 @@ static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x0430000, 0x043001f) AM_WRITE(dragngun_lightgun_w)
AM_RANGE(0x0440000, 0x0440003) AM_READ(dragngun_service_r)
- AM_RANGE(0x0500000, 0x0500003) AM_WRITE(dragngun_sprite_control_w)
+ AM_RANGE(0x0500000, 0x0500003) AM_WRITE(dragngun_sprite_control_w)
// this is clearly the dvi video related area
AM_RANGE(0x1000000, 0x1000007) AM_READ(dragngun_unk_video_r)
AM_RANGE(0x1000100, 0x1007fff) AM_RAM
AM_RANGE(0x10b0000, 0x10b01ff) AM_RAM
AM_RANGE(0x1400000, 0x1ffffff) AM_ROM AM_REGION("dvi", 0x00000) // reads from here during boss battles when the videos should be displayed at the offsets where the DVI headers are
- // as a result it ends up writing what looks like pointers to the frame data in the ram area above
+ // as a result it ends up writing what looks like pointers to the frame data in the ram area above
ADDRESS_MAP_END
static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32, dragngun_state )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_SHARE("ram")
-// AM_RANGE(0x120000, 0x120fff) AM_DEVREAD("ioprot", deco146_device, dragngun_prot_r)
-// AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w)
+// AM_RANGE(0x120000, 0x120fff) AM_DEVREAD("ioprot", deco146_device, dragngun_prot_r)
+// AM_RANGE(0x1204c0, 0x1204c3) AM_WRITE(deco32_sound_w)
AM_RANGE(0x120000, 0x127fff) AM_READWRITE16(dg_protection_region_0_146_r, dg_protection_region_0_146_w, 0x0000ffff)
AM_RANGE(0x128000, 0x12800f) AM_READWRITE(deco32_irq_controller_r, deco32_irq_controller_w)
@@ -985,7 +985,7 @@ static ADDRESS_MAP_START( tattass_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x1d4000, 0x1d5fff) AM_RAM_WRITE(deco32_pf4_rowscroll_w) AM_SHARE("pf4_rowscroll32")
AM_RANGE(0x1e0000, 0x1e001f) AM_DEVREADWRITE("tilegen2", deco16ic_device, pf_control_dword_r, pf_control_dword_w)
-// AM_RANGE(0x200000, 0x200fff) AM_READWRITE(tattass_prot_r, tattass_prot_w) AM_SHARE("prot32ram")
+// AM_RANGE(0x200000, 0x200fff) AM_READWRITE(tattass_prot_r, tattass_prot_w) AM_SHARE("prot32ram")
AM_RANGE(0x200000, 0x207fff) AM_READWRITE16(nslasher_protection_region_0_104_r, nslasher_protection_region_0_104_w, 0xffff0000)
AM_RANGE(0x200000, 0x207fff) AM_READ16(nslasher_debug_r, 0x0000ffff)
ADDRESS_MAP_END
@@ -1000,7 +1000,7 @@ READ16_MEMBER( deco32_state::nslasher_protection_region_0_104_r )
}
WRITE16_MEMBER( deco32_state::nslasher_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -1051,7 +1051,7 @@ static ADDRESS_MAP_START( nslasher_map, AS_PROGRAM, 32, deco32_state )
AM_RANGE(0x1d4000, 0x1d5fff) AM_RAM_WRITE(deco32_pf4_rowscroll_w) AM_SHARE("pf4_rowscroll32")
AM_RANGE(0x1e0000, 0x1e001f) AM_DEVREADWRITE("tilegen2", deco16ic_device, pf_control_dword_r, pf_control_dword_w)
-// AM_RANGE(0x200000, 0x200fff) AM_READWRITE(nslasher_prot_r, nslasher_prot_w) AM_SHARE("prot32ram")
+// AM_RANGE(0x200000, 0x200fff) AM_READWRITE(nslasher_prot_r, nslasher_prot_w) AM_SHARE("prot32ram")
AM_RANGE(0x200000, 0x207fff) AM_READWRITE16(nslasher_protection_region_0_104_r, nslasher_protection_region_0_104_w, 0xffff0000)
AM_RANGE(0x200000, 0x207fff) AM_READ16(nslasher_debug_r, 0x0000ffff) // seems to be debug switches / code activated by this?
@@ -2699,7 +2699,7 @@ ROM_START( dragngun )
ROM_LOAD32_BYTE( "mar-22.bin", 0x800001, 0x100000, CRC(c85f3559) SHA1(a5d5cf9b18c9ef6a92d7643ca1ec9052de0d4a01) ) // 44 D / 56 V
ROM_LOAD32_BYTE( "mar-26.bin", 0x800002, 0x100000, CRC(246a06c5) SHA1(447252be976a5059925f4ad98df8564b70198f62) ) // 56 V / 53 S
ROM_LOAD32_BYTE( "mar-23.bin", 0x800003, 0x100000, CRC(ba907d6a) SHA1(1fd99b66e6297c8d927c1cf723a613b4ee2e2f90) ) // 49 I / 53 S
-
+
ROM_REGION(0x80000, "oki1", 0 )
ROM_LOAD( "mar-06.n17", 0x000000, 0x80000, CRC(3e006c6e) SHA1(55786e0fde2bf6ba9802f3f4fa8d4c21625b976a) )
@@ -3466,17 +3466,17 @@ void dragngun_state::init_dragngun_common()
#endif
// there are DVI headers at 0x000000, 0x580000, 0x800000, 0xB10000, 0xB80000
-// process_dvi_data(memregion("dvi")->base(),0x000000, 0x1000000);
-// process_dvi_data(memregion("dvi")->base(),0x580000, 0x1000000);
-// process_dvi_data(memregion("dvi")->base(),0x800000, 0x1000000);
-// process_dvi_data(memregion("dvi")->base(),0xB10000, 0x1000000);
-// process_dvi_data(memregion("dvi")->base(),0xB80000, 0x1000000);
+// process_dvi_data(memregion("dvi")->base(),0x000000, 0x1000000);
+// process_dvi_data(memregion("dvi")->base(),0x580000, 0x1000000);
+// process_dvi_data(memregion("dvi")->base(),0x800000, 0x1000000);
+// process_dvi_data(memregion("dvi")->base(),0xB10000, 0x1000000);
+// process_dvi_data(memregion("dvi")->base(),0xB80000, 0x1000000);
}
DRIVER_INIT_MEMBER(dragngun_state,dragngun)
{
init_dragngun_common();
-
+
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
ROM[0x1b32c/4]=0xe1a00000; // bl $ee000: NOP test switch lock
}
@@ -3484,7 +3484,7 @@ DRIVER_INIT_MEMBER(dragngun_state,dragngun)
DRIVER_INIT_MEMBER(dragngun_state,dragngunj)
{
init_dragngun_common();
-
+
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
ROM[0x1a1b4/4]=0xe1a00000; // bl $ee000: NOP test switch lock
}
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 000a651a8c8..0ce0320bace 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -283,7 +283,7 @@ READ16_MEMBER( deco_mlc_state::sh96_protection_region_0_146_r )
}
WRITE16_MEMBER( deco_mlc_state::sh96_protection_region_0_146_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 3ef948d75d8..138222086ac 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -37,7 +37,7 @@ READ16_MEMBER( dietgo_state::dietgo_protection_region_0_104_r )
}
WRITE16_MEMBER( dietgo_state::dietgo_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -54,7 +54,7 @@ static ADDRESS_MAP_START( dietgo_map, AS_PROGRAM, 16, dietgo_state )
AM_RANGE(0x222000, 0x2227ff) AM_WRITEONLY AM_SHARE("pf2_rowscroll")
AM_RANGE(0x280000, 0x2807ff) AM_RAM AM_SHARE("spriteram")
AM_RANGE(0x300000, 0x300bff) AM_RAM_DEVWRITE("deco_common", decocomn_device, nonbuffered_palette_w) AM_SHARE("paletteram")
-// AM_RANGE(0x340000, 0x3407ff) AM_READWRITE_LEGACY(dietgo_104_prot_r, dietgo_104_prot_w)
+// AM_RANGE(0x340000, 0x3407ff) AM_READWRITE_LEGACY(dietgo_104_prot_r, dietgo_104_prot_w)
AM_RANGE(0x340000, 0x343fff) AM_READWRITE(dietgo_protection_region_0_104_r,dietgo_protection_region_0_104_w)AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x380000, 0x38ffff) AM_RAM // mainram
ADDRESS_MAP_END
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index da899b9bf6e..310df998faf 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -1625,4 +1625,3 @@ GAME( 2000, stealsee, 0, eolith45, stealsee, eolith_state, eolith, RO
GAME( 2000, hidctch3, 0, eolith50, hidctch3, eolith_state, hidctch3, ROT0, "Eolith", "Hidden Catch 3 (ver 1.00 / pcb ver 3.05)", GAME_IMPERFECT_SOUND )
GAME( 2001, fort2b, 0, eolith50, common, eolith_state, eolith, ROT0, "Eolith", "Fortress 2 Blue Arcade (ver 1.01 / pcb ver 3.05)", GAME_IMPERFECT_SOUND )
GAME( 2001, fort2ba, fort2b, eolith50, common, eolith_state, eolith, ROT0, "Eolith", "Fortress 2 Blue Arcade (ver 1.00 / pcb ver 3.05)", GAME_IMPERFECT_SOUND )
-
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 185604e53f7..0c36e925ad1 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -411,7 +411,7 @@ static MACHINE_CONFIG_START( eprom, eprom_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -449,7 +449,7 @@ static MACHINE_CONFIG_START( klaxp, eprom_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -486,7 +486,7 @@ static MACHINE_CONFIG_START( guts, eprom_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index da6d97418fb..be23003ad5d 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -178,7 +178,7 @@ static ADDRESS_MAP_START( feversoc_map, AS_PROGRAM, 32, feversoc_state )
AM_RANGE(0x06000008, 0x0600000b) AM_READ(in0_r)
AM_RANGE(0x0600000c, 0x0600000f) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff0000)
// AM_RANGE(0x06010000, 0x06017fff) AM_RAM //contains RISE11 keys and other related stuff.
-// AM_RANGE(0x06010060, 0x06010063) //bit 0 almost certainly irq ack
+// AM_RANGE(0x06010060, 0x06010063) //bit 0 almost certainly irq ack
AM_RANGE(0x06018000, 0x06019fff) AM_RAM_WRITE(fs_paletteram_w) AM_SHARE("paletteram")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 66caf5f5f55..7bd6d75724c 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -366,7 +366,7 @@ static MACHINE_CONFIG_START( foodf, foodf_state )
/* video hardware */
MCFG_GFXDECODE(foodf)
MCFG_PALETTE_LENGTH(256)
-
+
MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("playfield", 2, foodf_state, get_playfield_tile_info, 8,8, SCAN_COLS, 32,32, 0)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 855ef96c499..e0eba57676a 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -101,25 +101,25 @@ Notes:
READ16_MEMBER( funkyjet_state::funkyjet_protection_region_0_146_r )
{
-// UINT16 realdat = deco16_146_funkyjet_prot_r(space,offset&0x3ff,mem_mask);
-
+// UINT16 realdat = deco16_146_funkyjet_prot_r(space,offset&0x3ff,mem_mask);
+
int real_address = 0 + (offset *2);
- int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, /* note, same bitswap as fghthist */ 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) & 0x7fff;
+ int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, /* note, same bitswap as fghthist */ 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) & 0x7fff;
UINT8 cs = 0;
UINT16 data = m_deco146->read_data( deco146_addr, mem_mask, cs );
-
-// if ((realdat & mem_mask) != (data & mem_mask))
-// printf("returned %04x instead of %04x (real address %08x swapped addr %08x)\n", data, realdat, real_address, deco146_addr);
-
+
+// if ((realdat & mem_mask) != (data & mem_mask))
+// printf("returned %04x instead of %04x (real address %08x swapped addr %08x)\n", data, realdat, real_address, deco146_addr);
+
return data;
}
WRITE16_MEMBER( funkyjet_state::funkyjet_protection_region_0_146_w )
-{
-// deco16_146_funkyjet_prot_w(space,offset&0x3ff,data,mem_mask);
+{
+// deco16_146_funkyjet_prot_w(space,offset&0x3ff,data,mem_mask);
- int real_address = 0 + (offset *2);
- int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, /* note, same bitswap as fghthist */ 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) & 0x7fff;
+ int real_address = 0 + (offset *2);
+ int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, /* note, same bitswap as fghthist */ 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) & 0x7fff;
UINT8 cs = 0;
m_deco146->write_data( space, deco146_addr, data, mem_mask, cs );
}
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( funkyjet_map, AS_PROGRAM, 16, funkyjet_state )
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_word_w) AM_SHARE("paletteram")
AM_RANGE(0x140000, 0x143fff) AM_RAM
AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_SHARE("spriteram")
-// AM_RANGE(0x180000, 0x1807ff) AM_READWRITE_LEGACY(deco16_146_funkyjet_prot_r, deco16_146_funkyjet_prot_w) AM_SHARE("prot16ram")
+// AM_RANGE(0x180000, 0x1807ff) AM_READWRITE_LEGACY(deco16_146_funkyjet_prot_r, deco16_146_funkyjet_prot_w) AM_SHARE("prot16ram")
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(funkyjet_protection_region_0_146_r,funkyjet_protection_region_0_146_w) AM_SHARE("prot16ram") /* Protection device */ // unlikely to be cs0 region
AM_RANGE(0x184000, 0x184001) AM_WRITENOP
AM_RANGE(0x188000, 0x188001) AM_WRITENOP
@@ -314,7 +314,6 @@ static const deco16ic_interface funkyjet_deco16ic_tilegen1_intf =
void funkyjet_state::machine_start()
{
-
}
static MACHINE_CONFIG_START( funkyjet, funkyjet_state )
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 63025345d9c..99b3aa17506 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -509,7 +509,7 @@ static MACHINE_CONFIG_START( gauntlet, gauntlet_state )
MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_GFXDECODE(gauntlet)
MCFG_PALETTE_LENGTH(1024)
-
+
MCFG_TILEMAP_ADD_STANDARD("playfield", 2, gauntlet_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64)
MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, gauntlet_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0)
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 29a8df22940..1e13cab91fa 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -260,7 +260,7 @@ READ16_MEMBER(guab_state::ef9369_r)
UINT32 guab_state::screen_update_guab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x, y;
-
+
m_tms34061->get_display_state();
/* If blanked, fill with black */
@@ -824,7 +824,7 @@ static MACHINE_CONFIG_START( guab, guab_state )
MCFG_SCREEN_UPDATE_DRIVER(guab_state, screen_update_guab)
MCFG_PALETTE_LENGTH(16)
-
+
MCFG_TMS34061_ADD("tms34061", tms34061intf)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index c949327b37e..cbc0bbc1daf 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -1028,9 +1028,9 @@ static INPUT_PORTS_START( stunrun )
/* stunrun has its own coins */
// todo
-// PORT_MODIFY("jsa:JSAII")/
-// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
-// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_MODIFY("jsa:JSAII")/
+// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1118,9 +1118,9 @@ static INPUT_PORTS_START( steeltal )
/* steeltal has its own coins */
// todo
-// PORT_MODIFY("jsa:JSAIII")
-// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
-// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_MODIFY("jsa:JSAIII")
+// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -1576,7 +1576,7 @@ static MACHINE_CONFIG_DERIVED( stunrun, multisync_nomsp )
/* sund hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1598,7 +1598,7 @@ static MACHINE_CONFIG_DERIVED( steeltal, multisync_msp )
/* sund hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index 6f2855ec293..8ab8043acf7 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( hyhoo, hyhoo_state )
MCFG_CPU_PROGRAM_MAP(hyhoo_map)
MCFG_CPU_IO_MAP(hyhoo_io_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", hyhoo_state, irq0_line_hold)
-
+
MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
@@ -248,7 +248,7 @@ static MACHINE_CONFIG_START( hyhoo, hyhoo_state )
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(hyhoo_state, screen_update_hyhoo)
-
+
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HYHOO )
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 9cebb8b38a7..08ec98c3f63 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1820,7 +1820,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( spkrform_map, AS_PROGRAM, 8, igs017_state )
AM_RANGE( 0x00000, 0x0dfff ) AM_ROM
- AM_RANGE( 0x0e9bf, 0x0e9bf ) AM_NOP // hack: uncomment to switch to Formosa
+ AM_RANGE( 0x0e9bf, 0x0e9bf ) AM_NOP // hack: uncomment to switch to Formosa
AM_RANGE( 0x0e000, 0x0efff ) AM_RAM
AM_RANGE( 0x0f000, 0x0ffff ) AM_RAM
AM_RANGE( 0x10000, 0x3ffff ) AM_ROM
@@ -1864,7 +1864,7 @@ static ADDRESS_MAP_START( spkrform_io, AS_IO, 8, igs017_state )
AM_RANGE( 0x9000, 0x9001 ) AM_DEVWRITE("ymsnd", ym2413_device, write)
- AM_RANGE( 0xa000, 0xa000 ) AM_READ_PORT( "A000" ) // Game selection
+ AM_RANGE( 0xa000, 0xa000 ) AM_READ_PORT( "A000" ) // Game selection
AM_RANGE( 0xa001, 0xa001 ) AM_READ_PORT( "A001" )
AM_RANGE( 0xb000, 0xb000 ) AM_WRITE(input_select_w )
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 7374569f722..1865206850a 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -1335,7 +1335,7 @@ static INPUT_PORTS_START( wcbowlj )
PORT_MODIFY("DIPS")
PORT_DIPNAME( 0x0040, 0x0000, DEF_STR( Controls ) ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x0000, "One Trackball" )
- PORT_DIPSETTING( 0x0040, "Two Trackballs" ) /* Two Trackballs will work for Upright for "side by side" controls */
+ PORT_DIPSETTING( 0x0040, "Two Trackballs" ) /* Two Trackballs will work for Upright for "side by side" controls */
INPUT_PORTS_END
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 4bed6d5c7a3..8f8b301474f 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1696,7 +1696,7 @@ static MACHINE_CONFIG_START( itech8_core_lo, itech8_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(512, 263)
-
+
MCFG_TMS34061_ADD("tms34061", tms34061intf)
/* sound hardware */
@@ -1794,8 +1794,8 @@ static MACHINE_CONFIG_DERIVED( wfortune, itech8_core_hi )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(itech8_state, screen_update_itech8_2layer)
-
-
+
+
MACHINE_CONFIG_END
@@ -1811,7 +1811,7 @@ static MACHINE_CONFIG_DERIVED( grmatch, itech8_core_hi )
/* palette updater */
MCFG_TIMER_DRIVER_ADD_SCANLINE("palette", itech8_state, grmatch_palette_update, "screen", 0, 0)
-
+
MACHINE_CONFIG_END
@@ -1824,7 +1824,7 @@ static MACHINE_CONFIG_DERIVED( stratab_hi, itech8_core_hi )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(itech8_state, screen_update_itech8_2layer)
-
+
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index d9b18210054..8e339a51204 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -420,15 +420,15 @@ ROM_START( jackalr ) /* Rotary Joystick: Shot direction is controlled via the ro
ROM_LOAD16_BYTE( "631t05.8h", 0x00001, 0x20000, CRC(732b3fc1) SHA1(7e89650b9e5e2b7ae82f8c55ac9995740f6fdfe1) ) /* Silkscreened MASK1M */
ROM_LOAD16_BYTE( "631t06.12h", 0x40000, 0x20000, CRC(2d10e56e) SHA1(447b464ea725fb9ef87da067a41bcf463b427cce) ) /* Silkscreened MASK1M */
ROM_LOAD16_BYTE( "631t07.13h", 0x40001, 0x20000, CRC(4961c397) SHA1(b430df58fc3bb722d6fb23bed7d04afdb7e5d9c1) ) /* Silkscreened MASK1M */
- /* These roms are on a tiny riser board - two smaller roms instead of MASK1M roms */
-// ROM_LOAD16_BYTE( "631_q04.7h", 0x20000, 0x10000, CRC(0) SHA1(0) )
-// ROM_LOAD16_BYTE( "631_q05.7h", 0x00000, 0x10000, CRC(0) SHA1(0) )
-// ROM_LOAD16_BYTE( "631_q06.8h", 0x20001, 0x10000, CRC(0) SHA1(0) )
-// ROM_LOAD16_BYTE( "631_q07.8h", 0x00001, 0x10000, CRC(0) SHA1(0) ) /* 631 Q04 through 631 Q11 need to be redumped and verified. Should be the same data */
-// ROM_LOAD16_BYTE( "631_q08.12h", 0x40000, 0x10000, CRC(0) SHA1(0) ) /* until then we are going to use the standard MASK1M roms - Will fixed when dumped */
-// ROM_LOAD16_BYTE( "631_q09.12h", 0x60000, 0x10000, CRC(0) SHA1(0) )
-// ROM_LOAD16_BYTE( "631_q10.13h", 0x40001, 0x10000, CRC(0) SHA1(0) )
-// ROM_LOAD16_BYTE( "631_q11.13h", 0x60001, 0x10000, CRC(0) SHA1(0) )
+ /* These roms are on a tiny riser board - two smaller roms instead of MASK1M roms */
+// ROM_LOAD16_BYTE( "631_q04.7h", 0x20000, 0x10000, CRC(0) SHA1(0) )
+// ROM_LOAD16_BYTE( "631_q05.7h", 0x00000, 0x10000, CRC(0) SHA1(0) )
+// ROM_LOAD16_BYTE( "631_q06.8h", 0x20001, 0x10000, CRC(0) SHA1(0) )
+// ROM_LOAD16_BYTE( "631_q07.8h", 0x00001, 0x10000, CRC(0) SHA1(0) ) /* 631 Q04 through 631 Q11 need to be redumped and verified. Should be the same data */
+// ROM_LOAD16_BYTE( "631_q08.12h", 0x40000, 0x10000, CRC(0) SHA1(0) ) /* until then we are going to use the standard MASK1M roms - Will fixed when dumped */
+// ROM_LOAD16_BYTE( "631_q09.12h", 0x60000, 0x10000, CRC(0) SHA1(0) )
+// ROM_LOAD16_BYTE( "631_q10.13h", 0x40001, 0x10000, CRC(0) SHA1(0) )
+// ROM_LOAD16_BYTE( "631_q11.13h", 0x60001, 0x10000, CRC(0) SHA1(0) )
ROM_REGION( 0x0200, "proms", 0 ) /* color lookup tables */
ROM_LOAD( "631r08.9h", 0x0000, 0x0100, CRC(7553a172) SHA1(eadf1b4157f62c3af4602da764268df954aa0018) ) /* MMI 63S141AN or compatible (silkscreened 6301) */
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index f39ffb57d60..271aeddec9d 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -150,7 +150,7 @@ WRITE16_MEMBER(jpmsys5_state::ramdac_w)
UINT32 jpmsys5_state::screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int x, y;
-
+
m_tms34061->get_display_state();
if (m_tms34061->m_display.blanked)
@@ -848,7 +848,7 @@ MACHINE_CONFIG_START( jpmsys5_ym, jpmsys5_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_ROC10937_ADD("vfd",0,RIGHT_TO_LEFT)
-
+
MCFG_MACHINE_START_OVERRIDE(jpmsys5_state,jpmsys5)
MCFG_MACHINE_RESET_OVERRIDE(jpmsys5_state,jpmsys5)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -876,7 +876,7 @@ MACHINE_CONFIG_START( jpmsys5, jpmsys5_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_ROC10937_ADD("vfd",0,RIGHT_TO_LEFT)
-
+
MCFG_MACHINE_START_OVERRIDE(jpmsys5_state,jpmsys5)
MCFG_MACHINE_RESET_OVERRIDE(jpmsys5_state,jpmsys5)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index a95cd762cf9..405da47d341 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1129,10 +1129,10 @@ static MACHINE_CONFIG_START( godzilla, legionna_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
-// MCFG_SCREEN_REFRESH_RATE(61)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
-// MCFG_SCREEN_SIZE(42*8, 36*8)
-// MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+// MCFG_SCREEN_REFRESH_RATE(61)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+// MCFG_SCREEN_SIZE(42*8, 36*8)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
MCFG_SCREEN_RAW_PARAMS(14318180/2,442,0,320,262,0,224) // ~61 Hz
MCFG_SCREEN_UPDATE_DRIVER(legionna_state, screen_update_godzilla)
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 23f8e9972e2..22911c690bb 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -80,7 +80,7 @@ READ16_MEMBER( lemmings_state::lem_protection_region_0_146_r )
}
WRITE16_MEMBER( lemmings_state::lem_protection_region_0_146_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( lemmings_map, AS_PROGRAM, 16, lemmings_state )
AM_RANGE(0x160000, 0x160fff) AM_RAM_WRITE(lemmings_palette_24bit_w) AM_SHARE("paletteram")
AM_RANGE(0x170000, 0x17000f) AM_RAM_WRITE(lemmings_control_w) AM_SHARE("control_data")
AM_RANGE(0x190000, 0x19000f) AM_READ(lemmings_trackball_r)
-// AM_RANGE(0x1a0000, 0x1a07ff) AM_DEVREAD("ioprot", deco146_device,lemmings_prot_r)
+// AM_RANGE(0x1a0000, 0x1a07ff) AM_DEVREAD("ioprot", deco146_device,lemmings_prot_r)
AM_RANGE(0x1a0000, 0x1a3fff) AM_READWRITE(lem_protection_region_0_146_r,lem_protection_region_0_146_w)AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x1a0064, 0x1a0065) AM_WRITE(lemmings_sound_w)
AM_RANGE(0x1c0000, 0x1c0001) AM_DEVWRITE("spriteram", buffered_spriteram16_device, write) /* 1 written once a frame */
diff --git a/src/mame/drivers/lindbergh.c b/src/mame/drivers/lindbergh.c
index 24393cc247e..8544b83b7d4 100644
--- a/src/mame/drivers/lindbergh.c
+++ b/src/mame/drivers/lindbergh.c
@@ -2,10 +2,10 @@
Sega Lindbergh skeleton driver
- TODO:
- - tests area 0xd0000 - 0xd000f, wants an undumped ROM in there?
- - Apparently there's no way to avoid a dead lock at 0xfd085, perhaps
- tied to the aforementioned?
+ TODO:
+ - tests area 0xd0000 - 0xd000f, wants an undumped ROM in there?
+ - Apparently there's no way to avoid a dead lock at 0xfd085, perhaps
+ tied to the aforementioned?
***************************************************************************
@@ -265,7 +265,7 @@ void lindbergh_state::machine_reset()
}
static MACHINE_CONFIG_START(lindbergh, lindbergh_state)
-// MCFG_CPU_ADD("maincpu", PENTIUM, 2800000000U) /* Actually Celeron D at 2,8 GHz */
+// MCFG_CPU_ADD("maincpu", PENTIUM, 2800000000U) /* Actually Celeron D at 2,8 GHz */
MCFG_CPU_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
MCFG_CPU_PROGRAM_MAP(lindbergh_map)
MCFG_CPU_IO_MAP(lindbergh_io)
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 455611fe3c5..05d242f3ad4 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -2923,7 +2923,7 @@ ROM_START( p47 )
ROM_LOAD( "p47j_12.bin", 0x040000, 0x020000, CRC(5268395f) SHA1(de0cba1e7a7d4acc27467d1b553e8f39bea7282e) )
ROM_REGION( 0x020000, "gfx3", 0 ) /* Scroll 2 */
- ROM_LOAD( "p47us16.bin", 0x000000, 0x010000, CRC(5a682c8f) SHA1(0910025e2ee068e5a1fe7f2daae64c9112ab1de6) ) // "phantom" instead of "freedom" in the logo
+ ROM_LOAD( "p47us16.bin", 0x000000, 0x010000, CRC(5a682c8f) SHA1(0910025e2ee068e5a1fe7f2daae64c9112ab1de6) ) // "phantom" instead of "freedom" in the logo
ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
ROM_LOAD( "p47j_27.bin", 0x000000, 0x020000, CRC(9e2bde8e) SHA1(8cac74c8177a6953b78c6fbf734dfee5da8fc961) )
@@ -3021,7 +3021,7 @@ ROM_START( p47je )
ROM_REGION( 0x080000, "gfx4", 0 ) /* Sprites */
ROM_LOAD( "p47j_27.bin", 0x000000, 0x020000, CRC(9e2bde8e) SHA1(8cac74c8177a6953b78c6fbf734dfee5da8fc961) )
ROM_LOAD( "p47j_18.bin", 0x020000, 0x020000, CRC(29d8f676) SHA1(6af5ec9aa96ea67c2c95bcca2164afc128e84a31) )
- ROM_LOAD( "export_17.rom15", 0x040000, 0x020000, CRC(b6c2e241) SHA1(54c9cc9e858a3060117acc0128ea7e759d255a67) ) // German "Iron Cross" emblem removed from enemies
+ ROM_LOAD( "export_17.rom15", 0x040000, 0x020000, CRC(b6c2e241) SHA1(54c9cc9e858a3060117acc0128ea7e759d255a67) ) // German "Iron Cross" emblem removed from enemies
ROM_LOAD( "p47j_26.bin", 0x060000, 0x020000, CRC(4d07581a) SHA1(768693e1fcb822b8284ba14c9a5c3d6b00f73383) )
ROM_REGION( 0x040000, "oki1", 0 ) /* Samples */
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index a3251aca261..b5b79e7835c 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -2202,7 +2202,7 @@ DRIVER_INIT_MEMBER(meritm_state,pitbossc)
{ 0xf0, 0xaa, 0x0f, 0x0f, 0x55, 0x55, 0xff, 0xab };
static const UINT8 pitbossc_ds1204_nvram[16] =
- { 0x00, 0x00, 0x00, 0x39, 0x32, 0x32, 0x31, 0x2d, 0x31, 0x32, 0x30, 0xf4, 0xa1, 0x52, 0x56, 0x20 };
+ { 0x00, 0x00, 0x00, 0x39, 0x32, 0x32, 0x31, 0x2d, 0x31, 0x32, 0x30, 0xf4, 0xa1, 0x52, 0x56, 0x20 };
ds1204_init(pitbossc_ds1204_key, pitbossc_ds1204_nvram);
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 496b1b5290a..61d63209aab 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -591,4 +591,3 @@ ROM_END
GAME( 1983, miniboy7, 0, miniboy7, miniboy7, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini Boy 7 (set 1)", GAME_NO_SOUND | GAME_WRONG_COLORS | GAME_NOT_WORKING )
GAME( 1983, miniboy7a, miniboy7, miniboy7, miniboy7, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini Boy 7 (set 2)", GAME_NO_SOUND | GAME_WRONG_COLORS | GAME_NOT_WORKING )
GAME( 1983, miniboy7b, miniboy7, miniboy7, miniboy7, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini Boy 7 (set 3)", GAME_NO_SOUND | GAME_WRONG_COLORS | GAME_NOT_WORKING )
-
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index b83ec1be392..2538f85650d 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -195,7 +195,7 @@ TODO:
#include "crmaze2p.lh"
#include "crmaze4p.lh"
#include "includes/mpu4.h"
- #include "cpu/m68000/m68000.h"
+ #include "cpu/m68000/m68000.h"
struct ef9369_t
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 3c0fe351c11..79342f7ab0d 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -7159,7 +7159,7 @@ ROM_START( ndcfboxa )
ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
// PIC and sticker unknown
- ROM_LOAD("317-unk-jpn.pic", 0x00, 0x4000, NO_DUMP )
+ ROM_LOAD("317-unk-jpn.pic", 0x00, 0x4000, NO_DUMP )
ROM_END
/*
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 4fdc0c9ffbd..6cbb9fe69d3 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -2828,7 +2828,7 @@ static MACHINE_CONFIG_DERIVED( crystalg, NBMJDRV_256 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(secolove_map)
MCFG_CPU_IO_MAP(crystalg_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_CRYSTALG )
MACHINE_CONFIG_END
@@ -2851,7 +2851,7 @@ static MACHINE_CONFIG_DERIVED( apparel, NBMJDRV_256 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(secolove_map)
MCFG_CPU_IO_MAP(secolove_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_APPAREL )
MACHINE_CONFIG_END
@@ -2891,7 +2891,7 @@ static MACHINE_CONFIG_DERIVED( barline, mbmj_h12bit )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(barline_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_BARLINE )
@@ -2966,49 +2966,49 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bijokkoy, mbmj_p16bit_LCD )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOY )
+ MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOY )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bijokkog, mbmj_p16bit_LCD )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOG )
+ MCFG_NB1413M3_TYPE( NB1413M3_BIJOKKOG )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( housemnq, mbmj_p16bit_LCD )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMNQ )
+ MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMNQ )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( housemn2, mbmj_p16bit_LCD )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMN2 )
+ MCFG_NB1413M3_TYPE( NB1413M3_HOUSEMN2 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( livegal, mbmj_p16bit_LCD )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_LIVEGAL )
+ MCFG_NB1413M3_TYPE( NB1413M3_LIVEGAL )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( orangec, mbmj_p16bit )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_ORANGEC )
+ MCFG_NB1413M3_TYPE( NB1413M3_ORANGEC )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( orangeci, mbmj_p16bit )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_ORANGECI )
+ MCFG_NB1413M3_TYPE( NB1413M3_ORANGECI )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vipclub, mbmj_p16bit )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_VIPCLUB )
+ MCFG_NB1413M3_TYPE( NB1413M3_VIPCLUB )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 )
@@ -3017,15 +3017,15 @@ static MACHINE_CONFIG_DERIVED( seiha, NBMJDRV_65536 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(secolove_map)
MCFG_CPU_IO_MAP(seiha_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_SEIHA )
+ MCFG_NB1413M3_TYPE( NB1413M3_SEIHA )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( seiham, seiha )
MCFG_DEVICE_MODIFY("nb1413m3")
- MCFG_NB1413M3_TYPE( NB1413M3_SEIHAM )
+ MCFG_NB1413M3_TYPE( NB1413M3_SEIHAM )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 )
@@ -3035,7 +3035,7 @@ static MACHINE_CONFIG_DERIVED( mjgaiden, NBMJDRV_4096 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(ojousan_map)
MCFG_CPU_IO_MAP(mjgaiden_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN )
MACHINE_CONFIG_END
@@ -3046,7 +3046,7 @@ static MACHINE_CONFIG_DERIVED( iemoto, NBMJDRV_65536 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(secolove_map)
MCFG_CPU_IO_MAP(iemoto_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_IEMOTO )
MACHINE_CONFIG_END
@@ -3057,7 +3057,7 @@ static MACHINE_CONFIG_DERIVED( ojousan, NBMJDRV_65536 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(ojousan_map)
MCFG_CPU_IO_MAP(iemoto_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN )
MACHINE_CONFIG_END
@@ -3136,7 +3136,7 @@ static MACHINE_CONFIG_DERIVED( mjsikaku, NBMJDRV_4096 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mjsikaku_map)
MCFG_CPU_IO_MAP(mjsikaku_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJSIKAKU )
@@ -3151,7 +3151,7 @@ static MACHINE_CONFIG_DERIVED( mmsikaku, NBMJDRV_4096 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(secolove_map)
MCFG_CPU_IO_MAP(mmsikaku_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMSIKAKU )
MACHINE_CONFIG_END
@@ -3161,7 +3161,7 @@ static MACHINE_CONFIG_DERIVED( otonano, mjsikaku )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(otonano_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OTONANO )
MACHINE_CONFIG_END
@@ -4080,12 +4080,12 @@ GAME( 1988, korinaim, korinai, korinaim, korinaim, driver_device, 0,
/* pure 16-bit palette (+ LCD in some) */
GAME( 1987, housemnq, 0, housemnq, housemnq, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin (Japan 870217)", 0 )
GAME( 1987, housemn2, 0, housemn2, housemn2, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin Roppongi Live hen (Japan 870418)", 0 )
-GAME( 1987, livegal, 0, livegal, livegal, driver_device, 0, ROT0, "Central Denshi", "Live Gal (Japan 870530)", 0 )
+GAME( 1987, livegal, 0, livegal, livegal, driver_device, 0, ROT0, "Central Denshi", "Live Gal (Japan 870530)", 0 )
GAME( 1987, bijokkoy, 0, bijokkoy, bijokkoy, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Yume Monogatari (Japan 870925)", 0 )
GAME( 1988, bijokkog, 0, bijokkog, bijokkog, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Gakuen (Japan 880116)", 0 )
-GAME( 1988, orangec, 0, orangec, orangec, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maruhi Kagai Jugyou (Japan 880213)", 0 )
-GAME( 1988, orangeci, orangec, orangeci, orangeci, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880221)", 0 )
-GAME( 1988, vipclub, orangec, vipclub, vipclub, driver_device, 0, ROT0, "Daiichi Denshi", "Vip Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880310)", 0 )
+GAME( 1988, orangec, 0, orangec, orangec, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maruhi Kagai Jugyou (Japan 880213)", 0 )
+GAME( 1988, orangeci, orangec, orangeci, orangeci, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880221)", 0 )
+GAME( 1988, vipclub, orangec, vipclub, vipclub, driver_device, 0, ROT0, "Daiichi Denshi", "Vip Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880310)", 0 )
/* pure 12-bit palette */
GAME( 1988, kaguya, 0, kaguya, kaguya, driver_device, 0, ROT0, "Miki Syouji", "Mahjong Kaguyahime [BET] (Japan 880521)", 0 )
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 4f0cc4e8848..1a28dc11f4f 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -2531,7 +2531,7 @@ static MACHINE_CONFIG_START( gionbana, nbmj8891_state )
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_GIONBANA )
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -2559,7 +2559,7 @@ static MACHINE_CONFIG_DERIVED( mgion, gionbana )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mgion_map)
MCFG_CPU_IO_MAP(mgion_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MGION )
@@ -2575,7 +2575,7 @@ static MACHINE_CONFIG_DERIVED( omotesnd, gionbana )
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OMOTESND )
-
+
MCFG_NVRAM_ADD_0FILL("nvram")
/* sound hardware */
@@ -2585,7 +2585,7 @@ static MACHINE_CONFIG_DERIVED( omotesnd, gionbana )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( abunai, gionbana )
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_ABUNAI )
MACHINE_CONFIG_END
@@ -2596,7 +2596,7 @@ static MACHINE_CONFIG_DERIVED( mjcamerb, gionbana )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(hanamomo_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJCAMERB )
@@ -2613,7 +2613,7 @@ static MACHINE_CONFIG_DERIVED( mmcamera, gionbana )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(hanamomo_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMCAMERA )
@@ -2631,7 +2631,7 @@ static MACHINE_CONFIG_DERIVED( hanamomo, gionbana )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(hanamomo_map)
MCFG_CPU_IO_MAP(hanamomo_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HANAMOMO )
@@ -2647,7 +2647,7 @@ static MACHINE_CONFIG_DERIVED( msjiken, hanamomo )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(gionbana_map)
MCFG_CPU_IO_MAP(msjiken_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MSJIKEN )
MACHINE_CONFIG_END
@@ -2673,10 +2673,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mjfocus, gionbana )
/* basic machine hardware */
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJFOCUS )
-
+
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,nbmj8891_1layer)
MACHINE_CONFIG_END
@@ -2699,7 +2699,7 @@ static MACHINE_CONFIG_DERIVED( mjnanpas, gionbana )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(club90s_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJNANPAS )
MACHINE_CONFIG_END
@@ -2710,7 +2710,7 @@ static MACHINE_CONFIG_DERIVED( maiko, mjnanpas )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(maiko_map)
MCFG_CPU_IO_MAP(maiko_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MAIKO )
MACHINE_CONFIG_END
@@ -2720,10 +2720,10 @@ static MACHINE_CONFIG_DERIVED( mmaiko, maiko )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mmaiko_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMAIKO )
-
+
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2733,7 +2733,7 @@ static MACHINE_CONFIG_DERIVED( lovehous, mjnanpas )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(lovehous_map)
MCFG_CPU_IO_MAP(lovehous_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_LOVEHOUS )
@@ -2745,7 +2745,7 @@ static MACHINE_CONFIG_DERIVED( hanaoji, maiko )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(hanaoji_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HANAOJI )
@@ -2774,7 +2774,7 @@ static MACHINE_CONFIG_DERIVED( scandal, hanamomo )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(scandalm_map)
MCFG_CPU_IO_MAP(scandal_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_SCANDAL )
MACHINE_CONFIG_END
@@ -2785,7 +2785,7 @@ static MACHINE_CONFIG_DERIVED( bananadr, mjnanpas )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(scandalm_map)
MCFG_CPU_IO_MAP(bananadr_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_BANANADR )
@@ -2817,7 +2817,7 @@ static MACHINE_CONFIG_DERIVED( mjfocusm, gionbana )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(scandalm_map)
MCFG_CPU_IO_MAP(scandalm_io_map)
-
+
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJFOCUSM )
@@ -3842,7 +3842,7 @@ GAME( 1988, hanamomo, 0, hanamomo, hanamomo, driver_device, 0, R
GAME( 1988, hanamomb, hanamomo, hanamomo, hanamomo, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Hana no Momoko gumi (Japan 881125)", 0 )
GAME( 1988, telmahjn, 0, telmahjn, telmahjn, nbmj8891_state, telmahjn, ROT270, "Nichibutsu", "Telephone Mahjong (Japan 890111)", 0 )
GAME( 1989, gionbana, 0, gionbana, gionbana, nbmj8891_state, gionbana, ROT0, "Nichibutsu", "Gionbana (Japan 890120)", 0 )
-GAME( 1989, mgion, 0, mgion, mgion, driver_device, 0, ROT0, "Nichibutsu", "Gionbana [BET] (Japan 890207)", 0 )
+GAME( 1989, mgion, 0, mgion, mgion, driver_device, 0, ROT0, "Nichibutsu", "Gionbana [BET] (Japan 890207)", 0 )
GAME( 1989, omotesnd, 0, omotesnd, omotesnd, nbmj8891_state, omotesnd, ROT0, "Anime Tec", "Omotesandou (Japan 890215)", 0 )
GAME( 1989, abunai, 0, abunai, abunai, driver_device, 0, ROT0, "Green Soft", "Abunai Houkago - Mou Matenai (Japan 890325)", 0 )
GAME( 1989, mjfocus, 0, mjfocus, mjfocus, nbmj8891_state, mjfocus, ROT0, "Nichibutsu", "Mahjong Focus (Japan 890313)", 0 )
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 8207c9562a4..b31e164bcac 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -7425,7 +7425,7 @@ GAME( 1998, grdnstrmv,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT
GAME( 1998, grdnstrmk,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Sen Jin - Guardian Storm (Korea)", 0 )
GAME( 1998, redfoxwp2,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Red Fox War Planes II (China, set 1)", 0 )
GAME( 1998, redfoxwp2a,grdnstrm,grdnstrmk,grdnstrk, nmk16_state, redfoxwp2a,ROT270, "Afega", "Red Fox War Planes II (China, set 2)", 0 )
-GAME( 1998, grdnstrmg,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg,ROT270, "Afega", "Guardian Storm (Germany)", 0 )
+GAME( 1998, grdnstrmg,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg,ROT270, "Afega", "Guardian Storm (Germany)", 0 )
GAME( 1998, bubl2000, 0, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Tuning", "Bubble 2000", 0 ) // on a tuning board (bootleg?)
GAME( 1998, hotbubl, bubl2000, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Pandora", "Hot Bubble" , 0 ) // on an afega board ..
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index e11d1cfbb53..1d959f3cc2f 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -383,7 +383,7 @@ static MACHINE_CONFIG_START( offtwall, offtwall_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 0f62fa4a433..d31f38360d7 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -12,14 +12,14 @@
and the coin A setting isn't shown. It's OK with 1 IRQ5 per frame.
- The "Continue?" sprites are not visible until you press start
- priorities
-
- The issues below are both IRQ timing, and relate to when the sprites get
- copied across by the DMA
- - Some flickering sprites, this might be an interrupt/timing issue
- - The screen is cluttered with sprites which aren't supposed to be visible,
- increasing the coordinate mask in k053247_sprites_draw() from 0x3ff to 0xfff
- fixes this but breaks other games (e.g. Vendetta).
+
+ The issues below are both IRQ timing, and relate to when the sprites get
+ copied across by the DMA
+ - Some flickering sprites, this might be an interrupt/timing issue
+ - The screen is cluttered with sprites which aren't supposed to be visible,
+ increasing the coordinate mask in k053247_sprites_draw() from 0x3ff to 0xfff
+ fixes this but breaks other games (e.g. Vendetta).
***************************************************************************/
@@ -92,7 +92,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(overdriv_state::overdriv_cpuA_scanline)
INTERRUPT_GEN_MEMBER(overdriv_state::cpuB_interrupt)
{
// this doesn't get turned on until the irq has happened? wrong irq?
-// if (m_k053246->k053246_is_irq_enabled())
+// if (m_k053246->k053246_is_irq_enabled())
m_subcpu->set_input_line(4, HOLD_LINE); // likely wrong
}
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index 281bda39ee0..b7fced1b632 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -217,9 +217,9 @@ static MACHINE_CONFIG_START( pcat_nit, pcat_nit_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
-// MCFG_SCREEN_MODIFY("screen")
-// MCFG_SCREEN_REFRESH_RATE(60)
-// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
+// MCFG_SCREEN_MODIFY("screen")
+// MCFG_SCREEN_REFRESH_RATE(60)
+// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_FRAGMENT_ADD( pcat_common )
MCFG_NS16450_ADD( "ns16450_0", pcat_nit_com0_interface, XTAL_1_8432MHz )
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 7a8f138bbec..25d3747b44c 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -311,7 +311,6 @@ static const deco16ic_interface pktgaldx_deco16ic_tilegen1_intf =
void pktgaldx_state::machine_start()
{
-
}
static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state )
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 1e815d3ef8e..96b592996b9 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -99,39 +99,39 @@ WRITE8_MEMBER(polygonet_state::polygonet_sys_w)
{
case 0:
/*
- D28 = /FIXKILL - Disable 'FIX' layer?
- D27 = MUTE
- D26 = EEPROM CLK
- D25 = EEPROM CS
- D24 = EEPROM DATA
- */
+ D28 = /FIXKILL - Disable 'FIX' layer?
+ D27 = MUTE
+ D26 = EEPROM CLK
+ D25 = EEPROM CS
+ D24 = EEPROM DATA
+ */
m_eeprom->write_bit(data & 1);
m_eeprom->set_cs_line((data & 2) ? CLEAR_LINE : ASSERT_LINE);
m_eeprom->set_clock_line((data & 4) ? ASSERT_LINE : CLEAR_LINE);
-
+
m_sys0 = data;
break;
-
+
case 1:
/*
- D23 = BRMAS - 68k bus error mask
- D22 = L7MAS - L7 interrupt mask (unused - should always be '1')
- D21 = /L5MAS - L5 interrupt mask/acknowledge (vblank)
- D20 = L3MAS - L3 interrupt mask (network)
- D19 = VFLIP - Flip video vertically
- D18 = HFLIP - Flip video horizontally
- D17 = COIN2 - Coin counter 2
- D16 = COIN1 - Coin counter 1
+ D23 = BRMAS - 68k bus error mask
+ D22 = L7MAS - L7 interrupt mask (unused - should always be '1')
+ D21 = /L5MAS - L5 interrupt mask/acknowledge (vblank)
+ D20 = L3MAS - L3 interrupt mask (network)
+ D19 = VFLIP - Flip video vertically
+ D18 = HFLIP - Flip video horizontally
+ D17 = COIN2 - Coin counter 2
+ D16 = COIN1 - Coin counter 1
*/
coin_counter_w(machine(), 0, data & 1);
coin_counter_w(machine(), 1, data & 2);
-
+
if (~data & 0x20)
m_maincpu->set_input_line(M68K_IRQ_5, CLEAR_LINE);
-
+
m_sys1 = data;
break;
-
+
default:
break;
}
@@ -156,14 +156,14 @@ READ8_MEMBER(polygonet_state::sound_comms_r)
case 0:
// unknown
return 0;
-
+
case 2:
return soundlatch_byte_r(space, 0);
-
+
default:
break;
}
-
+
return 0;
}
@@ -174,27 +174,27 @@ WRITE8_MEMBER(polygonet_state::sound_comms_w)
case 0:
// unknown, writes once at boot
break;
-
+
case 2:
// TODO: reset global volume
break;
-
+
case 3:
// TODO: increase global volume
break;
-
+
case 4:
// unknown
break;
-
+
case 6:
soundlatch2_byte_w(space, 0, data);
break;
-
+
case 7:
soundlatch3_byte_w(space, 0, data);
break;
-
+
default:
break;
}
@@ -564,7 +564,7 @@ WRITE8_MEMBER(polygonet_state::sound_bankswitch_w)
// higher bits: ? (only used in plygonet)
if ((m_sound_bank & 7) != (data & 7))
membank("bank1")->set_entry(data & 7);
-
+
m_sound_bank = data;
}
@@ -623,7 +623,7 @@ void polygonet_state::machine_reset()
{
membank("bank1")->set_entry(0);
m_sound_bank = 0;
-
+
m_sys0 = 0;
m_sys1 = 0;
@@ -668,7 +668,7 @@ static MACHINE_CONFIG_START( plygonet, polygonet_state )
MCFG_CPU_ADD("audiocpu", Z80, 8000000)
MCFG_CPU_PROGRAM_MAP(sound_map)
-
+
MCFG_QUANTUM_PERFECT_CPU("maincpu") /* TODO: TEMPORARY! UNTIL A MORE LOCALIZED SYNC CAN BE MADE */
MCFG_EEPROM_ADD("eeprom", eeprom_intf)
@@ -714,7 +714,7 @@ static INPUT_PORTS_START( polygonet )
PORT_DIPSETTING( 0x30, "Blue" )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
+
PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN )
@@ -783,16 +783,16 @@ ROM_START( plygonet )
ROM_LOAD32_BYTE( "305uaa02.2k", 0x000002, 512*1024, CRC(4d7e32b3) SHA1(25731526535036972577637d186f02ae467296bd) )
ROM_LOAD32_BYTE( "305uaa03.2h", 0x000001, 512*1024, CRC(36e4e3fe) SHA1(e8fcad4f196c9b225a0fbe70791493ff07c648a9) )
ROM_LOAD32_BYTE( "305uaa04.4h", 0x000000, 512*1024, CRC(d8394e72) SHA1(eb6bcf8aedb9ba5843204ab8aacb735cbaafb74d) )
-
+
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 sound program */
ROM_LOAD("305b05.7b", 0x000000, 0x20000, CRC(2d3d9654) SHA1(784a409df47cee877e507b8bbd3610d161d63753) )
-
+
ROM_REGION( 0x20000, "gfx1", 0 ) /* TTL text plane tiles */
ROM_LOAD( "305b06.18g", 0x000000, 0x20000, CRC(decd6e42) SHA1(4c23dcb1d68132d3381007096e014ee4b6007086) )
-
+
ROM_REGION( 0x40000, "gfx2", 0 ) /* '936 tiles */
ROM_LOAD( "305b07.20d", 0x000000, 0x40000, CRC(e4320bc3) SHA1(b0bb2dac40d42f97da94516d4ebe29b1c3d77c37) )
-
+
ROM_REGION( 0x200000, "shared", 0 ) /* sound data */
ROM_LOAD( "305b08.2e", 0x000000, 0x200000, CRC(874607df) SHA1(763b44a80abfbc355bcb9be8bf44373254976019) )
@@ -806,16 +806,16 @@ ROM_START( polynetw )
ROM_LOAD32_BYTE( "305jaa02.2k", 0x000002, 0x080000, CRC(d0710379) SHA1(cf0970d63e8d021edf2d404838c658a5b7cb8fb8) )
ROM_LOAD32_BYTE( "305jaa03.2h", 0x000001, 0x080000, CRC(278b5928) SHA1(2ea96054e2ef637731cd64f2bef0b5b2bbe7e24f) )
ROM_LOAD32_BYTE( "305jaa04.4h", 0x000000, 0x080000, CRC(b069353b) SHA1(12fbe2df09328bb7193e89a49d84a61eab5bfdcb) )
-
+
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 sound program */
ROM_LOAD( "305jaa05.7b", 0x000000, 0x020000, CRC(06053db6) SHA1(c7d43c2650d949ee552a49db93dece842c17e68d) )
-
+
ROM_REGION( 0x20000, "gfx1", 0 ) /* TTL text plane tiles */
ROM_LOAD( "305a06.18g", 0x000000, 0x020000, CRC(4b9b7e9c) SHA1(8c3c0f1ec7e26fd9552f6da1e6bdd7ff4453ba57) )
-
+
ROM_REGION( 0x40000, "gfx2", 0 ) /* '936 tiles */
ROM_LOAD( "305a07.20d", 0x000000, 0x020000, CRC(0959283b) SHA1(482caf96e8e430b87810508b1a1420cd3b58f203) )
-
+
ROM_REGION( 0x400000, "shared", 0 ) /* sound data */
ROM_LOAD( "305a08.2e", 0x000000, 0x200000, CRC(7ddb8a52) SHA1(3199b347fc433ffe0de8521001df77672d40771e) )
ROM_LOAD( "305a09.3e", 0x200000, 0x200000, CRC(6da1be58) SHA1(d63ac16ac551193ff8a6036724fb59e1d702e06b) )
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 40cdf169c76..62bc128ee53 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -2089,7 +2089,7 @@ GAME( 1982, poleposa, polepos, polepos, poleposa, driver_device, 0,
GAME( 1982, polepos1, polepos, polepos, poleposa, driver_device, 0, ROT0, "Namco (Atari license)", "Pole Position (Atari version 1)", 0 )
GAME( 1984, topracer, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1984)", 0 ) // the NAMCO customs have been cloned on these bootlegs
GAME( 1983, topracera, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1983)", 0 ) // the only difference between them is the year displayed on the title screen
-GAME( 1983, ppspeed, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Speed Up (Spanish bootleg of Pole Position)", 0 ) // very close to topracer / topracera
+GAME( 1983, ppspeed, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Speed Up (Spanish bootleg of Pole Position)", 0 ) // very close to topracer / topracera
GAME( 1982, topracern, polepos, topracern, topracern, polepos_state,topracern,ROT0, "bootleg", "Top Racer (no MB8841 + MB8842)", 0 )
GAME( 1983, polepos2, 0, polepos, polepos2, polepos_state, polepos2, ROT0, "Namco", "Pole Position II", 0 )
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 88f24af30d7..797fe1a7a1f 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -485,31 +485,31 @@ static INPUT_PORTS_START( psikyo_common )
PORT_START("DSW") /* c00004 -> c00007 */
PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNUSED ) // these depends by the games
- PORT_DIPNAME( 0x00010000, 0x00010000, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x00010000, 0x00010000, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x00010000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00020000, 0x00000000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x00020000, 0x00000000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x00020000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x000c0000, 0x000c0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x000c0000, 0x000c0000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x00080000, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x000c0000, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x00040000, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x00300000, 0x00300000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x00300000, 0x00300000, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x00200000, "1" )
PORT_DIPSETTING( 0x00100000, "2" )
PORT_DIPSETTING( 0x00300000, "3" )
PORT_DIPSETTING( 0x00000000, "4" )
- PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x00400000, "400K" )
PORT_DIPSETTING( 0x00000000, "600K" )
PORT_SERVICE_DIPLOC( 0x00800000, IP_ACTIVE_LOW, "SW2:8" )
- PORT_DIPNAME( 0x01000000, 0x01000000, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01000000, 0x01000000, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01000000, "Shared" )
PORT_DIPSETTING( 0x00000000, "Individual [Free Play]" )
- PORT_DIPNAME( 0x0e000000, 0x0e000000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:2,3,4")
+ PORT_DIPNAME( 0x0e000000, 0x0e000000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:2,3,4")
PORT_DIPSETTING( 0x0a000000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0c000000, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0e000000, DEF_STR( 1C_1C ) )
@@ -518,7 +518,7 @@ static INPUT_PORTS_START( psikyo_common )
PORT_DIPSETTING( 0x04000000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x02000000, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00000000, "1C 6C [Free Play]" )
- PORT_DIPNAME( 0x70000000, 0x70000000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7")
+ PORT_DIPNAME( 0x70000000, 0x70000000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7")
PORT_DIPSETTING( 0x50000000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x60000000, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x70000000, DEF_STR( 1C_1C ) )
@@ -527,7 +527,7 @@ static INPUT_PORTS_START( psikyo_common )
PORT_DIPSETTING( 0x20000000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x10000000, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00000000, "1C 6C [Free Play]" )
- PORT_DIPNAME( 0x80000000, 0x80000000, "2C Start, 1C Continue" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80000000, 0x80000000, "2C Start, 1C Continue" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, "On [Free Play]" ) // Forces 1C_1C
INPUT_PORTS_END
@@ -677,30 +677,30 @@ static INPUT_PORTS_START( btlkroad )
PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") // vblank ACTIVE_HIGH fixes slowdowns, but is it right?
// This DSW is used for debugging the game
- PORT_DIPNAME( 0x00000100, 0x00000100, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1") // tested! - So leave as is until filled in
+ PORT_DIPNAME( 0x00000100, 0x00000100, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1") // tested! - So leave as is until filled in
PORT_DIPSETTING( 0x00000100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00000200, 0x00000200, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:2") // tested! - So leave as is until filled in
+ PORT_DIPNAME( 0x00000200, 0x00000200, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:2") // tested! - So leave as is until filled in
PORT_DIPSETTING( 0x00000200, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x00000400, IP_ACTIVE_LOW, "SW3:3" )
PORT_DIPUNUSED_DIPLOC( 0x00000800, IP_ACTIVE_LOW, "SW3:4" )
- PORT_DIPNAME( 0x00001000, 0x00001000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:5") // tested! - So leave as is until filled in
+ PORT_DIPNAME( 0x00001000, 0x00001000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:5") // tested! - So leave as is until filled in
PORT_DIPSETTING( 0x00001000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
PORT_DIPUNUSED_DIPLOC( 0x00002000, IP_ACTIVE_LOW, "SW3:6" )
PORT_DIPUNUSED_DIPLOC( 0x00004000, IP_ACTIVE_LOW, "SW3:7" )
- PORT_DIPNAME( 0x00008000, 0x00008000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8") // tested! - So leave as is until filled in
+ PORT_DIPNAME( 0x00008000, 0x00008000, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:8") // tested! - So leave as is until filled in
PORT_DIPSETTING( 0x00008000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00100000, 0x00100000, "Blood Effects" ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPNAME( 0x00100000, 0x00100000, "Blood Effects" ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x00000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00100000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00200000, 0x00200000, "Handicap Mode" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x00200000, 0x00200000, "Handicap Mode" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x00200000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
- PORT_DIPNAME( 0x00400000, 0x00400000, "Use DSW 3 (Debug)" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x00400000, 0x00400000, "Use DSW 3 (Debug)" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x00400000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) )
INPUT_PORTS_END
@@ -830,14 +830,14 @@ static INPUT_PORTS_START( s1945 )
PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested!
- PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x00400000, "600K" )
PORT_DIPSETTING( 0x00000000, "800K" )
- PORT_DIPNAME( 0x01000000, 0x01000000, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01000000, 0x01000000, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01000000, "Shared" )
PORT_DIPSETTING( 0x00000000, "Individual" )
- PORT_DIPNAME( 0x0e000000, 0x0e000000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:2,3,4")
+ PORT_DIPNAME( 0x0e000000, 0x0e000000, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:2,3,4")
PORT_DIPSETTING( 0x0a000000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0c000000, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0e000000, DEF_STR( 1C_1C ) )
@@ -846,7 +846,7 @@ static INPUT_PORTS_START( s1945 )
PORT_DIPSETTING( 0x04000000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x02000000, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x70000000, 0x70000000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7")
+ PORT_DIPNAME( 0x70000000, 0x70000000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7")
PORT_DIPSETTING( 0x50000000, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x60000000, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x70000000, DEF_STR( 1C_1C ) )
@@ -855,7 +855,7 @@ static INPUT_PORTS_START( s1945 )
PORT_DIPSETTING( 0x20000000, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x10000000, DEF_STR( 1C_5C ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( 1C_6C ) )
- PORT_DIPNAME( 0x80000000, 0x80000000, "2C Start, 1C Continue" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80000000, 0x80000000, "2C Start, 1C Continue" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80000000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00000000, DEF_STR( On ) ) // Forces 1C_1C
INPUT_PORTS_END
@@ -946,7 +946,7 @@ static INPUT_PORTS_START( tengai )
PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // tested!
- PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x00400000, 0x00400000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x00400000, "600K" )
PORT_DIPSETTING( 0x00000000, "800K" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 7f9b11b40fa..05acd847c6e 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1,6 +1,6 @@
/********************************************************************************************************
- Seibu Protected 1993-94 era hardware, V30 based (sequel to the 68k based hardware)
+ Seibu Protected 1993-94 era hardware, V30 based (sequel to the 68k based hardware)
TODO: figure out the rest of the protection
TODO: Zero Team presumably needs additive blending on the character screen
@@ -8,9 +8,9 @@
- Zero Team currently crashes due of an unknown check with collision detection.
Additionally:
8E377: C7 06 00 05 80 A9 mov word ptr [500h],0A980h
- 8E37D: C7 06 00 05 00 B9 mov word ptr [500h],0B900h
- 8E383: F7 06 88 05 FF FF test word ptr [588h],0FFFFh ;checks unknown collision detection port with 0xffff?
- 8E389: 75 0A bne 8E395h
+ 8E37D: C7 06 00 05 00 B9 mov word ptr [500h],0B900h
+ 8E383: F7 06 88 05 FF FF test word ptr [588h],0FFFFh ;checks unknown collision detection port with 0xffff?
+ 8E389: 75 0A bne 8E395h
===========================================================================================================
@@ -1437,8 +1437,8 @@ static ADDRESS_MAP_START( raiden2_cop_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x005b4, 0x005b5) AM_READ(cop_angle_r)
AM_RANGE(0x00600, 0x0064f) AM_DEVREADWRITE("crtc", seibu_crtc_device, read, write)
-// AM_RANGE(0x0061c, 0x0061d) AM_WRITE(tilemap_enable_w)
-// AM_RANGE(0x00620, 0x0062b) AM_WRITE(tile_scroll_w)
+// AM_RANGE(0x0061c, 0x0061d) AM_WRITE(tilemap_enable_w)
+// AM_RANGE(0x00620, 0x0062b) AM_WRITE(tile_scroll_w)
AM_RANGE(0x006a0, 0x006a3) AM_WRITE(sprcpt_val_1_w)
AM_RANGE(0x006a4, 0x006a7) AM_WRITE(sprcpt_data_3_w)
AM_RANGE(0x006a8, 0x006ab) AM_WRITE(sprcpt_data_4_w)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 9dc5edbd6c3..12e836c9981 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -759,7 +759,7 @@ static MACHINE_CONFIG_START( realbrk, realbrk_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", realbrk_state, realbrk_interrupt)
MCFG_TMP68301_ADD("tmp68301")
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index afd39201e12..11fb9eb24eb 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -134,7 +134,7 @@ static ADDRESS_MAP_START( rohga_map, AS_PROGRAM, 16, rohga_state )
AM_RANGE(0x200000, 0x20000f) AM_DEVWRITE("tilegen1", deco16ic_device, pf_control_w)
AM_RANGE(0x240000, 0x24000f) AM_DEVWRITE("tilegen2", deco16ic_device, pf_control_w)
-// AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_READWRITE_LEGACY(deco16_104_rohga_prot_r,deco16_104_rohga_prot_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0x280000, 0x2807ff) AM_MIRROR(0x800) AM_READWRITE_LEGACY(deco16_104_rohga_prot_r,deco16_104_rohga_prot_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x280000, 0x283fff) AM_READWRITE(wf_protection_region_0_104_r,wf_protection_region_0_104_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0x2c0000, 0x2c0001) AM_READ_PORT("DSW3")
@@ -171,7 +171,7 @@ READ16_MEMBER( rohga_state::wf_protection_region_0_104_r )
}
WRITE16_MEMBER( rohga_state::wf_protection_region_0_104_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -206,7 +206,7 @@ static ADDRESS_MAP_START( wizdfire_map, AS_PROGRAM, 16, rohga_state )
AM_RANGE(0x380000, 0x381fff) AM_RAM_DEVWRITE("deco_common", decocomn_device, buffered_palette_w) AM_SHARE("paletteram")
AM_RANGE(0x390008, 0x390009) AM_DEVWRITE("deco_common", decocomn_device, palette_dma_w)
-// AM_RANGE(0xfe4000, 0xfe47ff) AM_READWRITE_LEGACY(deco16_104_prot_r,deco16_104_prot_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0xfe4000, 0xfe47ff) AM_READWRITE_LEGACY(deco16_104_prot_r,deco16_104_prot_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0xfe4000, 0xfe7fff) AM_READWRITE(wf_protection_region_0_104_r,wf_protection_region_0_104_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0xfdc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
@@ -222,7 +222,7 @@ READ16_MEMBER( rohga_state::nb_protection_region_0_146_r )
}
WRITE16_MEMBER( rohga_state::nb_protection_region_0_146_w )
-{
+{
int real_address = 0 + (offset *2);
int deco146_addr = BITSWAP32(real_address, /* NC */31,30,29,28,27,26,25,24,23,22,21,20,19,18, 13,12,11,/**/ 17,16,15,14, 10,9,8, 7,6,5,4, 3,2,1,0) & 0x7fff;
UINT8 cs = 0;
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( nitrobal_map, AS_PROGRAM, 16, rohga_state )
AM_RANGE(0x390008, 0x390009) AM_DEVWRITE("deco_common", decocomn_device, palette_dma_w)
AM_RANGE(0xfec000, 0xff3fff) AM_RAM
-// AM_RANGE(0xff4000, 0xff47ff) AM_MIRROR(0x800) AM_READWRITE_LEGACY(deco16_146_nitroball_prot_r,deco16_146_nitroball_prot_w) AM_SHARE("prot16ram") /* Protection device */
+// AM_RANGE(0xff4000, 0xff47ff) AM_MIRROR(0x800) AM_READWRITE_LEGACY(deco16_146_nitroball_prot_r,deco16_146_nitroball_prot_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0xff4000, 0xff7fff) AM_READWRITE(nb_protection_region_0_146_r,nb_protection_region_0_146_w) AM_SHARE("prot16ram") /* Protection device */
AM_RANGE(0xff8000, 0xffffff) AM_RAM
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index 0316ab21293..8865f75da60 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -5,19 +5,19 @@
"Savage Quest" (c) 1999 Interactive Light, developed by Angel Studios.
Skeleton by R. Belmont
- TODO:
- - currently asserts by selecting a s3 video bank above 1M (register 0x6a)
-
- PCI list:
- Bus no. Device No. Func No. Vendor ID Device ID Device Class IRQ
- 0 7 1 8086 7111 IDE Controller 14
- 0 7 2 8086 7112 Serial Bus Controller 11
- 0 9 0 5333 8901 Display Controller 10
- 0 13 0 121a 0002 Multimedia Device NA
- - First two are PIIX4/4E/4M IDE Controller / PIIX4/4E/4M USB Interface
- Third is S3 trio64uv+
- Fourth is Voodoo 2 3D Accelerator
- Sound Blaster is ISA/PNP
+ TODO:
+ - currently asserts by selecting a s3 video bank above 1M (register 0x6a)
+
+ PCI list:
+ Bus no. Device No. Func No. Vendor ID Device ID Device Class IRQ
+ 0 7 1 8086 7111 IDE Controller 14
+ 0 7 2 8086 7112 Serial Bus Controller 11
+ 0 9 0 5333 8901 Display Controller 10
+ 0 13 0 121a 0002 Multimedia Device NA
+ - First two are PIIX4/4E/4M IDE Controller / PIIX4/4E/4M USB Interface
+ Third is S3 trio64uv+
+ Fourth is Voodoo 2 3D Accelerator
+ Sound Blaster is ISA/PNP
============================================================================
H/W is a white-box PC consisting of:
diff --git a/src/mame/drivers/seabattl.c b/src/mame/drivers/seabattl.c
index ad028402e20..1f9d29a3a3a 100644
--- a/src/mame/drivers/seabattl.c
+++ b/src/mame/drivers/seabattl.c
@@ -176,7 +176,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1
int code = (m_objram[offset] & 0x0f) | 0x10;
int x = ((offset & 0x0f) << 4) - ((m_objram[offset] & 0xf0) >> 4);
int y = (offset & 0xf0);
-
+
drawgfx_transpen(bitmap, cliprect, machine().gfx[0], code, 0, 0, 0, x, y, 0);
}
}
@@ -194,7 +194,7 @@ UINT32 seabattl_state::screen_update_seabattl(screen_device &screen, bitmap_ind1
bool obj = (bitmap.pix(y,x) > 0) && (bitmap.pix(y,x) < 8);
bool pvi = S2636_IS_PIXEL_DRAWN(s2636_0_bitmap.pix16(y, x));
bool scr = (m_collision_bg.pix(y,x) & 1) != 0;
-
+
if (obj && pvi)
m_collision |= 0x01;
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 316254c89dd..3f759d59bc4 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1814,7 +1814,7 @@ void seibuspi_state::machine_start()
// use this to determine the region code when adding a new SPI cartridge clone set
logerror("Game region code: %02X\n", memregion("maincpu")->base()[0x1ffffc]);
-
+
// savestates
save_item(NAME(m_z80_prg_transfer_pos));
save_item(NAME(m_z80_lastbank));
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 4a6560c897c..ca416fa730c 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -214,7 +214,7 @@ TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc0_tile_info )
{
int tile = m_sc0_vram[tile_index] & 0xfff;
int color = (m_sc0_vram[tile_index] >> 12) & 0x0f;
-// tile+=(m_seibucrtc_sc0bank<<12);
+// tile+=(m_seibucrtc_sc0bank<<12);
SET_TILE_INFO_MEMBER(1, tile, color, 0);
}
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index ba9c5cccba4..2014276a4b5 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -10401,7 +10401,7 @@ ROM_START( zombraidp ) /* Prototype or test board version. Data matches release
ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASE00 ) /* Layer 2 */
ROM_LOAD16_BYTE( "u164_master_scn_2-0_e79c.u164", 0x000000, 0x080000, CRC(f8c89062) SHA1(08fd32b30923025b3769e56a8601b2ea1f85ebd1) ) /* These 6 roms dated 7/17/95 */
ROM_LOAD16_BYTE( "u166_master_scn_2-1_0b75.u166", 0x000001, 0x080000, CRC(4d7a72d5) SHA1(83b7ca4ea4c83fdab5be3c17d816dfd4033fb89c) )
- ROM_LOAD16_BYTE( "u165_master_scn_2-3_be68.u165", 0x100000, 0x080000, CRC(8aaaef08) SHA1(12b9c8c170a4acf200e3fba45407a3e38f787926) )
+ ROM_LOAD16_BYTE( "u165_master_scn_2-3_be68.u165", 0x100000, 0x080000, CRC(8aaaef08) SHA1(12b9c8c170a4acf200e3fba45407a3e38f787926) )
ROM_LOAD16_BYTE( "u167_master_scn_2-4_c515.u167", 0x100001, 0x080000, CRC(d22ff5c1) SHA1(c488a69c9a241e1ca2119264bf879140d16fe69f) )
ROM_LOAD16_BYTE( "u152_master_scn_2-2_c00e.u152", 0x200000, 0x080000, CRC(0870ad58) SHA1(20e076fa665c24db0e316598a0a5d7fae9fc2f2a) )
ROM_LOAD16_BYTE( "u153_master_scn_2-5_e1da.u153", 0x300000, 0x080000, CRC(814ac66a) SHA1(1fd13a0bf73b9bdede82a865789413308d989c3a) )
@@ -10446,7 +10446,7 @@ ROM_START( zombraidpj ) /* Prototype or test board version. Data matches releas
ROM_REGION( 0x400000, "gfx3", ROMREGION_ERASE00 ) /* Layer 2 */
ROM_LOAD16_BYTE( "u164_master_scn_2-0_e79c.u164", 0x000000, 0x080000, CRC(f8c89062) SHA1(08fd32b30923025b3769e56a8601b2ea1f85ebd1) ) /* These 6 roms dated 7/17/95 */
ROM_LOAD16_BYTE( "u166_master_scn_2-1_0b75.u166", 0x000001, 0x080000, CRC(4d7a72d5) SHA1(83b7ca4ea4c83fdab5be3c17d816dfd4033fb89c) )
- ROM_LOAD16_BYTE( "u165_master_scn_2-3_be68.u165", 0x100000, 0x080000, CRC(8aaaef08) SHA1(12b9c8c170a4acf200e3fba45407a3e38f787926) )
+ ROM_LOAD16_BYTE( "u165_master_scn_2-3_be68.u165", 0x100000, 0x080000, CRC(8aaaef08) SHA1(12b9c8c170a4acf200e3fba45407a3e38f787926) )
ROM_LOAD16_BYTE( "u167_master_scn_2-4_c515.u167", 0x100001, 0x080000, CRC(d22ff5c1) SHA1(c488a69c9a241e1ca2119264bf879140d16fe69f) )
ROM_LOAD16_BYTE( "u152_master_scn_2-2_c00e.u152", 0x200000, 0x080000, CRC(0870ad58) SHA1(20e076fa665c24db0e316598a0a5d7fae9fc2f2a) )
ROM_LOAD16_BYTE( "u153_master_scn_2-5_e1da.u153", 0x300000, 0x080000, CRC(814ac66a) SHA1(1fd13a0bf73b9bdede82a865789413308d989c3a) )
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 8132eea27e6..1f2ee7c2621 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -1996,7 +1996,7 @@ static MACHINE_CONFIG_START( seta2, seta2_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
MCFG_TMP68301_ADD("tmp68301")
-
+
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2241,7 +2241,7 @@ static MACHINE_CONFIG_START( namcostr, seta2_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
MCFG_TMP68301_ADD("tmp68301")
-
+
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 0ff6a6b56cc..1e5674c4986 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -291,10 +291,10 @@ static INPUT_PORTS_START( shanghai )
PORT_START("DSW1")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW1:8" )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x02, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4")
+ PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -303,7 +303,7 @@ static INPUT_PORTS_START( shanghai )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x14, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1")
+ PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) )
@@ -314,23 +314,23 @@ static INPUT_PORTS_START( shanghai )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
PORT_START("DSW2")
- PORT_DIPNAME( 0x01, 0x01, "Confirmation" ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x01, 0x01, "Confirmation" ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x02, 0x02, "Help" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x02, 0x02, "Help" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
- PORT_DIPNAME( 0x0c, 0x08, "2 Players Move Time" ) PORT_DIPLOCATION("SW2:6,5")
+ PORT_DIPNAME( 0x0c, 0x08, "2 Players Move Time" ) PORT_DIPLOCATION("SW2:6,5")
PORT_DIPSETTING( 0x0c, "8" )
PORT_DIPSETTING( 0x08, "10" )
PORT_DIPSETTING( 0x04, "12" )
PORT_DIPSETTING( 0x00, "14" )
- PORT_DIPNAME( 0x30, 0x20, "Bonus Time for Making Pair" ) PORT_DIPLOCATION("SW2:4,3")
+ PORT_DIPNAME( 0x30, 0x20, "Bonus Time for Making Pair" ) PORT_DIPLOCATION("SW2:4,3")
PORT_DIPSETTING( 0x30, "3" )
PORT_DIPSETTING( 0x20, "4" )
PORT_DIPSETTING( 0x10, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_DIPNAME( 0xc0, 0x40, "Start Time" ) PORT_DIPLOCATION("SW2:2,1")
+ PORT_DIPNAME( 0xc0, 0x40, "Start Time" ) PORT_DIPLOCATION("SW2:2,1")
PORT_DIPSETTING( 0xc0, "30" )
PORT_DIPSETTING( 0x80, "60" )
PORT_DIPSETTING( 0x40, "90" )
@@ -370,32 +370,32 @@ static INPUT_PORTS_START( shangha2 )
PORT_START("DSW1")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SW2:8" )
- PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6")
+ PORT_DIPNAME( 0x06, 0x06, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:7,6")
PORT_DIPSETTING( 0x06, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x04, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x08, 0x00, "2 Players Move Time" ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPNAME( 0x08, 0x00, "2 Players Move Time" ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x08, "8" )
PORT_DIPSETTING( 0x00, "10" )
- PORT_DIPNAME( 0x30, 0x20, "Bonus Time for Making Pair" ) PORT_DIPLOCATION("SW2:4,3")
+ PORT_DIPNAME( 0x30, 0x20, "Bonus Time for Making Pair" ) PORT_DIPLOCATION("SW2:4,3")
PORT_DIPSETTING( 0x30, "3" )
PORT_DIPSETTING( 0x20, "4" )
PORT_DIPSETTING( 0x10, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_DIPNAME( 0xc0, 0x40, "Start Time" ) PORT_DIPLOCATION("SW2:2,1")
+ PORT_DIPNAME( 0xc0, 0x40, "Start Time" ) PORT_DIPLOCATION("SW2:2,1")
PORT_DIPSETTING( 0xc0, "30" )
PORT_DIPSETTING( 0x80, "60" )
PORT_DIPSETTING( 0x40, "90" )
PORT_DIPSETTING( 0x00, "120" )
PORT_START("DSW2")
- PORT_DIPNAME( 0x03, 0x03, "Mystery Tiles" ) PORT_DIPLOCATION("SW1:8,7")
+ PORT_DIPNAME( 0x03, 0x03, "Mystery Tiles" ) PORT_DIPLOCATION("SW1:8,7")
PORT_DIPSETTING( 0x03, "0" )
PORT_DIPSETTING( 0x02, "4" )
PORT_DIPSETTING( 0x01, "6" )
PORT_DIPSETTING( 0x00, "8" )
- PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4")
+ PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:6,5,4")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -404,7 +404,7 @@ static INPUT_PORTS_START( shangha2 )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x14, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1")
+ PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:3,2,1")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) )
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index cfc6e7681be..6491a430577 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -250,7 +250,7 @@ static MACHINE_CONFIG_START( skullxbo, skullxbo_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("FF5802", 7)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 5f6f5ba9963..1bd94464576 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1773,7 +1773,7 @@ MACHINE_CONFIG_END
***************************************************************************/
ROM_START( snowbros )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sn6.bin", 0x00000, 0x20000, CRC(4899ddcf) SHA1(47d750d3022a80e47ffabe47566bb2556cc8d477) )
ROM_LOAD16_BYTE( "sn5.bin", 0x00001, 0x20000, CRC(ad310d3f) SHA1(f39295b38d99087dbb9c5b00bf9cb963337a50e2) )
@@ -1790,7 +1790,7 @@ ROM_START( snowbros )
ROM_END
ROM_START( snowbrosa )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sbros-3a.5", 0x00000, 0x20000, CRC(10cb37e1) SHA1(786be4640f8df2c81a32decc189ea7657ace00c6) )
ROM_LOAD16_BYTE( "sbros-2a.6", 0x00001, 0x20000, CRC(ab91cc1e) SHA1(8cff61539dc7d35fcbf110d3e54fc1883e7b8509) )
@@ -1802,7 +1802,7 @@ ROM_START( snowbrosa )
ROM_END
ROM_START( snowbrosb )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sbros3-a", 0x00000, 0x20000, CRC(301627d6) SHA1(0d1dc70091c87e9c27916d4232ff31b7381a64e1) )
ROM_LOAD16_BYTE( "sbros2-a", 0x00001, 0x20000, CRC(f6689f41) SHA1(e4fd27b930a31479c0d99e0ddd23d5db34044666) )
@@ -1814,7 +1814,7 @@ ROM_START( snowbrosb )
ROM_END
ROM_START( snowbrosc )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "3-a.ic5", 0x00000, 0x20000, CRC(e1bc346b) SHA1(a20c343d9ed2ad4f785d21076499008edad251f9) )
ROM_LOAD16_BYTE( "2-a.ic6", 0x00001, 0x20000, CRC(1be27f9d) SHA1(76dd14480b9274831e51016f7bb57459d7b15cf9) )
@@ -1826,7 +1826,7 @@ ROM_START( snowbrosc )
ROM_END
ROM_START( snowbrosd ) /* Korean release, but no specific "For use in Korea only..." notice screen */
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "sbk_3-a.bin", 0x00000, 0x20000, CRC(97174d40) SHA1(481e8c680af8b03d4bcf97b87ca0ba5a3ffca0d7) )
ROM_LOAD16_BYTE( "sbk_2-a.bin", 0x00001, 0x20000, CRC(80cc80e5) SHA1(1eeca0924c93e9f0536683160e80c59871569088) )
@@ -1838,7 +1838,7 @@ ROM_START( snowbrosd ) /* Korean release, but no specific "For use in Korea only
ROM_END
ROM_START( snowbrosj )/* "For use in Japan only..." notice screen */
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "snowbros.3", 0x00000, 0x20000, CRC(3f504f9e) SHA1(700758b114c3fde6ea8f84222af0850dba13cd3b) )
ROM_LOAD16_BYTE( "snowbros.2", 0x00001, 0x20000, CRC(854b02bc) SHA1(4ad1548eef94dcb95119cb4a7dcdefa037591b5b) )
@@ -1851,7 +1851,7 @@ ROM_START( snowbrosj )/* "For use in Japan only..." notice screen */
ROM_END
ROM_START( wintbob )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "wb3", 0x00000, 0x10000, CRC(b9719767) SHA1(431c97d409f2a5ff7f46116a4d8907e446434431) )
ROM_LOAD16_BYTE( "wb1", 0x00001, 0x10000, CRC(a4488998) SHA1(4e927e31c1b865dbdba2b985c7a819a07e2e81b8) )
@@ -1906,7 +1906,7 @@ ROM_END
/* Barko */
ROM_START( honeydol )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "d-16.uh12", 0x00001, 0x20000, CRC(cee1a2e3) SHA1(6d1ff5358ec704616b724eea2ab9b60b84709eb1) )
ROM_LOAD16_BYTE( "d-17.ui12", 0x00000, 0x20000, CRC(cac44154) SHA1(2c30dc033001fc9303da7e117e3401bc7af16607) )
@@ -1968,7 +1968,7 @@ ROMs
*/
ROM_START( twinadv )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "13.uh12", 0x00001, 0x20000, CRC(9f70a39b) SHA1(d49823be58b00c4c5a4f6cc4e4371531492aff1e) )
ROM_LOAD16_BYTE( "12.ui12", 0x00000, 0x20000, CRC(d8776495) SHA1(15b93ded80bf9f240faef2d89b6076f33f1f4ece) )
@@ -1987,7 +1987,7 @@ ROM_START( twinadv )
ROM_END
ROM_START( twinadvk )
- ROM_REGION( 0x40000, "maincpu", 0 )
+ ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD16_BYTE( "uh12", 0x00001, 0x20000, CRC(e0bcc738) SHA1(7fc6a793fcdd80122c0ac6409ae4cac5597b7b5a) )
ROM_LOAD16_BYTE( "ui12", 0x00000, 0x20000, CRC(a3ee6451) SHA1(9c0b415a2f325513739f2047780c2a56df350aa5) )
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 7c356a239eb..6559fb34467 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( stfight )
PORT_START("DSW0") /* DSW1 */
/* Manual refers to these as Dip-Switch Bank B, but TEST mode shows them as DIP-SW 1 */
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -329,40 +329,40 @@ static INPUT_PORTS_START( stfight )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_5C ) )
- PORT_DIPNAME( 0x18, 0x18, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5")
+ PORT_DIPNAME( 0x18, 0x18, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5")
PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x18, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) )
PORT_SERVICE_DIPLOC( 0x20, IP_ACTIVE_LOW, "SW1:6" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( No ) )
PORT_DIPSETTING( 0x00, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x80, 0x00, "Bullet Colour" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x00, "Bullet Colour" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x00, "Red" )
PORT_DIPSETTING( 0x80, "Blue" )
PORT_START("DSW1") /* DSWA */
/* Manual refers to these as Dip-Switch Bank A, but TEST mode shows them as DIP-SW 2 */
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x06, 0x04, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:2,3")
+ PORT_DIPNAME( 0x06, 0x04, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:2,3")
PORT_DIPSETTING( 0x06, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x04, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x02, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x18, 0x08, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:4,5")
+ PORT_DIPNAME( 0x18, 0x08, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:4,5")
PORT_DIPSETTING( 0x18, "1" )
PORT_DIPSETTING( 0x10, "2" )
PORT_DIPSETTING( 0x08, "3" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_DIPNAME( 0x60, 0x40, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:6,7")
+ PORT_DIPNAME( 0x60, 0x40, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:6,7")
PORT_DIPSETTING( 0x60, "10000 30000" )
PORT_DIPSETTING( 0x40, "20000 40000" )
PORT_DIPSETTING( 0x20, "30000 60000" )
PORT_DIPSETTING( 0x00, "40000 80000" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index aa162f374da..0dd6fe3cb5e 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -983,8 +983,8 @@ static MACHINE_CONFIG_START( stv, stv_state )
MACHINE_CONFIG_END
/*
- Batman Forever has an extra ADSP, used for sound.
- Similar if not the same as Magic the Gathering, probably needs merging.
+ Batman Forever has an extra ADSP, used for sound.
+ Similar if not the same as Magic the Gathering, probably needs merging.
*/
WRITE32_MEMBER( stv_state::batmanfr_sound_comms_w )
@@ -2999,7 +2999,7 @@ GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT0
/* Playable */
GAME( 1998, astrass, stvbios, stv, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND )
GAME( 1995, bakubaku, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Baku Baku Animal (J 950407 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
-GAME( 1996, batmanfr, stvbios, batmanfr, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS )
+GAME( 1996, batmanfr, stvbios, batmanfr, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", GAME_NO_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1996, colmns97, stvbios, stv, stv, stv_state, colmns97, ROT0, "Sega", "Columns '97 (JET 961209 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1997, cotton2, stvbios, stv, stv, stv_state, cotton2, ROT0, "Success", "Cotton 2 (JUET 970902 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
GAME( 1998, cottonbm, stvbios, stv, stv, stv_state, cottonbm, ROT0, "Success", "Cotton Boomerang (JUET 980709 V1.000)", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 7e19d693b0d..fc1ca06987f 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1272,10 +1272,10 @@ static INPUT_PORTS_START( hardhead )
JOY(2)
PORT_START("DSW1") // DSW 1 - $da00 (ip = 2)
- PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x0e, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:2,3,4")
+ PORT_DIPNAME( 0x0e, 0x0c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:2,3,4")
PORT_DIPSETTING( 0x0e, "No Bonus" )
PORT_DIPSETTING( 0x0c, "10K" )
PORT_DIPSETTING( 0x0a, "20K" )
@@ -1284,7 +1284,7 @@ static INPUT_PORTS_START( hardhead )
PORT_DIPSETTING( 0x04, "100K, Every 50K" )
PORT_DIPSETTING( 0x02, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "200K, Every 100K" )
- PORT_DIPNAME( 0x70, 0x70, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,6,7")
+ PORT_DIPNAME( 0x70, 0x70, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:5,6,7")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 3C_1C ) )
@@ -1293,26 +1293,26 @@ static INPUT_PORTS_START( hardhead )
PORT_DIPSETTING( 0x60, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x50, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x80, 0x80, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x80, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2") //DSW 2 - $da00 (ip = 3)
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x18, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:4,5")
+ PORT_DIPNAME( 0x18, 0x10, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:4,5")
PORT_DIPSETTING( 0x18, "2" )
PORT_DIPSETTING( 0x10, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_DIPNAME( 0xe0, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7,8")
+ PORT_DIPNAME( 0xe0, 0x60, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:6,7,8")
PORT_DIPSETTING( 0xe0, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0xa0, DEF_STR( Easy ) )
@@ -1336,7 +1336,7 @@ static INPUT_PORTS_START( rranger )
JOY(2)
PORT_START("DSW1") //DSW 1 - $c280
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1345,7 +1345,7 @@ static INPUT_PORTS_START( rranger )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x38, 0x20, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4,5,6")
+ PORT_DIPNAME( 0x38, 0x20, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x30, "10K" )
PORT_DIPSETTING( 0x28, "30K" )
PORT_DIPSETTING( 0x20, "50K" )
@@ -1354,34 +1354,34 @@ static INPUT_PORTS_START( rranger )
PORT_DIPSETTING( 0x08, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "100K, Every 200K" )
PORT_DIPSETTING( 0x38, DEF_STR( None ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:7,8")
PORT_DIPSETTING( 0xc0, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x80, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x40, DEF_STR( Harder ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_START("DSW2") // DSW 2 - $c2c0
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x08, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x30, 0x20, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x30, 0x20, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x30, "2" )
PORT_DIPSETTING( 0x20, "3" )
PORT_DIPSETTING( 0x10, "4" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x80, 0x80, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -1423,7 +1423,7 @@ static INPUT_PORTS_START( brickzn )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_START("DSW1") // DSW 1 - $c102
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1432,7 +1432,7 @@ static INPUT_PORTS_START( brickzn )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
+ PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x38, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x28, DEF_STR( Easy ) )
@@ -1442,21 +1442,21 @@ static INPUT_PORTS_START( brickzn )
PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" ) PORT_NAME( "Service / Invulnerability" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2") // DSW 2 - $c103
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
+ PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
PORT_DIPSETTING( 0x30, "10K" )
PORT_DIPSETTING( 0x28, "30K" )
PORT_DIPSETTING( 0x18, "50K, Every 50K" )
@@ -1465,7 +1465,7 @@ static INPUT_PORTS_START( brickzn )
PORT_DIPSETTING( 0x08, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "200K, Every 100K" )
PORT_DIPSETTING( 0x38, DEF_STR( None ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x40, "4" )
@@ -1515,7 +1515,7 @@ static INPUT_PORTS_START( hardhea2 )
JOY(2)
PORT_START("DSW1") // DSW 1 - $c002
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1524,7 +1524,7 @@ static INPUT_PORTS_START( hardhea2 )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
+ PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x38, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x28, DEF_STR( Easy ) )
@@ -1534,21 +1534,21 @@ static INPUT_PORTS_START( hardhea2 )
PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2") // DSW 2 - $c003
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
+ PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
PORT_DIPSETTING( 0x30, "10K" )
PORT_DIPSETTING( 0x28, "30K" )
PORT_DIPSETTING( 0x18, "50K, Every 50K" )
@@ -1557,7 +1557,7 @@ static INPUT_PORTS_START( hardhea2 )
PORT_DIPSETTING( 0x08, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "200K, Every 100K" )
PORT_DIPSETTING( 0x38, DEF_STR( None ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x40, "4" )
@@ -1589,7 +1589,7 @@ static INPUT_PORTS_START( starfigh )
JOY(2)
PORT_START("DSW1") // DSW 1 - $c002
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1598,7 +1598,7 @@ static INPUT_PORTS_START( starfigh )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
+ PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x38, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x28, DEF_STR( Easy ) )
@@ -1608,21 +1608,21 @@ static INPUT_PORTS_START( starfigh )
PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2") // DSW 2 - $c003
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
+ PORT_DIPNAME( 0x38, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
PORT_DIPSETTING( 0x30, "10K" )
PORT_DIPSETTING( 0x28, "30K" )
PORT_DIPSETTING( 0x18, "50K, Every 50K" )
@@ -1631,7 +1631,7 @@ static INPUT_PORTS_START( starfigh )
PORT_DIPSETTING( 0x08, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "200K, Every 100K" )
PORT_DIPSETTING( 0x38, DEF_STR( None ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x40, "4" )
@@ -1665,7 +1665,7 @@ static INPUT_PORTS_START( sparkman )
JOY(2)
PORT_START("DSW1") // DSW 1 - $c002
- PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) )
@@ -1674,7 +1674,7 @@ static INPUT_PORTS_START( sparkman )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
+ PORT_DIPNAME( 0x38, 0x18, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5,6")
PORT_DIPSETTING( 0x20, DEF_STR( Easiest ) )
PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy) )
PORT_DIPSETTING( 0x28, DEF_STR( Easy ) )
@@ -1684,21 +1684,21 @@ static INPUT_PORTS_START( sparkman )
PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_SERVICE_DIPLOC( 0x40, IP_ACTIVE_LOW, "SW1:7" )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("DSW2") // DSW 2 - $c003
- PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x02, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x04, 0x04, "Play Together" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
PORT_DIPSETTING( 0x04, DEF_STR( Yes ) )
- PORT_DIPNAME( 0x38, 0x38, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
+ PORT_DIPNAME( 0x38, 0x38, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:4,5,6")
PORT_DIPSETTING( 0x38, "10K" )
PORT_DIPSETTING( 0x28, "30K" )
PORT_DIPSETTING( 0x18, "50K, Every 50K" )
@@ -1707,7 +1707,7 @@ static INPUT_PORTS_START( sparkman )
PORT_DIPSETTING( 0x08, "100K, Every 100K" )
PORT_DIPSETTING( 0x00, "200K, Every 100K" )
PORT_DIPSETTING( 0x30, DEF_STR( None ) )
- PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc0, 0xc0, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0x80, "2" )
PORT_DIPSETTING( 0xc0, "3" )
PORT_DIPSETTING( 0x40, "4" )
@@ -2407,7 +2407,7 @@ ROM_START( srangero )
ROM_LOAD( "13.p12", 0x38000, 0x8000, CRC(9809fee8) SHA1(b7e0664702d0c1f77247d7c76a381b24687a09ea) )
ROM_END
-ROM_START( srangerw ) // same program as srangero, 2 different gfx roms
+ROM_START( srangerw ) // same program as srangero, 2 different gfx roms
ROM_REGION( 0x48000, "maincpu", 0 ) /* Main Z80 Code */
ROM_LOAD( "1.e2", 0x00000, 0x8000, CRC(2287d3fc) SHA1(cc2dab587ca50fc4371d2861ac842cd81370f868) ) // 88,2,28 RANGER
ROM_LOAD( "2.f2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) )
@@ -2434,7 +2434,7 @@ ROM_START( srangerw ) // same program as srangero, 2 different gfx roms
ROM_LOAD( "13.p12", 0x38000, 0x8000, CRC(9809fee8) SHA1(b7e0664702d0c1f77247d7c76a381b24687a09ea) )
ROM_END
-ROM_START( srangern ) // same program as srangero, 2 different gfx roms
+ROM_START( srangern ) // same program as srangero, 2 different gfx roms
ROM_REGION( 0x48000, "maincpu", 0 ) /* Main Z80 Code */
ROM_LOAD( "1.e2", 0x00000, 0x8000, CRC(2287d3fc) SHA1(cc2dab587ca50fc4371d2861ac842cd81370f868) ) // 88,2,28 RANGER
ROM_LOAD( "2.f2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) )
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 2791fa0d5bb..05af2719473 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -841,7 +841,7 @@ ROM_START( gogold )
ROM_LOAD( "b56-18.bin", 0x00000, 0x02000, CRC(c88f0bbe) SHA1(18c87c744fbeca35d13033e50f62e5383eb4ec2c) )
ROM_END
-// Sega Tetris on a Taito H-System board, with some roms from ‘Go For The Gold’ still on the board.
+// Sega Tetris on a Taito H-System board, with some roms from ?Go For The Gold? still on the board.
ROM_START( tetristh )
ROM_REGION( 0x40000, "maincpu", 0 ) /* main cpu */
ROM_LOAD16_BYTE( "c26-12-1.ic36", 0x00000, 0x20000, CRC(77e80c82) SHA1(840dc5a54a865b8cd2e0d03001a493987d66c23b) )
diff --git a/src/mame/drivers/taitotx.c b/src/mame/drivers/taitotx.c
index 4e35058e6d2..69df484becd 100644
--- a/src/mame/drivers/taitotx.c
+++ b/src/mame/drivers/taitotx.c
@@ -25,68 +25,68 @@
- Prelim game lists (system16.com)
- Taito Type X games
-
- Chaos Breaker / Dark Awake
- Datacarddass Dragon Ball Z
- Dinoking III
- Dinomax
- Dragon Quest Monster: Battle Road
- Gigawing Generations
- Harakari Professional Baseball
- Homura
- King Of Jurassic
- Raiden III
- Raiden IV
- Shikigami No Shiro III / The Castle of Shikigami III
- Spica Adventure
- Taisen Hot Gimmick 5
- Taisen Hot Gimmick Mix Party
- Tetris The Grand Master 3 : Terror Instinct
- The King of Fighters 98 Ultimate Match
- Trouble Witches
- Usagi Online
- Zoids Card Colosseum
-
- Taito Type X+ games
- Battle Gear 4
- Battle Gear 4 Tuned
- Half Life 2 Survivor
- War Of The Grail
-
-
- Taito Type X2 games
-
- Battle Fantasia
- BlazBlue: Calamity Trigger
- BlazBlue: Continuum Shift
- BlazBlue: Continuum Shift Extend
- BlazBlue: Continuum Shift II
- Chase H.Q. 2 / Chase H. Q. : Nancy Yori Kinkyuu Renraku
- D1GP Arcade
- Dariusburst AC
- Elevator Action Death Parade
- Half Life 2: Survivor Ver. 2.0
- KOF Maximum Impact: Regulation A
- KOF Maximum Impact: Regulation A2
- Matrimelee Matsuri / Power Instinct V
- Samurai Spirits Sen / Samurai Shodown: Edge of Destiny
- Street Fighter IV
- Super Street Fighter IV Arcade Edition
- The King of Fighters XII
- The King of Fighters XIII
- Wacky Races
-
- Taito Type X2 satellite terminal games
-
- Aquarian Age Alternative
- Eternal Wheel
- Lord of Vermilion
-
-
- Taito Type X Zero games
-
- Spin Gear
+ Taito Type X games
+
+ Chaos Breaker / Dark Awake
+ Datacarddass Dragon Ball Z
+ Dinoking III
+ Dinomax
+ Dragon Quest Monster: Battle Road
+ Gigawing Generations
+ Harakari Professional Baseball
+ Homura
+ King Of Jurassic
+ Raiden III
+ Raiden IV
+ Shikigami No Shiro III / The Castle of Shikigami III
+ Spica Adventure
+ Taisen Hot Gimmick 5
+ Taisen Hot Gimmick Mix Party
+ Tetris The Grand Master 3 : Terror Instinct
+ The King of Fighters 98 Ultimate Match
+ Trouble Witches
+ Usagi Online
+ Zoids Card Colosseum
+
+ Taito Type X+ games
+ Battle Gear 4
+ Battle Gear 4 Tuned
+ Half Life 2 Survivor
+ War Of The Grail
+
+
+ Taito Type X2 games
+
+ Battle Fantasia
+ BlazBlue: Calamity Trigger
+ BlazBlue: Continuum Shift
+ BlazBlue: Continuum Shift Extend
+ BlazBlue: Continuum Shift II
+ Chase H.Q. 2 / Chase H. Q. : Nancy Yori Kinkyuu Renraku
+ D1GP Arcade
+ Dariusburst AC
+ Elevator Action Death Parade
+ Half Life 2: Survivor Ver. 2.0
+ KOF Maximum Impact: Regulation A
+ KOF Maximum Impact: Regulation A2
+ Matrimelee Matsuri / Power Instinct V
+ Samurai Spirits Sen / Samurai Shodown: Edge of Destiny
+ Street Fighter IV
+ Super Street Fighter IV Arcade Edition
+ The King of Fighters XII
+ The King of Fighters XIII
+ Wacky Races
+
+ Taito Type X2 satellite terminal games
+
+ Aquarian Age Alternative
+ Eternal Wheel
+ Lord of Vermilion
+
+
+ Taito Type X Zero games
+
+ Spin Gear
*/
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 3c2f7cf2dd2..8cd362af22e 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -397,46 +397,46 @@ Notes:
Word 0:
---x---- -------- -------- -------- 1: this is the last polygon of the model
- ------x- -------- -------- -------- ?
+ ------x- -------- -------- -------- ?
-------x -------- -------- -------- 0: triangle, 1: quad
-------- -------- -----xxx xxxxxxxx Texture number (* 0x4000 to address the texture)
Word 1:
- x------- -------- -------- -------- ?
- ----xx-- -------- -------- -------- ?
- -------- xxxxxxxx -------- -------- Polygon Normal X (signed 1.7 fixed point)
- -------- -------- xxxxxxxx -------- Polygon Normal Y (signed 1.7 fixed point)
- -------- -------- -------- xxxxxxxx Polygon Normal Z (signed 1.7 fixed point)
+ x------- -------- -------- -------- ?
+ ----xx-- -------- -------- -------- ?
+ -------- xxxxxxxx -------- -------- Polygon Normal X (signed 1.7 fixed point)
+ -------- -------- xxxxxxxx -------- Polygon Normal Y (signed 1.7 fixed point)
+ -------- -------- -------- xxxxxxxx Polygon Normal Z (signed 1.7 fixed point)
Word 2:
- x------- -------- -------- -------- ?
- ----x--- -------- -------- -------- ?
- -----x-- -------- -------- -------- ?
- ------x- -------- -------- -------- Enable environment mapping?
- -------x -------- -------- -------- ?
- -------- xxxxxxxx -------- -------- Tangent X (signed 1.7 fixed point)
- -------- -------- xxxxxxxx -------- Tangent Y (signed 1.7 fixed point)
- -------- -------- -------- xxxxxxxx Tangent Z (signed 1.7 fixed point)
+ x------- -------- -------- -------- ?
+ ----x--- -------- -------- -------- ?
+ -----x-- -------- -------- -------- ?
+ ------x- -------- -------- -------- Enable environment mapping?
+ -------x -------- -------- -------- ?
+ -------- xxxxxxxx -------- -------- Tangent X (signed 1.7 fixed point)
+ -------- -------- xxxxxxxx -------- Tangent Y (signed 1.7 fixed point)
+ -------- -------- -------- xxxxxxxx Tangent Z (signed 1.7 fixed point)
Word 3:
- x------- -------- -------- -------- ?
- ----xx-- -------- -------- -------- Tex mode? (more than 2 bits?)
- 00: Tex 0: color, Tex 1: color with pre-lighting (used by BG2 attract mode trackpieces)
- 01: Tex 0: alpha mask?, Tex 1: inverse alpha? (used by car shadow)
- 10: Tex 0: alpha mask, Tex 1: color (additive alpha, used by headlights, etc.)
- 11: Tex 0: color, Tex 1: environment map? (used by cars)
- -------x -------- -------- -------- ?
- -------- xxxxxxxx -------- -------- Bi-normal X (signed 1.7 fixed point)
- -------- -------- xxxxxxxx -------- Bi-normal Y (signed 1.7 fixed point)
- -------- -------- -------- xxxxxxxx Bi-normal Z (signed 1.7 fixed point)
+ x------- -------- -------- -------- ?
+ ----xx-- -------- -------- -------- Tex mode? (more than 2 bits?)
+ 00: Tex 0: color, Tex 1: color with pre-lighting (used by BG2 attract mode trackpieces)
+ 01: Tex 0: alpha mask?, Tex 1: inverse alpha? (used by car shadow)
+ 10: Tex 0: alpha mask, Tex 1: color (additive alpha, used by headlights, etc.)
+ 11: Tex 0: color, Tex 1: environment map? (used by cars)
+ -------x -------- -------- -------- ?
+ -------- xxxxxxxx -------- -------- Bi-normal X (signed 1.7 fixed point)
+ -------- -------- xxxxxxxx -------- Bi-normal Y (signed 1.7 fixed point)
+ -------- -------- -------- xxxxxxxx Bi-normal Z (signed 1.7 fixed point)
- e1000096 0c43cca2 02000000 0c000000 Car model (with env map?)
- e100009a 007f0000 000083ea 0c001784 Part with bump-mapping
- f1000068 0c007f00 0c7f0000 0500007f Car shadow
- e100006a 0c00007f 0c000000 08000000 Light
- e1000127 0c00007f 0c000000 08000000 Fireworks (alpha mask?)
- e1000185 0cee7d03 0c000000 00000000 Trackpiece
- f1000068 0c007f00 0c7e0000 0400007f Car shadow (BG2 0x1f160)
+ e1000096 0c43cca2 02000000 0c000000 Car model (with env map?)
+ e100009a 007f0000 000083ea 0c001784 Part with bump-mapping
+ f1000068 0c007f00 0c7f0000 0500007f Car shadow
+ e100006a 0c00007f 0c000000 08000000 Light
+ e1000127 0c00007f 0c000000 08000000 Fireworks (alpha mask?)
+ e1000185 0cee7d03 0c000000 00000000 Trackpiece
+ f1000068 0c007f00 0c7e0000 0400007f Car shadow (BG2 0x1f160)
@@ -454,22 +454,22 @@ Notes:
-------- -------- -------- xxxxxxxx Texture V coordinate (0..63 with max 4x repeat)
-------- -------- xxxxxxxx -------- Texture U coordinate (0..63 with max 4x repeat)
-------- xxxxxxxx -------- -------- Usually 0x40. HUD elements set 0xff. Self-illumination?
- xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
+ xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
Word 1:
-------- -------- xxxxxxxx xxxxxxxx Vertex X coordinate (signed 8.8 fixed point)
-------- xxxxxxxx -------- -------- Normal X (signed 1.7 fixed point)
- xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
+ xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
Word 2:
-------- -------- xxxxxxxx xxxxxxxx Vertex Y coordinate (signed 8.8 fixed point)
-------- xxxxxxxx -------- -------- Normal Y (signed 1.7 fixed point)
- xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
+ xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
Word 3:
-------- -------- xxxxxxxx xxxxxxxx Vertex Z coordinate (signed 8.8 fixed point)
-------- xxxxxxxx -------- -------- Normal Z (signed 1.7 fixed point)
- xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
+ xxxxxxxx -------- -------- -------- ? (seen 0x00, 0x83, 0x40)
3D registers
------------
@@ -487,19 +487,19 @@ Notes:
0x00000104:
- 0x10000100: -------x xxxxxxxx -------- -------- \ Screen space light vector? (changes during camera movement)
- -------- -------- -------x xxxxxxxx / (int)(N * 127.0f)
+ 0x10000100: -------x xxxxxxxx -------- -------- \ Screen space light vector? (changes during camera movement)
+ -------- -------- -------x xxxxxxxx / (int)(N * 127.0f)
- 0x10000101: -------- -------x -------- -------- ?
- -------- -------- -------- -xxxxxxx ? (int)(N * 127.0f)
+ 0x10000101: -------- -------x -------- -------- ?
+ -------- -------- -------- -xxxxxxx ? (int)(N * 127.0f)
0x10000102: xxxxxxxx xxxxxxxx -------- -------- Diffuse light color (ARGB1555)
-------- -------- xxxxxxxx xxxxxxxx Ambient light color (ARGB1555)
- 0x10000103: x------- -------- -------- -------- ?
- -xxxxxxx xxxxxxxx -------- -------- ?
- -------- -------- ---xxxxx -------- \ ? converted from floats to int 0..31
- -------- -------- -------- ---xxxxx /
+ 0x10000103: x------- -------- -------- -------- ?
+ -xxxxxxx xxxxxxxx -------- -------- ?
+ -------- -------- ---xxxxx -------- \ ? converted from floats to int 0..31
+ -------- -------- -------- ---xxxxx /
0x10000104:
@@ -510,7 +510,7 @@ Notes:
#define LOG_TLCS_TO_PPC_COMMANDS 1
#define LOG_DISPLAY_LIST 0
-#define ENABLE_LIGHTING 1
+#define ENABLE_LIGHTING 1
#define PPC_TLCS_COMM_TRIGGER 12345
#define TLCS_PPC_COMM_TRIGGER 12346
@@ -1281,7 +1281,7 @@ void taitotz_renderer::draw_object(running_machine &machine, UINT32 address, flo
extra.light[0] = light_x;
extra.light[1] = light_y;
extra.light[2] = -light_z;
-
+
for (int i=2; i < num_verts; i++)
{
render_triangle(visarea, render_delegate(FUNC(taitotz_renderer::draw_scanline), this), 6, v[0], v[i-1], v[i]);
@@ -1555,21 +1555,21 @@ void taitotz_renderer::render_displaylist(running_machine &machine, const rectan
setup_viewport(xw, xh, vpw-xw, vph-xh, vpw, vph);
}
-
+
/*
if (address == 0x10000100)
{
- int in1 = (m_reg_10000100 >> 16) & 0x1ff;
- if (in1 & 0x100) in1 |= 0xfffffe00;
- int in2 = m_reg_10000100 & 0x1ff;
- if (in2 & 0x100) in2 |= 0xfffffe00;
- int in3 = m_reg_10000101 & 0x7f;
+ int in1 = (m_reg_10000100 >> 16) & 0x1ff;
+ if (in1 & 0x100) in1 |= 0xfffffe00;
+ int in2 = m_reg_10000100 & 0x1ff;
+ if (in2 & 0x100) in2 |= 0xfffffe00;
+ int in3 = m_reg_10000101 & 0x7f;
- float n1 = (float)(in1) / 127.0f;
- float n2 = (float)(in2) / 127.0f;
- float n3 = (float)(in3) / 127.0f;
+ float n1 = (float)(in1) / 127.0f;
+ float n2 = (float)(in2) / 127.0f;
+ float n3 = (float)(in3) / 127.0f;
- printf("UNK: %f, %f, %f\n", n1, n2, n3);
+ printf("UNK: %f, %f, %f\n", n1, n2, n3);
}
*/
}
@@ -2125,7 +2125,7 @@ WRITE64_MEMBER(taitotz_state::ppc_common_w)
/*
if (m_io_share_ram[0xfff] == 0x1010)
{
- printf("PPC -> TLCS cmd 1010: %04X %04X %04X %04X\n", m_io_share_ram[0x1a02/2], m_io_share_ram[0x1a04/2], m_io_share_ram[0x1a06/2], m_io_share_ram[0x1a08/2]);
+ printf("PPC -> TLCS cmd 1010: %04X %04X %04X %04X\n", m_io_share_ram[0x1a02/2], m_io_share_ram[0x1a04/2], m_io_share_ram[0x1a06/2], m_io_share_ram[0x1a08/2]);
}
*/
@@ -2748,7 +2748,7 @@ static INPUT_PORTS_START( styphp )
PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_BUTTON2 ) // Shift Down
PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_BUTTON1 ) // Shift Up
PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_BUTTON3 ) // View
- PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON4 ) // Side Brake
+ PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON4 ) // Side Brake
PORT_BIT( 0x000000e0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("INPUTS4")
@@ -2883,7 +2883,7 @@ static const char BATLGR2A_HDD_SERIAL[] = // " 05411645"
static const char RAIZPIN_HDD_SERIAL[] = // "691934013492 "
{ 0x36, 0x39, 0x31, 0x39, 0x33, 0x34, 0x30, 0x31, 0x33, 0x34, 0x39, 0x32, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 };
-static const char STYPHP_HDD_SERIAL[] = // " 05872160"
+static const char STYPHP_HDD_SERIAL[] = // " 05872160"
{ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x30, 0x35, 0x38, 0x37, 0x32, 0x31, 0x36, 0x30 };
DRIVER_INIT_MEMBER(taitotz_state,landhigh)
diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c
index 9ac95cb9c9b..6ff97394910 100644
--- a/src/mame/drivers/tasman.c
+++ b/src/mame/drivers/tasman.c
@@ -121,7 +121,7 @@ READ32_MEMBER(kongambl_state::eeprom_r)
retval |= (ioport("SYSTEM")->read());
-// printf("%08x\n",mem_mask);
+// printf("%08x\n",mem_mask);
return retval;
}
@@ -616,9 +616,9 @@ static MACHINE_CONFIG_START( kongambl, kongambl_state )
MCFG_K055673_ADD_NOINTF("k055673")
MCFG_GFXDECODE(tasman)
-
+
MCFG_K056832_ADD("k056832", k056832_intf)
-
+
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index e65e9968157..d817d21c4a5 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -289,41 +289,41 @@ static INPUT_PORTS_START( thedeep )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 )
PORT_START("e00a")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2")
PORT_DIPSETTING( 0x03, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:3,4")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_1C ) )
- PORT_DIPNAME( 0x10, 0x10, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:5") /* Listed as "NOT USED - ALWAYS OFF" */
+ PORT_DIPNAME( 0x10, 0x10, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:5") /* Listed as "NOT USED - ALWAYS OFF" */
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, "Start Stage" ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPNAME( 0x20, 0x20, "Start Stage" ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x20, "1" )
PORT_DIPSETTING( 0x00, "4" )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("e00b")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x01, DEF_STR( Harder ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x0c, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x04, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x00, "50k" )
PORT_DIPSETTING( 0x30, "50k 70k" )
PORT_DIPSETTING( 0x20, "60k 80k" )
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index cf69f5eaece..d830936c268 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -268,29 +268,29 @@ static INPUT_PORTS_START( thepit )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
- PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
+ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x01, DEF_STR( 2C_3C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 2C_4C ) )
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x03, DEF_STR( Free_Play ) )
- PORT_DIPNAME( 0x04, 0x00, "Game Speed" ) PORT_DIPLOCATION("SW1:!3")
+ PORT_DIPNAME( 0x04, 0x00, "Game Speed" ) PORT_DIPLOCATION("SW1:!3")
PORT_DIPSETTING( 0x04, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
- PORT_DIPNAME( 0x08, 0x00, "Time Limit" ) PORT_DIPLOCATION("SW1:!4")
+ PORT_DIPNAME( 0x08, 0x00, "Time Limit" ) PORT_DIPLOCATION("SW1:!4")
PORT_DIPSETTING( 0x00, "Long" )
PORT_DIPSETTING( 0x08, "Short" )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:!1")
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:!1")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x10, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:!2")
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:!2")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:!3")
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:!3")
PORT_DIPSETTING( 0x00, "3" )
PORT_DIPSETTING( 0x40, "4" )
- PORT_DIPNAME( 0x80, 0x00, "Diagnostic Tests" ) PORT_DIPLOCATION("SW2:!4") /* Manual states "Always On" */
+ PORT_DIPNAME( 0x80, 0x00, "Diagnostic Tests" ) PORT_DIPLOCATION("SW2:!4") /* Manual states "Always On" */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x80, "Loop Tests" ) /* Audio Tones for TEST results */
+ PORT_DIPSETTING( 0x80, "Loop Tests" ) /* Audio Tones for TEST results */
/* Since the real inputs are multiplexed, we used this fake port
to read the 2nd player controls when the screen is flipped */
@@ -355,26 +355,26 @@ static INPUT_PORTS_START( roundup )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
- PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
+ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_3C ) )
- PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!3,!4")
+ PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!3,!4")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x04, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x0c, "5" )
- PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!5")
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!5")
PORT_DIPSETTING( 0x10, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!6")
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x20, "30000" )
- PORT_DIPNAME( 0x40, 0x40, "Gly Boys Wake Up" ) PORT_DIPLOCATION("SW1:!7")
+ PORT_DIPNAME( 0x40, 0x40, "Gly Boys Wake Up" ) PORT_DIPLOCATION("SW1:!7")
PORT_DIPSETTING( 0x40, "Slow" )
PORT_DIPSETTING( 0x00, "Fast" )
- PORT_DIPNAME( 0x80, 0x00, "Push Switch Check") PORT_DIPLOCATION("SW1:!8")
+ PORT_DIPNAME( 0x80, 0x00, "Push Switch Check") PORT_DIPLOCATION("SW1:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
@@ -388,7 +388,7 @@ static INPUT_PORTS_START( fitter )
PORT_INCLUDE(roundup)
PORT_MODIFY("DSW")
- PORT_DIPNAME( 0x80, 0x00, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:!8")
+ PORT_DIPNAME( 0x80, 0x00, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:!8")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
INPUT_PORTS_END
@@ -409,25 +409,25 @@ static INPUT_PORTS_START( intrepid )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
- PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:!1")
+ PORT_DIPNAME( 0x01, 0x01, "Invulnerability (Cheat)") PORT_DIPLOCATION("SW1:!1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:!2")
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:!2")
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x02, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!3")
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!3")
PORT_DIPSETTING( 0x04, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x08, 0x08, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:!4")
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:!4")
PORT_DIPSETTING( 0x08, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5")
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5")
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x10, "30000" )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!6")
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x20, "3" )
PORT_DIPSETTING( 0x00, "5" )
- PORT_DIPNAME( 0xc0, 0x40, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!7,!8")
+ PORT_DIPNAME( 0xc0, 0x40, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!7,!8")
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x40, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) )
@@ -453,26 +453,26 @@ static INPUT_PORTS_START( dockman )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
PORT_START("DSW")
- PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
+ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:!1,!2")
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_3C ) )
- PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!3,!4")
+ PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:!3,!4")
PORT_DIPSETTING( 0x00, "2" )
PORT_DIPSETTING( 0x04, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x0c, "5" )
- PORT_DIPNAME( 0x10, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5")
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:!5")
PORT_DIPSETTING( 0x00, "10000" )
PORT_DIPSETTING( 0x10, "30000" )
- PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!6")
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!6")
PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x20, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!7") /* not used? */
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!7") /* not used? */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x40, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!8") /* not used? */
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW1:!8") /* not used? */
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index e04768b8506..07ae632a596 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -12,20 +12,20 @@
****************************************************************************
- Video controller interface woes:
+ Video controller interface woes:
- Sigh. CPU #1 reads the video controller register twice per frame, once at
- the beginning of interrupt and once near the end. It stores these values in a
- table starting at $163484. CPU #2 periodically looks at this table to make
- sure that it is getting interrupts at the appropriate times, and that the
- VBLANK bit is set appropriately. Unfortunately, due to all the device_yield(&space.device())
- calls we make to synchronize the two CPUs, we occasionally get out of time
- and generate the interrupt outside of the tight tolerances CPU #2 expects.
+ Sigh. CPU #1 reads the video controller register twice per frame, once at
+ the beginning of interrupt and once near the end. It stores these values in a
+ table starting at $163484. CPU #2 periodically looks at this table to make
+ sure that it is getting interrupts at the appropriate times, and that the
+ VBLANK bit is set appropriately. Unfortunately, due to all the device_yield(&space.device())
+ calls we make to synchronize the two CPUs, we occasionally get out of time
+ and generate the interrupt outside of the tight tolerances CPU #2 expects.
- So we fake it. Returning scanlines $f5 and $f7 alternately provides the
- correct answer that causes CPU #2 to be happy and not aggressively trash
- memory (which is what it does if this interrupt test fails -- see the code
- at $1E56 to see!)
+ So we fake it. Returning scanlines $f5 and $f7 alternately provides the
+ correct answer that causes CPU #2 to be happy and not aggressively trash
+ memory (which is what it does if this interrupt test fails -- see the code
+ at $1E56 to see!)
****************************************************************************
@@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( thunderj, thunderj_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-
+
MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260012", 1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 2a0e3d3d10a..ce321be3395 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1104,7 +1104,7 @@ static INPUT_PORTS_START( hellfire )
PORT_START("DSWB")
TOAPLAN_DIFFICULTY
PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) /* table at 0x00390e ('hellfire') */
- PORT_DIPSETTING( 0x00, "70k 270k 200k+" ) /* / 0x0030f0 ('hellfire1') */
+ PORT_DIPSETTING( 0x00, "70k 270k 200k+" ) /* / 0x0030f0 ('hellfire1') */
PORT_DIPSETTING( 0x04, "100k 350k 250k+" ) /* / 0x003aac ('hellfire2a') */
PORT_DIPSETTING( 0x08, "100k Only" ) /* / 0x00329c ('hellfire1a') */
PORT_DIPSETTING( 0x0c, "200k Only" )
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index 0e53313fc63..be8204f6046 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -219,7 +219,7 @@ static MACHINE_CONFIG_START( toobin, toobin_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
+
MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("FF9000", 12)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 82d0e0ae1ca..2fe614415b6 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -62,7 +62,7 @@ TP-011 SUB
| 2148 2148|
| 2148 2148|
|---------------|
-Notes:
+Notes:
T.T-2 - Custom chip (DIP40) marked 'TOAPLAN-02 M70H005'
2016 - 2kx8 SRAM (DIP24)
6264 - 8kx8 SRAM (DIP28)
@@ -117,21 +117,21 @@ Notes:
5165 - 8kx8 SRAM (DIP28)
74LS163- Synchronous 4-Bit Binary Counter logic chip. This chip is used to divide the 28MHz clock.
28MHz input on pin 2, outputs: pin 11 1.75MHz, pin 12 3.5MHz, pin 13 7MHz, pin 14 14MHz
- T.T-1 - Custom chip marked 'TOAPLAN GXL-01' (DIP40)
- T.T-2 - Custom chip marked 'TOAPLAN-02 M70H005' (DIP40)
+ T.T-1 - Custom chip marked 'TOAPLAN GXL-01' (DIP40)
+ T.T-2 - Custom chip marked 'TOAPLAN-02 M70H005' (DIP40)
7135 - Intersil ICL7135 DAC (DIP8)
MB3730 - Fujitsu MB3730 14W BTL Audio Power Amplifier
SW1/2 - 8-position DIP switch
B30-21 - 82S123 bipolar PROM (DIP16)
B30_05 \
B30_06 |
- B30_07 |
+ B30_07 |
B30_08 |
B30_09 | Hitachi HN27256 OTP EPROM (DIP28)
- B30_10 |
+ B30_10 |
B30_11 |
B30_12 /
-
+
B30_02 \
B30_04 / SGS M27256 EPROM (DIP28)
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index 561ff4bcfad..76858efe6ab 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -193,7 +193,7 @@ static MACHINE_CONFIG_START( vindictr, vindictr_state )
MCFG_TILEMAP_ADD_STANDARD("playfield", 2, vindictr_state, get_playfield_tile_info, 8,8, SCAN_COLS, 64,64)
MCFG_TILEMAP_ADD_STANDARD_TRANSPEN("alpha", 2, vindictr_state, get_alpha_tile_info, 8,8, SCAN_ROWS, 64,32, 0)
-
+
MCFG_SCREEN_ADD("screen", RASTER)
/* note: these parameters are from published specs, not derived */
/* the board uses a SYNGEN chip to generate video signals */
@@ -204,7 +204,7 @@ static MACHINE_CONFIG_START( vindictr, vindictr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
+
MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("260010", 1)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 41ff96ae57a..b4afbc3337d 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -99,25 +99,25 @@ static INPUT_PORTS_START( volfied )
/* Z80 CPU -> 0x10002e ($2e,A5) */
PORT_START("DSWB")
- PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:1,2") /* table at 0x003140 - 4 * 6 words - LSB first */
+ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:1,2") /* table at 0x003140 - 4 * 6 words - LSB first */
PORT_DIPSETTING( 0x02, "20k 40k 120k 480k 2400k" )
PORT_DIPSETTING( 0x03, "50k 150k 600k 3000k" )
PORT_DIPSETTING( 0x01, "70k 280k 1400k" )
PORT_DIPSETTING( 0x00, "100k 500k" )
- PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x08, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0c, DEF_STR( Medium ) )
PORT_DIPSETTING( 0x04, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x30, "3" )
PORT_DIPSETTING( 0x20, "4" )
PORT_DIPSETTING( 0x10, "5" )
PORT_DIPSETTING( 0x00, "6" )
- PORT_DIPNAME( 0x40, 0x40, "32768 Lives (Cheat)" ) PORT_DIPLOCATION("SW2:7") /* code at 0x0015cc - Manual shows unused and OFF */
+ PORT_DIPNAME( 0x40, 0x40, "32768 Lives (Cheat)" ) PORT_DIPLOCATION("SW2:7") /* code at 0x0015cc - Manual shows unused and OFF */
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x80, DEF_STR( Japanese ) )
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
@@ -166,9 +166,9 @@ static INPUT_PORTS_START( volfiedu )
PORT_INCLUDE(volfied)
PORT_MODIFY("DSWA")
- TAITO_COINAGE_US_COIN_START_LOC(SW1) /* see notes */
- PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) /* see notes */
- PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) /* see notes */
+ TAITO_COINAGE_US_COIN_START_LOC(SW1) /* see notes */
+ PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW1:7" ) /* see notes */
+ PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" ) /* see notes */
INPUT_PORTS_END
static INPUT_PORTS_START( volfiedj )
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 05eed022bfd..14facbaf28f 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -404,7 +404,7 @@ static MACHINE_CONFIG_START( wardner, wardner_state )
/* video hardware */
MCFG_MC6845_ADD("crtc", HD6845, XTAL_14MHz/4, twincobr_mc6845_intf) /* 3.5MHz measured on CLKin */
-
+
MCFG_TOAPLAN_SCU_ADD("toaplan_scu")
MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 4e29ae5d2ca..a3ba50667a5 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -125,9 +125,9 @@ static INPUT_PORTS_START( xybots )
/* Xybots uses a swapped version */
// todo:
-// PORT_MODIFY("jsa:JSAI")
-// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
-// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
+// PORT_MODIFY("jsa:JSAI")
+// PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
+// PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
INPUT_PORTS_END
@@ -204,7 +204,7 @@ static MACHINE_CONFIG_START( xybots, xybots_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
+
MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(atarigen_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("FFE200", 8)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 6479b1f87f7..51378d2ff14 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1366,7 +1366,7 @@ READ16_MEMBER(zn_state::vt83c461_16_r)
if( offset >= 0x30 / 2 && offset < 0x40 / 2 )
{
- return m_vt83c461->read_config( space, ( offset / 2 ) & 3, mem_mask << shift ) >> shift;
+ return m_vt83c461->read_config( space, ( offset / 2 ) & 3, mem_mask << shift ) >> shift;
}
else if( offset >= 0x1f0 / 2 && offset < 0x1f8 / 2 )
{
@@ -1389,7 +1389,7 @@ WRITE16_MEMBER(zn_state::vt83c461_16_w)
if( offset >= 0x30 / 2 && offset < 0x40 / 2 )
{
- m_vt83c461->write_config( space, ( offset / 2 ) & 3, data << shift, mem_mask << shift );
+ m_vt83c461->write_config( space, ( offset / 2 ) & 3, data << shift, mem_mask << shift );
}
else if( offset >= 0x1f0 / 2 && offset < 0x1f8 / 2 )
{
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 1c688dbaf85..8e0cac342e7 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -69,7 +69,7 @@ public:
optional_device<cpu_device> m_mcu;
optional_device<buggychl_mcu_device> m_bmcu;
required_device<msm5232_device> m_msm;
-
+
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(nmi_disable_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index d7418644233..cfa2033e09a 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -25,9 +25,9 @@ public:
UINT8 m_is_primrage;
required_shared_ptr<UINT16> m_colorram;
-
- required_device<tilemap_device> m_playfield_tilemap;
- required_device<tilemap_device> m_alpha_tilemap;
+
+ required_device<tilemap_device> m_playfield_tilemap;
+ required_device<tilemap_device> m_alpha_tilemap;
bitmap_ind16 * m_pf_bitmap;
bitmap_ind16 * m_an_bitmap;
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 50ea95d0d21..febb91aa3c3 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -24,9 +24,9 @@ public:
required_shared_ptr<UINT32> m_mo_command;
required_shared_ptr<UINT32> m_protection_base;
-
- required_device<tilemap_device> m_playfield_tilemap;
- required_device<tilemap_device> m_alpha_tilemap;
+
+ required_device<tilemap_device> m_playfield_tilemap;
+ required_device<tilemap_device> m_alpha_tilemap;
UINT16 m_current_control;
UINT8 m_playfield_tile_bank;
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index c199b92746e..09ed120d740 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -28,7 +28,7 @@ public:
UINT8 m_interrupt_enable;
required_shared_ptr<UINT16> m_bankselect;
-
+
required_device<tilemap_device> m_playfield_tilemap;
required_device<tilemap_device> m_alpha_tilemap;
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index 3a656b0ce08..a9889e95f11 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -9,7 +9,7 @@ public:
m_videoram(*this, "videoram"),
m_textram(*this, "textram"),
m_maincpu(*this, "maincpu"),
- m_cus30(*this, "namco") { }
+ m_cus30(*this, "namco") { }
int m_inputport_selected;
int m_counter;
@@ -17,7 +17,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_textram;
required_device<cpu_device> m_maincpu;
- required_device<namco_cus30_device> m_cus30;
+ required_device<namco_cus30_device> m_cus30;
tilemap_t *m_tx_tilemap;
tilemap_t *m_bg_tilemap[2];
int m_xscroll[2];
diff --git a/src/mame/includes/beezer.h b/src/mame/includes/beezer.h
index c66d6e5095b..9741f414ce1 100644
--- a/src/mame/includes/beezer.h
+++ b/src/mame/includes/beezer.h
@@ -20,7 +20,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<beezer_sound_device> m_custom;
-
+
DECLARE_WRITE8_MEMBER(beezer_bankswitch_w);
DECLARE_WRITE8_MEMBER(beezer_map_w);
DECLARE_READ8_MEMBER(beezer_line_r);
@@ -73,9 +73,9 @@ public:
DECLARE_WRITE8_MEMBER( sfxctrl_w );
DECLARE_WRITE8_MEMBER( timer1_w );
DECLARE_READ8_MEMBER( noise_r );
-
+
//DECLARE_WRITE_LINE_MEMBER( update_irq_state );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -108,7 +108,7 @@ private:
/* sound streaming variables */
sound_stream *m_stream;
//double m_freq_to_step;
-
+
int sh6840_update_noise(int clocks);
};
@@ -119,4 +119,3 @@ extern const device_type BEEZER;
extern const via6522_interface b_via_0_interface;
extern const via6522_interface b_via_1_interface;
-
diff --git a/src/mame/includes/boogwing.h b/src/mame/includes/boogwing.h
index 9f804621b89..6719827526e 100644
--- a/src/mame/includes/boogwing.h
+++ b/src/mame/includes/boogwing.h
@@ -61,5 +61,5 @@ public:
void mix_boogwing(bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ16_MEMBER( boogwing_protection_region_0_104_r );
DECLARE_WRITE16_MEMBER( boogwing_protection_region_0_104_w );
-
+
};
diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h
index 3761c396ea2..b9a3e6212f3 100644
--- a/src/mame/includes/buggychl.h
+++ b/src/mame/includes/buggychl.h
@@ -49,7 +49,7 @@ public:
required_device<cpu_device> m_mcu;
required_device<buggychl_mcu_device> m_bmcu;
required_device<msm5232_device> m_msm;
-
+
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(nmi_disable_w);
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index 478f923f4ff..dab5407a1d6 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -93,4 +93,3 @@ MACHINE_CONFIG_EXTERN( wotw_sound );
MACHINE_CONFIG_EXTERN( wotwc_sound );
MACHINE_CONFIG_EXTERN( demon_sound );
MACHINE_CONFIG_EXTERN( qb3_sound );
-
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index ce318aee463..665771227c4 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -46,7 +46,7 @@ public:
device_t *m_filter3;
required_device<cpu_device> m_maincpu;
required_device<vlm5030_device> m_vlm;
-
+
DECLARE_WRITE8_MEMBER(ddribble_bankswitch_w);
DECLARE_READ8_MEMBER(ddribble_sharedram_r);
DECLARE_WRITE8_MEMBER(ddribble_sharedram_w);
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 8340b76408d..8e8f511bce4 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -21,7 +21,7 @@ public:
m_tilegen1(*this, "tilegen1"),
m_tilegen2(*this, "tilegen2"),
m_videoram(*this, "videoram"),
- m_bg_data(*this, "bg_data") { }
+ m_bg_data(*this, "bg_data") { }
/* devices */
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index e4e5329a533..f35a8e8173f 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -69,5 +69,3 @@ public:
DECLARE_READ16_MEMBER( sh96_protection_region_0_146_r );
DECLARE_WRITE16_MEMBER( sh96_protection_region_0_146_w );
};
-
-
diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h
index b1c308adf7e..60fcb2201e9 100644
--- a/src/mame/includes/exidy440.h
+++ b/src/mame/includes/exidy440.h
@@ -23,10 +23,10 @@ public:
required_shared_ptr<UINT8> m_imageram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_scanline;
-
+
required_device<cpu_device> m_maincpu;
required_device<exidy440_sound_device> m_custom;
-
+
UINT8 m_bank;
const UINT8 *m_showdown_bank_data[2];
INT8 m_showdown_bank_select;
diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h
index 50e74129350..821894ba421 100644
--- a/src/mame/includes/gauntlet.h
+++ b/src/mame/includes/gauntlet.h
@@ -11,9 +11,9 @@ class gauntlet_state : public atarigen_state
public:
gauntlet_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
- m_playfield_tilemap(*this, "playfield"),
- m_alpha_tilemap(*this, "alpha") { }
-
+ m_playfield_tilemap(*this, "playfield"),
+ m_alpha_tilemap(*this, "alpha") { }
+
required_device<tilemap_device> m_playfield_tilemap;
required_device<tilemap_device> m_alpha_tilemap;
diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h
index 4d0c6a4f709..1ba4e89de55 100644
--- a/src/mame/includes/groundfx.h
+++ b/src/mame/includes/groundfx.h
@@ -33,7 +33,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<tc0100scn_device> m_tc0100scn;
required_device<tc0480scp_device> m_tc0480scp;
-
+
UINT16 m_coin_word;
UINT16 m_frame_counter;
UINT16 m_port_sel;
@@ -55,7 +55,7 @@ public:
UINT32 screen_update_groundfx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(groundfx_interrupt);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int do_hack,int x_offs,int y_offs);
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index 415b44214df..63b954e8323 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -8,7 +8,7 @@ public:
m_maincpu(*this, "maincpu"),
m_k053252(*this, "k053252")
{ }
-
+
required_device<cpu_device> m_maincpu;
required_device<k053252_device> m_k053252;
UINT8 *m_vram[2];
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index 7c5c8ea9c89..dd6ad35e378 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -12,7 +12,7 @@ public:
: driver_device(mconfig, type, tag),
m_clut(*this, "clut"),
m_maincpu(*this, "maincpu"),
- m_nb1413m3(*this, "nb1413m3") { }
+ m_nb1413m3(*this, "nb1413m3") { }
required_shared_ptr<UINT8> m_clut;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index 380c0a1e983..b48752d948b 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -23,7 +23,7 @@ public:
optional_device<sn76496_device> m_sn;
required_device<cpu_device> m_maincpu;
optional_device<vlm5030_device> m_vlm;
-
+
UINT8 * m_scroll2;
UINT8 * m_spriteram2;
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 27f07584790..6a1bbc7c80b 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -28,7 +28,7 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_scroll_x;
required_shared_ptr<UINT8> m_scroll_dir;
-
+
/* devices */
required_device<cpu_device> m_maincpu;
required_device<vlm5030_device> m_vlm;
diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h
index 0cb2c8d0f99..5828118acf6 100644
--- a/src/mame/includes/jpmsys5.h
+++ b/src/mame/includes/jpmsys5.h
@@ -18,13 +18,13 @@ public:
m_maincpu(*this, "maincpu"),
m_upd7759(*this, "upd7759"),
m_tms34061(*this, "tms34061"),
- m_vfd(*this, "vfd") { }
-
+ m_vfd(*this, "vfd") { }
+
required_device<cpu_device> m_maincpu;
required_device<upd7759_device> m_upd7759;
optional_device<tms34061_device> m_tms34061;
optional_device<roc10937_t> m_vfd;
-
+
UINT8 m_palette[16][3];
int m_pal_addr;
int m_pal_idx;
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index 25c620948c5..cca31be3fd1 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -12,9 +12,9 @@ public:
klax_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
m_playfield_tilemap(*this, "playfield") { }
-
+
required_device<tilemap_device> m_playfield_tilemap;
-
+
virtual void update_interrupts();
virtual void scanline_update(screen_device &screen, int scanline);
DECLARE_WRITE16_MEMBER(interrupt_ack_w);
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index 63da9bd48e6..99468069920 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -15,7 +15,7 @@ public:
m_scrlram(*this, "scrlram"),
m_audiocpu(*this, "audiocpu"),
m_maincpu(*this, "maincpu"),
- m_msm(*this, "msm") { }
+ m_msm(*this, "msm") { }
/* memory pointers */
required_shared_ptr<UINT8> m_videoram;
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index c9ca41adf83..ebbbebdfb42 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -29,7 +29,7 @@ public:
optional_shared_ptr<UINT16> m_majtitle_rowscrollram;
optional_shared_ptr<UINT16> m_spriteram2;
optional_shared_ptr<UINT8> m_soundram;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
optional_device<cpu_device> m_mcu;
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index fdc0e0ed0d9..eaaf47ded2d 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -13,11 +13,11 @@ public:
required_shared_ptr<UINT16> m_video_data;
optional_shared_ptr<UINT16> m_spriteram;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
- optional_device<m72_audio_device> m_audio;
-
+ optional_device<m72_audio_device> m_audio;
+
UINT16 m_video_control_data[8];
tilemap_t *m_pf1_layer;
tilemap_t *m_pf2_layer;
diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h
index fc02424fd06..ada192d967e 100644
--- a/src/mame/includes/madmotor.h
+++ b/src/mame/includes/madmotor.h
@@ -15,7 +15,7 @@ public:
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_tilegen1(*this, "tilegen1"),
- m_tilegen2(*this, "tilegen2"),
+ m_tilegen2(*this, "tilegen2"),
m_tilegen3(*this, "tilegen3") { }
/* memory pointers */
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index a099aba61c2..7fc5927123a 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -52,7 +52,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<buggychl_mcu_device> m_bmcu;
required_device<msm5232_device> m_msm;
-
+
DECLARE_WRITE8_MEMBER(sound_command_w);
DECLARE_WRITE8_MEMBER(nmi_disable_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index 76442cab9ca..f36e8ba4da4 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -36,7 +36,7 @@ public:
int m_roz_rombank;
tilemap_t *m_ult_936_tilemap;
UINT16 m_clip;
-
+
DECLARE_READ16_MEMBER(eeprom_r);
DECLARE_WRITE16_MEMBER(mweeprom_w);
DECLARE_READ16_MEMBER(dddeeprom_r);
diff --git a/src/mame/includes/nb1413m3.h b/src/mame/includes/nb1413m3.h
index d8ea34d1afe..414b2ae09de 100644
--- a/src/mame/includes/nb1413m3.h
+++ b/src/mame/includes/nb1413m3.h
@@ -149,7 +149,7 @@ public:
DECLARE_READ8_MEMBER( dipsw3_h_r );
DECLARE_WRITE8_MEMBER( outcoin_w );
DECLARE_WRITE8_MEMBER( vcrctrl_w );
-
+
const char * m_sndromrgntag;
int m_sndrombank1;
int m_sndrombank2;
@@ -158,13 +158,13 @@ public:
int m_outcoin_flag;
int m_inputport;
int m_nb1413m3_type;
-
+
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
private:
int m_74ls193_counter;
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index 6b73fc6db43..8a4c9050ff7 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -11,11 +11,11 @@ public:
nbmj8688_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu"),
- m_nb1413m3(*this, "nb1413m3") { }
+ m_nb1413m3(*this, "nb1413m3") { }
required_device<cpu_device> m_maincpu;
required_device<nb1413m3_device> m_nb1413m3;
-
+
int m_mjsikaku_scrolly;
int m_blitter_destx;
int m_blitter_desty;
@@ -83,7 +83,7 @@ public:
void common_video_start();
void nbmj8688_HD61830B_instr_w(address_space &space,int offset,int data,int chip);
void nbmj8688_HD61830B_data_w(address_space &space,int offset,int data,int chip);
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 632d555012f..84fa16cce34 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -11,11 +11,11 @@ public:
nbmj8891_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu"),
- m_nb1413m3(*this, "nb1413m3") { }
+ m_nb1413m3(*this, "nb1413m3") { }
required_device<cpu_device> m_maincpu;
required_device<nb1413m3_device> m_nb1413m3;
-
+
int m_scrolly;
int m_blitter_destx;
int m_blitter_desty;
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index f05b75f4273..3ab9a43683b 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -11,8 +11,8 @@ public:
nbmj8900_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu"),
- m_nb1413m3(*this, "nb1413m3") { }
-
+ m_nb1413m3(*this, "nb1413m3") { }
+
required_device<cpu_device> m_maincpu;
required_device<nb1413m3_device> m_nb1413m3;
@@ -61,7 +61,7 @@ public:
void update_pixel0(int x, int y);
void update_pixel1(int x, int y);
void nbmj8900_gfxdraw();
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index 871142fcbb7..37848296922 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -7,12 +7,12 @@ public:
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
- m_nb1413m3(*this, "nb1413m3") { }
+ m_nb1413m3(*this, "nb1413m3") { }
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_device<nb1413m3_device> m_nb1413m3;
-
+
int m_scrollx;
int m_scrolly;
int m_blitter_destx;
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index 28023b32587..62164198a6d 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -10,7 +10,7 @@ public:
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_mcu(*this, "mcu"),
- m_cus30(*this, "namco") { }
+ m_cus30(*this, "namco") { }
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_videoram2;
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index 2ec396e543a..22c7710d95c 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -11,11 +11,11 @@ public:
pastelg_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu"),
- m_nb1413m3(*this, "nb1413m3") { }
+ m_nb1413m3(*this, "nb1413m3") { }
required_device<cpu_device> m_maincpu;
required_device<nb1413m3_device> m_nb1413m3;
-
+
UINT8 m_mux_data;
int m_blitter_destx;
int m_blitter_desty;
@@ -50,7 +50,7 @@ public:
int pastelg_blitter_src_addr_r(address_space &space);
void pastelg_vramflip();
void pastelg_gfxdraw();
-
+
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index a65620d82e9..4e631a58ec4 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -98,7 +98,7 @@ private:
UINT32 * m_poly18;
device_t *m_discrete;
tms36xx_device *m_tms;
-
+
int update_c24(int samplerate);
int update_c25(int samplerate);
int noise(int samplerate);
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index 73a58aed78f..7afaece4eff 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -23,7 +23,7 @@ public:
m_sprite16_memory(*this, "sprite16_memory"),
m_road16_memory(*this, "road16_memory"),
m_alpha16_memory(*this, "alpha16_memory"),
- m_view16_memory(*this, "view16_memory") { }
+ m_view16_memory(*this, "view16_memory") { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 2ef1e8d523c..24ccd25840c 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -27,11 +27,11 @@ public:
required_shared_ptr<UINT8> m_spr2_videoram;
required_shared_ptr<UINT8> m_bg_bot_videoram;
optional_shared_ptr<UINT8> m_armwrest_fg_videoram;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<vlm5030_device> m_vlm;
-
+
tilemap_t *m_bg_top_tilemap;
tilemap_t *m_bg_bot_tilemap;
tilemap_t *m_fg_tilemap;
diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h
index 767518edeb8..e2842e2f334 100644
--- a/src/mame/includes/redalert.h
+++ b/src/mame/includes/redalert.h
@@ -24,16 +24,16 @@ public:
UINT8 m_ay8910_latch_1;
UINT8 m_ay8910_latch_2;
-
+
required_shared_ptr<UINT8> m_bitmap_videoram;
required_shared_ptr<UINT8> m_charmap_videoram;
required_shared_ptr<UINT8> m_video_control;
required_shared_ptr<UINT8> m_bitmap_color;
-
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<hc55516_device> m_cvsd;
-
+
UINT8 *m_bitmap_colorram;
UINT8 m_control_xor;
DECLARE_READ8_MEMBER(redalert_interrupt_clear_r);
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 54585d2a1b2..8793ff6a5f1 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -25,7 +25,7 @@ public:
required_shared_ptr<UINT8> m_palettebank;
required_shared_ptr<UINT8> m_spriteram_select;
required_shared_ptr<UINT8> m_scroll;
-
+
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 0ef65654e3d..3e70f2ec826 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -28,11 +28,11 @@ public:
optional_shared_ptr<UINT8> m_funcube_outputs;
optional_shared_ptr<UINT8> m_funcube_leds;
-
+
optional_device<x1_010_device> m_x1;
optional_device<okim9810_device> m_oki;
optional_device<eeprom_device> m_eeprom;
-
+
int m_xoffset;
int m_yoffset;
int m_keyboard_row;
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index b8b2f273b95..f2c6e499297 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -12,10 +12,10 @@ public:
required_shared_ptr<UINT8> m_paletteram;
required_shared_ptr<UINT8> m_videoram;
-
+
required_device<cpu_device> m_maincpu;
required_device<m72_audio_device> m_audio;
-
+
int m_gfxbank;
tilemap_t *m_bg_tilemap;
DECLARE_READ8_MEMBER(sichuan2_dsw1_r);
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index dee102ca5ff..846a32e222a 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -620,9 +620,9 @@ public:
UINT8 m_oldjoy1_latch;
/* input-related */
- UINT16 m_data1[4]; // JOY1/JOY2 + 3rd & 4th only used by multitap (hacky support)
- UINT16 m_data2[4]; // JOY3/JOY4 + 3rd & 4th only used by multitap (hacky support)
- UINT8 m_read_idx[4]; // 3rd & 4th only used by multitap (hacky support)
+ UINT16 m_data1[4]; // JOY1/JOY2 + 3rd & 4th only used by multitap (hacky support)
+ UINT16 m_data2[4]; // JOY3/JOY4 + 3rd & 4th only used by multitap (hacky support)
+ UINT8 m_read_idx[4]; // 3rd & 4th only used by multitap (hacky support)
/* cart related */
snes_cart_info m_cart; // used by NSS/SFCBox only! to be moved in a derived class!
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index a08e6ffa0eb..1513e568e59 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -6,7 +6,7 @@ class sshangha_state : public driver_device
{
public:
sshangha_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ : driver_device(mconfig, type, tag),
m_deco146(*this, "ioprot"),
m_deco_tilegen1(*this, "tilegen1"),
m_spriteram(*this, "spriteram"),
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index 904b5280c97..df3b0da8691 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -74,7 +74,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int);
/*
- MCU specifics
+ MCU specifics
*/
DECLARE_READ8_MEMBER(cshooter_68705_port_a_r);
diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h
index c1ddac6915c..aac12de578d 100644
--- a/src/mame/includes/toobin.h
+++ b/src/mame/includes/toobin.h
@@ -18,7 +18,7 @@ public:
m_interrupt_scan(*this, "interrupt_scan") { }
required_device<atari_jsa_i_device> m_jsa;
-
+
required_device<tilemap_device> m_playfield_tilemap;
required_device<tilemap_device> m_alpha_tilemap;
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index 6e3226c62cd..6d522d28927 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -29,7 +29,7 @@ public:
required_shared_ptr<UINT8> m_scroll2;
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_colorram;
-
+
/* devices */
required_device<cpu_device> m_maincpu;
optional_device<sn76496_device> m_sn;
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 5cf71703b4c..ac98163bee0 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -246,7 +246,7 @@ public:
DECLARE_WRITE8_MEMBER( pit8253_w );
DECLARE_WRITE8_MEMBER( ay8910_a_w );
DECLARE_WRITE8_MEMBER( ay8910_b_w );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -255,7 +255,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
// internal state
sound_stream *m_stream;
UINT32 m_freq_to_step;
@@ -296,11 +296,11 @@ class buggyboy_sound_device : public tx1_sound_device
{
public:
buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_WRITE8_MEMBER( ym1_a_w );
DECLARE_WRITE8_MEMBER( ym2_a_w );
DECLARE_WRITE8_MEMBER( ym2_b_w );
-
+
protected:
// device-level overrides
virtual void device_config_complete();
@@ -309,7 +309,7 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
-
+
private:
// internal state
};
diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h
index f504979b06b..6a66f1de330 100644
--- a/src/mame/includes/vigilant.h
+++ b/src/mame/includes/vigilant.h
@@ -12,10 +12,10 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_videoram;
-
+
required_device<cpu_device> m_maincpu;
required_device<m72_audio_device> m_audio;
-
+
int m_horiz_scroll_low;
int m_horiz_scroll_high;
int m_rear_horiz_scroll_low;
diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h
index acb7a012a35..f428802663d 100644
--- a/src/mame/includes/xybots.h
+++ b/src/mame/includes/xybots.h
@@ -17,9 +17,9 @@ public:
m_alpha_tilemap(*this, "alpha") { }
required_device<atari_jsa_i_device> m_jsa;
- required_device<tilemap_device> m_playfield_tilemap;
- required_device<tilemap_device> m_alpha_tilemap;
-
+ required_device<tilemap_device> m_playfield_tilemap;
+ required_device<tilemap_device> m_alpha_tilemap;
+
UINT16 m_h256;
virtual void update_interrupts();
DECLARE_READ16_MEMBER(special_port1_r);
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index 8abca126239..715c502ae05 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -17,7 +17,7 @@ public:
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_spriteram2;
required_shared_ptr<UINT8> m_videoram;
-
+
/* devices */
required_device<cpu_device> m_maincpu;
required_device<sn76489a_device> m_sn;
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index d26d6f5f836..db0b6e0fd76 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -107,7 +107,7 @@ atari_sound_comm_device::atari_sound_comm_device(const machine_config &mconfig,
//-------------------------------------------------
// static_set_sound_cpu: Set the tag of the
-// sound CPU
+// sound CPU
//-------------------------------------------------
void atari_sound_comm_device::static_set_sound_cpu(device_t &device, const char *cputag)
@@ -143,8 +143,8 @@ void atari_sound_comm_device::device_start()
//-------------------------------------------------
-// device_reset: Handle a device reset by
-// clearing the interrupt lines and states
+// device_reset: Handle a device reset by
+// clearing the interrupt lines and states
//-------------------------------------------------
void atari_sound_comm_device::device_reset()
@@ -160,7 +160,7 @@ void atari_sound_comm_device::device_reset()
//-------------------------------------------------
// device_timer: Handle device-specific timer
-// calbacks
+// calbacks
//-------------------------------------------------
void atari_sound_comm_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -195,8 +195,8 @@ INTERRUPT_GEN_MEMBER(atari_sound_comm_device::sound_irq_gen)
//-------------------------------------------------
-// sound_irq_ack_r: Resets the IRQ signal to the
-// 6502 sound processor. Both reads and writes
+// sound_irq_ack_r: Resets the IRQ signal to the
+// 6502 sound processor. Both reads and writes
// can be used.
//-------------------------------------------------
@@ -215,7 +215,7 @@ WRITE8_MEMBER(atari_sound_comm_device::sound_irq_ack_w)
//-------------------------------------------------
-// atarigen_ym2151_irq_gen: Sets the state of the
+// atarigen_ym2151_irq_gen: Sets the state of the
// YM2151's IRQ line.
//-------------------------------------------------
@@ -291,10 +291,10 @@ READ8_MEMBER(atari_sound_comm_device::sound_command_r)
//-------------------------------------------------
-// update_sound_irq: Called whenever the IRQ state
-// changes. An interrupt is generated if either
-// sound_irq_gen() was called, or if the YM2151
-// generated an interrupt via the
+// update_sound_irq: Called whenever the IRQ state
+// changes. An interrupt is generated if either
+// sound_irq_gen() was called, or if the YM2151
+// generated an interrupt via the
// ym2151_irq_gen() callback.
//-------------------------------------------------
@@ -308,8 +308,8 @@ void atari_sound_comm_device::update_sound_irq()
//-------------------------------------------------
-// delayed_sound_reset: Synchronizes the sound
-// reset command between the two CPUs.
+// delayed_sound_reset: Synchronizes the sound
+// reset command between the two CPUs.
//-------------------------------------------------
void atari_sound_comm_device::delayed_sound_reset(int param)
@@ -408,7 +408,7 @@ atari_vad_device::atari_vad_device(const machine_config &mconfig, const char *ta
//-------------------------------------------------
// static_set_sound_cpu: Set the tag of the
-// sound CPU
+// sound CPU
//-------------------------------------------------
void atari_vad_device::static_set_screen(device_t &device, const char *screentag)
@@ -537,7 +537,7 @@ void atari_vad_device::device_start()
m_screen = siblingdevice<screen_device>(m_screen_tag);
if (m_screen == NULL)
throw emu_fatalerror("Screen '%s' not found!", m_screen_tag);
-
+
// resolve callbacks
m_scanline_int_cb.resolve_safe();
@@ -558,8 +558,8 @@ void atari_vad_device::device_start()
//-------------------------------------------------
-// device_reset: Handle a device reset by
-// clearing the interrupt lines and states
+// device_reset: Handle a device reset by
+// clearing the interrupt lines and states
//-------------------------------------------------
void atari_vad_device::device_reset()
@@ -583,7 +583,7 @@ void atari_vad_device::device_reset()
//-------------------------------------------------
// device_timer: Handle device-specific timer
-// calbacks
+// calbacks
//-------------------------------------------------
void atari_vad_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
@@ -593,7 +593,7 @@ void atari_vad_device::device_timer(emu_timer &timer, device_timer_id id, int pa
case TID_SCANLINE_INT:
m_scanline_int_cb(ASSERT_LINE);
break;
-
+
case TID_TILEROW_UPDATE:
update_tilerow(timer, param);
break;
@@ -607,7 +607,7 @@ void atari_vad_device::device_timer(emu_timer &timer, device_timer_id id, int pa
//-------------------------------------------------
// internal_control_write: Handle writes to the
-// control registers and EOF updates
+// control registers and EOF updates
//-------------------------------------------------
void atari_vad_device::internal_control_write(offs_t offset, UINT16 newword)
@@ -618,77 +618,77 @@ void atari_vad_device::internal_control_write(offs_t offset, UINT16 newword)
switch (offset)
{
//
- // VAD register map:
+ // VAD register map:
//
- // 00 = HDW_ENABLE
- // A000 = enable other VAD params
- // E000 = enable other VAD params but disable update from ALPHA RAM
- // 01 = HDW_VSY_LD (standard = 0x795)
- // 0FF8 = V_SY_S
- // 0007 = V_SY_E
- // 02 = HDW_VBL_LD (standard = 0xAEF)
- // FE00 = VLAST
- // 01FF = V_BL_S
- // 03 = HDW_VINT
- // 04 = HDW_HSY_LD (standard = 0x5EEF)
- // FC00 = H_SY_E/2
- // 03FF = H_SY_S
- // 05 = HDW_HBL_LD (relief = 0x72AC, batman/thunderj = 0xBEB1, shuuz/offtwall = 0xCEB1)
- // F000 = LB_CLR
- // 0800 = H_BL_E/16
- // 0400 = H_BL_E/1
- // 03FF = H_BL_S
- // 06 = HDW_SLIP_LD (relief/batman/shuuz = 0x6F05, shuuz/offtwall = 0x0F05)
- // 7F00 = SLIP_S
- // 0080 = SLIP_E_SE1
- // 007F = SLIP_E
- // 07 = HDW_APDMA_LD (relief/batman/shuuz = 0xBE84, shuuz = 0xB90E, offtwall = 0xB90D)
- // C000 = OPFPIC
- // 3800 = PF_HRESET/16
- // 0780 = PFAT
- // 0070 = AL_HRESET (depending on ALHSIZ)
- // 000F = ALPHA_DMA
- // 08 = HDW_PMBASE_LD (relief/batman/shuuz = 0x0519, shuuz/offtwall = 0x49B4)
- // E000 = P1BASE/0x2000
- // 1C00 = P2BASE/0x2000
- // 0380 = PABASE/0x2000
- // 0040 = PMASK
- // 003E = MOBASE/0x800
- // 0001 = MOMASK
- // 09 = HDW_ALBASE_LD (relief/batman/shuuz = 0x061F, shuuz/offtwall = 0x017F)
- // 0400 = OPMINUS1
- // 03C0 = ALBASE/0x1000
- // 003F = SLIPBASE/0x80
- // 0A = HDW_OPT_LD (relief/batman/shuuz = 0x4410, shuuz = 0x0250, offtwall = 0x0A10)
- // 8000 = OPFHSIZ - subtract 1 from PF2 attribute horizontal stamp address
- // 4000 = OPIUM - playfield 2 enable
- // 2000 = OLS_EN - linescroll enable
- // 1000 = OSLPINK - split links enable
- // 0800 = OSLORAM - slow MO DMA cycles
- // 0400 = O_DCDMA - enable double time color RAM DMA cycles
- // 0200 = O_DVDMA - enable double time video RAM DMA cycles
- // 0100 = OADROEN - tristate address bus
- // 0080 = OAS_EN - enable autostore of playfield attributes
- // 0040 = OCRDWE - enable 8-bit color RAM
- // 0020 = OVRDTACK - wait for VRAM DMA on writes
- // 0010 = OCRDTACK - wait for CRAM DMA on writes
- // 0008 = OALHSIZ - alpha horiz stamp size (0=8)
- // 0004 = OPFHSIZ - PF horiz stamp size (0=8)
- // 0002 = OPFVSIZ - PF vertical stamp size (0=8)
- // 0001 = OMOVSIZ - MO vertical stamp size (0=8)
- // 10 = HDW_MOCON (MOB chip MOB code)
- // 11 = HDW_PCON (MOB chip PF code)
- // 12 = HDW_GRCON (MOB chip GR code)
- // 13 = MO_hscroll (9)
- // 14 = PF1_hscroll (A)
- // 15 = PF2_hscroll (B)
- // 16 = MO_vscroll (D)
- // 17 = PF1_vscroll (E)
- // 18 = PF2_vscroll (F)
+ // 00 = HDW_ENABLE
+ // A000 = enable other VAD params
+ // E000 = enable other VAD params but disable update from ALPHA RAM
+ // 01 = HDW_VSY_LD (standard = 0x795)
+ // 0FF8 = V_SY_S
+ // 0007 = V_SY_E
+ // 02 = HDW_VBL_LD (standard = 0xAEF)
+ // FE00 = VLAST
+ // 01FF = V_BL_S
+ // 03 = HDW_VINT
+ // 04 = HDW_HSY_LD (standard = 0x5EEF)
+ // FC00 = H_SY_E/2
+ // 03FF = H_SY_S
+ // 05 = HDW_HBL_LD (relief = 0x72AC, batman/thunderj = 0xBEB1, shuuz/offtwall = 0xCEB1)
+ // F000 = LB_CLR
+ // 0800 = H_BL_E/16
+ // 0400 = H_BL_E/1
+ // 03FF = H_BL_S
+ // 06 = HDW_SLIP_LD (relief/batman/shuuz = 0x6F05, shuuz/offtwall = 0x0F05)
+ // 7F00 = SLIP_S
+ // 0080 = SLIP_E_SE1
+ // 007F = SLIP_E
+ // 07 = HDW_APDMA_LD (relief/batman/shuuz = 0xBE84, shuuz = 0xB90E, offtwall = 0xB90D)
+ // C000 = OPFPIC
+ // 3800 = PF_HRESET/16
+ // 0780 = PFAT
+ // 0070 = AL_HRESET (depending on ALHSIZ)
+ // 000F = ALPHA_DMA
+ // 08 = HDW_PMBASE_LD (relief/batman/shuuz = 0x0519, shuuz/offtwall = 0x49B4)
+ // E000 = P1BASE/0x2000
+ // 1C00 = P2BASE/0x2000
+ // 0380 = PABASE/0x2000
+ // 0040 = PMASK
+ // 003E = MOBASE/0x800
+ // 0001 = MOMASK
+ // 09 = HDW_ALBASE_LD (relief/batman/shuuz = 0x061F, shuuz/offtwall = 0x017F)
+ // 0400 = OPMINUS1
+ // 03C0 = ALBASE/0x1000
+ // 003F = SLIPBASE/0x80
+ // 0A = HDW_OPT_LD (relief/batman/shuuz = 0x4410, shuuz = 0x0250, offtwall = 0x0A10)
+ // 8000 = OPFHSIZ - subtract 1 from PF2 attribute horizontal stamp address
+ // 4000 = OPIUM - playfield 2 enable
+ // 2000 = OLS_EN - linescroll enable
+ // 1000 = OSLPINK - split links enable
+ // 0800 = OSLORAM - slow MO DMA cycles
+ // 0400 = O_DCDMA - enable double time color RAM DMA cycles
+ // 0200 = O_DVDMA - enable double time video RAM DMA cycles
+ // 0100 = OADROEN - tristate address bus
+ // 0080 = OAS_EN - enable autostore of playfield attributes
+ // 0040 = OCRDWE - enable 8-bit color RAM
+ // 0020 = OVRDTACK - wait for VRAM DMA on writes
+ // 0010 = OCRDTACK - wait for CRAM DMA on writes
+ // 0008 = OALHSIZ - alpha horiz stamp size (0=8)
+ // 0004 = OPFHSIZ - PF horiz stamp size (0=8)
+ // 0002 = OPFVSIZ - PF vertical stamp size (0=8)
+ // 0001 = OMOVSIZ - MO vertical stamp size (0=8)
+ // 10 = HDW_MOCON (MOB chip MOB code)
+ // 11 = HDW_PCON (MOB chip PF code)
+ // 12 = HDW_GRCON (MOB chip GR code)
+ // 13 = MO_hscroll (9)
+ // 14 = PF1_hscroll (A)
+ // 15 = PF2_hscroll (B)
+ // 16 = MO_vscroll (D)
+ // 17 = PF1_vscroll (E)
+ // 18 = PF2_vscroll (F)
//
- // 3efffe = reset to wrong configuration?
+ // 3efffe = reset to wrong configuration?
//
-
+
case 0:
//if (oldword != newword) printf("Word 0 = %04X\n", newword);
break;
@@ -716,7 +716,7 @@ void atari_vad_device::internal_control_write(offs_t offset, UINT16 newword)
case 0x18: case 0x19: case 0x1a: case 0x1b:
update_parameter(newword);
break;
-
+
// scanline IRQ ack here
case 0x1e:
m_scanline_int_cb(CLEAR_LINE);
@@ -733,7 +733,7 @@ void atari_vad_device::internal_control_write(offs_t offset, UINT16 newword)
//-------------------------------------------------
// update_pf_xscrolls: Update the playfield
-// scroll values.
+// scroll values.
//-------------------------------------------------
inline void atari_vad_device::update_pf_xscrolls()
@@ -746,8 +746,8 @@ inline void atari_vad_device::update_pf_xscrolls()
//-------------------------------------------------
// update_parameter: Update parameters, shared
-// between end-of-frame, tilerow updates, and
-// direct control writes.
+// between end-of-frame, tilerow updates, and
+// direct control writes.
//-------------------------------------------------
void atari_vad_device::update_parameter(UINT16 newword)
@@ -790,8 +790,8 @@ void atari_vad_device::update_parameter(UINT16 newword)
//-------------------------------------------------
// update_tilerow: Fetch parameters stored at
-// the end of the current tilerow, which affect
-// rowscrolling.
+// the end of the current tilerow, which affect
+// rowscrolling.
//-------------------------------------------------
void atari_vad_device::update_tilerow(emu_timer &timer, int scanline)
@@ -803,11 +803,11 @@ void atari_vad_device::update_tilerow(emu_timer &timer, int scanline)
int offset = scanline / 8 * 64 + 48 + 2 * (scanline % 8);
int data0 = m_alpha_tilemap->basemem_read(offset++);
int data1 = m_alpha_tilemap->basemem_read(offset++);
-
+
// force an update if we have data
if (scanline > 0 && ((data0 | data1) & 15) != 0)
m_screen->update_partial(scanline - 1);
-
+
// write the data
if ((data0 & 15) != 0)
update_parameter(data0);
@@ -824,8 +824,8 @@ void atari_vad_device::update_tilerow(emu_timer &timer, int scanline)
//-------------------------------------------------
-// eof_update: Callback that slurps up data and
-// feeds it into the video controller registers
+// eof_update: Callback that slurps up data and
+// feeds it into the video controller registers
// every refresh.
//-------------------------------------------------
@@ -837,14 +837,14 @@ void atari_vad_device::eof_update(emu_timer &timer)
internal_control_write(i, m_eof_data[i]);
// update the scroll positions
-/* atarimo_set_xscroll(0, m_mo_xscroll);
- atarimo_set_yscroll(0, m_mo_yscroll);
+/* atarimo_set_xscroll(0, m_mo_xscroll);
+ atarimo_set_yscroll(0, m_mo_yscroll);
- update_pf_xscrolls();
+ update_pf_xscrolls();
- m_playfield_tilemap->set_scrolly(0, m_pf0_yscroll);
- if (m_playfield2_tilemap != NULL)
- m_playfield2_tilemap->set_scrolly(0, m_pf1_yscroll);*/
+ m_playfield_tilemap->set_scrolly(0, m_pf0_yscroll);
+ if (m_playfield2_tilemap != NULL)
+ m_playfield2_tilemap->set_scrolly(0, m_pf1_yscroll);*/
timer.adjust(m_screen->time_until_pos(0));
// use this for debugging the video controller values
diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h
index 009f236b268..93aa969038a 100644
--- a/src/mame/machine/atarigen.h
+++ b/src/mame/machine/atarigen.h
@@ -64,14 +64,12 @@
#define MCFG_ATARI_SOUND_COMM_ADD(_tag, _soundcpu, _intcb) \
MCFG_DEVICE_ADD(_tag, ATARI_SOUND_COMM, 0) \
atari_sound_comm_device::static_set_sound_cpu(*device, _soundcpu); \
- devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB2_##_intcb); \
-
+ devcb = &atari_sound_comm_device::static_set_main_int_cb(*device, DEVCB2_##_intcb);
#define MCFG_ATARI_VAD_ADD(_tag, _screen, _intcb) \
MCFG_DEVICE_ADD(_tag, ATARI_VAD, 0) \
atari_vad_device::static_set_screen(*device, _screen); \
- devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB2_##_intcb); \
-
+ devcb = &atari_vad_device::static_set_scanline_int_cb(*device, DEVCB2_##_intcb);
#define MCFG_ATARI_VAD_PLAYFIELD(_class, _getinfo) \
{ astring fulltag(device->tag(), ":playfield"); device_t *device; \
MCFG_TILEMAP_ADD(fulltag) \
@@ -125,7 +123,7 @@ public:
// static configuration helpers
static void static_set_sound_cpu(device_t &device, const char *cputag);
template<class _Object> static devcb2_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_sound_comm_device &>(device).m_main_int_cb.set_callback(object); }
-
+
// getters
DECLARE_READ_LINE_MEMBER(main_to_sound_ready) { return m_main_to_sound_ready ? ASSERT_LINE : CLEAR_LINE; }
DECLARE_READ_LINE_MEMBER(sound_to_main_ready) { return m_sound_to_main_ready ? ASSERT_LINE : CLEAR_LINE; }
@@ -168,11 +166,11 @@ private:
};
// configuration state
- const char * m_sound_cpu_tag;
- devcb2_write_line m_main_int_cb;
+ const char * m_sound_cpu_tag;
+ devcb2_write_line m_main_int_cb;
// internal state
- m6502_device * m_sound_cpu;
+ m6502_device * m_sound_cpu;
bool m_main_to_sound_ready;
bool m_sound_to_main_ready;
UINT8 m_main_to_sound_data;
@@ -237,30 +235,30 @@ private:
void eof_update(emu_timer &timer);
// configuration state
- const char * m_screen_tag;
- devcb2_write_line m_scanline_int_cb;
+ const char * m_screen_tag;
+ devcb2_write_line m_scanline_int_cb;
// internal state
optional_device<tilemap_device> m_alpha_tilemap;
- required_device<tilemap_device> m_playfield_tilemap;
+ required_device<tilemap_device> m_playfield_tilemap;
optional_device<tilemap_device> m_playfield2_tilemap;
optional_shared_ptr<UINT16> m_eof_data;
- screen_device * m_screen;
- emu_timer * m_scanline_int_timer;
- emu_timer * m_tilerow_update_timer;
- emu_timer * m_eof_timer;
-
- UINT32 m_palette_bank; // which palette bank is enabled
- UINT32 m_pf0_xscroll; // playfield 1 xscroll
- UINT32 m_pf0_xscroll_raw; // playfield 1 xscroll raw value
- UINT32 m_pf0_yscroll; // playfield 1 yscroll
- UINT32 m_pf1_xscroll_raw; // playfield 2 xscroll raw value
- UINT32 m_pf1_yscroll; // playfield 2 yscroll
- UINT32 m_mo_xscroll; // sprite xscroll
- UINT32 m_mo_yscroll; // sprite xscroll
-
- UINT16 m_control[0x40/2]; // control data
+ screen_device * m_screen;
+ emu_timer * m_scanline_int_timer;
+ emu_timer * m_tilerow_update_timer;
+ emu_timer * m_eof_timer;
+
+ UINT32 m_palette_bank; // which palette bank is enabled
+ UINT32 m_pf0_xscroll; // playfield 1 xscroll
+ UINT32 m_pf0_xscroll_raw; // playfield 1 xscroll raw value
+ UINT32 m_pf0_yscroll; // playfield 1 yscroll
+ UINT32 m_pf1_xscroll_raw; // playfield 2 xscroll raw value
+ UINT32 m_pf1_yscroll; // playfield 2 yscroll
+ UINT32 m_mo_xscroll; // sprite xscroll
+ UINT32 m_mo_yscroll; // sprite xscroll
+
+ UINT16 m_control[0x40/2]; // control data
};
@@ -392,7 +390,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<okim6295_device> m_oki;
-
+
optional_device<atari_sound_comm_device> m_soundcomm;
};
diff --git a/src/mame/machine/deco104.c b/src/mame/machine/deco104.c
index 842d7f3fa70..ec817d76e31 100644
--- a/src/mame/machine/deco104.c
+++ b/src/mame/machine/deco104.c
@@ -1,9 +1,9 @@
/****************************************************************************
Data East 104 based protection/IO chips
- (a variation on the Deco 146 protection, see deco146.c for notes)
+ (a variation on the Deco 146 protection, see deco146.c for notes)
- original protection simulations by Bryan McPhail, mish@tendril.co.uk
+ original protection simulations by Bryan McPhail, mish@tendril.co.uk
***************************************************************************/
@@ -128,7 +128,7 @@ void deco104_device::device_reset()
UINT16 deco104_device::read_data_getloc(UINT16 offset, int& location)
{
UINT16* prot_ram;
-
+
if (m_current_rambank==0)
prot_ram = m_rambank0;
else
@@ -201,172 +201,172 @@ UINT16 deco104_device::read_data_getloc(UINT16 offset, int& location)
switch (offset>>1)
{
- case 0x088/2: /* Player 1 & 2 input ports */ tempinput = m_port_a_r(0); return tempinput; // also caveman ninja + wizard fire
- case 0x36c/2: tempinput = m_port_b_r(0); return tempinput; // also caveman ninja + wizard fire
- case 0x44c/2: tempinput = m_port_b_r(0); return ((tempinput & 0x7)<<13)|((tempinput & 0x8)<<9);
- case 0x292/2: /* Dips */ tempinput = m_port_c_r(0); return tempinput; // also wizard fire
- case 0x044/2: location = 0x2c; return ((((DECO_PORT(location)&0x000f)<<12)) ^ m_xor) & (~m_nand);
- case 0x282/2: location = 0x26; return ((DECO_PORT(location)&0x000f)<<12) & (~m_nand);
- case 0x0d4/2: location = 0x6e; return ((DECO_PORT(location)&0x0ff0)<<4) | ((DECO_PORT(location)&0x000e)<<3) | ((DECO_PORT(location)&0x0001)<<7);
- case 0x5a2/2: return (((DECO_PORT(0x24)&0xff00)>>4) | ((DECO_PORT(0x24)&0x000f)<<0) | ((DECO_PORT(0x24)&0x00f0)<<8)) & (~m_nand);
- case 0x570/2: return (((DECO_PORT(0x24)&0xf0f0)>>0) | ((DECO_PORT(0x24)&0x000f)<<8)) ^ m_xor;
- case 0x32e/2: return (((DECO_PORT(0x46)&0xf000)>>0) | ((DECO_PORT(0x46)&0x00ff)<<4)) & (~m_nand);
- case 0x4dc/2: return ((DECO_PORT(0x62)&0x00ff)<<8);
- case 0x1be/2: return ((((DECO_PORT(0xc2)&0x0ff0)<<4) | ((DECO_PORT(0xc2)&0x0003)<<6) | ((DECO_PORT(0xc2)&0x000c)<<2)) ^ m_xor) & (~m_nand);
- case 0x420/2: return ((DECO_PORT(0x2e)&0xf000)>>4) | ((DECO_PORT(0x2e)&0x0f00)<<4) | ((DECO_PORT(0x2e)&0x00f0)>>4) | ((DECO_PORT(0x2e)&0x000f)<<4);
- case 0x390/2: return DECO_PORT(0x2c);
- case 0x756/2: return ((DECO_PORT(0x60)&0xfff0)>>4) | ((DECO_PORT(0x60)&0x0007)<<13) | ((DECO_PORT(0x60)&0x0008)<<9);
- case 0x424/2: return ((DECO_PORT(0x60)&0xf000)>>4) | ((DECO_PORT(0x60)&0x0f00)<<4) | ((DECO_PORT(0x60)&0x00f0)>>0) | ((DECO_PORT(0x60)&0x000f)<<0);
- case 0x156/2: return (((DECO_PORT(0xde)&0xff00)<<0) | ((DECO_PORT(0xde)&0x000f)<<4) | ((DECO_PORT(0xde)&0x00f0)>>4)) & (~m_nand);
- case 0x0a8/2: return (((DECO_PORT(0xde)&0xff00)>>4) | ((DECO_PORT(0xde)&0x000f)<<0) | ((DECO_PORT(0xde)&0x00f0)<<8)) & (~m_nand);
- case 0x64a/2: return (((DECO_PORT(0xde)&0xfff0)>>4) | ((DECO_PORT(0xde)&0x000c)<<10) | ((DECO_PORT(0xde)&0x0003)<<14)) & (~m_nand);
- case 0x16e/2: return DECO_PORT(0x6a);
- case 0x39c/2: return (DECO_PORT(0x6a)&0x00ff) | ((DECO_PORT(0x6a)&0xf000)>>4) | ((DECO_PORT(0x6a)&0x0f00)<<4);
- case 0x212/2: return (((DECO_PORT(0x6e)&0xff00)>>4) | ((DECO_PORT(0x6e)&0x00f0)<<8) | ((DECO_PORT(0x6e)&0x000f)<<0)) ^ m_xor;
- case 0x70a/2: return (((DECO_PORT(0xde)&0x00f0)<<8) | ((DECO_PORT(0xde)&0x0007)<<9) | ((DECO_PORT(0xde)&0x0008)<<5)) ^ m_xor;
- case 0x7a0/2: return (DECO_PORT(0x6e)&0x00ff) | ((DECO_PORT(0x6e)&0xf000)>>4) | ((DECO_PORT(0x6e)&0x0f00)<<4);
- case 0x162/2: return DECO_PORT(0x6e);
- case 0x384/2: return ((DECO_PORT(0xdc)&0xf000)>>12) | ((DECO_PORT(0xdc)&0x0ff0)<<4) | ((DECO_PORT(0xdc)&0x000c)<<2) | ((DECO_PORT(0xdc)&0x0003)<<6);
- case 0x302/2: return DECO_PORT(0x24);
- case 0x334/2: return DECO_PORT(0x30);
- case 0x34c/2: return DECO_PORT(0x3c);
- case 0x514/2: return (((DECO_PORT(0x32)&0x0ff0)<<4) | ((DECO_PORT(0x32)&0x000c)<<2) | ((DECO_PORT(0x32)&0x0003)<<6)) & (~m_nand);
- case 0x34e/2: return ((DECO_PORT(0xde)&0x0ff0)<<4) | ((DECO_PORT(0xde)&0xf000)>>8) | ((DECO_PORT(0xde)&0x000f)<<0);
- case 0x722/2: return (((DECO_PORT(0xdc)&0x0fff)<<4) ^ m_xor) & (~m_nand);
- case 0x574/2: return ((((DECO_PORT(0xdc)&0xfff0)>>0) | ((DECO_PORT(0xdc)&0x0003)<<2) | ((DECO_PORT(0xdc)&0x000c)>>2)) ^ m_xor) & (~m_nand);
- case 0x5ae/2: return DECO_PORT(0xdc); // also caveman ninja
- case 0x410/2: return DECO_PORT(0xde); // also caveman ninja
- case 0x340/2: return ((DECO_PORT(0x90)&0xfff0) | ((DECO_PORT(0x90)&0x7)<<1) | ((DECO_PORT(0x90)&0x8)>>3)) ^ m_xor;
- case 0x4a4/2: return (((DECO_PORT(0xce)&0x0ff0) | ((DECO_PORT(0xce)&0xf000)>>12) | ((DECO_PORT(0xce)&0x000f)<<12)) ^ m_xor) & (~m_nand);
- case 0x256/2: return ((((DECO_PORT(0xce)&0xf000)>>12) | ((DECO_PORT(0xce)&0x0fff)<<4))) & (~m_nand);
- case 0x79a/2: return (((DECO_PORT(0xc8)&0xfff0)>>4) | ((DECO_PORT(0xc8)&0x0008)<<9) | ((DECO_PORT(0xc8)&0x0007)<<13)) ^ m_xor;
- case 0x65e/2: return DECO_PORT(0x9c); // also caveman ninja
- case 0x79c/2: return ((DECO_PORT(0xc6)&0xf000) | ((DECO_PORT(0xc6)&0x00ff)<<4) | ((DECO_PORT(0xc6)&0x0f00)>>8)) & (~m_nand);
- case 0x15e/2: return (((DECO_PORT(0x98)&0x0ff0)<<4) | ((DECO_PORT(0x98)&0xf000)>>12) | ((DECO_PORT(0x98)&0x0003)<<6) | ((DECO_PORT(0x98)&0x000c)<<2)) ^ m_xor;
- case 0x6e4/2: return DECO_PORT(0x98); // also caveman ninja
- case 0x01e/2: return ((((DECO_PORT(0xc4)&0xf000)>>4) | ((DECO_PORT(0xc4)&0x0f00)<<4) | ((DECO_PORT(0xc4)&0x00ff)<<0)) ^ m_xor) & (~m_nand);
- case 0x23a/2: return ((((DECO_PORT(0x86)&0xfff0)>>0) | ((DECO_PORT(0x86)&0x0003)<<2) | ((DECO_PORT(0x86)&0x000c)>>2)) ^ m_xor);
- case 0x06e/2: return ((((DECO_PORT(0x96)&0xf000)>>8) | ((DECO_PORT(0x96)&0x0f0f)<<0) | ((DECO_PORT(0x96)&0x00f0)<<8)) ^ m_xor);
- case 0x3a2/2: return ((((DECO_PORT(0x94)&0xf000)>>8) | ((DECO_PORT(0x94)&0x0f00)>>8) | ((DECO_PORT(0x94)&0x00f0)<<8) | ((DECO_PORT(0x94)&0x000e)<<7) | ((DECO_PORT(0x94)&0x0001)<<11)) ^ m_xor);// & (~m_nand);
- case 0x4a6/2: return ((DECO_PORT(0x8c)&0xff00)>>0) | ((DECO_PORT(0x8c)&0x00f0)>>4) | ((DECO_PORT(0x8c)&0x000f)<<4);
- case 0x7b0/2: return DECO_PORT(0x80); // also caveman ninja
- case 0x5aa/2: return ((((DECO_PORT(0x98)&0x0f00)>>8) | ((DECO_PORT(0x98)&0xf000)>>8) | ((DECO_PORT(0x98)&0x00f0)<<8) | ((DECO_PORT(0x98)&0x000e)<<7) | ((DECO_PORT(0x98)&0x0001)<<11)) ^ m_xor) & (~m_nand);
- case 0x662/2: return DECO_PORT(0x8c); // also caveman ninja
- case 0x624/2: return DECO_PORT(0x9a); // also caveman ninja
- case 0x02c/2: return (((DECO_PORT(0x82)&0x0f0f)>>0) | ((DECO_PORT(0x82)&0xf000)>>8) | ((DECO_PORT(0x82)&0x00f0)<<8)) & (~m_nand);
- case 0x1b4/2: return ((DECO_PORT(0xcc)&0x00f0)<<4) | ((DECO_PORT(0xcc)&0x000f)<<12);
- case 0x7ce/2: return ((DECO_PORT(0x80)&0x000e)<<11) | ((DECO_PORT(0x80)&0x0001)<<15);
- case 0x41a/2: return ((((DECO_PORT(0x84)&0x00f0)<<8) | ((DECO_PORT(0x84)&0xf000)>>8) | ((DECO_PORT(0x84)&0x0f00)>>8) | ((DECO_PORT(0x84)&0x0003)<<10) | ((DECO_PORT(0x84)&0x000c)<<6)) ^ m_xor);
- case 0x168/2: return ((((DECO_PORT(0x84)&0x0ff0)<<4) | ((DECO_PORT(0x84)&0x000e)<<3) | ((DECO_PORT(0x84)&0x0001)<<5))) & (~m_nand);
- case 0x314/2: return ((((DECO_PORT(0x84)&0x0ff0)<<4) | ((DECO_PORT(0x84)&0x000e)<<3) | ((DECO_PORT(0x84)&0x0001)<<5)));
- case 0x5e2/2: return ((((DECO_PORT(0x84)&0x00f0)<<8) | ((DECO_PORT(0x84)&0x000e)<<7) | ((DECO_PORT(0x84)&0x0001)<<9)));
- case 0x72a/2: return ((((DECO_PORT(0x86)&0xfff0)>>4) | ((DECO_PORT(0x86)&0x0003)<<14) | ((DECO_PORT(0x86)&0x000c)<<10)) ^ m_xor) & (~m_nand);
- case 0x178/2: return (((DECO_PORT(0x88)&0x00ff)<<8) | ((DECO_PORT(0x88)&0xff00)>>8)) & (~m_nand); // also wizard fire
- case 0x40e/2: return ((((DECO_PORT(0x8a)&0xf000)>>0) | ((DECO_PORT(0x8a)&0x00ff)<<4)) ^ m_xor) & (~m_nand);
- case 0x248/2: return ((((DECO_PORT(0x8c)&0xff00)>>8) | ((DECO_PORT(0x8c)&0x00f0)<<4) | ((DECO_PORT(0x8c)&0x000f)<<12)) ^ m_xor) & (~m_nand);
- case 0x27e/2: return ((((DECO_PORT(0x94)&0x00f0)<<8)) ^ m_xor) & (~m_nand);
- case 0x22c/2: return ((DECO_PORT(0xc4)&0x00f0)<<8);
- case 0x77e/2: return ((DECO_PORT(0x62)&0xf000)>>12) | ((DECO_PORT(0x62)&0x0ff0)<<0) | ((DECO_PORT(0x62)&0x000f)<<12);
- case 0x00c/2: return ((DECO_PORT(0xd6)&0xf000)>>12) | ((DECO_PORT(0xd6)&0x0fff)<<4);
- case 0x090/2: return DECO_PORT(0x44);
- case 0x246/2: return ((((DECO_PORT(0x48)&0xff00)>>8) | ((DECO_PORT(0x48)&0x00f0)<<8) | ((DECO_PORT(0x48)&0x0f00)>>8) | ((DECO_PORT(0x48)&0x0003)<<10) | ((DECO_PORT(0x48)&0x000c)<<6)) ^ m_xor);
- case 0x546/2: return (((DECO_PORT(0x62)&0xf0f0)>>0) | ((DECO_PORT(0x62)&0x000f)<<8)) & (~m_nand);
- case 0x2e2/2: return ((DECO_PORT(0xc6)&0x000e)<<11) | ((DECO_PORT(0xc6)&0x0001)<<15);
- case 0x3c0/2: return DECO_PORT(0x22);
- case 0x4b8/2: return (((DECO_PORT(0x46)&0xf000)>>12) | ((DECO_PORT(0x46)&0x0f00)>>4) | ((DECO_PORT(0x46)&0x00ff)<<8)) ^ m_xor;
- case 0x65c/2: return ((((DECO_PORT(0x44)&0xf000)>>12) | ((DECO_PORT(0x44)&0x0fff)<<4)) ^ m_xor) & (~m_nand);
- case 0x32a/2: return ((((DECO_PORT(0xc0)&0x0ff0)<<4) | ((DECO_PORT(0xc0)&0x000e)<<3) | ((DECO_PORT(0xc0)&0x0001)<<7))) & (~m_nand);// ^ m_xor;
- case 0x008/2: return ((((DECO_PORT(0x94)&0xfff0)<<0) | ((DECO_PORT(0x94)&0x000e)>>1) | ((DECO_PORT(0x94)&0x0001)<<3))) & (~m_nand);// ^ m_xor;
- case 0x456/2: return (((DECO_PORT(0x26)&0xfff0)<<0) | ((DECO_PORT(0x26)&0x0007)<<1) | ((DECO_PORT(0x26)&0x0008)>>3));// ^ m_xor;
- case 0x190/2: return ((((DECO_PORT(0x44)&0xf000)<<0) | ((DECO_PORT(0x44)&0x00ff)<<4))) & (~m_nand);// ^ m_xor;
- case 0x3f2/2: return ((((DECO_PORT(0x48)&0x000f)<<12) | ((DECO_PORT(0x48)&0x00f0)<<4))) & (~m_nand);// ^ m_xor;
- case 0x2be/2: return ((DECO_PORT(0x40)&0x00ff)<<8);
- case 0x19e/2: return ((((DECO_PORT(0x3c)&0xf000)>>12) | ((DECO_PORT(0x3c)&0x0f00)<<4) | ((DECO_PORT(0x3c)&0x00f0)>>0) | ((DECO_PORT(0x3c)&0x000f)<<8)) ^ m_xor) & (~m_nand);
- case 0x2a2/2: return ((((DECO_PORT(0x44)&0xff00)>>8) | ((DECO_PORT(0x44)&0x00f0)<<8) | ((DECO_PORT(0x44)&0x000e)<<7) | ((DECO_PORT(0x44)&0x0001)<<11)) ^ m_xor) & (~m_nand);
- case 0x748/2: return (((DECO_PORT(0x44)&0xfff0)<<0) | ((DECO_PORT(0x44)&0x000e)>>1) | ((DECO_PORT(0x44)&0x0001)<<3));// & (~m_nand);
- case 0x686/2: return (((DECO_PORT(0x46)&0xf000)>>4) | ((DECO_PORT(0x46)&0x0f00)>>8) | ((DECO_PORT(0x46)&0x00f0)<<8) | ((DECO_PORT(0x46)&0x000f)<<4));// & (~m_nand);
- case 0x4c4/2: return ((DECO_PORT(0x3c)&0x000f)<<12) & (~m_nand);
- case 0x538/2: return ((DECO_PORT(0x3c)&0x000f)<<12);
- case 0x63a/2: return ((DECO_PORT(0x3c)&0x000f)<<12);
- case 0x348/2: return ((((DECO_PORT(0x44)&0xf000)>>12) | ((DECO_PORT(0x44)&0x0ff0)<<4) | ((DECO_PORT(0x44)&0x000e)<<3) | ((DECO_PORT(0x44)&0x0001)<<7))) ^ m_xor;// & (~m_nand);
- case 0x200/2: return (((DECO_PORT(0xa0)&0xfff0)>>4) | ((DECO_PORT(0xa0)&0x0007)<<13) | ((DECO_PORT(0xa0)&0x0008)<<9));// & (~m_nand);
- case 0x254/2: return ((((DECO_PORT(0x7e)&0x0ff0)<<4) | ((DECO_PORT(0x7e)&0x000c)<<2) | ((DECO_PORT(0x7e)&0x0003)<<6))) ^ m_xor;// & (~m_nand);
- case 0x182/2: return ((DECO_PORT(0x46)&0xf000)<<0) | ((DECO_PORT(0x46)&0x0f00)>>8) | ((DECO_PORT(0x46)&0x00f0)>>0) | ((DECO_PORT(0x46)&0x000f)<<8);
- case 0x058/2: return DECO_PORT(0x46);
- case 0x48e/2: return ((((DECO_PORT(0x46)&0xf000)>>12) | ((DECO_PORT(0x46)&0x0f00)>>4) | ((DECO_PORT(0x46)&0x00f0)<<4) | ((DECO_PORT(0x46)&0x000f)<<12)));// /*^ m_xor*/) & (~m_nand);
- case 0x4ba/2: return (((DECO_PORT(0x24)&0xf000)>>12) | ((DECO_PORT(0x24)&0x0ff0)<<4) | ((DECO_PORT(0x24)&0x000c)<<2) | ((DECO_PORT(0x24)&0x0003)<<6)) & (~m_nand);
- case 0x092/2: return (((DECO_PORT(0x3c)&0xfff0)>>0) | ((DECO_PORT(0x3c)&0x0007)<<1) | ((DECO_PORT(0x3c)&0x0008)>>3));
- case 0x1f0/2: return ((((DECO_PORT(0xa2)&0xf000)>>12) | ((DECO_PORT(0xa2)&0x0f00)>>4) | ((DECO_PORT(0xa2)&0x00ff)<<8)) ^ m_xor) & (~m_nand);
- case 0x24e/2: return ((((DECO_PORT(0x46)&0xf000)>>8) | ((DECO_PORT(0x46)&0x0f00)>>0) | ((DECO_PORT(0x46)&0x00f0)>>4) | ((DECO_PORT(0x46)&0x000f)<<12)) ^ m_xor);// & (~m_nand);
- case 0x594/2: return ((((DECO_PORT(0x40)&0x00f0)<<8) | ((DECO_PORT(0x40)&0x000c)<<6) | ((DECO_PORT(0x40)&0x0003)<<10)) ^ m_xor);// & (~m_nand);
- case 0x7e2/2: return ((((DECO_PORT(0x96)&0xf000)<<0) | ((DECO_PORT(0x96)&0x00f0)<<4) | ((DECO_PORT(0x96)&0x000f)<<4))) ^ m_xor;// | ((DECO_PORT(0x96)&0x0001)<<7));// ^ m_xor);// & (~m_nand);
- case 0x18c/2: return (((DECO_PORT(0x22)&0xfff0)>>4) | ((DECO_PORT(0x22)&0x000e)<<11) | ((DECO_PORT(0x22)&0x0001)<<15));// ^ m_xor);// & (~m_nand);
- case 0x1fa/2: return ((((DECO_PORT(0x26)&0xf000)>>8) | ((DECO_PORT(0x26)&0x0f00)<<0) | ((DECO_PORT(0x26)&0x00f0)>>4) | ((DECO_PORT(0x26)&0x000f)<<12))) ^ m_xor;// & (~m_nand);
- case 0x70e/2: return ((((DECO_PORT(0x26)&0x0ff0)<<4) | ((DECO_PORT(0x26)&0x000c)<<2) | ((DECO_PORT(0x26)&0x0003)<<6))) ^ m_xor;// & (~m_nand);
- case 0x33a/2: return DECO_PORT(0x60) & (~m_nand);
- case 0x1e2/2: return ((DECO_PORT(0xd0)&0xf000)>>12) | ((DECO_PORT(0xd0)&0x0f00)>>4) | ((DECO_PORT(0xd0)&0x00ff)<<8);
- case 0x3f4/2: return DECO_PORT(0x6e)<<4;
- case 0x2ae/2: return ((DECO_PORT(0x9c)&0xf000)<<0) | ((DECO_PORT(0x9c)&0x0ff0)>>4) | ((DECO_PORT(0x9c)&0x000f)<<8);// & (~m_nand);
- case 0x096/2: return ((((DECO_PORT(0x22)&0xff00)>>8) | ((DECO_PORT(0x22)&0x00f0)<<8) | ((DECO_PORT(0x22)&0x000e)<<7) | ((DECO_PORT(0x22)&0x0001)<<11)) ^ m_xor) & (~m_nand);
- case 0x33e/2: return (((DECO_PORT(0x0)&0xf000)>>12) | ((DECO_PORT(0x0)&0x0f00)>>4) | ((DECO_PORT(0x0)&0x00f0)<<4) | ((DECO_PORT(0x0)&0x000f)<<12)) & (~m_nand); // also wizard fire
+ case 0x088/2: /* Player 1 & 2 input ports */ tempinput = m_port_a_r(0); return tempinput; // also caveman ninja + wizard fire
+ case 0x36c/2: tempinput = m_port_b_r(0); return tempinput; // also caveman ninja + wizard fire
+ case 0x44c/2: tempinput = m_port_b_r(0); return ((tempinput & 0x7)<<13)|((tempinput & 0x8)<<9);
+ case 0x292/2: /* Dips */ tempinput = m_port_c_r(0); return tempinput; // also wizard fire
+ case 0x044/2: location = 0x2c; return ((((DECO_PORT(location)&0x000f)<<12)) ^ m_xor) & (~m_nand);
+ case 0x282/2: location = 0x26; return ((DECO_PORT(location)&0x000f)<<12) & (~m_nand);
+ case 0x0d4/2: location = 0x6e; return ((DECO_PORT(location)&0x0ff0)<<4) | ((DECO_PORT(location)&0x000e)<<3) | ((DECO_PORT(location)&0x0001)<<7);
+ case 0x5a2/2: return (((DECO_PORT(0x24)&0xff00)>>4) | ((DECO_PORT(0x24)&0x000f)<<0) | ((DECO_PORT(0x24)&0x00f0)<<8)) & (~m_nand);
+ case 0x570/2: return (((DECO_PORT(0x24)&0xf0f0)>>0) | ((DECO_PORT(0x24)&0x000f)<<8)) ^ m_xor;
+ case 0x32e/2: return (((DECO_PORT(0x46)&0xf000)>>0) | ((DECO_PORT(0x46)&0x00ff)<<4)) & (~m_nand);
+ case 0x4dc/2: return ((DECO_PORT(0x62)&0x00ff)<<8);
+ case 0x1be/2: return ((((DECO_PORT(0xc2)&0x0ff0)<<4) | ((DECO_PORT(0xc2)&0x0003)<<6) | ((DECO_PORT(0xc2)&0x000c)<<2)) ^ m_xor) & (~m_nand);
+ case 0x420/2: return ((DECO_PORT(0x2e)&0xf000)>>4) | ((DECO_PORT(0x2e)&0x0f00)<<4) | ((DECO_PORT(0x2e)&0x00f0)>>4) | ((DECO_PORT(0x2e)&0x000f)<<4);
+ case 0x390/2: return DECO_PORT(0x2c);
+ case 0x756/2: return ((DECO_PORT(0x60)&0xfff0)>>4) | ((DECO_PORT(0x60)&0x0007)<<13) | ((DECO_PORT(0x60)&0x0008)<<9);
+ case 0x424/2: return ((DECO_PORT(0x60)&0xf000)>>4) | ((DECO_PORT(0x60)&0x0f00)<<4) | ((DECO_PORT(0x60)&0x00f0)>>0) | ((DECO_PORT(0x60)&0x000f)<<0);
+ case 0x156/2: return (((DECO_PORT(0xde)&0xff00)<<0) | ((DECO_PORT(0xde)&0x000f)<<4) | ((DECO_PORT(0xde)&0x00f0)>>4)) & (~m_nand);
+ case 0x0a8/2: return (((DECO_PORT(0xde)&0xff00)>>4) | ((DECO_PORT(0xde)&0x000f)<<0) | ((DECO_PORT(0xde)&0x00f0)<<8)) & (~m_nand);
+ case 0x64a/2: return (((DECO_PORT(0xde)&0xfff0)>>4) | ((DECO_PORT(0xde)&0x000c)<<10) | ((DECO_PORT(0xde)&0x0003)<<14)) & (~m_nand);
+ case 0x16e/2: return DECO_PORT(0x6a);
+ case 0x39c/2: return (DECO_PORT(0x6a)&0x00ff) | ((DECO_PORT(0x6a)&0xf000)>>4) | ((DECO_PORT(0x6a)&0x0f00)<<4);
+ case 0x212/2: return (((DECO_PORT(0x6e)&0xff00)>>4) | ((DECO_PORT(0x6e)&0x00f0)<<8) | ((DECO_PORT(0x6e)&0x000f)<<0)) ^ m_xor;
+ case 0x70a/2: return (((DECO_PORT(0xde)&0x00f0)<<8) | ((DECO_PORT(0xde)&0x0007)<<9) | ((DECO_PORT(0xde)&0x0008)<<5)) ^ m_xor;
+ case 0x7a0/2: return (DECO_PORT(0x6e)&0x00ff) | ((DECO_PORT(0x6e)&0xf000)>>4) | ((DECO_PORT(0x6e)&0x0f00)<<4);
+ case 0x162/2: return DECO_PORT(0x6e);
+ case 0x384/2: return ((DECO_PORT(0xdc)&0xf000)>>12) | ((DECO_PORT(0xdc)&0x0ff0)<<4) | ((DECO_PORT(0xdc)&0x000c)<<2) | ((DECO_PORT(0xdc)&0x0003)<<6);
+ case 0x302/2: return DECO_PORT(0x24);
+ case 0x334/2: return DECO_PORT(0x30);
+ case 0x34c/2: return DECO_PORT(0x3c);
+ case 0x514/2: return (((DECO_PORT(0x32)&0x0ff0)<<4) | ((DECO_PORT(0x32)&0x000c)<<2) | ((DECO_PORT(0x32)&0x0003)<<6)) & (~m_nand);
+ case 0x34e/2: return ((DECO_PORT(0xde)&0x0ff0)<<4) | ((DECO_PORT(0xde)&0xf000)>>8) | ((DECO_PORT(0xde)&0x000f)<<0);
+ case 0x722/2: return (((DECO_PORT(0xdc)&0x0fff)<<4) ^ m_xor) & (~m_nand);
+ case 0x574/2: return ((((DECO_PORT(0xdc)&0xfff0)>>0) | ((DECO_PORT(0xdc)&0x0003)<<2) | ((DECO_PORT(0xdc)&0x000c)>>2)) ^ m_xor) & (~m_nand);
+ case 0x5ae/2: return DECO_PORT(0xdc); // also caveman ninja
+ case 0x410/2: return DECO_PORT(0xde); // also caveman ninja
+ case 0x340/2: return ((DECO_PORT(0x90)&0xfff0) | ((DECO_PORT(0x90)&0x7)<<1) | ((DECO_PORT(0x90)&0x8)>>3)) ^ m_xor;
+ case 0x4a4/2: return (((DECO_PORT(0xce)&0x0ff0) | ((DECO_PORT(0xce)&0xf000)>>12) | ((DECO_PORT(0xce)&0x000f)<<12)) ^ m_xor) & (~m_nand);
+ case 0x256/2: return ((((DECO_PORT(0xce)&0xf000)>>12) | ((DECO_PORT(0xce)&0x0fff)<<4))) & (~m_nand);
+ case 0x79a/2: return (((DECO_PORT(0xc8)&0xfff0)>>4) | ((DECO_PORT(0xc8)&0x0008)<<9) | ((DECO_PORT(0xc8)&0x0007)<<13)) ^ m_xor;
+ case 0x65e/2: return DECO_PORT(0x9c); // also caveman ninja
+ case 0x79c/2: return ((DECO_PORT(0xc6)&0xf000) | ((DECO_PORT(0xc6)&0x00ff)<<4) | ((DECO_PORT(0xc6)&0x0f00)>>8)) & (~m_nand);
+ case 0x15e/2: return (((DECO_PORT(0x98)&0x0ff0)<<4) | ((DECO_PORT(0x98)&0xf000)>>12) | ((DECO_PORT(0x98)&0x0003)<<6) | ((DECO_PORT(0x98)&0x000c)<<2)) ^ m_xor;
+ case 0x6e4/2: return DECO_PORT(0x98); // also caveman ninja
+ case 0x01e/2: return ((((DECO_PORT(0xc4)&0xf000)>>4) | ((DECO_PORT(0xc4)&0x0f00)<<4) | ((DECO_PORT(0xc4)&0x00ff)<<0)) ^ m_xor) & (~m_nand);
+ case 0x23a/2: return ((((DECO_PORT(0x86)&0xfff0)>>0) | ((DECO_PORT(0x86)&0x0003)<<2) | ((DECO_PORT(0x86)&0x000c)>>2)) ^ m_xor);
+ case 0x06e/2: return ((((DECO_PORT(0x96)&0xf000)>>8) | ((DECO_PORT(0x96)&0x0f0f)<<0) | ((DECO_PORT(0x96)&0x00f0)<<8)) ^ m_xor);
+ case 0x3a2/2: return ((((DECO_PORT(0x94)&0xf000)>>8) | ((DECO_PORT(0x94)&0x0f00)>>8) | ((DECO_PORT(0x94)&0x00f0)<<8) | ((DECO_PORT(0x94)&0x000e)<<7) | ((DECO_PORT(0x94)&0x0001)<<11)) ^ m_xor);// & (~m_nand);
+ case 0x4a6/2: return ((DECO_PORT(0x8c)&0xff00)>>0) | ((DECO_PORT(0x8c)&0x00f0)>>4) | ((DECO_PORT(0x8c)&0x000f)<<4);
+ case 0x7b0/2: return DECO_PORT(0x80); // also caveman ninja
+ case 0x5aa/2: return ((((DECO_PORT(0x98)&0x0f00)>>8) | ((DECO_PORT(0x98)&0xf000)>>8) | ((DECO_PORT(0x98)&0x00f0)<<8) | ((DECO_PORT(0x98)&0x000e)<<7) | ((DECO_PORT(0x98)&0x0001)<<11)) ^ m_xor) & (~m_nand);
+ case 0x662/2: return DECO_PORT(0x8c); // also caveman ninja
+ case 0x624/2: return DECO_PORT(0x9a); // also caveman ninja
+ case 0x02c/2: return (((DECO_PORT(0x82)&0x0f0f)>>0) | ((DECO_PORT(0x82)&0xf000)>>8) | ((DECO_PORT(0x82)&0x00f0)<<8)) & (~m_nand);
+ case 0x1b4/2: return ((DECO_PORT(0xcc)&0x00f0)<<4) | ((DECO_PORT(0xcc)&0x000f)<<12);
+ case 0x7ce/2: return ((DECO_PORT(0x80)&0x000e)<<11) | ((DECO_PORT(0x80)&0x0001)<<15);
+ case 0x41a/2: return ((((DECO_PORT(0x84)&0x00f0)<<8) | ((DECO_PORT(0x84)&0xf000)>>8) | ((DECO_PORT(0x84)&0x0f00)>>8) | ((DECO_PORT(0x84)&0x0003)<<10) | ((DECO_PORT(0x84)&0x000c)<<6)) ^ m_xor);
+ case 0x168/2: return ((((DECO_PORT(0x84)&0x0ff0)<<4) | ((DECO_PORT(0x84)&0x000e)<<3) | ((DECO_PORT(0x84)&0x0001)<<5))) & (~m_nand);
+ case 0x314/2: return ((((DECO_PORT(0x84)&0x0ff0)<<4) | ((DECO_PORT(0x84)&0x000e)<<3) | ((DECO_PORT(0x84)&0x0001)<<5)));
+ case 0x5e2/2: return ((((DECO_PORT(0x84)&0x00f0)<<8) | ((DECO_PORT(0x84)&0x000e)<<7) | ((DECO_PORT(0x84)&0x0001)<<9)));
+ case 0x72a/2: return ((((DECO_PORT(0x86)&0xfff0)>>4) | ((DECO_PORT(0x86)&0x0003)<<14) | ((DECO_PORT(0x86)&0x000c)<<10)) ^ m_xor) & (~m_nand);
+ case 0x178/2: return (((DECO_PORT(0x88)&0x00ff)<<8) | ((DECO_PORT(0x88)&0xff00)>>8)) & (~m_nand); // also wizard fire
+ case 0x40e/2: return ((((DECO_PORT(0x8a)&0xf000)>>0) | ((DECO_PORT(0x8a)&0x00ff)<<4)) ^ m_xor) & (~m_nand);
+ case 0x248/2: return ((((DECO_PORT(0x8c)&0xff00)>>8) | ((DECO_PORT(0x8c)&0x00f0)<<4) | ((DECO_PORT(0x8c)&0x000f)<<12)) ^ m_xor) & (~m_nand);
+ case 0x27e/2: return ((((DECO_PORT(0x94)&0x00f0)<<8)) ^ m_xor) & (~m_nand);
+ case 0x22c/2: return ((DECO_PORT(0xc4)&0x00f0)<<8);
+ case 0x77e/2: return ((DECO_PORT(0x62)&0xf000)>>12) | ((DECO_PORT(0x62)&0x0ff0)<<0) | ((DECO_PORT(0x62)&0x000f)<<12);
+ case 0x00c/2: return ((DECO_PORT(0xd6)&0xf000)>>12) | ((DECO_PORT(0xd6)&0x0fff)<<4);
+ case 0x090/2: return DECO_PORT(0x44);
+ case 0x246/2: return ((((DECO_PORT(0x48)&0xff00)>>8) | ((DECO_PORT(0x48)&0x00f0)<<8) | ((DECO_PORT(0x48)&0x0f00)>>8) | ((DECO_PORT(0x48)&0x0003)<<10) | ((DECO_PORT(0x48)&0x000c)<<6)) ^ m_xor);
+ case 0x546/2: return (((DECO_PORT(0x62)&0xf0f0)>>0) | ((DECO_PORT(0x62)&0x000f)<<8)) & (~m_nand);
+ case 0x2e2/2: return ((DECO_PORT(0xc6)&0x000e)<<11) | ((DECO_PORT(0xc6)&0x0001)<<15);
+ case 0x3c0/2: return DECO_PORT(0x22);
+ case 0x4b8/2: return (((DECO_PORT(0x46)&0xf000)>>12) | ((DECO_PORT(0x46)&0x0f00)>>4) | ((DECO_PORT(0x46)&0x00ff)<<8)) ^ m_xor;
+ case 0x65c/2: return ((((DECO_PORT(0x44)&0xf000)>>12) | ((DECO_PORT(0x44)&0x0fff)<<4)) ^ m_xor) & (~m_nand);
+ case 0x32a/2: return ((((DECO_PORT(0xc0)&0x0ff0)<<4) | ((DECO_PORT(0xc0)&0x000e)<<3) | ((DECO_PORT(0xc0)&0x0001)<<7))) & (~m_nand);// ^ m_xor;
+ case 0x008/2: return ((((DECO_PORT(0x94)&0xfff0)<<0) | ((DECO_PORT(0x94)&0x000e)>>1) | ((DECO_PORT(0x94)&0x0001)<<3))) & (~m_nand);// ^ m_xor;
+ case 0x456/2: return (((DECO_PORT(0x26)&0xfff0)<<0) | ((DECO_PORT(0x26)&0x0007)<<1) | ((DECO_PORT(0x26)&0x0008)>>3));// ^ m_xor;
+ case 0x190/2: return ((((DECO_PORT(0x44)&0xf000)<<0) | ((DECO_PORT(0x44)&0x00ff)<<4))) & (~m_nand);// ^ m_xor;
+ case 0x3f2/2: return ((((DECO_PORT(0x48)&0x000f)<<12) | ((DECO_PORT(0x48)&0x00f0)<<4))) & (~m_nand);// ^ m_xor;
+ case 0x2be/2: return ((DECO_PORT(0x40)&0x00ff)<<8);
+ case 0x19e/2: return ((((DECO_PORT(0x3c)&0xf000)>>12) | ((DECO_PORT(0x3c)&0x0f00)<<4) | ((DECO_PORT(0x3c)&0x00f0)>>0) | ((DECO_PORT(0x3c)&0x000f)<<8)) ^ m_xor) & (~m_nand);
+ case 0x2a2/2: return ((((DECO_PORT(0x44)&0xff00)>>8) | ((DECO_PORT(0x44)&0x00f0)<<8) | ((DECO_PORT(0x44)&0x000e)<<7) | ((DECO_PORT(0x44)&0x0001)<<11)) ^ m_xor) & (~m_nand);
+ case 0x748/2: return (((DECO_PORT(0x44)&0xfff0)<<0) | ((DECO_PORT(0x44)&0x000e)>>1) | ((DECO_PORT(0x44)&0x0001)<<3));// & (~m_nand);
+ case 0x686/2: return (((DECO_PORT(0x46)&0xf000)>>4) | ((DECO_PORT(0x46)&0x0f00)>>8) | ((DECO_PORT(0x46)&0x00f0)<<8) | ((DECO_PORT(0x46)&0x000f)<<4));// & (~m_nand);
+ case 0x4c4/2: return ((DECO_PORT(0x3c)&0x000f)<<12) & (~m_nand);
+ case 0x538/2: return ((DECO_PORT(0x3c)&0x000f)<<12);
+ case 0x63a/2: return ((DECO_PORT(0x3c)&0x000f)<<12);
+ case 0x348/2: return ((((DECO_PORT(0x44)&0xf000)>>12) | ((DECO_PORT(0x44)&0x0ff0)<<4) | ((DECO_PORT(0x44)&0x000e)<<3) | ((DECO_PORT(0x44)&0x0001)<<7))) ^ m_xor;// & (~m_nand);
+ case 0x200/2: return (((DECO_PORT(0xa0)&0xfff0)>>4) | ((DECO_PORT(0xa0)&0x0007)<<13) | ((DECO_PORT(0xa0)&0x0008)<<9));// & (~m_nand);
+ case 0x254/2: return ((((DECO_PORT(0x7e)&0x0ff0)<<4) | ((DECO_PORT(0x7e)&0x000c)<<2) | ((DECO_PORT(0x7e)&0x0003)<<6))) ^ m_xor;// & (~m_nand);
+ case 0x182/2: return ((DECO_PORT(0x46)&0xf000)<<0) | ((DECO_PORT(0x46)&0x0f00)>>8) | ((DECO_PORT(0x46)&0x00f0)>>0) | ((DECO_PORT(0x46)&0x000f)<<8);
+ case 0x058/2: return DECO_PORT(0x46);
+ case 0x48e/2: return ((((DECO_PORT(0x46)&0xf000)>>12) | ((DECO_PORT(0x46)&0x0f00)>>4) | ((DECO_PORT(0x46)&0x00f0)<<4) | ((DECO_PORT(0x46)&0x000f)<<12)));// /*^ m_xor*/) & (~m_nand);
+ case 0x4ba/2: return (((DECO_PORT(0x24)&0xf000)>>12) | ((DECO_PORT(0x24)&0x0ff0)<<4) | ((DECO_PORT(0x24)&0x000c)<<2) | ((DECO_PORT(0x24)&0x0003)<<6)) & (~m_nand);
+ case 0x092/2: return (((DECO_PORT(0x3c)&0xfff0)>>0) | ((DECO_PORT(0x3c)&0x0007)<<1) | ((DECO_PORT(0x3c)&0x0008)>>3));
+ case 0x1f0/2: return ((((DECO_PORT(0xa2)&0xf000)>>12) | ((DECO_PORT(0xa2)&0x0f00)>>4) | ((DECO_PORT(0xa2)&0x00ff)<<8)) ^ m_xor) & (~m_nand);
+ case 0x24e/2: return ((((DECO_PORT(0x46)&0xf000)>>8) | ((DECO_PORT(0x46)&0x0f00)>>0) | ((DECO_PORT(0x46)&0x00f0)>>4) | ((DECO_PORT(0x46)&0x000f)<<12)) ^ m_xor);// & (~m_nand);
+ case 0x594/2: return ((((DECO_PORT(0x40)&0x00f0)<<8) | ((DECO_PORT(0x40)&0x000c)<<6) | ((DECO_PORT(0x40)&0x0003)<<10)) ^ m_xor);// & (~m_nand);
+ case 0x7e2/2: return ((((DECO_PORT(0x96)&0xf000)<<0) | ((DECO_PORT(0x96)&0x00f0)<<4) | ((DECO_PORT(0x96)&0x000f)<<4))) ^ m_xor;// | ((DECO_PORT(0x96)&0x0001)<<7));// ^ m_xor);// & (~m_nand);
+ case 0x18c/2: return (((DECO_PORT(0x22)&0xfff0)>>4) | ((DECO_PORT(0x22)&0x000e)<<11) | ((DECO_PORT(0x22)&0x0001)<<15));// ^ m_xor);// & (~m_nand);
+ case 0x1fa/2: return ((((DECO_PORT(0x26)&0xf000)>>8) | ((DECO_PORT(0x26)&0x0f00)<<0) | ((DECO_PORT(0x26)&0x00f0)>>4) | ((DECO_PORT(0x26)&0x000f)<<12))) ^ m_xor;// & (~m_nand);
+ case 0x70e/2: return ((((DECO_PORT(0x26)&0x0ff0)<<4) | ((DECO_PORT(0x26)&0x000c)<<2) | ((DECO_PORT(0x26)&0x0003)<<6))) ^ m_xor;// & (~m_nand);
+ case 0x33a/2: return DECO_PORT(0x60) & (~m_nand);
+ case 0x1e2/2: return ((DECO_PORT(0xd0)&0xf000)>>12) | ((DECO_PORT(0xd0)&0x0f00)>>4) | ((DECO_PORT(0xd0)&0x00ff)<<8);
+ case 0x3f4/2: return DECO_PORT(0x6e)<<4;
+ case 0x2ae/2: return ((DECO_PORT(0x9c)&0xf000)<<0) | ((DECO_PORT(0x9c)&0x0ff0)>>4) | ((DECO_PORT(0x9c)&0x000f)<<8);// & (~m_nand);
+ case 0x096/2: return ((((DECO_PORT(0x22)&0xff00)>>8) | ((DECO_PORT(0x22)&0x00f0)<<8) | ((DECO_PORT(0x22)&0x000e)<<7) | ((DECO_PORT(0x22)&0x0001)<<11)) ^ m_xor) & (~m_nand);
+ case 0x33e/2: return (((DECO_PORT(0x0)&0xf000)>>12) | ((DECO_PORT(0x0)&0x0f00)>>4) | ((DECO_PORT(0x0)&0x00f0)<<4) | ((DECO_PORT(0x0)&0x000f)<<12)) & (~m_nand); // also wizard fire
case 0x6c4/2: /* Reads from here flip buffers */location = 0x66; /* Flip occurs AFTER this data has been calculated*/return ((DECO_PORT(location)&0xf0f0) | ((DECO_PORT(location)&0x000f)<<8)) & (~m_nand);
case 0x700/2: /* Reads from here flip buffers */location = 0x66; return (((DECO_PORT(location)&0xf000)>>4) | ((DECO_PORT(location)&0x00f0)<<8)) ^ m_xor;
- case 0x444/2: location = 0x66; return ((DECO_PORT(location)&0x00f0)<<8) | ((DECO_PORT(location)&0x0007)<<9) | ((DECO_PORT(location)&0x0008)<<5);
- case 0x2d0/2: location = 0x66; return (((DECO_PORT(location)&0xf000)>>4) | ((DECO_PORT(location)&0x00f0)<<8)) ^ m_xor;
- case 0x2b8/2: location = 0x66; return ((DECO_PORT(location)&0x00f0)<<8) ^ m_xor;
- case 0x294/2: location = 0x66; return ((DECO_PORT(location)&0x000f)<<12);
- case 0x1e8/2: location = 0x66; return 0; // todo
- case 0x49c/2: return (((DECO_PORT(0x6c)&0x00f0)<<8) ^ m_xor) & (~m_nand);
- case 0x44e/2: return (((DECO_PORT(0x44)&0x00f0)<<4) | ((DECO_PORT(0x44)&0x000f)<<12)) ^ m_xor;
- case 0x3ca/2: return (((DECO_PORT(0x1e)&0xfff0)>>4) | ((DECO_PORT(0x1e)&0x0003)<<14) | ((DECO_PORT(0x1e)&0x000c)<<10)) ^ m_xor;
- case 0x2ac/2: return DECO_PORT(0x1e); // also caveman ninja
- case 0x03c/2: return (((DECO_PORT(0x1e)&0x0003)<<14) | ((DECO_PORT(0x1e)&0x000c)<<10)) & (~m_nand);
- case 0x174/2: return (((DECO_PORT(0x1e)&0xff00)>>8) | ((DECO_PORT(0x1e)&0x00f0)<<8) | ((DECO_PORT(0x1e)&0x0007)<<9) | ((DECO_PORT(0x1e)&0x0008)<<5)) & (~m_nand);
- case 0x34a/2: return (((DECO_PORT(0x4)&0xff00)>>0) | ((DECO_PORT(0x4)&0x00f0)>>4) | ((DECO_PORT(0x4)&0x000f)<<4)) & (~m_nand);
- case 0x324/2: return (((DECO_PORT(0x6)&0xf000)>>12) | ((DECO_PORT(0x6)&0x0ff0)<<4) | ((DECO_PORT(0x6)&0x0007)<<5) | ((DECO_PORT(0x6)&0x0008)<<1));
- case 0x344/2: return (((DECO_PORT(0x8)&0xf000)>>8) | ((DECO_PORT(0x8)&0x0f00)>>8) | ((DECO_PORT(0x8)&0x00f0)<<4) | ((DECO_PORT(0x8)&0x000f)<<12));
- case 0x072/2: return ((((DECO_PORT(0xa)&0xf000)>>8) | ((DECO_PORT(0xa)&0x0ff0)<<4) | ((DECO_PORT(0xa)&0x000f)>>0))) & (~m_nand);
- case 0x36e/2: return ((((DECO_PORT(0xc)&0xf000)>>0) | ((DECO_PORT(0xc)&0x0ff0)>>4) | ((DECO_PORT(0xc)&0x000f)<<8))) & (~m_nand);
- case 0x590/2: return ((((DECO_PORT(0xe)&0xfff0)>>4) | ((DECO_PORT(0xe)&0x000e)<<11) | ((DECO_PORT(0xe)&0x0001)<<15))) ^ m_xor;
- case 0x7b6/2: return ((((DECO_PORT(0x2)&0xf000)>>8) | ((DECO_PORT(0x2)&0x0ff0)<<4) | ((DECO_PORT(0x2)&0x000f)<<0)) ^ m_xor) & (~m_nand);
- case 0x588/2: return ((((DECO_PORT(0x4)&0xff00)>>4) | ((DECO_PORT(0x4)&0x00f0)<<8) | ((DECO_PORT(0x4)&0x000f)<<0)) ^ m_xor) & (~m_nand);
- case 0x1f6/2: return (((DECO_PORT(0x6)&0xf000)>>12) | ((DECO_PORT(0x6)&0x0ff0)<<4) | ((DECO_PORT(0x6)&0x0007)<<5) | ((DECO_PORT(0x6)&0x0008)<<1)) ^ m_xor;
- case 0x4c0/2: return (((DECO_PORT(0x8)&0xf000)>>4) | ((DECO_PORT(0x8)&0x0f00)<<4) | ((DECO_PORT(0x8)&0x00f0)>>4) | ((DECO_PORT(0x8)&0x000f)<<4)) & (~m_nand);
- case 0x63e/2: return ((((DECO_PORT(0xa)&0x0ff0)<<4) | ((DECO_PORT(0xa)&0xf000)>>12) | ((DECO_PORT(0xa)&0x0003)<<6) | ((DECO_PORT(0xa)&0x000c)<<2)));
- case 0x7cc/2: return ((((DECO_PORT(0xc)&0xfff0)>>4) | ((DECO_PORT(0xc)&0x000e)<<11) | ((DECO_PORT(0xc)&0x0001)<<15)) ^ m_xor) & (~m_nand);
- case 0x1bc/2: return (((DECO_PORT(0xe)&0xf000)>>12) | ((DECO_PORT(0xe)&0x0f00)>>4) | ((DECO_PORT(0xe)&0x00ff)<<8)) & (~m_nand);
- case 0x780/2: return DECO_PORT(0xb8); // also caveman ninja
- case 0x454/2: return (((DECO_PORT(0x82)&0xf000)>>8) | ((DECO_PORT(0x82)&0x0f00)>>0) | ((DECO_PORT(0x82)&0x00f0)>>4) | ((DECO_PORT(0x82)&0x000f)<<12)) ^ m_xor;
- case 0x53e/2: return ((DECO_PORT(0x9e)&0x0003)<<14) | ((DECO_PORT(0x9e)&0x000c)<<10);
- case 0x250/2: return (((DECO_PORT(0x62)&0xf0f0)<<0) | ((DECO_PORT(0x62)&0x0f00)>>8) | ((DECO_PORT(0x62)&0x000f)<<8)) & (~m_nand);
- case 0x150/2: /* Shared */ return DECO_PORT(0x7e);
- case 0x10e/2: /* Schmeizr Robo only */ return DECO_PORT(0x7c);
- case 0x56a/2: /* Schmeizr Robo only */ return (((DECO_PORT(0x7c)&0xfff0)>>4) | ((DECO_PORT(0x7c)&0x000e)<<11) | ((DECO_PORT(0x7c)&0x0001)<<15)) & (~m_nand);
- case 0x39a/2: /* Schmeizr Robo only */ return ((((DECO_PORT(0x7e)&0xfff0)>>4) | ((DECO_PORT(0x7e)&0x000e)<<11) | ((DECO_PORT(0x7e)&0x0001)<<15)) ^ m_xor) & (~m_nand);
- case 0x188/2: /* Schmeizr Robo only */ return (((m_nand&0x0003)<<6) | ((m_nand&0x000c)<<2) | ((m_nand&0x00f0)<<4) | ((m_nand&0x0f00)<<4)) & (~m_nand);
- case 0x3cc/2: /* Schmeizr Robo only */ return m_nand;
- case 0x04a/2: /* Schmeizr Robo only */ return DECO_PORT(0x9e) & (~m_nand);
- case 0x7e8/2: /* Schmeizr Robo only */ return DECO_PORT(0x4a) ^ m_xor;
- case 0x0fc/2: /* Schmeizr Robo only */ return DECO_PORT(0x4a);
- case 0x38c/2: /* Schmeizr Robo only */ return DECO_PORT(0x28);
- case 0x028/2: /* Schmeizr Robo only */ return DECO_PORT(0x58);
+ case 0x444/2: location = 0x66; return ((DECO_PORT(location)&0x00f0)<<8) | ((DECO_PORT(location)&0x0007)<<9) | ((DECO_PORT(location)&0x0008)<<5);
+ case 0x2d0/2: location = 0x66; return (((DECO_PORT(location)&0xf000)>>4) | ((DECO_PORT(location)&0x00f0)<<8)) ^ m_xor;
+ case 0x2b8/2: location = 0x66; return ((DECO_PORT(location)&0x00f0)<<8) ^ m_xor;
+ case 0x294/2: location = 0x66; return ((DECO_PORT(location)&0x000f)<<12);
+ case 0x1e8/2: location = 0x66; return 0; // todo
+ case 0x49c/2: return (((DECO_PORT(0x6c)&0x00f0)<<8) ^ m_xor) & (~m_nand);
+ case 0x44e/2: return (((DECO_PORT(0x44)&0x00f0)<<4) | ((DECO_PORT(0x44)&0x000f)<<12)) ^ m_xor;
+ case 0x3ca/2: return (((DECO_PORT(0x1e)&0xfff0)>>4) | ((DECO_PORT(0x1e)&0x0003)<<14) | ((DECO_PORT(0x1e)&0x000c)<<10)) ^ m_xor;
+ case 0x2ac/2: return DECO_PORT(0x1e); // also caveman ninja
+ case 0x03c/2: return (((DECO_PORT(0x1e)&0x0003)<<14) | ((DECO_PORT(0x1e)&0x000c)<<10)) & (~m_nand);
+ case 0x174/2: return (((DECO_PORT(0x1e)&0xff00)>>8) | ((DECO_PORT(0x1e)&0x00f0)<<8) | ((DECO_PORT(0x1e)&0x0007)<<9) | ((DECO_PORT(0x1e)&0x0008)<<5)) & (~m_nand);
+ case 0x34a/2: return (((DECO_PORT(0x4)&0xff00)>>0) | ((DECO_PORT(0x4)&0x00f0)>>4) | ((DECO_PORT(0x4)&0x000f)<<4)) & (~m_nand);
+ case 0x324/2: return (((DECO_PORT(0x6)&0xf000)>>12) | ((DECO_PORT(0x6)&0x0ff0)<<4) | ((DECO_PORT(0x6)&0x0007)<<5) | ((DECO_PORT(0x6)&0x0008)<<1));
+ case 0x344/2: return (((DECO_PORT(0x8)&0xf000)>>8) | ((DECO_PORT(0x8)&0x0f00)>>8) | ((DECO_PORT(0x8)&0x00f0)<<4) | ((DECO_PORT(0x8)&0x000f)<<12));
+ case 0x072/2: return ((((DECO_PORT(0xa)&0xf000)>>8) | ((DECO_PORT(0xa)&0x0ff0)<<4) | ((DECO_PORT(0xa)&0x000f)>>0))) & (~m_nand);
+ case 0x36e/2: return ((((DECO_PORT(0xc)&0xf000)>>0) | ((DECO_PORT(0xc)&0x0ff0)>>4) | ((DECO_PORT(0xc)&0x000f)<<8))) & (~m_nand);
+ case 0x590/2: return ((((DECO_PORT(0xe)&0xfff0)>>4) | ((DECO_PORT(0xe)&0x000e)<<11) | ((DECO_PORT(0xe)&0x0001)<<15))) ^ m_xor;
+ case 0x7b6/2: return ((((DECO_PORT(0x2)&0xf000)>>8) | ((DECO_PORT(0x2)&0x0ff0)<<4) | ((DECO_PORT(0x2)&0x000f)<<0)) ^ m_xor) & (~m_nand);
+ case 0x588/2: return ((((DECO_PORT(0x4)&0xff00)>>4) | ((DECO_PORT(0x4)&0x00f0)<<8) | ((DECO_PORT(0x4)&0x000f)<<0)) ^ m_xor) & (~m_nand);
+ case 0x1f6/2: return (((DECO_PORT(0x6)&0xf000)>>12) | ((DECO_PORT(0x6)&0x0ff0)<<4) | ((DECO_PORT(0x6)&0x0007)<<5) | ((DECO_PORT(0x6)&0x0008)<<1)) ^ m_xor;
+ case 0x4c0/2: return (((DECO_PORT(0x8)&0xf000)>>4) | ((DECO_PORT(0x8)&0x0f00)<<4) | ((DECO_PORT(0x8)&0x00f0)>>4) | ((DECO_PORT(0x8)&0x000f)<<4)) & (~m_nand);
+ case 0x63e/2: return ((((DECO_PORT(0xa)&0x0ff0)<<4) | ((DECO_PORT(0xa)&0xf000)>>12) | ((DECO_PORT(0xa)&0x0003)<<6) | ((DECO_PORT(0xa)&0x000c)<<2)));
+ case 0x7cc/2: return ((((DECO_PORT(0xc)&0xfff0)>>4) | ((DECO_PORT(0xc)&0x000e)<<11) | ((DECO_PORT(0xc)&0x0001)<<15)) ^ m_xor) & (~m_nand);
+ case 0x1bc/2: return (((DECO_PORT(0xe)&0xf000)>>12) | ((DECO_PORT(0xe)&0x0f00)>>4) | ((DECO_PORT(0xe)&0x00ff)<<8)) & (~m_nand);
+ case 0x780/2: return DECO_PORT(0xb8); // also caveman ninja
+ case 0x454/2: return (((DECO_PORT(0x82)&0xf000)>>8) | ((DECO_PORT(0x82)&0x0f00)>>0) | ((DECO_PORT(0x82)&0x00f0)>>4) | ((DECO_PORT(0x82)&0x000f)<<12)) ^ m_xor;
+ case 0x53e/2: return ((DECO_PORT(0x9e)&0x0003)<<14) | ((DECO_PORT(0x9e)&0x000c)<<10);
+ case 0x250/2: return (((DECO_PORT(0x62)&0xf0f0)<<0) | ((DECO_PORT(0x62)&0x0f00)>>8) | ((DECO_PORT(0x62)&0x000f)<<8)) & (~m_nand);
+ case 0x150/2: /* Shared */ return DECO_PORT(0x7e);
+ case 0x10e/2: /* Schmeizr Robo only */ return DECO_PORT(0x7c);
+ case 0x56a/2: /* Schmeizr Robo only */ return (((DECO_PORT(0x7c)&0xfff0)>>4) | ((DECO_PORT(0x7c)&0x000e)<<11) | ((DECO_PORT(0x7c)&0x0001)<<15)) & (~m_nand);
+ case 0x39a/2: /* Schmeizr Robo only */ return ((((DECO_PORT(0x7e)&0xfff0)>>4) | ((DECO_PORT(0x7e)&0x000e)<<11) | ((DECO_PORT(0x7e)&0x0001)<<15)) ^ m_xor) & (~m_nand);
+ case 0x188/2: /* Schmeizr Robo only */ return (((m_nand&0x0003)<<6) | ((m_nand&0x000c)<<2) | ((m_nand&0x00f0)<<4) | ((m_nand&0x0f00)<<4)) & (~m_nand);
+ case 0x3cc/2: /* Schmeizr Robo only */ return m_nand;
+ case 0x04a/2: /* Schmeizr Robo only */ return DECO_PORT(0x9e) & (~m_nand);
+ case 0x7e8/2: /* Schmeizr Robo only */ return DECO_PORT(0x4a) ^ m_xor;
+ case 0x0fc/2: /* Schmeizr Robo only */ return DECO_PORT(0x4a);
+ case 0x38c/2: /* Schmeizr Robo only */ return DECO_PORT(0x28);
+ case 0x028/2: /* Schmeizr Robo only */ return DECO_PORT(0x58);
// caveman ninja cases
- case 0x224/2: /* was 0x080 */ /* Master level control */ return prot_ram[0x0/2];
- case 0x27a/2: /* was 0x0de */ /* Restart position control */ return prot_ram[0x2/2];
- case 0x242/2: /* was 0x0e6 */ /* The number of credits in the system. */ return prot_ram[0x4/2];
- case 0x222/2: /* was 0x086 */ /* End of game check. See 0x1814 */ return prot_ram[0x6/2];
- case 0x2fe/2: /* was 0x05a */ /* Moved to 0x140000 on int */ return prot_ram[0x10/2];
- case 0x220/2: /* was 0x084 */ /* Moved to 0x14000a on int */ return prot_ram[0x12/2];
- case 0x284/2: /* was 0x020 */ /* Moved to 0x14000c on int */ return prot_ram[0x14/2];
- case 0x2d6/2: /* was 0x072 */ /* Moved to 0x14000e on int */ return prot_ram[0x16/2];
- case 0x278/2: /* was 0x0dc */ /* Moved to 0x150000 on int */ return prot_ram[0x18/2];
- case 0x2ca/2: /* was 0x06e */ /* Moved to 0x15000a on int */ return prot_ram[0x1a/2]; /* Not used on bootleg */
- case 0x2c8/2: /* was 0x06c */ /* Moved to 0x15000c on int */ return prot_ram[0x1c/2];
- //case 0x2ac/2: /* was 0x008 */ /* Moved to 0x15000e on int */ return prot_ram[0x1e/2];
- //case 0x292/2: /* was 0x036 */ /* Dip switches */ return space.machine().root_device().ioport("DSW")->read();
- //case 0x36c/2: /* was 0x1c8 */ /* Coins */ return space.machine().root_device().ioport("IN1")->read();
- //case 0x088/2: /* was 0x22c */ /* Player 1 & 2 input ports */ return space.machine().root_device().ioport("IN0")->read();
+ case 0x224/2: /* was 0x080 */ /* Master level control */ return prot_ram[0x0/2];
+ case 0x27a/2: /* was 0x0de */ /* Restart position control */ return prot_ram[0x2/2];
+ case 0x242/2: /* was 0x0e6 */ /* The number of credits in the system. */ return prot_ram[0x4/2];
+ case 0x222/2: /* was 0x086 */ /* End of game check. See 0x1814 */ return prot_ram[0x6/2];
+ case 0x2fe/2: /* was 0x05a */ /* Moved to 0x140000 on int */ return prot_ram[0x10/2];
+ case 0x220/2: /* was 0x084 */ /* Moved to 0x14000a on int */ return prot_ram[0x12/2];
+ case 0x284/2: /* was 0x020 */ /* Moved to 0x14000c on int */ return prot_ram[0x14/2];
+ case 0x2d6/2: /* was 0x072 */ /* Moved to 0x14000e on int */ return prot_ram[0x16/2];
+ case 0x278/2: /* was 0x0dc */ /* Moved to 0x150000 on int */ return prot_ram[0x18/2];
+ case 0x2ca/2: /* was 0x06e */ /* Moved to 0x15000a on int */ return prot_ram[0x1a/2]; /* Not used on bootleg */
+ case 0x2c8/2: /* was 0x06c */ /* Moved to 0x15000c on int */ return prot_ram[0x1c/2];
+ //case 0x2ac/2: /* was 0x008 */ /* Moved to 0x15000e on int */ return prot_ram[0x1e/2];
+ //case 0x292/2: /* was 0x036 */ /* Dip switches */ return space.machine().root_device().ioport("DSW")->read();
+ //case 0x36c/2: /* was 0x1c8 */ /* Coins */ return space.machine().root_device().ioport("IN1")->read();
+ //case 0x088/2: /* was 0x22c */ /* Player 1 & 2 input ports */ return space.machine().root_device().ioport("IN0")->read();
case 0x016/2: /* was 0x2b2 */ return prot_ram[0x0fc/2]; // 0xad65
case 0x68e/2: /* was 0x42a */ return prot_ram[0x092/2]; // 0xb2b7
case 0x692/2: /* was 0x436 */ return prot_ram[0x088/2]; // 0xea5a
@@ -431,43 +431,43 @@ UINT16 deco104_device::read_data_getloc(UINT16 offset, int& location)
case 0x55a/2: /* was 0x7fe */ return prot_ram[0x0f2/2]; // 0x91d4
// wizard fire cases
- //case 0x088/2: /* was 0x110*/ /* Player input */ return space.machine().root_device().ioport("IN0")->read(); // also used in rohga sim
- //case 0x36c/2: /* was 0x36c*/ return space.machine().root_device().ioport("IN1")->read(); // also used in rohga sim
- case 0x2cc/2: /* was 0x334*/ tempinput = m_port_b_r(0); return tempinput;
- case 0x3b0/2: /* was 0x0dc*/ tempinput = m_port_b_r(0); return tempinput<<4;
- //case 0x292/2: /* was 0x494*/ /* Dips */ return space.machine().root_device().ioport("DSW1_2")->read(); // also used in rohga sim // also caveman ninja
- //case 0x224/2: /* was 0x244*/ return DECO_NEW_PORT(0x00); // also caveman ninja
- //case 0x33e/2: /* was 0x7cc*/ return ((DECO_NEW_PORT(0x00)&0x000f)<<12) | ((DECO_NEW_PORT(0x00)&0x00f0)<<4) | ((DECO_NEW_PORT(0x00)&0x0f00)>>4) | ((DECO_NEW_PORT(0x00)&0xf000)>>12); // also used in rohga sim (NOTE, ROHGA APPLIES MASK, CHECK!)
- case 0x030/2: /* was 0x0c0*/ return (((DECO_NEW_PORT(0x00)&0x000e)>>1) | ((DECO_NEW_PORT(0x00)&0x0001)<<3))<<12;
- case 0x118/2: /* was 0x188*/ return (((DECO_NEW_PORT(0x00)&0x000e)>>1) | ((DECO_NEW_PORT(0x00)&0x0001)<<3))<<12;
- case 0x7a6/2: /* was 0x65e*/ return (((DECO_NEW_PORT(0x00)&0x000c)>>2) | ((DECO_NEW_PORT(0x00)&0x0003)<<2))<<12;
- case 0x73a/2: /* was 0x5ce*/ return ((DECO_NEW_PORT(0x00)<<8)&0xf000) | ((DECO_NEW_PORT(0x00)&0xe)<<7) | ((DECO_NEW_PORT(0x00)&0x1)<<11);
- case 0x586/2: /* was 0x61a*/ return (DECO_NEW_PORT(0x00)<<8)&0xff00;
- //case 0x692/2: /* was 0x496*/ return DECO_NEW_PORT(0x88); // also caveman ninja
- case 0x502/2: /* was 0x40a*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<12) | ((DECO_NEW_PORT(0x88)&0x00f0)>>4) | ((DECO_NEW_PORT(0x88)&0x0f00)<<0) | ((DECO_NEW_PORT(0x88)&0xf000)>>8);
- //case 0x178/2: /* was 0x1e8*/ return ((DECO_NEW_PORT(0x88)&0x00ff)<<8) | ((DECO_NEW_PORT(0x88)&0xff00)>>8); // also used in rohga sim (NOTE, ROHGA APPLIES MASK, CHECK!)
- case 0x3d2/2: /* was 0x4bc*/ return ((DECO_NEW_PORT(0x88)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x88)&0x0003)<<6) | ((DECO_NEW_PORT(0x88)&0x000c)<<2);
- case 0x762/2: /* was 0x46e*/ return ((DECO_NEW_PORT(0x88)&0xfff0)<<0) | ((DECO_NEW_PORT(0x88)&0x0007)<<1) | ((DECO_NEW_PORT(0x88)&0x0008)>>3);
- case 0x264/2: /* was 0x264*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<8) | ((DECO_NEW_PORT(0x88)&0x00f0)>>0) | ((DECO_NEW_PORT(0x88)&0x0f00)<<4);
- case 0x4e8/2: /* was 0x172*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<4) | ((DECO_NEW_PORT(0x88)&0x00f0)<<4) | ((DECO_NEW_PORT(0x88)&0xf000)<<0);
- //case 0x284/2: /* was 0x214*/ return DECO_NEW_PORT(0x14); // also caveman ninja
- case 0x74a/2: /* was 0x52e*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
- case 0x5e0/2: /* was 0x07a*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
- case 0x06c/2: /* was 0x360*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
- case 0x3b2/2: /* was 0x4dc*/ return ((DECO_NEW_PORT(0x14)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x14)&0x0007)<<5) | ((DECO_NEW_PORT(0x14)&0x0008)<<1);
- case 0x15c/2: /* was 0x3a8*/ return ((DECO_NEW_PORT(0x14)&0x000e)<<3) | ((DECO_NEW_PORT(0x14)&0x0001)<<7) | ((DECO_NEW_PORT(0x14)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x14)&0xf000)>>12);
- case 0x6f4/2: /* was 0x2f6*/ return ((DECO_NEW_PORT(0x14)&0xff00)>>8) | ((DECO_NEW_PORT(0x14)&0x00f0)<<8) | ((DECO_NEW_PORT(0x14)&0x000c)<<6) | ((DECO_NEW_PORT(0x14)&0x0003)<<10);
- //case 0x27e/2: /* was 0x7e4*/ return (DECO_NEW_PORT(0x94)&0x00f0)<<8; // also used in rohga sim (NOTE, ROHGA APPLIES XOR and MASK, CHECK!)
- case 0x6ca/2: /* was 0x536*/ return ((DECO_NEW_PORT(0xd4)&0x000f)<<8) | ((DECO_NEW_PORT(0xd4)&0x00f0)<<0) | ((DECO_NEW_PORT(0xd4)&0x0f00)<<4) | ((DECO_NEW_PORT(0xd4)&0xf000)>>12);
- case 0x7d0/2: /* was 0x0be*/ return ((DECO_NEW_PORT(0xec)&0x000f)<<4) | ((DECO_NEW_PORT(0xec)&0x00f0)<<4) | ((DECO_NEW_PORT(0xec)&0x0f00)>>8) | ((DECO_NEW_PORT(0xec)&0xf000)>>0);
- //case 0x092/2: /* was 0x490*/ return (DECO_NEW_PORT(0x3c)&0xfff0) | ((DECO_NEW_PORT(0x3c)&0x0007)<<1) | ((DECO_NEW_PORT(0x3c)&0x0008)>>3); // also used in rohga sim
- case 0x08e/2: /* was 0x710*/ return (DECO_NEW_PORT(0xc2)&0xfff0) | ((DECO_NEW_PORT(0xc2)&0x0007)<<1) | ((DECO_NEW_PORT(0xc2)&0x0008)>>3);
- case 0x544/2: /* was 0x22a*/ return ((DECO_NEW_PORT(0x5a)&0xff00)>>8) | ((DECO_NEW_PORT(0x5a)&0x00f0)<<8) | ((DECO_NEW_PORT(0x5a)&0x0001)<<11) | ((DECO_NEW_PORT(0x5a)&0x000e)<<7);
- case 0x646/2: /* was 0x626*/ return ((DECO_NEW_PORT(0xda)&0x000f)<<8) | ((DECO_NEW_PORT(0xda)&0x00f0)<<8) | ((DECO_NEW_PORT(0xda)&0x0f00)>>4) | ((DECO_NEW_PORT(0xda)&0xf000)>>12);
- //case 0x222/2: /* was 0x444*/ return DECO_NEW_PORT(0x06); // (old comment was 'rohga') /* this CAN'T be right (port addr > 0x100), is it even used by this game or some c+p error? */
- case 0x35a/2: /* was 0x5ac*/ return ((DECO_NEW_PORT(0x76)&0xfff0)>>4) | ((DECO_NEW_PORT(0x76)&0x0007)<<13) | ((DECO_NEW_PORT(0x76)&0x0008)<<9);
- case 0x0a6/2: /* was 0x650*/ return ((DECO_NEW_PORT(0xbe)&0xfff0)>>4) | ((DECO_NEW_PORT(0xbe)&0x000f)<<12); // also used in rohga sim
- case 0x352/2: /* was 0x4ac*/ return ((DECO_NEW_PORT(0x62)&0x0007)<<13) | ((DECO_NEW_PORT(0x62)&0x0008)<<9);
+ //case 0x088/2: /* was 0x110*/ /* Player input */ return space.machine().root_device().ioport("IN0")->read(); // also used in rohga sim
+ //case 0x36c/2: /* was 0x36c*/ return space.machine().root_device().ioport("IN1")->read(); // also used in rohga sim
+ case 0x2cc/2: /* was 0x334*/ tempinput = m_port_b_r(0); return tempinput;
+ case 0x3b0/2: /* was 0x0dc*/ tempinput = m_port_b_r(0); return tempinput<<4;
+ //case 0x292/2: /* was 0x494*/ /* Dips */ return space.machine().root_device().ioport("DSW1_2")->read(); // also used in rohga sim // also caveman ninja
+ //case 0x224/2: /* was 0x244*/ return DECO_NEW_PORT(0x00); // also caveman ninja
+ //case 0x33e/2: /* was 0x7cc*/ return ((DECO_NEW_PORT(0x00)&0x000f)<<12) | ((DECO_NEW_PORT(0x00)&0x00f0)<<4) | ((DECO_NEW_PORT(0x00)&0x0f00)>>4) | ((DECO_NEW_PORT(0x00)&0xf000)>>12); // also used in rohga sim (NOTE, ROHGA APPLIES MASK, CHECK!)
+ case 0x030/2: /* was 0x0c0*/ return (((DECO_NEW_PORT(0x00)&0x000e)>>1) | ((DECO_NEW_PORT(0x00)&0x0001)<<3))<<12;
+ case 0x118/2: /* was 0x188*/ return (((DECO_NEW_PORT(0x00)&0x000e)>>1) | ((DECO_NEW_PORT(0x00)&0x0001)<<3))<<12;
+ case 0x7a6/2: /* was 0x65e*/ return (((DECO_NEW_PORT(0x00)&0x000c)>>2) | ((DECO_NEW_PORT(0x00)&0x0003)<<2))<<12;
+ case 0x73a/2: /* was 0x5ce*/ return ((DECO_NEW_PORT(0x00)<<8)&0xf000) | ((DECO_NEW_PORT(0x00)&0xe)<<7) | ((DECO_NEW_PORT(0x00)&0x1)<<11);
+ case 0x586/2: /* was 0x61a*/ return (DECO_NEW_PORT(0x00)<<8)&0xff00;
+ //case 0x692/2: /* was 0x496*/ return DECO_NEW_PORT(0x88); // also caveman ninja
+ case 0x502/2: /* was 0x40a*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<12) | ((DECO_NEW_PORT(0x88)&0x00f0)>>4) | ((DECO_NEW_PORT(0x88)&0x0f00)<<0) | ((DECO_NEW_PORT(0x88)&0xf000)>>8);
+ //case 0x178/2: /* was 0x1e8*/ return ((DECO_NEW_PORT(0x88)&0x00ff)<<8) | ((DECO_NEW_PORT(0x88)&0xff00)>>8); // also used in rohga sim (NOTE, ROHGA APPLIES MASK, CHECK!)
+ case 0x3d2/2: /* was 0x4bc*/ return ((DECO_NEW_PORT(0x88)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x88)&0x0003)<<6) | ((DECO_NEW_PORT(0x88)&0x000c)<<2);
+ case 0x762/2: /* was 0x46e*/ return ((DECO_NEW_PORT(0x88)&0xfff0)<<0) | ((DECO_NEW_PORT(0x88)&0x0007)<<1) | ((DECO_NEW_PORT(0x88)&0x0008)>>3);
+ case 0x264/2: /* was 0x264*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<8) | ((DECO_NEW_PORT(0x88)&0x00f0)>>0) | ((DECO_NEW_PORT(0x88)&0x0f00)<<4);
+ case 0x4e8/2: /* was 0x172*/ return ((DECO_NEW_PORT(0x88)&0x000f)<<4) | ((DECO_NEW_PORT(0x88)&0x00f0)<<4) | ((DECO_NEW_PORT(0x88)&0xf000)<<0);
+ //case 0x284/2: /* was 0x214*/ return DECO_NEW_PORT(0x14); // also caveman ninja
+ case 0x74a/2: /* was 0x52e*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
+ case 0x5e0/2: /* was 0x07a*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
+ case 0x06c/2: /* was 0x360*/ return ((DECO_NEW_PORT(0x14)&0x000f)<<8) | ((DECO_NEW_PORT(0x14)&0x00f0)>>0) | ((DECO_NEW_PORT(0x14)&0x0f00)>>8) | ((DECO_NEW_PORT(0x14)&0xf000)>>0);
+ case 0x3b2/2: /* was 0x4dc*/ return ((DECO_NEW_PORT(0x14)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x14)&0x0007)<<5) | ((DECO_NEW_PORT(0x14)&0x0008)<<1);
+ case 0x15c/2: /* was 0x3a8*/ return ((DECO_NEW_PORT(0x14)&0x000e)<<3) | ((DECO_NEW_PORT(0x14)&0x0001)<<7) | ((DECO_NEW_PORT(0x14)&0x0ff0)<<4) | ((DECO_NEW_PORT(0x14)&0xf000)>>12);
+ case 0x6f4/2: /* was 0x2f6*/ return ((DECO_NEW_PORT(0x14)&0xff00)>>8) | ((DECO_NEW_PORT(0x14)&0x00f0)<<8) | ((DECO_NEW_PORT(0x14)&0x000c)<<6) | ((DECO_NEW_PORT(0x14)&0x0003)<<10);
+ //case 0x27e/2: /* was 0x7e4*/ return (DECO_NEW_PORT(0x94)&0x00f0)<<8; // also used in rohga sim (NOTE, ROHGA APPLIES XOR and MASK, CHECK!)
+ case 0x6ca/2: /* was 0x536*/ return ((DECO_NEW_PORT(0xd4)&0x000f)<<8) | ((DECO_NEW_PORT(0xd4)&0x00f0)<<0) | ((DECO_NEW_PORT(0xd4)&0x0f00)<<4) | ((DECO_NEW_PORT(0xd4)&0xf000)>>12);
+ case 0x7d0/2: /* was 0x0be*/ return ((DECO_NEW_PORT(0xec)&0x000f)<<4) | ((DECO_NEW_PORT(0xec)&0x00f0)<<4) | ((DECO_NEW_PORT(0xec)&0x0f00)>>8) | ((DECO_NEW_PORT(0xec)&0xf000)>>0);
+ //case 0x092/2: /* was 0x490*/ return (DECO_NEW_PORT(0x3c)&0xfff0) | ((DECO_NEW_PORT(0x3c)&0x0007)<<1) | ((DECO_NEW_PORT(0x3c)&0x0008)>>3); // also used in rohga sim
+ case 0x08e/2: /* was 0x710*/ return (DECO_NEW_PORT(0xc2)&0xfff0) | ((DECO_NEW_PORT(0xc2)&0x0007)<<1) | ((DECO_NEW_PORT(0xc2)&0x0008)>>3);
+ case 0x544/2: /* was 0x22a*/ return ((DECO_NEW_PORT(0x5a)&0xff00)>>8) | ((DECO_NEW_PORT(0x5a)&0x00f0)<<8) | ((DECO_NEW_PORT(0x5a)&0x0001)<<11) | ((DECO_NEW_PORT(0x5a)&0x000e)<<7);
+ case 0x646/2: /* was 0x626*/ return ((DECO_NEW_PORT(0xda)&0x000f)<<8) | ((DECO_NEW_PORT(0xda)&0x00f0)<<8) | ((DECO_NEW_PORT(0xda)&0x0f00)>>4) | ((DECO_NEW_PORT(0xda)&0xf000)>>12);
+ //case 0x222/2: /* was 0x444*/ return DECO_NEW_PORT(0x06); // (old comment was 'rohga') /* this CAN'T be right (port addr > 0x100), is it even used by this game or some c+p error? */
+ case 0x35a/2: /* was 0x5ac*/ return ((DECO_NEW_PORT(0x76)&0xfff0)>>4) | ((DECO_NEW_PORT(0x76)&0x0007)<<13) | ((DECO_NEW_PORT(0x76)&0x0008)<<9);
+ case 0x0a6/2: /* was 0x650*/ return ((DECO_NEW_PORT(0xbe)&0xfff0)>>4) | ((DECO_NEW_PORT(0xbe)&0x000f)<<12); // also used in rohga sim
+ case 0x352/2: /* was 0x4ac*/ return ((DECO_NEW_PORT(0x62)&0x0007)<<13) | ((DECO_NEW_PORT(0x62)&0x0008)<<9);
}
//logerror("Protection PC %06x: warning - read unmapped memory address %04x\n",device().safe_pc(),offset);
@@ -489,7 +489,6 @@ static UINT16 deco16_prot_ram[0x800];
READ16_HANDLER( deco16_104_pktgaldx_prot_r )
{
-
const UINT16* prot_ram=deco16_prot_ram;
switch (offset * 2)
{
@@ -508,7 +507,6 @@ READ16_HANDLER( deco16_104_pktgaldx_prot_r )
WRITE16_HANDLER( deco16_104_pktgaldx_prot_w )
{
-
COMBINE_DATA(&deco16_prot_ram[offset]);
// logerror("Protection PC %06x: warning - write unmapped memory address %04x %04x\n",space.device().safe_pc(),offset<<1,data);
@@ -574,14 +572,14 @@ void deco104_device::write_protport(address_space &space, UINT16 address, UINT16
//printf("%04x\n",m_280_data);
return;
//case 0x0a8: /* was 0x380*/
- // drvstate->soundlatch_byte_w(space, 0, data & 0xff);
- // cpudev = (cpu_device*)machine().device(":audiocpu");
- // if (cpudev) cpudev->set_input_line(0, HOLD_LINE);
+ // drvstate->soundlatch_byte_w(space, 0, data & 0xff);
+ // cpudev = (cpu_device*)machine().device(":audiocpu");
+ // if (cpudev) cpudev->set_input_line(0, HOLD_LINE);
- // m_sound_irq |= 0x02;
- // m_audiocpu->set_input_line(0, (m_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
- // return;
+ // m_sound_irq |= 0x02;
+ // m_audiocpu->set_input_line(0, (m_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
+ // return;
case 0x0b8: /* was 0x384*/
m_384_data = data;
switch(m_384_data)
@@ -643,7 +641,3 @@ void deco104_device::write_protport(address_space &space, UINT16 address, UINT16
}
}
-
-
-
-
diff --git a/src/mame/machine/deco146.c b/src/mame/machine/deco146.c
index 81f32680d59..0322d6a19b2 100644
--- a/src/mame/machine/deco146.c
+++ b/src/mame/machine/deco146.c
@@ -47,9 +47,9 @@
scrambled or reversed.
Game Chip Address Scramble Extra Read Address Xor?
-
+
--- 146 compatible games ---
-
+
Edward Randy 60 None No
Mutant Fighter 66 None No
Captain America 75 None No
@@ -57,7 +57,7 @@
Robocop 2 75 None Yes
Super Shanghai Dragon's Eye 146 None No
Funky Jet 146 Interleave No
- Sotsugyo Shousho (same board / config as Funky Jet)
+ Sotsugyo Shousho (same board / config as Funky Jet)
Nitro Ball 146 Reversed Yes
Fighters History 146? (surface scratched) Interleave Yes
Stadium Hero 96 146 None Yes
@@ -93,7 +93,7 @@
-
+
#define BLK (0xff)
#define INPUT_PORT_A (-1)
#define INPUT_PORT_B (-2)
@@ -104,12 +104,11 @@
struct deco146port_xx
{
- int write_offset;
- UINT8 mapping[16];
+ int write_offset;
+ UINT8 mapping[16];
int use_xor;
int use_nand;
} port_table[] = {
-
#define NIB3__ 0xc, 0xd, 0xe, 0xf
#define NIB3R1 0xd, 0xe, 0xf, 0xc
#define NIB3R2 0xe, 0xf, 0xc, 0xd
@@ -935,7 +934,7 @@ struct deco146port_xx
/* 0x640 */ { 0x022, { NIB1R2, NIB2__, NIB3__, BLANK_ }, 1, 0 },
/* 0x642 */ { 0x030, { NIB2R1, NIB3__, BLANK_, BLANK_ }, 1, 1 },
/* 0x644 */ { 0x000, { NIB1R3, NIB2__, NIB3__, BLANK_ }, 1, 1 },
-/* 0x646 */ { INPUT_PORT_A, { NIB1__, NIB2__, NIB3__, BLANK_ }, 0, 0 },// $4646 $FFF0 CBA- ..B 0
+/* 0x646 */ { INPUT_PORT_A, { NIB1__, NIB2__, NIB3__, BLANK_ }, 0, 0 },// $4646 $FFF0 CBA- ..B 0
/* 0x648 */ { 0x00a, { NIB1R3, NIB2__, NIB3__, BLANK_ }, 0, 0 },
/* 0x64a */ { 0x074, { NIB1R1, NIB2__, NIB3__, NIB0__ }, 1, 0 },
/* 0x64c */ { 0x0ae, { NIB1__, NIB2__, BLANK_, NIB3__ }, 0, 1 },
@@ -1079,7 +1078,7 @@ struct deco146port_xx
/* 0x760 */ { 0x0f4, { NIB2__, NIB3__, BLANK_, BLANK_ }, 0, 0 },
/* 0x762 */ { 0x082, { NIB0__, NIB1__, NIB2__, NIB3__ }, 0, 0 },
/* 0x764 */ { 0x008, { NIB2R2, NIB3__, NIB0__, NIB1__ }, 0, 1 },
-/* 0x766 */ { INPUT_PORT_A, { NIB0__, NIB1__, NIB3__, NIB2__ }, 0, 0 }, // $4766 $FFFF CDBA ... 0
+/* 0x766 */ { INPUT_PORT_A, { NIB0__, NIB1__, NIB3__, NIB2__ }, 0, 0 }, // $4766 $FFFF CDBA ... 0
/* 0x768 */ { 0x0c8, { NIB1R2, NIB2__, NIB3__, NIB0__ }, 1, 0 },
/* 0x76a */ { INPUT_PORT_B, { NIB0__, BLANK_, BLANK_, BLANK_ }, 0, 0 }, // $476A $000F ---A ... 0 (standard i/o read shanghai)
/* 0x76c */ { 0x088, { NIB3__, NIB2__, NIB0__, NIB1__ }, 0, 1 },
@@ -1100,7 +1099,7 @@ struct deco146port_xx
/* 0x78a */ { 0x05e, { NIB1__, NIB2__, NIB3__, BLANK_ }, 0, 1 },
/* 0x78c */ { 0x03a, { NIB0__, NIB3__, NIB1__, NIB2__ }, 1, 1 },
/* 0x78e */ { 0x032, { NIB1R2, NIB2__, NIB3__, NIB0__ }, 1, 1 },
-/* 0x790 */ { INPUT_PORT_A, { NIB3__, NIB1__, NIB2__, NIB0__ }, 0, 0 }, // $4790 $FFFF ACBD ... 0
+/* 0x790 */ { INPUT_PORT_A, { NIB3__, NIB1__, NIB2__, NIB0__ }, 0, 0 }, // $4790 $FFFF ACBD ... 0
/* 0x792 */ { 0x0e6, { NIB0__, NIB1__, NIB2__, NIB3__ }, 1, 0 },
/* 0x794 */ { 0x096, { NIB0__, NIB1__, NIB2__, NIB3__ }, 0, 0 },
/* 0x796 */ { 0x0ee, { NIB0R2, NIB1__, NIB2__, NIB3__ }, 0, 0 },
@@ -1202,8 +1201,8 @@ void deco_146_base_device::write_data(address_space &space, UINT16 address, UINT
}
return; // or fall through?
- }
-
+ }
+
for (int i=0;i<6;i++)
{
int cs = region_selects[i];
@@ -1238,7 +1237,6 @@ void deco_146_base_device::write_data(address_space &space, UINT16 address, UINT
UINT16 deco_146_base_device::read_protport(UINT16 address, UINT16 mem_mask)
{
-
// if we read the last written address immediately after then ignore all other logic and just return what was written unmodified
if ((address==m_latchaddr) && (m_latchflag==1))
{
@@ -1261,8 +1259,8 @@ UINT16 deco_146_base_device::read_protport(UINT16 address, UINT16 mem_mask)
if (location == m_bankswitch_swap_read_address) // this has a special meaning
{
- // logerror("(bankswitch) %04x %04x\n", address, mem_mask);
-
+ // logerror("(bankswitch) %04x %04x\n", address, mem_mask);
+
if (m_current_rambank==0)
m_current_rambank = 1;
else
@@ -1281,19 +1279,19 @@ void deco_146_base_device::write_protport(address_space &space, UINT16 address,
if ((address&0xff) == m_xor_port)
{
- logerror("LOAD XOR REGISTER %04x %04x\n", data, mem_mask);
- COMBINE_DATA(&m_xor);
+ logerror("LOAD XOR REGISTER %04x %04x\n", data, mem_mask);
+ COMBINE_DATA(&m_xor);
}
else if ((address&0xff) == m_mask_port)
{
- logerror("LOAD NAND REGISTER %04x %04x\n", data, mem_mask);
- COMBINE_DATA(&m_nand);
+ logerror("LOAD NAND REGISTER %04x %04x\n", data, mem_mask);
+ COMBINE_DATA(&m_nan