From 1940866c70674f0a625a79677b90f9f4a33b2e25 Mon Sep 17 00:00:00 2001 From: smf- Date: Fri, 11 Jan 2013 19:43:14 +0000 Subject: output of new srcclean changes that are relatively small [smf] --- src/emu/addrmap.h | 207 +-- src/emu/cpu/adsp2100/adsp2100.h | 3 +- src/emu/cpu/am29000/am29000.c | 1 - src/emu/cpu/arm/arm.c | 2 - src/emu/cpu/arm7/arm7.c | 3 +- src/emu/cpu/arm7/arm7core.c | 1 - src/emu/cpu/arm7/arm7dasm.c | 1 - src/emu/cpu/arm7/arm7ops.c | 8 - src/emu/cpu/avr8/avr8.h | 3 +- src/emu/cpu/cubeqcpu/cubeqcpu.c | 1 - src/emu/cpu/dsp32/dsp32.h | 3 +- src/emu/cpu/dsp56k/dsp56def.h | 1 - src/emu/cpu/dsp56k/dsp56mem.c | 1 - src/emu/cpu/dsp56k/dsp56mem.h | 1 - src/emu/cpu/dsp56k/dsp56pcu.c | 1 - src/emu/cpu/dsp56k/dsp56pcu.h | 1 - src/emu/cpu/dsp56k/inst.c | 1 - src/emu/cpu/dsp56k/inst.h | 1 - src/emu/cpu/dsp56k/opcode.c | 1 - src/emu/cpu/dsp56k/opcode.h | 1 - src/emu/cpu/dsp56k/pmove.c | 1 - src/emu/cpu/dsp56k/pmove.h | 1 - src/emu/cpu/dsp56k/tables.c | 1 - src/emu/cpu/dsp56k/tables.h | 1 - src/emu/cpu/e132xs/e132xsop.c | 3 +- src/emu/cpu/esrip/esrip.c | 1 - src/emu/cpu/esrip/esrip.h | 3 +- src/emu/cpu/f8/f8.c | 1 - src/emu/cpu/g65816/g65816op.h | 3 +- src/emu/cpu/h6280/6280dasm.c | 1 - src/emu/cpu/h6280/h6280ops.h | 9 +- src/emu/cpu/hd61700/hd61700.c | 1 - src/emu/cpu/hd61700/hd61700.h | 3 +- src/emu/cpu/hd6309/6309ops.c | 3 +- src/emu/cpu/i386/i386op16.c | 10 - src/emu/cpu/i386/i386op32.c | 9 - src/emu/cpu/i386/i386ops.c | 2 - src/emu/cpu/i86/instr186.c | 1 - src/emu/cpu/i86/instr86.c | 1 - src/emu/cpu/lc8670/lc8670.h | 3 +- src/emu/cpu/m37710/m37710op.h | 3 +- src/emu/cpu/m68000/68307ser.c | 2 - src/emu/cpu/m68000/68307sim.c | 1 - src/emu/cpu/m68000/68307tmu.c | 1 - src/emu/cpu/m68000/68340dma.c | 1 - src/emu/cpu/m68000/68340ser.c | 1 - src/emu/cpu/m68000/68340sim.c | 1 - src/emu/cpu/m68000/68340tmu.c | 1 - src/emu/cpu/m68000/m68kdasm.c | 1 - src/emu/cpu/m6809/m6809.h | 3 +- src/emu/cpu/mc68hc11/mc68hc11.c | 1 - src/emu/cpu/mcs51/mcs51.c | 2 - src/emu/cpu/mn10200/mn10200.c | 2 - src/emu/cpu/nec/nec.c | 1 - src/emu/cpu/nec/v25.c | 1 - src/emu/cpu/pic16c62x/pic16c62x.c | 1 - src/emu/cpu/powerpc/drc_ops.c | 1 - src/emu/cpu/powerpc/ppc.c | 10 - src/emu/cpu/powerpc/ppc403.c | 7 - src/emu/cpu/powerpc/ppc602.c | 2 - src/emu/cpu/powerpc/ppc_ops.c | 10 - src/emu/cpu/psx/psx.h | 6 +- src/emu/cpu/psx/rcnt.h | 9 +- src/emu/cpu/psx/sio.h | 3 +- src/emu/cpu/rsp/rsp.c | 7 - src/emu/cpu/rsp/rspdrc.c | 7 - src/emu/cpu/s2650/2650dasm.c | 2 - src/emu/cpu/sc61860/sc61860.c | 1 - src/emu/cpu/se3208/se3208.c | 1 - src/emu/cpu/se3208/se3208dis.c | 1 - src/emu/cpu/sh2/sh2.c | 1 - src/emu/cpu/sh2/sh2comn.c | 3 - src/emu/cpu/sh4/sh3comn.c | 7 - src/emu/cpu/sh4/sh4comn.c | 2 - src/emu/cpu/sharc/sharc.c | 1 - src/emu/cpu/sharc/sharcops.c | 1 - src/emu/cpu/tms32031/tms32031.h | 3 +- src/emu/cpu/tms34010/34010ops.h | 24 +- src/emu/cpu/tms34010/tms34010.c | 12 +- src/emu/cpu/tms7000/tms7000.c | 1 - src/emu/cpu/upd7725/upd7725.c | 1 - src/emu/cpu/upd7810/upd7810.c | 6 +- src/emu/cpu/x86emit.h | 1 - src/emu/cpu/z180/z180ops.h | 3 +- src/emu/debugint/debugint.c | 2 - src/emu/device.h | 12 +- src/emu/diexec.h | 21 +- src/emu/diserial.c | 1 - src/emu/dislot.h | 9 +- src/emu/disound.h | 15 +- src/emu/drawgfxm.h | 48 +- src/emu/driver.h | 21 +- src/emu/emucore.h | 3 +- src/emu/emuopts.c | 1 - src/emu/imagedev/cartslot.c | 2 - src/emu/imagedev/cartslot.h | 6 +- src/emu/imagedev/cassette.c | 2 - src/emu/imagedev/chd_cd.c | 1 - src/emu/imagedev/chd_cd.h | 3 +- src/emu/imagedev/flopdrv.c | 1 - src/emu/imagedev/floppy.h | 3 +- src/emu/imagedev/harddriv.c | 1 - src/emu/imagedev/harddriv.h | 6 +- src/emu/imagedev/printer.c | 1 - src/emu/imagedev/printer.h | 3 +- src/emu/imagedev/serial.c | 1 - src/emu/imagedev/serial.h | 3 +- src/emu/ioport.c | 3 +- src/emu/ioport.h | 43 +- src/emu/machine/6522via.c | 1 - src/emu/machine/6551acia.c | 1 - src/emu/machine/74123.c | 1 - src/emu/machine/7474.h | 6 +- src/emu/machine/8237dma.c | 1 - src/emu/machine/aakart.c | 1 - src/emu/machine/aakart.h | 3 +- src/emu/machine/am53cf96.h | 3 +- src/emu/machine/cdp1871.c | 1 - src/emu/machine/ctronics.c | 2 - src/emu/machine/ctronics.h | 6 +- src/emu/machine/eeprom.h | 9 +- src/emu/machine/er2055.h | 3 +- src/emu/machine/f3853.c | 1 - src/emu/machine/i8155.c | 1 - src/emu/machine/i8212.c | 1 - src/emu/machine/i8243.h | 9 +- src/emu/machine/i8251.c | 1 - src/emu/machine/i8355.c | 1 - src/emu/machine/idectrl.c | 1 - src/emu/machine/ins8154.c | 1 - src/emu/machine/jvsdev.h | 3 +- src/emu/machine/k033906.c | 1 - src/emu/machine/k056230.c | 1 - src/emu/machine/laserdsc.h | 30 +- src/emu/machine/lc89510.c | 2 - src/emu/machine/ldpr8210.h | 6 +- src/emu/machine/ldstub.h | 9 +- src/emu/machine/ldv1000.h | 3 +- src/emu/machine/ldvp931.h | 3 +- src/emu/machine/m6m80011ap.c | 2 - src/emu/machine/m6m80011ap.h | 3 +- src/emu/machine/msm6242.c | 1 - src/emu/machine/n68681.h | 3 +- src/emu/machine/net_lib.h | 81 +- src/emu/machine/netlist.c | 5 - src/emu/machine/netlist.h | 51 +- src/emu/machine/nvram.h | 27 +- src/emu/machine/pc16552d.c | 1 - src/emu/machine/pci.h | 15 +- src/emu/machine/roc10937.c | 2 - src/emu/machine/roc10937.h | 24 +- src/emu/machine/rtc65271.h | 3 +- src/emu/machine/rtc9701.c | 1 - src/emu/machine/rtc9701.h | 3 +- src/emu/machine/s3520cf.c | 1 - src/emu/machine/s3520cf.h | 3 +- src/emu/machine/s3c24xx.c | 1 - src/emu/machine/scsicb.h | 27 +- src/emu/machine/seibu_cop.c | 1 - src/emu/machine/seibu_cop.h | 3 +- src/emu/machine/tc009xlvc.c | 1 - src/emu/machine/timekpr.c | 1 - src/emu/machine/upd765.c | 1 - src/emu/machine/v3021.c | 1 - src/emu/machine/v3021.h | 3 +- src/emu/machine/wd17xx.c | 2 - src/emu/machine/x2212.h | 6 +- src/emu/mconfig.h | 57 +- src/emu/rendlay.c | 4 - src/emu/screen.h | 42 +- src/emu/softlist.c | 1 - src/emu/sound/2151intf.h | 6 +- src/emu/sound/aica.c | 1 - src/emu/sound/asc.h | 6 +- src/emu/sound/bsmt2000.h | 9 +- src/emu/sound/cdp1869.c | 1 - src/emu/sound/dac.h | 3 +- src/emu/sound/disc_wav.c | 1 - src/emu/sound/discrete.c | 4 - src/emu/sound/discrete.h | 4 +- src/emu/sound/es5503.h | 9 +- src/emu/sound/fm.c | 16 +- src/emu/sound/fm2612.c | 10 +- src/emu/sound/fmopl.c | 3 - src/emu/sound/gaelco.h | 12 +- src/emu/sound/ics2115.h | 6 +- src/emu/sound/k053260.c | 4 - src/emu/sound/k054539.h | 3 +- src/emu/sound/nile.h | 6 +- src/emu/sound/okim6295.h | 3 +- src/emu/sound/okim6376.c | 2 - src/emu/sound/qs1000.c | 1 - src/emu/sound/qs1000.h | 1 - src/emu/sound/qsound.h | 6 +- src/emu/sound/scsp.c | 1 - src/emu/sound/segapcm.h | 6 +- src/emu/sound/snkwave.h | 6 +- src/emu/sound/tms5110.c | 2 - src/emu/sound/votrax.h | 3 +- src/emu/sound/vrender0.h | 6 +- src/emu/sound/ym2151.c | 1 - src/emu/sound/ym2413.c | 4 - src/emu/sound/ymdeltat.c | 3 - src/emu/sound/ymf262.c | 3 - src/emu/speaker.h | 3 +- src/emu/timer.h | 36 +- src/emu/validity.c | 1 - src/emu/video/bufsprite.h | 12 +- src/emu/video/huc6272.c | 3 - src/emu/video/m50458.c | 1 - src/emu/video/m50458.h | 3 +- src/emu/video/mb90082.c | 1 - src/emu/video/mb90082.h | 3 +- src/emu/video/psx.c | 4 +- src/emu/video/ramdac.c | 1 - src/emu/video/resnet.c | 2 - src/emu/video/v9938.c | 6 +- src/emu/video/v9938.h | 6 +- src/emu/video/vooddefs.h | 36 +- src/lib/expat/xmlparse.c | 2 - src/lib/formats/ami_dsk.c | 1 - src/lib/formats/cassimg.h | 6 +- src/lib/formats/flopimg.h | 9 +- src/lib/formats/gtp_cas.c | 1 - src/lib/formats/kc_cas.c | 1 - src/lib/formats/pasti_dsk.c | 1 - src/lib/formats/primoptp.c | 2 - src/lib/formats/thom_cas.c | 2 - src/lib/formats/vg5k_cas.c | 1 - src/lib/lib7z/7zIn.c | 1 - src/lib/lib7z/Aes.c | 6 +- src/lib/lib7z/BwtSort.c | 3 +- src/lib/libflac/include/flac++/decoder.h | 1 - src/lib/libflac/include/flac++/encoder.h | 1 - src/lib/libflac/include/flac++/metadata.h | 1 - src/lib/libflac/include/flac/format.h | 3 - src/lib/libflac/include/flac/metadata.h | 1 - src/lib/libflac/include/flac/stream_decoder.h | 8 - src/lib/libflac/include/flac/stream_encoder.h | 6 - src/lib/libflac/libflac/bitreader.c | 2 - src/lib/libjpeg/jcmaster.c | 2 - src/lib/libjpeg/jdhuff.c | 5 - src/lib/libjpeg/jdinput.c | 2 - src/lib/libjpeg/jerror.h | 1 - src/lib/libjpeg/jpegtran.c | 1 - src/lib/portmidi/ptmacosx_cf.c | 1 - src/lib/softfloat/fsincos.c | 3 - src/lib/softfloat/fyl2x.c | 3 - src/lib/softfloat/softfloat.c | 20 - src/lib/util/opresolv.h | 21 +- src/lib/zlib/deflate.c | 3 - src/lib/zlib/trees.c | 1 - src/mame/audio/8080bw.c | 1 - src/mame/audio/astrof.c | 1 - src/mame/audio/circus.c | 1 - src/mame/audio/copsnrob.c | 1 - src/mame/audio/cyberbal.c | 1 - src/mame/audio/harddriv.c | 4 - src/mame/audio/jedi.c | 3 - src/mame/audio/mario.c | 2 - src/mame/audio/midway.h | 15 +- src/mame/audio/mw8080bw.c | 9 - src/mame/audio/n8080.c | 3 - src/mame/audio/seibu.h | 43 +- src/mame/audio/senjyo.c | 1 - src/mame/audio/williams.h | 9 +- src/mame/drivers/1942.c | 2 - src/mame/drivers/1943.c | 1 - src/mame/drivers/20pacgal.c | 5 - src/mame/drivers/2mindril.c | 9 - src/mame/drivers/30test.c | 2 - src/mame/drivers/39in1.c | 2 - src/mame/drivers/40love.c | 4 - src/mame/drivers/4enraya.c | 2 - src/mame/drivers/4roses.c | 1 - src/mame/drivers/5clown.c | 1 - src/mame/drivers/88games.c | 8 - src/mame/drivers/acesp.c | 178 +-- src/mame/drivers/actfancr.c | 4 - src/mame/drivers/adp.c | 3 - src/mame/drivers/aeroboto.c | 5 - src/mame/drivers/aerofgt.c | 1 - src/mame/drivers/airbustr.c | 4 - src/mame/drivers/albazc.c | 1 - src/mame/drivers/alg.c | 4 - src/mame/drivers/alien.c | 1 - src/mame/drivers/aliens.c | 7 - src/mame/drivers/alpha68k.c | 11 +- src/mame/drivers/amaticmg.c | 2 - src/mame/drivers/ampoker2.c | 1 - src/mame/drivers/amspdwy.c | 1 - src/mame/drivers/angelkds.c | 1 - src/mame/drivers/appoooh.c | 4 - src/mame/drivers/aquarium.c | 2 - src/mame/drivers/arabian.c | 5 - src/mame/drivers/arcadia.c | 1 - src/mame/drivers/aristmk4.c | 13 - src/mame/drivers/aristmk5.c | 4 +- src/mame/drivers/aristmk6.c | 1 - src/mame/drivers/arkanoid.c | 2 - src/mame/drivers/armedf.c | 16 - src/mame/drivers/ashnojoe.c | 2 - src/mame/drivers/asterix.c | 4 - src/mame/drivers/astinvad.c | 7 - src/mame/drivers/astrafr.c | 1 - src/mame/drivers/astrocorp.c | 3 - src/mame/drivers/astrof.c | 13 - src/mame/drivers/astropc.c | 1 - src/mame/drivers/asuka.c | 2 - src/mame/drivers/atarifb.c | 2 - src/mame/drivers/atarig42.c | 1 - src/mame/drivers/atarigt.c | 2 - src/mame/drivers/atarigx2.c | 4 - src/mame/drivers/atarisy2.c | 3 - src/mame/drivers/atetris.c | 4 - src/mame/drivers/avalnche.c | 2 - src/mame/drivers/avt.c | 1 - src/mame/drivers/backfire.c | 7 - src/mame/drivers/badlands.c | 2 - src/mame/drivers/bagman.c | 3 - src/mame/drivers/bankp.c | 2 - src/mame/drivers/baraduke.c | 1 - src/mame/drivers/battlane.c | 4 - src/mame/drivers/battlex.c | 2 - src/mame/drivers/battlnts.c | 1 - src/mame/drivers/bbusters.c | 4 - src/mame/drivers/beathead.c | 1 - src/mame/drivers/beezer.c | 1 - src/mame/drivers/bfcobra.c | 1 - src/mame/drivers/bfm_ad5sw.c | 96 +- src/mame/drivers/bfm_sc1.c | 45 +- src/mame/drivers/bfm_sc2.c | 116 +- src/mame/drivers/bfm_sc4.c | 4 +- src/mame/drivers/bfm_sc4h.c | 3 - src/mame/drivers/bfm_swp.c | 1 - src/mame/drivers/bfmsys85.c | 2 - src/mame/drivers/bigevglf.c | 4 - src/mame/drivers/bingoc.c | 2 - src/mame/drivers/bingoman.c | 1 - src/mame/drivers/bionicc.c | 7 - src/mame/drivers/bishi.c | 1 - src/mame/drivers/bking.c | 4 - src/mame/drivers/blackt96.c | 4 +- src/mame/drivers/bladestl.c | 2 - src/mame/drivers/blktiger.c | 2 - src/mame/drivers/blmbycar.c | 7 - src/mame/drivers/blockade.c | 3 - src/mame/drivers/blockhl.c | 6 - src/mame/drivers/blockout.c | 5 - src/mame/drivers/bmcpokr.c | 1 - src/mame/drivers/bnstars.c | 2 - src/mame/drivers/bogeyman.c | 4 - src/mame/drivers/bombjack.c | 4 - src/mame/drivers/bottom9.c | 9 - src/mame/drivers/boxer.c | 1 - src/mame/drivers/brkthru.c | 4 - src/mame/drivers/bsktball.c | 2 - src/mame/drivers/bublbobl.c | 11 - src/mame/drivers/buggychl.c | 2 - src/mame/drivers/bwing.c | 6 - src/mame/drivers/cabal.c | 4 - src/mame/drivers/calorie.c | 3 - src/mame/drivers/capbowl.c | 3 - src/mame/drivers/carjmbre.c | 3 - src/mame/drivers/carrera.c | 1 - src/mame/drivers/cave.c | 14 +- src/mame/drivers/cball.c | 1 - src/mame/drivers/cbasebal.c | 5 - src/mame/drivers/cbuster.c | 4 - src/mame/drivers/ccastles.c | 1 - src/mame/drivers/cchance.c | 5 - src/mame/drivers/cclimber.c | 3 - src/mame/drivers/cd32.c | 3 +- src/mame/drivers/cdi.c | 1 - src/mame/drivers/centiped.c | 4 - src/mame/drivers/chaknpop.c | 1 - src/mame/drivers/champbas.c | 5 - src/mame/drivers/champbwl.c | 1 - src/mame/drivers/chanbara.c | 7 - src/mame/drivers/chance32.c | 4 - src/mame/drivers/changela.c | 4 - src/mame/drivers/cheekyms.c | 3 - src/mame/drivers/chihiro.c | 3 +- src/mame/drivers/chinagat.c | 2 - src/mame/drivers/chinsan.c | 5 - src/mame/drivers/chqflag.c | 2 - src/mame/drivers/cidelsa.c | 2 - src/mame/drivers/cinemat.c | 3 +- src/mame/drivers/circus.c | 2 - src/mame/drivers/circusc.c | 4 - src/mame/drivers/citycon.c | 2 - src/mame/drivers/clayshoo.c | 1 - src/mame/drivers/cliffhgr.c | 1 - src/mame/drivers/cmmb.c | 1 - src/mame/drivers/cninja.c | 1 - src/mame/drivers/cntsteer.c | 6 - src/mame/drivers/cobra.c | 9 - src/mame/drivers/coinmvga.c | 1 - src/mame/drivers/combatsc.c | 5 - src/mame/drivers/commando.c | 2 - src/mame/drivers/compgolf.c | 3 - src/mame/drivers/coolpool.c | 15 - src/mame/drivers/coolridr.c | 2 - src/mame/drivers/cop01.c | 4 - src/mame/drivers/cops.c | 1 - src/mame/drivers/copsnrob.c | 3 - src/mame/drivers/cosmic.c | 5 - src/mame/drivers/cps1.c | 3 - src/mame/drivers/cps2.c | 4 - src/mame/drivers/cps3.c | 2 - src/mame/drivers/crbaloon.c | 1 - src/mame/drivers/crgolf.c | 7 - src/mame/drivers/crimfght.c | 3 - src/mame/drivers/crospang.c | 2 - src/mame/drivers/crshrace.c | 3 - src/mame/drivers/crystal.c | 5 - src/mame/drivers/cupidon.c | 1 - src/mame/drivers/cvs.c | 18 +- src/mame/drivers/cyclemb.c | 3 - src/mame/drivers/dacholer.c | 3 - src/mame/drivers/dai3wksi.c | 3 - src/mame/drivers/darius.c | 11 - src/mame/drivers/dassault.c | 1 - src/mame/drivers/dblewing.c | 5 - src/mame/drivers/dbz.c | 1 - src/mame/drivers/dcheese.c | 3 - src/mame/drivers/dday.c | 2 - src/mame/drivers/ddayjlc.c | 6 - src/mame/drivers/ddealer.c | 6 +- src/mame/drivers/ddenlovr.c | 1 - src/mame/drivers/ddragon.c | 5 - src/mame/drivers/ddragon3.c | 2 - src/mame/drivers/ddz.c | 1 - src/mame/drivers/dec0.c | 1 - src/mame/drivers/dec8.c | 8 - src/mame/drivers/deco32.c | 2 - src/mame/drivers/decocass.c | 12 +- src/mame/drivers/deniam.c | 1 - src/mame/drivers/destroyr.c | 4 - src/mame/drivers/dietgo.c | 1 - src/mame/drivers/discoboy.c | 8 - src/mame/drivers/diverboy.c | 2 - src/mame/drivers/djboy.c | 10 - src/mame/drivers/dkong.c | 2 - src/mame/drivers/dlair2.c | 1 - src/mame/drivers/docastle.c | 1 - src/mame/drivers/dogfgt.c | 2 - src/mame/drivers/dooyong.c | 1 - src/mame/drivers/dorachan.c | 3 - src/mame/drivers/dotrikun.c | 1 - src/mame/drivers/dreamwld.c | 3 - src/mame/drivers/drgnmst.c | 4 - src/mame/drivers/dribling.c | 8 - src/mame/drivers/drmicro.c | 4 - src/mame/drivers/drtomy.c | 5 - src/mame/drivers/drw80pkr.c | 1 - src/mame/drivers/dunhuang.c | 2 - src/mame/drivers/dwarfd.c | 7 - src/mame/drivers/dynadice.c | 1 - src/mame/drivers/dynax.c | 12 - src/mame/drivers/ecoinf1.c | 1 - src/mame/drivers/ecoinf2.c | 1 - src/mame/drivers/ecoinf3.c | 2 - src/mame/drivers/ecoinfr.c | 78 +- src/mame/drivers/egghunt.c | 2 - src/mame/drivers/embargo.c | 3 - src/mame/drivers/eolith.c | 2 - src/mame/drivers/eolithsp.c | 1 - src/mame/drivers/epos.c | 3 - src/mame/drivers/eprom.c | 2 - src/mame/drivers/equites.c | 4 - src/mame/drivers/esd16.c | 20 +- src/mame/drivers/espial.c | 3 - src/mame/drivers/exedexes.c | 2 - src/mame/drivers/exerion.c | 1 - src/mame/drivers/expro02.c | 2 - src/mame/drivers/exprraid.c | 3 - src/mame/drivers/extrema.c | 3 +- src/mame/drivers/f1gp.c | 3 - src/mame/drivers/famibox.c | 4 - src/mame/drivers/fantland.c | 2 - src/mame/drivers/fastfred.c | 6 - src/mame/drivers/fastlane.c | 1 - src/mame/drivers/fcombat.c | 4 - src/mame/drivers/feversoc.c | 1 - src/mame/drivers/fgoal.c | 4 - src/mame/drivers/finalizr.c | 4 - src/mame/drivers/firebeat.c | 1 - src/mame/drivers/firetrap.c | 2 - src/mame/drivers/firetrk.c | 1 - src/mame/drivers/fitfight.c | 2 - src/mame/drivers/flkatck.c | 3 - src/mame/drivers/flstory.c | 3 - src/mame/drivers/flyball.c | 1 - src/mame/drivers/forte2.c | 1 - src/mame/drivers/fromanc2.c | 4 - src/mame/drivers/fromance.c | 2 - src/mame/drivers/funkball.c | 4 - src/mame/drivers/funkybee.c | 2 - src/mame/drivers/funkyjet.c | 1 - src/mame/drivers/fuukifg3.c | 1 - src/mame/drivers/gaelco.c | 6 - src/mame/drivers/gaiden.c | 6 - src/mame/drivers/galaga.c | 5 - src/mame/drivers/galastrm.c | 1 - src/mame/drivers/galaxi.c | 4 - src/mame/drivers/galaxian.c | 4 - src/mame/drivers/galgame.c | 2 - src/mame/drivers/galivan.c | 7 - src/mame/drivers/galpani3.c | 3 - src/mame/drivers/galspnbl.c | 2 - src/mame/drivers/gameplan.c | 3 - src/mame/drivers/gamtor.c | 1 - src/mame/drivers/gaplus.c | 3 - src/mame/drivers/gatron.c | 1 - src/mame/drivers/gberet.c | 3 - src/mame/drivers/gbusters.c | 7 - src/mame/drivers/gcpinbal.c | 2 - src/mame/drivers/gei.c | 1 - src/mame/drivers/ggconnie.c | 1 - src/mame/drivers/gijoe.c | 4 - src/mame/drivers/ginganin.c | 2 - src/mame/drivers/glass.c | 2 - src/mame/drivers/globalfr.c | 4 +- src/mame/drivers/gng.c | 2 - src/mame/drivers/goal92.c | 1 - src/mame/drivers/goindol.c | 7 - src/mame/drivers/goldngam.c | 3 - src/mame/drivers/goldnpkr.c | 1 - src/mame/drivers/goldstar.c | 4 - src/mame/drivers/gotcha.c | 1 - src/mame/drivers/gotya.c | 2 - src/mame/drivers/gradius3.c | 7 - src/mame/drivers/grchamp.c | 2 - src/mame/drivers/gstream.c | 2 - src/mame/drivers/gsword.c | 1 - src/mame/drivers/gundealr.c | 1 - src/mame/drivers/gunsmoke.c | 1 - src/mame/drivers/gyruss.c | 3 - src/mame/drivers/halleys.c | 3 - src/mame/drivers/hanaawas.c | 2 - src/mame/drivers/hcastle.c | 1 - src/mame/drivers/highvdeo.c | 1 - src/mame/drivers/hikaru.c | 4 +- src/mame/drivers/himesiki.c | 1 - src/mame/drivers/hitme.c | 3 - src/mame/drivers/hnayayoi.c | 2 - src/mame/drivers/hng64.c | 21 - src/mame/drivers/homedata.c | 4 - src/mame/drivers/hotstuff.c | 1 - src/mame/drivers/hshavoc.c | 1 - src/mame/drivers/hvyunit.c | 17 - src/mame/drivers/hyperspt.c | 2 - src/mame/drivers/hyprduel.c | 6 - src/mame/drivers/icecold.c | 1 - src/mame/drivers/ichiban.c | 1 - src/mame/drivers/igs011.c | 2 - src/mame/drivers/igspc.c | 1 - src/mame/drivers/ikki.c | 3 - src/mame/drivers/imolagp.c | 4 - src/mame/drivers/inufuku.c | 1 - src/mame/drivers/ironhors.c | 4 - src/mame/drivers/jackal.c | 2 - src/mame/drivers/jackie.c | 1 - src/mame/drivers/jailbrek.c | 3 - src/mame/drivers/jangou.c | 9 - src/mame/drivers/jantotsu.c | 4 - src/mame/drivers/jchan.c | 8 - src/mame/drivers/jclub2.c | 3 - src/mame/drivers/jedi.c | 5 - src/mame/drivers/jollyjgr.c | 5 - src/mame/drivers/jongkyo.c | 3 - src/mame/drivers/jpmimpct.c | 3 - src/mame/drivers/jpmimpctsw.c | 468 +++---- src/mame/drivers/jpmsys5.c | 3 +- src/mame/drivers/jpmsys5sw.c | 36 +- src/mame/drivers/jrpacman.c | 3 - src/mame/drivers/jubilee.c | 1 - src/mame/drivers/junofrst.c | 12 - src/mame/drivers/kangaroo.c | 1 - src/mame/drivers/karnov.c | 4 - src/mame/drivers/kas89.c | 4 +- src/mame/drivers/kchamp.c | 4 - src/mame/drivers/kickgoal.c | 3 - src/mame/drivers/kingobox.c | 3 - src/mame/drivers/kncljoe.c | 3 - src/mame/drivers/koikoi.c | 2 - src/mame/drivers/konamigv.c | 7 - src/mame/drivers/konamigx.c | 1 - src/mame/drivers/kontest.c | 1 - src/mame/drivers/kopunch.c | 4 - src/mame/drivers/ksayakyu.c | 1 - src/mame/drivers/ksys573.c | 8 - src/mame/drivers/kungfur.c | 3 - src/mame/drivers/kyugo.c | 1 - src/mame/drivers/ladybug.c | 4 - src/mame/drivers/ladyfrog.c | 5 - src/mame/drivers/laserbas.c | 9 - src/mame/drivers/laserbat.c | 5 - src/mame/drivers/lasso.c | 5 - src/mame/drivers/lastduel.c | 1 - src/mame/drivers/lastfght.c | 15 - src/mame/drivers/lazercmd.c | 5 - src/mame/drivers/lemmings.c | 2 - src/mame/drivers/lethal.c | 3 - src/mame/drivers/liberate.c | 2 - src/mame/drivers/limenko.c | 2 - src/mame/drivers/littlerb.c | 4 - src/mame/drivers/lkage.c | 3 - src/mame/drivers/lockon.c | 3 - src/mame/drivers/looping.c | 1 - src/mame/drivers/lsasquad.c | 2 - src/mame/drivers/lwings.c | 4 - src/mame/drivers/m10.c | 6 - src/mame/drivers/m107.c | 1 - src/mame/drivers/m14.c | 9 - src/mame/drivers/m62.c | 2 - src/mame/drivers/m63.c | 17 - src/mame/drivers/m72.c | 1 - src/mame/drivers/m92.c | 1 - src/mame/drivers/macrossp.c | 7 - src/mame/drivers/macs.c | 6 +- src/mame/drivers/madmotor.c | 3 - src/mame/drivers/magicard.c | 1 - src/mame/drivers/magictg.c | 2 - src/mame/drivers/mainevt.c | 10 - src/mame/drivers/mainsnk.c | 3 - src/mame/drivers/majorpkr.c | 9 - src/mame/drivers/malzak.c | 3 - src/mame/drivers/mappy.c | 6 - src/mame/drivers/marineb.c | 6 - src/mame/drivers/marinedt.c | 4 - src/mame/drivers/mario.c | 2 - src/mame/drivers/matmania.c | 3 - src/mame/drivers/maygay1b.c | 1 - src/mame/drivers/maygay1bsw.c | 222 +-- src/mame/drivers/maygayep.c | 169 +-- src/mame/drivers/maygayv1.c | 7 +- src/mame/drivers/mayumi.c | 2 - src/mame/drivers/mazerbla.c | 10 - src/mame/drivers/mcatadv.c | 1 - src/mame/drivers/mediagx.c | 11 - src/mame/drivers/megaplay.c | 4 +- src/mame/drivers/megasys1.c | 2 - src/mame/drivers/megatech.c | 4 +- src/mame/drivers/megazone.c | 5 - src/mame/drivers/meijinsn.c | 2 - src/mame/drivers/meritm.c | 1 - src/mame/drivers/mermaid.c | 7 - src/mame/drivers/metalmx.c | 11 - src/mame/drivers/metlclsh.c | 2 - src/mame/drivers/metro.c | 6 +- src/mame/drivers/mexico86.c | 1 - src/mame/drivers/mgolf.c | 1 - src/mame/drivers/midqslvr.c | 1 - src/mame/drivers/midzeus.c | 1 - src/mame/drivers/mikie.c | 5 - src/mame/drivers/mirage.c | 3 - src/mame/drivers/missb2.c | 4 - src/mame/drivers/missile.c | 1 - src/mame/drivers/mitchell.c | 5 - src/mame/drivers/mjkjidai.c | 2 - src/mame/drivers/mjsister.c | 2 - src/mame/drivers/model1.c | 3 +- src/mame/drivers/model2.c | 7 +- src/mame/drivers/model3.c | 3 - src/mame/drivers/mogura.c | 1 - src/mame/drivers/mole.c | 1 - src/mame/drivers/momoko.c | 1 - src/mame/drivers/moo.c | 3 - src/mame/drivers/mosaic.c | 4 - src/mame/drivers/mouser.c | 3 - src/mame/drivers/mpoker.c | 1 - src/mame/drivers/mpu12wbk.c | 1 - src/mame/drivers/mpu2.c | 3 +- src/mame/drivers/mpu3.c | 1 - src/mame/drivers/mpu4.c | 72 +- src/mame/drivers/mpu4avan.c | 99 +- src/mame/drivers/mpu4bwb.c | 312 ++--- src/mame/drivers/mpu4concept.c | 24 +- src/mame/drivers/mpu4crystal.c | 87 +- src/mame/drivers/mpu4dealem.c | 1 - src/mame/drivers/mpu4hw.c | 2 - src/mame/drivers/mpu4misc.c | 78 +- src/mame/drivers/mpu4mod4yam.c | 48 +- src/mame/drivers/mpu4plasma.c | 14 +- src/mame/drivers/mpu4sw.c | 603 +++----- src/mame/drivers/mpu4vid.c | 3 - src/mame/drivers/mrflea.c | 4 - src/mame/drivers/msisaac.c | 2 - src/mame/drivers/mugsmash.c | 2 - src/mame/drivers/multfish.c | 10 - src/mame/drivers/multigam.c | 1 - src/mame/drivers/munchmo.c | 5 - src/mame/drivers/murogmbl.c | 1 - src/mame/drivers/mwarr.c | 8 - src/mame/drivers/mystston.c | 1 - src/mame/drivers/n8080.c | 5 - src/mame/drivers/namcos11.c | 8 - src/mame/drivers/namcos12.c | 13 - src/mame/drivers/namcos21.c | 6 +- src/mame/drivers/namcos22.c | 1 - src/mame/drivers/naomi.c | 7 +- src/mame/drivers/nbmj9195.c | 2 - src/mame/drivers/nemesis.c | 4 - src/mame/drivers/neodrvr.c | 9 +- src/mame/drivers/neogeo.c | 7 - src/mame/drivers/neoprint.c | 3 - src/mame/drivers/neptunp2.c | 1 - src/mame/drivers/news.c | 2 - src/mame/drivers/nexus3d.c | 2 - src/mame/drivers/nightgal.c | 7 - src/mame/drivers/ninjaw.c | 6 - src/mame/drivers/nmg5.c | 7 - src/mame/drivers/nmk16.c | 4 +- src/mame/drivers/nsmpoker.c | 1 - src/mame/drivers/nss.c | 2 - src/mame/drivers/nycaptor.c | 4 - src/mame/drivers/nyny.c | 8 - src/mame/drivers/offtwall.c | 4 - src/mame/drivers/ohmygod.c | 2 - src/mame/drivers/ojankohs.c | 4 - src/mame/drivers/olibochu.c | 2 - src/mame/drivers/oneshot.c | 4 - src/mame/drivers/opwolf.c | 2 - src/mame/drivers/orbit.c | 1 - src/mame/drivers/othello.c | 5 - src/mame/drivers/othldrby.c | 2 - src/mame/drivers/othunder.c | 7 - src/mame/drivers/overdriv.c | 4 - src/mame/drivers/pachifev.c | 4 - src/mame/drivers/pacland.c | 2 - src/mame/drivers/pacman.c | 4 - src/mame/drivers/pandoras.c | 7 - src/mame/drivers/panicr.c | 1 - src/mame/drivers/paradise.c | 5 +- src/mame/drivers/parodius.c | 7 - src/mame/drivers/pasha2.c | 6 - src/mame/drivers/pbaction.c | 5 - src/mame/drivers/pcat_dyn.c | 1 - src/mame/drivers/pcxt.c | 3 - src/mame/drivers/pengadvb.c | 2 - src/mame/drivers/pengo.c | 3 - src/mame/drivers/peyper.c | 1 - src/mame/drivers/pgm.c | 9 +- src/mame/drivers/pgm2.c | 4 - src/mame/drivers/pinkiri8.c | 4 - src/mame/drivers/pipedrm.c | 2 - src/mame/drivers/pktgaldx.c | 1 - src/mame/drivers/playch10.c | 4 +- src/mame/drivers/playmark.c | 6 - src/mame/drivers/plygonet.c | 2 - src/mame/drivers/pntnpuzl.c | 1 - src/mame/drivers/polyplay.c | 1 - src/mame/drivers/pong.c | 2 - src/mame/drivers/pooyan.c | 3 - src/mame/drivers/popobear.c | 2 - src/mame/drivers/popper.c | 4 - src/mame/drivers/potgoldu.c | 3 - src/mame/drivers/powerbal.c | 6 - src/mame/drivers/proconn.c | 10 +- src/mame/drivers/psattack.c | 6 - src/mame/drivers/psikyo.c | 12 - src/mame/drivers/psikyo4.c | 4 - src/mame/drivers/psikyosh.c | 1 - src/mame/drivers/punchout.c | 2 - src/mame/drivers/pushman.c | 8 - src/mame/drivers/pzletime.c | 4 - src/mame/drivers/qdrmfgp.c | 2 - src/mame/drivers/quasar.c | 3 - src/mame/drivers/quizshow.c | 2 - src/mame/drivers/rabbit.c | 1 - src/mame/drivers/raiden.c | 1 - src/mame/drivers/rainbow.c | 2 - src/mame/drivers/rallyx.c | 6 - src/mame/drivers/rastan.c | 1 - src/mame/drivers/rastersp.c | 2 - src/mame/drivers/rcorsair.c | 1 - src/mame/drivers/redclash.c | 2 - src/mame/drivers/retofinv.c | 2 - src/mame/drivers/rgum.c | 1 - src/mame/drivers/rltennis.c | 2 - src/mame/drivers/rockrage.c | 1 - src/mame/drivers/rocnrope.c | 2 - src/mame/drivers/rohga.c | 1 - src/mame/drivers/rollerg.c | 2 - src/mame/drivers/rollrace.c | 4 - src/mame/drivers/royalmah.c | 1 - src/mame/drivers/rungun.c | 7 - src/mame/drivers/s11.c | 1 - src/mame/drivers/safarir.c | 6 - src/mame/drivers/sandscrp.c | 9 - src/mame/drivers/saturn.c | 1 - src/mame/drivers/sbasketb.c | 2 - src/mame/drivers/sbowling.c | 5 - src/mame/drivers/scotrsht.c | 2 - src/mame/drivers/scregg.c | 2 - src/mame/drivers/segac2.c | 1 - src/mame/drivers/segag80r.c | 1 - src/mame/drivers/segajw.c | 2 - src/mame/drivers/segald.c | 8 - src/mame/drivers/segas16b.c | 3 +- src/mame/drivers/seibuspi.c | 1 - src/mame/drivers/seicross.c | 3 - src/mame/drivers/senjyo.c | 6 - src/mame/drivers/seta.c | 10 - src/mame/drivers/seta2.c | 9 - src/mame/drivers/sf.c | 3 - src/mame/drivers/sfbonus.c | 3 - src/mame/drivers/sfcbox.c | 6 +- src/mame/drivers/shadfrce.c | 2 - src/mame/drivers/shougi.c | 3 - src/mame/drivers/shtzone.c | 4 - src/mame/drivers/sigmab52.c | 3 - src/mame/drivers/silkroad.c | 1 - src/mame/drivers/silvmil.c | 4 - src/mame/drivers/simpsons.c | 1 - src/mame/drivers/skeetsht.c | 6 - src/mame/drivers/skimaxx.c | 1 - src/mame/drivers/skyarmy.c | 5 - src/mame/drivers/skyfox.c | 3 - src/mame/drivers/skykid.c | 2 - src/mame/drivers/skylncr.c | 3 - src/mame/drivers/skyraid.c | 3 - src/mame/drivers/slapfght.c | 1 - src/mame/drivers/slapshot.c | 1 - src/mame/drivers/sliver.c | 9 - src/mame/drivers/snk.c | 13 +- src/mame/drivers/snk6502.c | 2 - src/mame/drivers/snk68.c | 2 - src/mame/drivers/solomon.c | 2 - src/mame/drivers/sonson.c | 2 - src/mame/drivers/spcforce.c | 5 - src/mame/drivers/speedatk.c | 5 - src/mame/drivers/splash.c | 6 - src/mame/drivers/splus.c | 8 - src/mame/drivers/spoker.c | 12 - src/mame/drivers/spool99.c | 5 - src/mame/drivers/sprcros2.c | 2 - src/mame/drivers/spy.c | 7 - src/mame/drivers/srmp5.c | 16 - src/mame/drivers/srmp6.c | 10 - src/mame/drivers/sshot.c | 2 - src/mame/drivers/ssingles.c | 6 - src/mame/drivers/sslam.c | 4 - src/mame/drivers/ssozumo.c | 2 - src/mame/drivers/sstrangr.c | 1 - src/mame/drivers/ssv.c | 17 +- src/mame/drivers/st0016.c | 1 - src/mame/drivers/stactics.c | 5 - src/mame/drivers/stlforce.c | 2 - src/mame/drivers/strnskil.c | 1 - src/mame/drivers/stv.c | 37 +- src/mame/drivers/su2000.c | 2 - src/mame/drivers/sub.c | 2 - src/mame/drivers/subsino2.c | 1 - src/mame/drivers/summit.c | 1 - src/mame/drivers/supbtime.c | 1 - src/mame/drivers/superchs.c | 1 - src/mame/drivers/superdq.c | 7 - src/mame/drivers/superqix.c | 3 - src/mame/drivers/supertnk.c | 3 - src/mame/drivers/superwng.c | 4 - src/mame/drivers/suprgolf.c | 10 - src/mame/drivers/suprslam.c | 2 - src/mame/drivers/surpratk.c | 4 - src/mame/drivers/system16.c | 23 - src/mame/drivers/tagteam.c | 2 - src/mame/drivers/tail2nos.c | 2 - src/mame/drivers/taito_b.c | 4 - src/mame/drivers/taito_f2.c | 7 - src/mame/drivers/taito_l.c | 10 - src/mame/drivers/taito_o.c | 1 - src/mame/drivers/taito_x.c | 2 - src/mame/drivers/taito_z.c | 3 - src/mame/drivers/taitoair.c | 5 - src/mame/drivers/taitojc.c | 4 - src/mame/drivers/taitopjc.c | 1 - src/mame/drivers/taitotz.c | 10 - src/mame/drivers/tankbust.c | 1 - src/mame/drivers/tapatune.c | 3 - src/mame/drivers/tattack.c | 1 - src/mame/drivers/tetrisp2.c | 1 - src/mame/drivers/thayers.c | 1 - src/mame/drivers/thedeep.c | 2 - src/mame/drivers/thepit.c | 2 - src/mame/drivers/thunderj.c | 1 - src/mame/drivers/thunderx.c | 10 - src/mame/drivers/timetrv.c | 1 - src/mame/drivers/tmaster.c | 1 - src/mame/drivers/tmmjprd.c | 1 - src/mame/drivers/tmnt.c | 1 - src/mame/drivers/toaplan2.c | 26 +- src/mame/drivers/topspeed.c | 2 - src/mame/drivers/toratora.c | 2 - src/mame/drivers/toypop.c | 3 - src/mame/drivers/tp84.c | 2 - src/mame/drivers/trackfld.c | 7 - src/mame/drivers/travrusa.c | 1 - src/mame/drivers/triforce.c | 6 +- src/mame/drivers/trucocl.c | 2 - src/mame/drivers/trvmadns.c | 1 - src/mame/drivers/trvquest.c | 2 - src/mame/drivers/tumbleb.c | 4 - src/mame/drivers/tumblep.c | 1 - src/mame/drivers/tutankhm.c | 4 - src/mame/drivers/twinkle.c | 12 - src/mame/drivers/ultraman.c | 3 - src/mame/drivers/umipoker.c | 9 - src/mame/drivers/unkhorse.c | 1 - src/mame/drivers/vamphalf.c | 2 - src/mame/drivers/vaportra.c | 3 - src/mame/drivers/vastar.c | 1 - src/mame/drivers/vega.c | 16 - src/mame/drivers/vegaeo.c | 3 - src/mame/drivers/vendetta.c | 2 - src/mame/drivers/videopin.c | 1 - src/mame/drivers/viper.c | 4 +- src/mame/drivers/vlc.c | 2 - src/mame/drivers/volfied.c | 1 - src/mame/drivers/warpsped.c | 3 - src/mame/drivers/warpwarp.c | 1 - src/mame/drivers/warriorb.c | 6 - src/mame/drivers/welltris.c | 3 - src/mame/drivers/wgp.c | 4 - src/mame/drivers/wheelfir.c | 10 - src/mame/drivers/wiping.c | 4 - src/mame/drivers/witch.c | 2 - src/mame/drivers/wiz.c | 4 - src/mame/drivers/wms.c | 1 - src/mame/drivers/wwfsstar.c | 2 - src/mame/drivers/xexex.c | 6 - src/mame/drivers/xmen.c | 2 - src/mame/drivers/xtom3d.c | 1 - src/mame/drivers/xyonix.c | 1 - src/mame/drivers/yiear.c | 4 - src/mame/drivers/yunsun16.c | 2 - src/mame/drivers/yunsung8.c | 1 - src/mame/drivers/zaccaria.c | 3 - src/mame/drivers/zaxxon.c | 5 - src/mame/drivers/zn.c | 2 - src/mame/drivers/zodiack.c | 1 - src/mame/etc/template_device.c | 2 - src/mame/etc/template_device.h | 3 +- src/mame/etc/template_driver.c | 1 - src/mame/includes/bfm_sc45.h | 1853 ++++++++----------------- src/mame/includes/dec0.h | 1 - src/mame/includes/gottlieb.h | 12 +- src/mame/includes/iremipt.h | 6 +- src/mame/includes/konamipt.h | 3 +- src/mame/includes/maygay1b.h | 1 - src/mame/includes/namcoic.h | 3 +- src/mame/includes/pgm.h | 6 - src/mame/includes/segaipt.h | 3 +- src/mame/machine/3do.c | 1 - src/mame/machine/ajax.c | 4 - src/mame/machine/amiga.c | 3 - src/mame/machine/arkanoid.c | 7 - src/mame/machine/atari.c | 1 - src/mame/machine/atarifb.c | 3 - src/mame/machine/balsente.c | 8 - src/mame/machine/bfm_bd1.c | 2 - src/mame/machine/bfm_bd1.h | 6 +- src/mame/machine/bfm_bda.c | 3 - src/mame/machine/bfm_bda.h | 6 +- src/mame/machine/bigevglf.c | 4 - src/mame/machine/bublbobl.c | 6 - src/mame/machine/cdicdic.h | 6 +- src/mame/machine/cdislave.h | 6 +- src/mame/machine/dc.c | 7 - src/mame/machine/decocass.c | 1 - src/mame/machine/flstory.c | 5 - src/mame/machine/irobot.c | 2 - src/mame/machine/kaneko_calc3.c | 2 - src/mame/machine/kaneko_hit.c | 1 - src/mame/machine/kaneko_toybox.c | 1 - src/mame/machine/konamigx.c | 2 - src/mame/machine/lkage.c | 7 - src/mame/machine/lsasquad.c | 9 - src/mame/machine/md_cart.c | 2 - src/mame/machine/mega32x.c | 19 +- src/mame/machine/megacd.c | 36 - src/mame/machine/megacd.h | 33 +- src/mame/machine/megacdcd.c | 10 - src/mame/machine/megacdcd.h | 48 +- src/mame/machine/megadriv.c | 3 - src/mame/machine/megavdp.c | 8 - src/mame/machine/mexico86.c | 4 - src/mame/machine/micro3d.c | 3 - src/mame/machine/mw8080bw.c | 1 - src/mame/machine/n64.c | 1 - src/mame/machine/namco50.h | 3 +- src/mame/machine/namcond1.c | 1 - src/mame/machine/naomim2.c | 1 - src/mame/machine/nb1413m3.c | 1 - src/mame/machine/neoboot.c | 1 - src/mame/machine/nitedrvr.c | 4 - src/mame/machine/nycaptor.c | 5 - src/mame/machine/opwolf.c | 4 - src/mame/machine/pgmcrypt.c | 68 +- src/mame/machine/pgmprot1.c | 1 - src/mame/machine/pgmprot4.c | 6 - src/mame/machine/qix.c | 14 - src/mame/machine/rainbow.c | 1 - src/mame/machine/scudsp.c | 1 - src/mame/machine/segaic16.h | 18 +- src/mame/machine/segamsys.c | 4 - src/mame/machine/seicop.c | 3 +- src/mame/machine/simpsons.c | 3 - src/mame/machine/slapfght.c | 3 - src/mame/machine/snes.c | 2 - src/mame/machine/snesbsx.c | 1 - src/mame/machine/starwars.c | 1 - src/mame/machine/steppers.c | 1 - src/mame/machine/stvprot.c | 2 - src/mame/machine/taitoio.c | 2 - src/mame/machine/ticket.h | 3 +- src/mame/machine/tnzs.c | 3 - src/mame/machine/toaplan1.c | 8 - src/mame/machine/twincobr.c | 1 - src/mame/machine/tx1.c | 1 - src/mame/machine/vertigo.c | 1 - src/mame/machine/volfied.c | 3 - src/mame/machine/vsnes.c | 5 - src/mame/machine/xevious.c | 1 - src/mame/machine/zndip.h | 3 +- src/mame/machine/zs01.h | 3 +- src/mame/video/1942.c | 5 - src/mame/video/1943.c | 4 - src/mame/video/20pacgal.c | 1 - src/mame/video/4enraya.c | 4 - src/mame/video/88games.c | 1 - src/mame/video/actfancr.c | 1 - src/mame/video/aeroboto.c | 5 - src/mame/video/airbustr.c | 3 - src/mame/video/ajax.c | 2 - src/mame/video/aliens.c | 2 - src/mame/video/alpha68k.c | 3 - src/mame/video/amigaaga.c | 1 - src/mame/video/angelkds.c | 10 - src/mame/video/appoooh.c | 1 - src/mame/video/arabian.c | 1 - src/mame/video/arcadecl.c | 1 - src/mame/video/arkanoid.c | 4 - src/mame/video/armedf.c | 5 - src/mame/video/ashnojoe.c | 11 - src/mame/video/astrocde.c | 2 - src/mame/video/asuka.c | 1 - src/mame/video/atarifb.c | 4 - src/mame/video/atarig1.c | 2 - src/mame/video/atarig42.c | 1 - src/mame/video/atarigt.c | 1 - src/mame/video/atarigx2.c | 1 - src/mame/video/atetris.c | 2 - src/mame/video/avgdvg.c | 2 - src/mame/video/awpvid.c | 1 - src/mame/video/balsente.c | 3 - src/mame/video/bankp.c | 7 - src/mame/video/battlane.c | 1 - src/mame/video/battlera.c | 2 - src/mame/video/battlex.c | 1 - src/mame/video/battlnts.c | 1 - src/mame/video/bbusters.c | 8 - src/mame/video/bfm_dm01.c | 2 - src/mame/video/bigevglf.c | 3 - src/mame/video/bigstrkb.c | 1 - src/mame/video/bionicc.c | 10 - src/mame/video/bishi.c | 1 - src/mame/video/bking.c | 4 - src/mame/video/blktiger.c | 3 - src/mame/video/blmbycar.c | 2 - src/mame/video/blockade.c | 1 - src/mame/video/blockhl.c | 2 - src/mame/video/blockout.c | 4 - src/mame/video/bogeyman.c | 5 - src/mame/video/bombjack.c | 2 - src/mame/video/bosco.c | 2 - src/mame/video/bottom9.c | 2 - src/mame/video/brkthru.c | 5 - src/mame/video/bsktball.c | 2 - src/mame/video/btime.c | 1 - src/mame/video/buggychl.c | 1 - src/mame/video/cabal.c | 3 - src/mame/video/canyon.c | 2 - src/mame/video/capbowl.c | 1 - src/mame/video/carjmbre.c | 3 - src/mame/video/carpolo.c | 1 - src/mame/video/cbasebal.c | 5 - src/mame/video/ccastles.c | 3 - src/mame/video/chaknpop.c | 4 - src/mame/video/changela.c | 1 - src/mame/video/cheekyms.c | 2 - src/mame/video/chqflag.c | 2 - src/mame/video/cischeat.c | 1 - src/mame/video/citycon.c | 1 - src/mame/video/cloak.c | 3 - src/mame/video/cloud9.c | 4 - src/mame/video/cninja.c | 1 - src/mame/video/combatsc.c | 2 - src/mame/video/commando.c | 9 - src/mame/video/contra.c | 7 - src/mame/video/cosmic.c | 2 - src/mame/video/cps1.c | 7 - src/mame/video/crgolf.c | 2 - src/mame/video/crimfght.c | 2 - src/mame/video/crospang.c | 5 - src/mame/video/crshrace.c | 6 - src/mame/video/cvs.c | 2 - src/mame/video/darius.c | 2 - src/mame/video/darkseal.c | 1 - src/mame/video/dbz.c | 1 - src/mame/video/dc.c | 11 - src/mame/video/dcheese.c | 1 - src/mame/video/dcon.c | 1 - src/mame/video/dday.c | 6 - src/mame/video/ddragon.c | 3 - src/mame/video/ddragon3.c | 5 - src/mame/video/ddribble.c | 1 - src/mame/video/dec0.c | 3 - src/mame/video/dec8.c | 3 - src/mame/video/decbac06.c | 4 - src/mame/video/deckarn.c | 2 - src/mame/video/decmxc06.c | 2 - src/mame/video/deco16ic.c | 2 - src/mame/video/deco32.c | 2 - src/mame/video/decospr.c | 4 - src/mame/video/deniam.c | 2 - src/mame/video/digdug.c | 2 - src/mame/video/djboy.c | 1 - src/mame/video/dkong.c | 14 - src/mame/video/docastle.c | 1 - src/mame/video/dogfgt.c | 6 - src/mame/video/dribling.c | 1 - src/mame/video/drmicro.c | 1 - src/mame/video/dynax.c | 19 - src/mame/video/dynduke.c | 2 - src/mame/video/esd16.c | 1 - src/mame/video/espial.c | 8 - src/mame/video/exedexes.c | 5 - src/mame/video/exerion.c | 1 - src/mame/video/exidy.c | 1 - src/mame/video/exprraid.c | 1 - src/mame/video/f1gp.c | 5 - src/mame/video/fastlane.c | 1 - src/mame/video/fcombat.c | 1 - src/mame/video/finalizr.c | 1 - src/mame/video/fitfight.c | 4 - src/mame/video/flkatck.c | 2 - src/mame/video/fromanc2.c | 3 - src/mame/video/fromance.c | 7 - src/mame/video/fuukifg3.c | 1 - src/mame/video/gaelco.c | 2 - src/mame/video/gaelco3d.c | 1 - src/mame/video/gaiden.c | 8 - src/mame/video/galaga.c | 4 - src/mame/video/galastrm.c | 1 - src/mame/video/galaxold.c | 1 - src/mame/video/galivan.c | 5 - src/mame/video/gameplan.c | 7 - src/mame/video/gberet.c | 2 - src/mame/video/gbusters.c | 1 - src/mame/video/gng.c | 1 - src/mame/video/goldstar.c | 16 - src/mame/video/gotya.c | 1 - src/mame/video/gp9001.c | 1 - src/mame/video/gp9001.h | 6 +- src/mame/video/gradius3.c | 1 - src/mame/video/grchamp.c | 1 - src/mame/video/gstriker.c | 3 - src/mame/video/gticlub.c | 3 - src/mame/video/gunsmoke.c | 2 - src/mame/video/gyruss.c | 1 - src/mame/video/hcastle.c | 3 - src/mame/video/hng64.c | 12 +- src/mame/video/homerun.c | 2 - src/mame/video/hyperspt.c | 2 - src/mame/video/hyprduel.c | 2 - src/mame/video/inufuku.c | 1 - src/mame/video/jedi.c | 4 - src/mame/video/kaneko16.c | 1 - src/mame/video/kaneko_grap2.c | 1 - src/mame/video/kaneko_grap2.h | 3 +- src/mame/video/kaneko_spr.h | 6 +- src/mame/video/kangaroo.c | 1 - src/mame/video/karnov.c | 2 - src/mame/video/kchamp.c | 2 - src/mame/video/kickgoal.c | 3 - src/mame/video/kingobox.c | 2 - src/mame/video/kncljoe.c | 1 - src/mame/video/konamigx.c | 3 - src/mame/video/konamiic.c | 6 - src/mame/video/konicdev.c | 5 - src/mame/video/kopunch.c | 1 - src/mame/video/ksayakyu.c | 1 - src/mame/video/kyugo.c | 8 - src/mame/video/labyrunr.c | 1 - src/mame/video/ladybug.c | 4 - src/mame/video/ladyfrog.c | 7 - src/mame/video/lasso.c | 4 - src/mame/video/lastduel.c | 9 - src/mame/video/legionna.c | 1 - src/mame/video/lemmings.c | 1 - src/mame/video/lethal.c | 3 - src/mame/video/lkage.c | 2 - src/mame/video/lockon.c | 7 - src/mame/video/lwings.c | 6 - src/mame/video/m10.c | 5 - src/mame/video/m52.c | 3 - src/mame/video/m57.c | 4 - src/mame/video/m58.c | 5 - src/mame/video/m62.c | 3 - src/mame/video/m90.c | 1 - src/mame/video/macrossp.c | 7 - src/mame/video/mainevt.c | 2 - src/mame/video/mainsnk.c | 4 - src/mame/video/mappy.c | 7 - src/mame/video/marineb.c | 6 - src/mame/video/mario.c | 6 - src/mame/video/mcatadv.c | 2 - src/mame/video/mcd212.c | 1 - src/mame/video/mermaid.c | 2 - src/mame/video/metlclsh.c | 5 - src/mame/video/mexico86.c | 1 - src/mame/video/micro3d.c | 2 - src/mame/video/mikie.c | 3 - src/mame/video/mitchell.c | 13 - src/mame/video/mjkjidai.c | 2 - src/mame/video/model2.c | 1 - src/mame/video/model3.c | 2 - src/mame/video/moo.c | 1 - src/mame/video/mosaic.c | 4 - src/mame/video/mrdo.c | 4 - src/mame/video/mrflea.c | 1 - src/mame/video/ms32.c | 2 - src/mame/video/mugsmash.c | 8 - src/mame/video/mw8080bw.c | 1 - src/mame/video/mystston.c | 6 - src/mame/video/mystwarr.c | 1 - src/mame/video/n64.c | 1 - src/mame/video/n8080.c | 4 - src/mame/video/nbmj8891.c | 1 - src/mame/video/nemesis.c | 9 - src/mame/video/neogeo.c | 2 - src/mame/video/news.c | 4 - src/mame/video/ninjaw.c | 1 - src/mame/video/nitedrvr.c | 3 - src/mame/video/nmk16.c | 6 - src/mame/video/nycaptor.c | 5 - src/mame/video/ohmygod.c | 1 - src/mame/video/ojankohs.c | 7 - src/mame/video/oneshot.c | 3 - src/mame/video/opwolf.c | 1 - src/mame/video/orbit.c | 1 - src/mame/video/othldrby.c | 5 - src/mame/video/overdriv.c | 1 - src/mame/video/pacman.c | 1 - src/mame/video/pandoras.c | 4 - src/mame/video/paradise.c | 3 - src/mame/video/pass.c | 3 - src/mame/video/pbaction.c | 1 - src/mame/video/pgm.c | 4 - src/mame/video/pitnrun.c | 1 - src/mame/video/playch10.c | 1 - src/mame/video/playmark.c | 21 - src/mame/video/polepos.c | 1 - src/mame/video/pooyan.c | 1 - src/mame/video/popper.c | 6 - src/mame/video/ppu2c0x.c | 4 - src/mame/video/ppu2c0x.h | 24 +- src/mame/video/prehisle.c | 5 - src/mame/video/psikyo.c | 3 - src/mame/video/psikyosh.c | 20 +- src/mame/video/punchout.c | 3 - src/mame/video/pushman.c | 3 - src/mame/video/qix.c | 11 - src/mame/video/rainbow.c | 3 - src/mame/video/rallyx.c | 5 - src/mame/video/rastan.c | 1 - src/mame/video/redclash.c | 2 - src/mame/video/rltennis.c | 2 - src/mame/video/rockrage.c | 1 - src/mame/video/rollrace.c | 4 - src/mame/video/rungun.c | 1 - src/mame/video/sauro.c | 9 - src/mame/video/sbasketb.c | 1 - src/mame/video/sbugger.c | 2 - src/mame/video/scn2674.c | 2 - src/mame/video/scotrsht.c | 5 - src/mame/video/sderby.c | 7 - src/mame/video/sega16sp.h | 27 +- src/mame/video/segaic24.c | 1 - src/mame/video/segas18.c | 1 - src/mame/video/segas24.c | 1 - src/mame/video/seicross.c | 2 - src/mame/video/senjyo.c | 7 - src/mame/video/seta.c | 7 - src/mame/video/seta001.c | 2 - src/mame/video/seta2.c | 5 - src/mame/video/sf.c | 2 - src/mame/video/shadfrce.c | 12 - src/mame/video/shangha3.c | 2 - src/mame/video/shangkid.c | 1 - src/mame/video/shaolins.c | 6 - src/mame/video/shisen.c | 3 - src/mame/video/shootout.c | 5 - src/mame/video/sidearms.c | 4 - src/mame/video/silkroad.c | 5 - src/mame/video/simpl156.c | 2 - src/mame/video/sknsspr.c | 1 - src/mame/video/skyfox.c | 4 +- src/mame/video/skyraid.c | 2 - src/mame/video/slapshot.c | 1 - src/mame/video/snes.c | 3 +- src/mame/video/snk.c | 41 - src/mame/video/snk6502.c | 11 - src/mame/video/snk68.c | 8 - src/mame/video/solomon.c | 5 - src/mame/video/sonson.c | 1 - src/mame/video/spbactn.c | 1 - src/mame/video/speedatk.c | 4 - src/mame/video/splash.c | 4 - src/mame/video/sprcros2.c | 7 - src/mame/video/spy.c | 2 - src/mame/video/srumbler.c | 1 - src/mame/video/sshangha.c | 2 - src/mame/video/sslam.c | 8 - src/mame/video/ssozumo.c | 7 - src/mame/video/ssrj.c | 8 - src/mame/video/ssv.c | 4 - src/mame/video/st0016.c | 4 - src/mame/video/st0020.h | 6 +- src/mame/video/stactics.c | 9 - src/mame/video/starcrus.c | 2 - src/mame/video/stlforce.c | 5 - src/mame/video/stvvdp1.c | 1 - src/mame/video/stvvdp2.c | 3 - src/mame/video/suna16.c | 4 - src/mame/video/suprnova.c | 6 - src/mame/video/suprslam.c | 3 - src/mame/video/system16.c | 9 - src/mame/video/tagteam.c | 1 - src/mame/video/tail2nos.c | 4 - src/mame/video/taito_b.c | 3 - src/mame/video/taito_f2.c | 9 - src/mame/video/taito_f3.c | 1 - src/mame/video/taito_h.c | 3 - src/mame/video/taito_l.c | 4 - src/mame/video/taito_o.c | 1 - src/mame/video/taitoair.c | 3 - src/mame/video/taitoic.c | 5 +- src/mame/video/taitojc.c | 4 - src/mame/video/tankbust.c | 1 - src/mame/video/tatsumi.c | 3 - src/mame/video/tbowl.c | 2 - src/mame/video/tecmo.c | 2 - src/mame/video/tecmo16.c | 4 - src/mame/video/tecmosys.c | 5 - src/mame/video/tetrisp2.c | 3 - src/mame/video/thoop2.c | 1 - src/mame/video/thunderx.c | 1 - src/mame/video/timeplt.c | 1 - src/mame/video/tmnt.c | 19 - src/mame/video/toaplan1.c | 23 - src/mame/video/toaplan2.c | 10 - src/mame/video/toki.c | 1 - src/mame/video/toypop.c | 1 - src/mame/video/travrusa.c | 1 - src/mame/video/tumbleb.c | 16 - src/mame/video/tunhunt.c | 1 - src/mame/video/turbo.c | 2 - src/mame/video/twincobr.c | 13 - src/mame/video/tx1.c | 10 +- src/mame/video/ultraman.c | 2 - src/mame/video/vdc.c | 2 - src/mame/video/vectrex.c | 1 - src/mame/video/volfied.c | 2 - src/mame/video/vrender0.c | 3 +- src/mame/video/vsystem_spr.c | 1 - src/mame/video/vsystem_spr.h | 15 +- src/mame/video/vsystem_spr2.c | 1 - src/mame/video/vsystem_spr2.h | 12 +- src/mame/video/warriorb.c | 1 - src/mame/video/wc90.c | 5 - src/mame/video/welltris.c | 4 - src/mame/video/wgp.c | 1 - src/mame/video/wolfpack.c | 1 - src/mame/video/wwfsstar.c | 4 - src/mame/video/xain.c | 4 - src/mame/video/xevious.c | 2 - src/mame/video/xexex.c | 1 - src/mame/video/xmen.c | 2 - src/mame/video/xyonix.c | 3 - src/mame/video/ygv608.c | 4 - src/mame/video/ygv608.h | 1 - src/mame/video/yiear.c | 1 - src/mame/video/yunsun16.c | 4 - src/mame/video/yunsung8.c | 2 - src/mame/video/zaxxon.c | 14 - src/mame/video/zodiack.c | 2 - src/mess/audio/arcadia.c | 1 - src/mess/audio/dave.c | 1 - src/mess/audio/mea8000.c | 3 - src/mess/audio/t6721.h | 3 +- src/mess/audio/upd1771.c | 5 - src/mess/devices/microdrv.c | 1 - src/mess/drivers/altair.c | 1 - src/mess/drivers/amico2k.c | 1 - src/mess/drivers/apc.c | 1 - src/mess/drivers/apf.c | 1 - src/mess/drivers/apollo.c | 1 - src/mess/drivers/apricot.c | 1 - src/mess/drivers/apricotp.c | 1 - src/mess/drivers/atarist.c | 3 - src/mess/drivers/atm.c | 1 - src/mess/drivers/b16.c | 1 - src/mess/drivers/babbage.c | 1 - src/mess/drivers/beta.c | 1 - src/mess/drivers/bigbord2.c | 1 - src/mess/drivers/bmjr.c | 1 - src/mess/drivers/bml3.c | 2 - src/mess/drivers/busicom.c | 1 - src/mess/drivers/casloopy.c | 1 - src/mess/drivers/cat.c | 1 - src/mess/drivers/coleco.c | 3 - src/mess/drivers/cxhumax.c | 1 - src/mess/drivers/dm7000.c | 1 - src/mess/drivers/eacc.c | 1 - src/mess/drivers/einstein.c | 7 - src/mess/drivers/esq5505.c | 2 - src/mess/drivers/fidelz80.c | 2 - src/mess/drivers/fk1.c | 2 - src/mess/drivers/fm7.c | 1 - src/mess/drivers/fp1100.c | 1 - src/mess/drivers/fp6000.c | 7 - src/mess/drivers/gba.c | 7 - src/mess/drivers/glasgow.c | 2 - src/mess/drivers/h89.c | 1 - src/mess/drivers/homelab.c | 3 - src/mess/drivers/intv.c | 2 - src/mess/drivers/ip20.c | 1 - src/mess/drivers/ip22.c | 1 - src/mess/drivers/iq151.c | 3 - src/mess/drivers/korgm1.c | 1 - src/mess/drivers/m20.c | 3 - src/mess/drivers/mac.c | 1 - src/mess/drivers/mc10.c | 1 - src/mess/drivers/mc1000.c | 1 - src/mess/drivers/megadriv.c | 3 +- src/mess/drivers/mikrosha.c | 1 - src/mess/drivers/mirage.c | 1 - src/mess/drivers/mmodular.c | 7 - src/mess/drivers/mpf1.c | 2 - src/mess/drivers/msx.c | 3 +- src/mess/drivers/multi8.c | 1 - src/mess/drivers/mycom.c | 1 - src/mess/drivers/mz2000.c | 2 - src/mess/drivers/nakajies.c | 1 - src/mess/drivers/nanos.c | 1 - src/mess/drivers/newbrain.c | 1 - src/mess/drivers/ng_aes.c | 7 +- src/mess/drivers/ngp.c | 3 - src/mess/drivers/osbexec.c | 12 - src/mess/drivers/osi.c | 1 - src/mess/drivers/pasopia7.c | 2 - src/mess/drivers/pc6001.c | 51 +- src/mess/drivers/pc8801.c | 3 - src/mess/drivers/pc88va.c | 1 - src/mess/drivers/pc9801.c | 26 +- src/mess/drivers/pce220.c | 3 - src/mess/drivers/pcw.c | 9 - src/mess/drivers/pcw16.c | 1 - src/mess/drivers/pdp11.c | 3 +- src/mess/drivers/plus4.c | 2 - src/mess/drivers/pv1000.c | 1 - src/mess/drivers/pv2000.c | 1 - src/mess/drivers/px4.c | 5 - src/mess/drivers/qx10.c | 1 - src/mess/drivers/rainbow.c | 2 - src/mess/drivers/rex6000.c | 4 - src/mess/drivers/rt1715.c | 1 - src/mess/drivers/sc2.c | 2 - src/mess/drivers/scorpion.c | 1 - src/mess/drivers/scv.c | 2 - src/mess/drivers/smc777.c | 10 - src/mess/drivers/supercon.c | 2 - src/mess/drivers/supracan.c | 17 - src/mess/drivers/tandy2k.c | 1 - src/mess/drivers/ti89.c | 1 - src/mess/drivers/ti990_4.c | 3 - src/mess/drivers/ti99_4p.c | 1 - src/mess/drivers/ti99_4x.c | 2 - src/mess/drivers/ti99_8.c | 1 - src/mess/drivers/timex.c | 1 - src/mess/drivers/tm990189.c | 2 - src/mess/drivers/tvc.c | 6 +- src/mess/drivers/vboy.c | 5 - src/mess/drivers/vii.c | 5 - src/mess/drivers/vtech1.c | 2 - src/mess/drivers/x07.c | 3 - src/mess/drivers/x1.c | 1 - src/mess/drivers/x1twin.c | 1 - src/mess/drivers/x68k.c | 3 - src/mess/drivers/z100.c | 3 - src/mess/includes/alesis.h | 1 - src/mess/includes/genpc.h | 6 +- src/mess/includes/msx_slot.h | 2 - src/mess/includes/psion.h | 1 - src/mess/machine/3c505.c | 1 - src/mess/machine/a2bus.h | 6 +- src/mess/machine/a2eauxslot.h | 6 +- src/mess/machine/apollo.c | 6 - src/mess/machine/apollo_dbg.c | 2 - src/mess/machine/apollo_eth.c | 1 - src/mess/machine/apollo_kbd.c | 1 - src/mess/machine/apollo_net.c | 5 - src/mess/machine/apple2gs.c | 2 - src/mess/machine/at45dbxx.h | 9 +- src/mess/machine/at_keybc.h | 1 - src/mess/machine/b2m.c | 1 - src/mess/machine/bbc.c | 1 - src/mess/machine/beta.c | 1 - src/mess/machine/c1581.h | 1 - src/mess/machine/c2n.h | 1 - src/mess/machine/coco_vhd.c | 1 - src/mess/machine/coco_vhd.h | 3 +- src/mess/machine/compis.c | 1 - src/mess/machine/corvushd.c | 19 - src/mess/machine/cpc_rom.c | 1 - src/mess/machine/cpc_rom.h | 3 +- src/mess/machine/d9060.h | 1 - src/mess/machine/dai.c | 1 - src/mess/machine/diag264_lb_tape.h | 1 - src/mess/machine/fm_scsi.h | 6 +- src/mess/machine/gb.c | 1 - src/mess/machine/hec2hrp.c | 2 - src/mess/machine/hp48.c | 2 - src/mess/machine/i8271.c | 7 - src/mess/machine/intv.c | 1 - src/mess/machine/isa.h | 12 +- src/mess/machine/isa_ide_cd.c | 1 - src/mess/machine/kc.c | 2 - src/mess/machine/kc_keyb.h | 3 +- src/mess/machine/lisa.c | 3 - src/mess/machine/mboard.c | 3 - src/mess/machine/mc6843.c | 4 - src/mess/machine/mc6846.c | 2 - src/mess/machine/mc6854.c | 4 - src/mess/machine/msx.c | 2 - src/mess/machine/mz700.c | 3 - src/mess/machine/nascom1.c | 1 - src/mess/machine/nes.c | 3 - src/mess/machine/nes_mmc.c | 2 - src/mess/machine/nes_pcb.c | 5 - src/mess/machine/nubus.h | 6 +- src/mess/machine/omti8621.c | 3 - src/mess/machine/osborne1.c | 1 - src/mess/machine/pc1350.c | 1 - src/mess/machine/pc9801_118.c | 1 - src/mess/machine/pc9801_26.c | 2 - src/mess/machine/pc9801_86.c | 2 - src/mess/machine/pc9801_kbd.c | 1 - src/mess/machine/pc_joy.c | 1 - src/mess/machine/pc_kbdc.h | 6 +- src/mess/machine/pce220_ser.h | 3 +- src/mess/machine/pcf8593.h | 3 +- src/mess/machine/pecom.c | 1 - src/mess/machine/pet.c | 1 - src/mess/machine/poly88.c | 1 - src/mess/machine/primo.c | 1 - src/mess/machine/psion_pack.h | 3 +- src/mess/machine/psxcd.h | 3 +- src/mess/machine/rmnimbus.c | 3 - src/mess/machine/s100.h | 6 +- src/mess/machine/serialbox.h | 1 - src/mess/machine/sms.c | 23 - src/mess/machine/softbox.h | 1 - src/mess/machine/svi318.c | 1 - src/mess/machine/thomflop.c | 18 - src/mess/machine/thomson.c | 16 - src/mess/machine/ti85.c | 4 - src/mess/machine/ti99/mapper8.c | 1 - src/mess/machine/trs80.c | 1 - src/mess/machine/tvcexp.h | 3 +- src/mess/machine/wangpc_wdc.c | 1 - src/mess/tools/imgtool/modules/thomson.c | 7 - src/mess/tools/imgtool/modules/ti99.c | 1 - src/mess/tools/imgtool/modules/vzdos.c | 9 - src/mess/video/911_chr.h | 1 - src/mess/video/a7800.c | 1 - src/mess/video/apollo.c | 2 - src/mess/video/apple2gs.c | 1 - src/mess/video/atarist.c | 3 - src/mess/video/bbc.c | 2 - src/mess/video/dai.c | 5 - src/mess/video/epnick.c | 1 - src/mess/video/gb.c | 1 - src/mess/video/gf4500.c | 1 - src/mess/video/hd44780.h | 1 - src/mess/video/hd66421.h | 3 +- src/mess/video/mac.c | 4 - src/mess/video/mbc55x.c | 1 - src/mess/video/mc6847.h | 6 +- src/mess/video/mz700.c | 1 - src/mess/video/nes.c | 2 - src/mess/video/odyssey2.c | 5 - src/mess/video/pcw.c | 1 - src/mess/video/pdp1.c | 1 - src/mess/video/pecom.c | 2 - src/mess/video/rmnimbus.c | 1 - src/mess/video/thomson.c | 1 - src/mess/video/tms3556.h | 3 +- src/mess/video/tx0.c | 1 - src/mess/video/vc4000.c | 1 - src/mess/video/vtvideo.c | 2 - src/mess/video/zx.c | 1 - src/osd/sdl/drawogl.c | 1 - src/osd/sdl/dview.c | 1 - src/osd/sdl/sdlos_unix.c | 1 - src/osd/sdl/window.c | 1 - src/osd/windows/debugwin.c | 1 - 1620 files changed, 2202 insertions(+), 9095 deletions(-) diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index 1fe20c90233..19ddd95510d 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -387,8 +387,7 @@ void ADDRESS_MAP_NAME(_name)(address_map &map, device_t &device) \ address_map_entry##_bits *curentry = NULL; \ (void)curentry; \ map.configure(_space, _bits); \ - typedef _class drivdata_class; \ - + typedef _class drivdata_class; #define DEVICE_ADDRESS_MAP_START(_name, _bits, _class) \ void _class :: _name(::address_map &map, device_t &device) \ { \ @@ -397,8 +396,7 @@ void _class :: _name(::address_map &map, device_t &device) \ address_map_entry##_bits *curentry = NULL; \ (void)curentry; \ map.configure(AS_PROGRAM, _bits); \ - typedef _class drivdata_class; \ - + typedef _class drivdata_class; #define ADDRESS_MAP_END \ } @@ -414,254 +412,187 @@ void _class :: _name(::address_map &map, device_t &device) \ // global controls #define ADDRESS_MAP_GLOBAL_MASK(_mask) \ - map.set_global_mask(_mask); \ - + map.set_global_mask(_mask); #define ADDRESS_MAP_UNMAP_LOW \ - map.set_unmap_value(0); \ - + map.set_unmap_value(0); #define ADDRESS_MAP_UNMAP_HIGH \ - map.set_unmap_value(~0); \ - + map.set_unmap_value(~0); // importing data from other address maps #define AM_IMPORT_FROM(_name) \ - ADDRESS_MAP_NAME(_name)(map, device); \ - + ADDRESS_MAP_NAME(_name)(map, device); // importing data from inherited address maps #define AM_INHERIT_FROM(_name) \ - _name(map, device); \ - + _name(map, device); // address ranges #define AM_RANGE(_start, _end) \ - curentry = map.add(_start, _end, curentry); \ - + curentry = map.add(_start, _end, curentry); #define AM_MASK(_mask) \ - curentry->set_mask(_mask); \ - + curentry->set_mask(_mask); #define AM_MIRROR(_mirror) \ - curentry->set_mirror(_mirror); \ - + curentry->set_mirror(_mirror); // legacy space reads #define AM_READ_LEGACY(_handler) \ - curentry->set_handler(_handler, #_handler); \ - + curentry->set_handler(_handler, #_handler); #define AM_READ8_LEGACY(_handler, _unitmask) \ - curentry->set_handler(_handler, #_handler, _unitmask); \ - + curentry->set_handler(_handler, #_handler, _unitmask); // legacy space writes #define AM_WRITE_LEGACY(_handler) \ - curentry->set_handler(_handler, #_handler); \ - + curentry->set_handler(_handler, #_handler); #define AM_WRITE8_LEGACY(_handler, _unitmask) \ - curentry->set_handler(_handler, #_handler, _unitmask); \ - + curentry->set_handler(_handler, #_handler, _unitmask); // legacy space reads/writes #define AM_READWRITE_LEGACY(_rhandler, _whandler) \ - curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler); \ - + curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler); #define AM_READWRITE8_LEGACY(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); \ - + curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); #define AM_READWRITE16_LEGACY(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); \ - + curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); #define AM_READWRITE32_LEGACY(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); \ - + curentry->set_handler(_rhandler, #_rhandler, _whandler, #_whandler, _unitmask); // legacy device reads #define AM_DEVREAD_LEGACY(_tag, _handler) \ - curentry->set_handler(device, read_delegate(&_handler, #_handler, _tag, (device_t *)0)); \ - + curentry->set_handler(device, read_delegate(&_handler, #_handler, _tag, (device_t *)0)); #define AM_DEVREAD8_LEGACY(_tag, _handler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&_handler, #_handler, _tag, (device_t *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&_handler, #_handler, _tag, (device_t *)0), _unitmask); // legacy device writes #define AM_DEVWRITE_LEGACY(_tag, _handler) \ - curentry->set_handler(device, write_delegate(&_handler, #_handler, _tag, (device_t *)0)); \ - + curentry->set_handler(device, write_delegate(&_handler, #_handler, _tag, (device_t *)0)); #define AM_DEVWRITE8_LEGACY(_tag, _handler, _unitmask) \ - curentry->set_handler(device, write8_delegate(&_handler, #_handler, _tag, (device_t *)0), _unitmask); \ - + curentry->set_handler(device, write8_delegate(&_handler, #_handler, _tag, (device_t *)0), _unitmask); // legacy device reads/writes #define AM_DEVREADWRITE_LEGACY(_tag, _rhandler, _whandler) \ - curentry->set_handler(device, read_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write_delegate(&_whandler, #_whandler, _tag, (device_t *)0)); \ - + curentry->set_handler(device, read_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write_delegate(&_whandler, #_whandler, _tag, (device_t *)0)); #define AM_DEVREADWRITE8_LEGACY(_tag, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write8_delegate(&_whandler, #_whandler, _tag, (device_t *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write8_delegate(&_whandler, #_whandler, _tag, (device_t *)0), _unitmask); #define AM_DEVREADWRITE16_LEGACY(_tag, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read16_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write16_delegate(&_whandler, #_whandler, _tag, (device_t *)0), _unitmask); \ - + curentry->set_handler(device, read16_delegate(&_rhandler, #_rhandler, _tag, (device_t *)0), write16_delegate(&_whandler, #_whandler, _tag, (device_t *)0), _unitmask); // driver data reads #define AM_READ(_handler) \ - curentry->set_handler(device, read_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0)); \ - + curentry->set_handler(device, read_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0)); #define AM_READ8(_handler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_READ16(_handler, _unitmask) \ - curentry->set_handler(device, read16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_READ32(_handler, _unitmask) \ - curentry->set_handler(device, read32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); // driver data writes #define AM_WRITE(_handler) \ - curentry->set_handler(device, write_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0)); \ - + curentry->set_handler(device, write_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0)); #define AM_WRITE8(_handler, _unitmask) \ - curentry->set_handler(device, write8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, write8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_WRITE16(_handler, _unitmask) \ - curentry->set_handler(device, write16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, write16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_WRITE32(_handler, _unitmask) \ - curentry->set_handler(device, write32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, write32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)0), _unitmask); // driver data reads/writes #define AM_READWRITE(_rhandler, _whandler) \ - curentry->set_handler(device, read_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0)); \ - + curentry->set_handler(device, read_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0)); #define AM_READWRITE8(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write8_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write8_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_READWRITE16(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read16_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write16_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read16_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write16_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); #define AM_READWRITE32(_rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read32_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write32_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); \ - + curentry->set_handler(device, read32_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)0), write32_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)0), _unitmask); // device reads #define AM_DEVREAD(_tag, _class, _handler) \ - curentry->set_handler(device, read_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0)); \ - + curentry->set_handler(device, read_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0)); #define AM_DEVREAD8(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); #define AM_DEVREAD16(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, read16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); #define AM_DEVREAD32(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, read32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); // device writes #define AM_DEVWRITE(_tag, _class, _handler) \ - curentry->set_handler(device, write_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0)); \ - + curentry->set_handler(device, write_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0)); #define AM_DEVWRITE8(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, write8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, write8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); #define AM_DEVWRITE16(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, write16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, write16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); #define AM_DEVWRITE32(_tag, _class, _handler, _unitmask) \ - curentry->set_handler(device, write32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, write32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)0), _unitmask); // device reads/writes #define AM_DEVREADWRITE(_tag, _class, _rhandler, _whandler) \ - curentry->set_handler(device, read_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0)); \ - + curentry->set_handler(device, read_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0)); #define AM_DEVREADWRITE8(_tag, _class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read8_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write8_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read8_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write8_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); #define AM_DEVREADWRITE16(_tag, _class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read16_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write16_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read16_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write16_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); #define AM_DEVREADWRITE32(_tag, _class, _rhandler, _whandler, _unitmask) \ - curentry->set_handler(device, read32_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write32_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); \ - + curentry->set_handler(device, read32_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)0), write32_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)0), _unitmask); // device mapping #define AM_DEVICE(_tag, _class, _handler) \ - curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 0, 0); \ - + curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 0, 0); #define AM_DEVICE8(_tag, _class, _handler, _unitmask) \ - curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 8, _unitmask); \ - + curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 8, _unitmask); #define AM_DEVICE16(_tag, _class, _handler, _unitmask) \ - curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 16, _unitmask); \ - + curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 16, _unitmask); #define AM_DEVICE32(_tag, _class, _handler, _unitmask) \ - curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 32, _unitmask); \ - + curentry->set_submap(device, _tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)0), 32, _unitmask); // special-case accesses #define AM_ROM \ - curentry->set_read_type(AMH_ROM); \ - + curentry->set_read_type(AMH_ROM); #define AM_RAM \ curentry->set_read_type(AMH_RAM); \ - curentry->set_write_type(AMH_RAM); \ - + curentry->set_write_type(AMH_RAM); #define AM_READONLY \ - curentry->set_read_type(AMH_RAM); \ - + curentry->set_read_type(AMH_RAM); #define AM_WRITEONLY \ - curentry->set_write_type(AMH_RAM); \ - + curentry->set_write_type(AMH_RAM); #define AM_UNMAP \ curentry->set_read_type(AMH_UNMAP); \ - curentry->set_write_type(AMH_UNMAP); \ - + curentry->set_write_type(AMH_UNMAP); #define AM_NOP \ curentry->set_read_type(AMH_NOP); \ - curentry->set_write_type(AMH_NOP); \ - + curentry->set_write_type(AMH_NOP); #define AM_READNOP \ - curentry->set_read_type(AMH_NOP); \ - + curentry->set_read_type(AMH_NOP); #define AM_WRITENOP \ - curentry->set_write_type(AMH_NOP); \ - + curentry->set_write_type(AMH_NOP); // port accesses #define AM_READ_PORT(_tag) \ - curentry->set_read_port(device, _tag); \ - + curentry->set_read_port(device, _tag); #define AM_WRITE_PORT(_tag) \ - curentry->set_write_port(device, _tag); \ - + curentry->set_write_port(device, _tag); #define AM_READWRITE_PORT(_tag) \ - curentry->set_readwrite_port(device, _tag); \ - + curentry->set_readwrite_port(device, _tag); // bank accesses #define AM_READ_BANK(_tag) \ - curentry->set_read_bank(device, _tag); \ - + curentry->set_read_bank(device, _tag); #define AM_WRITE_BANK(_tag) \ - curentry->set_write_bank(device, _tag); \ - + curentry->set_write_bank(device, _tag); #define AM_READWRITE_BANK(_tag) \ - curentry->set_readwrite_bank(device, _tag); \ - + curentry->set_readwrite_bank(device, _tag); // attributes for accesses #define AM_REGION(_tag, _offs) \ - curentry->set_region(_tag, _offs); \ - + curentry->set_region(_tag, _offs); #define AM_SHARE(_tag) \ - curentry->set_share(_tag); \ - + curentry->set_share(_tag); // common shortcuts #define AM_ROMBANK(_bank) AM_READ_BANK(_bank) diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index 96cc4650084..5db7258d9a0 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -213,8 +213,7 @@ enum //************************************************************************** #define MCFG_ADSP21XX_CONFIG(_config) \ - adsp21xx_device::static_set_config(*device, _config); \ - + adsp21xx_device::static_set_config(*device, _config); //************************************************************************** diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c index f15585d2ae8..298e61f7e0c 100644 --- a/src/emu/cpu/am29000/am29000.c +++ b/src/emu/cpu/am29000/am29000.c @@ -227,7 +227,6 @@ static CPU_RESET( am29000 ) static CPU_EXIT( am29000 ) { - } diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index 10364e4c19b..bcd203125e2 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -503,7 +503,6 @@ static void arm_check_irq_state(ARM_REGS* cpustate) static void set_irq_line(ARM_REGS* cpustate, int irqline, int state) { switch (irqline) { - case ARM_IRQ_LINE: /* IRQ */ if (state && (R15&0x3)!=eARM_MODE_IRQ) /* Don't allow nested IRQs */ cpustate->pendingIrq=1; @@ -707,7 +706,6 @@ static void HandleMemSingle( ARM_REGS* cpustate, UINT32 insn ) SetRegister(cpustate, rn,GetRegister(cpustate, rd)); } else { - if ((insn&INSN_SDT_W)!=0) logerror("%08x: RegisterWritebackIncrement %d %d %d\n",R15,(insn & INSN_SDT_P)!=0,(insn&INSN_SDT_W)!=0,(insn & INSN_SDT_U)!=0); diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index 7a79d82a16d..8b56fcf3a06 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -517,8 +517,7 @@ static CPU_EXIT( arm7 ) #define UNEXECUTED() \ R15 += 4; \ - ARM7_ICOUNT +=2; /* Any unexecuted instruction only takes 1 cycle (page 193) */ \ - + ARM7_ICOUNT +=2; /* Any unexecuted instruction only takes 1 cycle (page 193) */ static CPU_EXECUTE( arm7 ) { UINT32 pc; diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index a74e2cd6876..48af446b831 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -289,7 +289,6 @@ void arm7_check_irq_state(arm_state *cpustate) static void arm7_core_set_irq_line(arm_state *cpustate, int irqline, int state) { switch (irqline) { - case ARM7_IRQ_LINE: /* IRQ */ cpustate->pendingIrq = state & 1; break; diff --git a/src/emu/cpu/arm7/arm7dasm.c b/src/emu/cpu/arm7/arm7dasm.c index e8129ca436a..5f42f2f0507 100644 --- a/src/emu/cpu/arm7/arm7dasm.c +++ b/src/emu/cpu/arm7/arm7dasm.c @@ -430,7 +430,6 @@ static UINT32 arm7_disasm( char *pBuf, UINT32 pc, UINT32 opcode ) } else if( (opcode&0x0c000000)==0 ) //bits 27-26 == 00 - This check can only exist properly after Multiplication check above { - /* Data Processing OR PSR Transfer */ //SJE: check for MRS & MSR ( S bit must be clear, and bit 24,23 = 10 ) diff --git a/src/emu/cpu/arm7/arm7ops.c b/src/emu/cpu/arm7/arm7ops.c index 63c32e4ca80..9ed012e5a7a 100644 --- a/src/emu/cpu/arm7/arm7ops.c +++ b/src/emu/cpu/arm7/arm7ops.c @@ -291,7 +291,6 @@ static void HandleCoProcDO(arm_state *cpustate, UINT32 insn) // Co-Processor Register Transfer - To/From Arm to Co-Proc static void HandleCoProcRT(arm_state *cpustate, UINT32 insn) { - /* xxxx 1110 oooL nnnn dddd cccc ppp1 mmmm */ // Load (MRC) data from Co-Proc to ARM7 register @@ -544,7 +543,6 @@ static void HandleMemSingle(arm_state *cpustate, UINT32 insn) } else { - /* Do post-indexing writeback */ if (!(insn & INSN_SDT_P)/* && (insn & INSN_SDT_W)*/) { @@ -557,7 +555,6 @@ static void HandleMemSingle(arm_state *cpustate, UINT32 insn) // todo: check for offs... ? } else { - if ((insn & INSN_SDT_W) != 0) LOG(("%08x: RegisterWritebackIncrement %d %d %d\n", R15, (insn & INSN_SDT_P) != 0, (insn & INSN_SDT_W) != 0, (insn & INSN_SDT_U) != 0)); @@ -669,7 +666,6 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) if (cpustate->pendingAbtD == 0) { - // PC? if (rd == eR15) { @@ -698,7 +694,6 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) if (cpustate->pendingAbtD == 0) { - if (rd == eR15) { R15 = newval + 8; @@ -761,7 +756,6 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) } else { - // SJE: No idea if this writeback code works or makes sense here.. /* Do post-indexing writeback */ @@ -776,7 +770,6 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) // todo: check for offs... ? } else { - if ((insn & INSN_SDT_W) != 0) LOG(("%08x: RegisterWritebackIncrement %d %d %d\n", R15, (insn & INSN_SDT_P) != 0, (insn & INSN_SDT_W) != 0, (insn & INSN_SDT_U) != 0)); @@ -1085,7 +1078,6 @@ static void HandleALU(arm_state *cpustate, UINT32 insn) { // Rd = 15 and S Flag IS set, Result is placed in R15, and current mode SPSR moved to CPSR if (rdn == eR15) { - if (MODE32) { // When Rd is R15 and the S flag is set the result of the operation is placed in R15 and the SPSR corresponding to diff --git a/src/emu/cpu/avr8/avr8.h b/src/emu/cpu/avr8/avr8.h index d5490ef18db..b89ac9d11e0 100644 --- a/src/emu/cpu/avr8/avr8.h +++ b/src/emu/cpu/avr8/avr8.h @@ -45,8 +45,7 @@ //************************************************************************** #define MCFG_CPU_AVR8_CONFIG(_config) \ - avr8_device::static_set_config(*device, _config); \ - + avr8_device::static_set_config(*device, _config); //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index adc53bfa1ef..dab7a34fb33 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -983,7 +983,6 @@ static CPU_EXECUTE( cquestrot ) } case RAMU: { - UINT16 q15 = BIT(cpustate->q, 15); UINT16 r15 = BIT(cpustate->f, 15); UINT16 r0 = 0; diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h index e419b46ef65..9bba8f137ce 100644 --- a/src/emu/cpu/dsp32/dsp32.h +++ b/src/emu/cpu/dsp32/dsp32.h @@ -47,8 +47,7 @@ //************************************************************************** #define MCFG_DSP32C_CONFIG(_config) \ - dsp32c_device::static_set_config(*device, _config); \ - + dsp32c_device::static_set_config(*device, _config); //************************************************************************** diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h index 741de50846d..a813de5570d 100644 --- a/src/emu/cpu/dsp56k/dsp56def.h +++ b/src/emu/cpu/dsp56k/dsp56def.h @@ -9,7 +9,6 @@ namespace DSP56K { - /*************************************************************************** ALU ***************************************************************************/ diff --git a/src/emu/cpu/dsp56k/dsp56mem.c b/src/emu/cpu/dsp56k/dsp56mem.c index e421bcffcc1..47b1a4dc57d 100644 --- a/src/emu/cpu/dsp56k/dsp56mem.c +++ b/src/emu/cpu/dsp56k/dsp56mem.c @@ -6,7 +6,6 @@ namespace DSP56K { - /* IPR Accessor Implementations */ void IPR_set(dsp56k_core* cpustate, UINT16 value) { diff --git a/src/emu/cpu/dsp56k/dsp56mem.h b/src/emu/cpu/dsp56k/dsp56mem.h index 642ae059c5e..c9ddd0e8267 100644 --- a/src/emu/cpu/dsp56k/dsp56mem.h +++ b/src/emu/cpu/dsp56k/dsp56mem.h @@ -5,7 +5,6 @@ namespace DSP56K { - /*************************************************************************** MEMORY ***************************************************************************/ diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c index 87bb8c77b0f..66d5fbacf1b 100644 --- a/src/emu/cpu/dsp56k/dsp56pcu.c +++ b/src/emu/cpu/dsp56k/dsp56pcu.c @@ -3,7 +3,6 @@ namespace DSP56K { - /* ************************************************************************* */ /* Status Register */ /* ************************************************************************* */ diff --git a/src/emu/cpu/dsp56k/dsp56pcu.h b/src/emu/cpu/dsp56k/dsp56pcu.h index a582eb1cb39..360b08f4d61 100644 --- a/src/emu/cpu/dsp56k/dsp56pcu.h +++ b/src/emu/cpu/dsp56k/dsp56pcu.h @@ -5,7 +5,6 @@ namespace DSP56K { - /*************************************************************************** PCU ***************************************************************************/ diff --git a/src/emu/cpu/dsp56k/inst.c b/src/emu/cpu/dsp56k/inst.c index 74c5b88c090..58c3bf67aed 100644 --- a/src/emu/cpu/dsp56k/inst.c +++ b/src/emu/cpu/dsp56k/inst.c @@ -3,7 +3,6 @@ namespace DSP56K { - // Factory Instruction* Instruction::decodeInstruction(const Opcode* opc, const UINT16 word0, diff --git a/src/emu/cpu/dsp56k/inst.h b/src/emu/cpu/dsp56k/inst.h index afd65fa340d..34f19534976 100644 --- a/src/emu/cpu/dsp56k/inst.h +++ b/src/emu/cpu/dsp56k/inst.h @@ -13,7 +13,6 @@ // namespace DSP56K { - #define ADDRESS(X) ((X)<<1) #define UNIMPLEMENTED_OPCODE() mame_printf_error("Unimplemented opcode: PC=%04x | %s;\n", PC, __PRETTY_FUNCTION__); diff --git a/src/emu/cpu/dsp56k/opcode.c b/src/emu/cpu/dsp56k/opcode.c index 0e9ad3706dc..803a4fe7160 100644 --- a/src/emu/cpu/dsp56k/opcode.c +++ b/src/emu/cpu/dsp56k/opcode.c @@ -4,7 +4,6 @@ namespace DSP56K { - Opcode::Opcode(UINT16 w0, UINT16 w1) : m_word0(w0), m_word1(w1) { m_instruction = Instruction::decodeInstruction(this, w0, w1); diff --git a/src/emu/cpu/dsp56k/opcode.h b/src/emu/cpu/dsp56k/opcode.h index cd841e2d1a8..86f5a3f1350 100644 --- a/src/emu/cpu/dsp56k/opcode.h +++ b/src/emu/cpu/dsp56k/opcode.h @@ -12,7 +12,6 @@ // namespace DSP56K { - class Instruction; class ParallelMove; diff --git a/src/emu/cpu/dsp56k/pmove.c b/src/emu/cpu/dsp56k/pmove.c index a3f6a0dada4..ce9c7776e87 100644 --- a/src/emu/cpu/dsp56k/pmove.c +++ b/src/emu/cpu/dsp56k/pmove.c @@ -2,7 +2,6 @@ namespace DSP56K { - const reg_id& ParallelMove::opSource() const { return m_oco->instSource(); } const reg_id& ParallelMove::opDestination() const { return m_oco->instDestination(); } const size_t ParallelMove::opAccumulatorBitsModified() const { return m_oco->instAccumulatorBitsModified(); } diff --git a/src/emu/cpu/dsp56k/pmove.h b/src/emu/cpu/dsp56k/pmove.h index 4dabb9b3a30..e6b017280b6 100644 --- a/src/emu/cpu/dsp56k/pmove.h +++ b/src/emu/cpu/dsp56k/pmove.h @@ -10,7 +10,6 @@ // namespace DSP56K { - class Opcode; class ParallelMove diff --git a/src/emu/cpu/dsp56k/tables.c b/src/emu/cpu/dsp56k/tables.c index 096eb04ffae..edbe3b32a9d 100644 --- a/src/emu/cpu/dsp56k/tables.c +++ b/src/emu/cpu/dsp56k/tables.c @@ -7,7 +7,6 @@ namespace DSP56K { - /******************/ /* Table decoding */ /******************/ diff --git a/src/emu/cpu/dsp56k/tables.h b/src/emu/cpu/dsp56k/tables.h index 1701bcd146a..139d89403a0 100644 --- a/src/emu/cpu/dsp56k/tables.h +++ b/src/emu/cpu/dsp56k/tables.h @@ -9,7 +9,6 @@ namespace DSP56K { - #define BITSn(CUR,MASK) (dsp56k_op_maskn(CUR,MASK)) enum bitsModified {BM_NONE = 0x0, BM_LOW = 0x1, BM_MIDDLE = 0x2, BM_HIGH = 0x4}; diff --git a/src/emu/cpu/e132xs/e132xsop.c b/src/emu/cpu/e132xs/e132xsop.c index 585af997675..02fcff4190a 100644 --- a/src/emu/cpu/e132xs/e132xsop.c +++ b/src/emu/cpu/e132xs/e132xsop.c @@ -15,8 +15,7 @@ decode->dst_is_local = 0; \ decode->same_src_dst = 0; \ decode->same_src_dstf = 0; \ - decode->same_srcf_dst = 0; \ - + decode->same_srcf_dst = 0; void hyperstone_device::op00() { diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 4e351c26c06..300ac0d9a2c 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -327,7 +327,6 @@ void esrip_device::device_reset() void esrip_device::device_stop() { - } diff --git a/src/emu/cpu/esrip/esrip.h b/src/emu/cpu/esrip/esrip.h index 729a0f96eef..296ccf7f803 100644 --- a/src/emu/cpu/esrip/esrip.h +++ b/src/emu/cpu/esrip/esrip.h @@ -25,8 +25,7 @@ ***************************************************************************/ #define MCFG_CPU_ESRIP_CONFIG(_config) \ - esrip_device::static_set_config(*device, _config); \ - + esrip_device::static_set_config(*device, _config); /*************************************************************************** REGISTER ENUMERATION diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c index 605056e99e2..4e86d1c00d3 100644 --- a/src/emu/cpu/f8/f8.c +++ b/src/emu/cpu/f8/f8.c @@ -1158,7 +1158,6 @@ static void f8_am(f8_Regs *cpustate) ***************************************************/ static void f8_amd(f8_Regs *cpustate) { - /*SKR from F8 Guide To programming description of AMD binary add the addend to the binary sum of the augend and $66 diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h index 2748b37aa5a..3d5cefc4e01 100644 --- a/src/emu/cpu/g65816/g65816op.h +++ b/src/emu/cpu/g65816/g65816op.h @@ -777,8 +777,7 @@ INLINE uint EA_SIY(g65816i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ g65816i_branch_8(cpustate, DST); \ BREAKOUT; \ } \ - CLK(CLK_OP + CLK_RELATIVE_8); \ - + CLK(CLK_OP + CLK_RELATIVE_8); /* M6502 Set flags according to bits */ #undef OP_BIT #if FLAG_SET_M diff --git a/src/emu/cpu/h6280/6280dasm.c b/src/emu/cpu/h6280/6280dasm.c index de07366a884..cf40842aede 100644 --- a/src/emu/cpu/h6280/6280dasm.c +++ b/src/emu/cpu/h6280/6280dasm.c @@ -48,7 +48,6 @@ enum addr_mode { }; enum opcodes { - /* 6502 opcodes */ _adc=0,_and, _asl, _bcc, _bcs, _beq, _bit, _bmi, _bne, _bpl, _brk, _bvc, _bvs, _clc, _cld, _cli, diff --git a/src/emu/cpu/h6280/h6280ops.h b/src/emu/cpu/h6280/h6280ops.h index 8c57e2cfff5..994941296d9 100644 --- a/src/emu/cpu/h6280/h6280ops.h +++ b/src/emu/cpu/h6280/h6280ops.h @@ -494,8 +494,7 @@ push(P); \ P = (P & ~_fD) | _fI; \ PCL = program_read8(H6280_IRQ2_VEC); \ - PCH = program_read8(H6280_IRQ2_VEC+1); \ - + PCH = program_read8(H6280_IRQ2_VEC+1); /* 6280 ******************************************************** * BSR Branch to subroutine ***************************************************************/ @@ -691,8 +690,7 @@ ***************************************************************/ #define JMP \ CLEAR_T; \ - PCD = EAD; \ - + PCD = EAD; /* 6280 ******************************************************** * JSR Jump to subroutine * decrement PC (sic!) push PC hi, push PC lo and set @@ -703,8 +701,7 @@ PCW--; \ push(PCH); \ push(PCL); \ - PCD = EAD; \ - + PCD = EAD; /* 6280 ******************************************************** * LDA Load accumulator ***************************************************************/ diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/emu/cpu/hd61700/hd61700.c index cfbfb785720..06ae03d9a12 100644 --- a/src/emu/cpu/hd61700/hd61700.c +++ b/src/emu/cpu/hd61700/hd61700.c @@ -2963,7 +2963,6 @@ inline int hd61700_cpu_device::get_im_7(UINT8 data) inline UINT16 hd61700_cpu_device::make_bcd_sub(UINT8 arg1, UINT8 arg2) { - UINT32 ret = (arg1&0x0f) - (arg2&0x0f); UINT8 carry; diff --git a/src/emu/cpu/hd61700/hd61700.h b/src/emu/cpu/hd61700/hd61700.h index 039d4ce853f..ff2b5cdf78e 100644 --- a/src/emu/cpu/hd61700/hd61700.h +++ b/src/emu/cpu/hd61700/hd61700.h @@ -14,8 +14,7 @@ //************************************************************************** #define MCFG_HD61700_CONFIG(_config) \ - hd61700_cpu_device::static_set_config(*device, _config); \ - + hd61700_cpu_device::static_set_config(*device, _config); //************************************************************************** // DEFINITIONS //************************************************************************** diff --git a/src/emu/cpu/hd6309/6309ops.c b/src/emu/cpu/hd6309/6309ops.c index a9f72db1b22..a2bcc37830d 100644 --- a/src/emu/cpu/hd6309/6309ops.c +++ b/src/emu/cpu/hd6309/6309ops.c @@ -697,8 +697,7 @@ OP_HANDLER( lble ) case 13: if (promote) dst16Reg = &z16; else dst8Reg = &z8; break; \ case 14: if (promote) dst16Reg = &W; else dst8Reg = &E; break; \ default: if (promote) dst16Reg = &W; else dst8Reg = &F; break; \ - } \ - + } /* $1030 addr_r r1 + r2 -> r2 */ OP_HANDLER( addr_r ) diff --git a/src/emu/cpu/i386/i386op16.c b/src/emu/cpu/i386/i386op16.c index e009e6e6bcf..440628a3ddc 100644 --- a/src/emu/cpu/i386/i386op16.c +++ b/src/emu/cpu/i386/i386op16.c @@ -6,7 +6,6 @@ static UINT16 I386OP(shift_rotate16)(i386_state *cpustate, UINT8 modrm, UINT32 v if( shift == 0 ) { CYCLES_RM(cpustate,modrm, 3, 7); } else if( shift == 1 ) { - switch( (modrm >> 3) & 0x7 ) { case 0: /* ROL rm16, 1 */ @@ -57,7 +56,6 @@ static UINT16 I386OP(shift_rotate16)(i386_state *cpustate, UINT8 modrm, UINT32 v break; } } else { - switch( (modrm >> 3) & 0x7 ) { case 0: /* ROL rm16, i8 */ @@ -2012,7 +2010,6 @@ static void I386OP(shld16_i8)(i386_state *cpustate) // Opcode 0x0f a4 UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (16-shift))) ? 1 : 0; // ppro and above should be (dst >> (32-shift)) @@ -2034,7 +2031,6 @@ static void I386OP(shld16_i8)(i386_state *cpustate) // Opcode 0x0f a4 UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (16-shift))) ? 1 : 0; dst = (upper << (shift-16)) | (upper >> (32-shift)); @@ -2060,7 +2056,6 @@ static void I386OP(shld16_cl)(i386_state *cpustate) // Opcode 0x0f a5 UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (16-shift))) ? 1 : 0; dst = (upper << (shift-16)) | (upper >> (32-shift)); @@ -2081,7 +2076,6 @@ static void I386OP(shld16_cl)(i386_state *cpustate) // Opcode 0x0f a5 UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (16-shift))) ? 1 : 0; dst = (upper << (shift-16)) | (upper >> (32-shift)); @@ -2107,7 +2101,6 @@ static void I386OP(shrd16_i8)(i386_state *cpustate) // Opcode 0x0f ac UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (shift-1))) ? 1 : 0; dst = (upper >> (shift-16)) | (upper << (32-shift)); @@ -2128,7 +2121,6 @@ static void I386OP(shrd16_i8)(i386_state *cpustate) // Opcode 0x0f ac UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (shift-1))) ? 1 : 0; dst = (upper >> (shift-16)) | (upper << (32-shift)); @@ -2154,7 +2146,6 @@ static void I386OP(shrd16_cl)(i386_state *cpustate) // Opcode 0x0f ad UINT8 shift = REG8(CL); shift &= 31; if( shift == 0) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (shift-1))) ? 1 : 0; dst = (upper >> (shift-16)) | (upper << (32-shift)); @@ -2175,7 +2166,6 @@ static void I386OP(shrd16_cl)(i386_state *cpustate) // Opcode 0x0f ad UINT8 shift = REG8(CL); shift &= 31; if( shift == 0) { - } else if( shift > 15 ) { cpustate->CF = (upper & (1 << (shift-1))) ? 1 : 0; dst = (upper >> (shift-16)) | (upper << (32-shift)); diff --git a/src/emu/cpu/i386/i386op32.c b/src/emu/cpu/i386/i386op32.c index a139ba884c9..20b6cc58b88 100644 --- a/src/emu/cpu/i386/i386op32.c +++ b/src/emu/cpu/i386/i386op32.c @@ -7,7 +7,6 @@ static UINT32 I386OP(shift_rotate32)(i386_state *cpustate, UINT8 modrm, UINT32 v if( shift == 0 ) { CYCLES_RM(cpustate,modrm, 3, 7); } else if( shift == 1 ) { - switch( (modrm >> 3) & 0x7 ) { case 0: /* ROL rm32, 1 */ @@ -1863,7 +1862,6 @@ static void I386OP(shld32_i8)(i386_state *cpustate) // Opcode 0x0f a4 UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (32-shift))) ? 1 : 0; dst = (dst << shift) | (upper >> (32-shift)); @@ -1879,7 +1877,6 @@ static void I386OP(shld32_i8)(i386_state *cpustate) // Opcode 0x0f a4 UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (32-shift))) ? 1 : 0; dst = (dst << shift) | (upper >> (32-shift)); @@ -1900,7 +1897,6 @@ static void I386OP(shld32_cl)(i386_state *cpustate) // Opcode 0x0f a5 UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (32-shift))) ? 1 : 0; dst = (dst << shift) | (upper >> (32-shift)); @@ -1916,7 +1912,6 @@ static void I386OP(shld32_cl)(i386_state *cpustate) // Opcode 0x0f a5 UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (32-shift))) ? 1 : 0; dst = (dst << shift) | (upper >> (32-shift)); @@ -1937,7 +1932,6 @@ static void I386OP(shrd32_i8)(i386_state *cpustate) // Opcode 0x0f ac UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (shift-1))) ? 1 : 0; dst = (dst >> shift) | (upper << (32-shift)); @@ -1953,7 +1947,6 @@ static void I386OP(shrd32_i8)(i386_state *cpustate) // Opcode 0x0f ac UINT8 shift = FETCH(cpustate); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (shift-1))) ? 1 : 0; dst = (dst >> shift) | (upper << (32-shift)); @@ -1974,7 +1967,6 @@ static void I386OP(shrd32_cl)(i386_state *cpustate) // Opcode 0x0f ad UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (shift-1))) ? 1 : 0; dst = (dst >> shift) | (upper << (32-shift)); @@ -1990,7 +1982,6 @@ static void I386OP(shrd32_cl)(i386_state *cpustate) // Opcode 0x0f ad UINT8 shift = REG8(CL); shift &= 31; if( shift == 0 ) { - } else { cpustate->CF = (dst & (1 << (shift-1))) ? 1 : 0; dst = (dst >> shift) | (upper << (32-shift)); diff --git a/src/emu/cpu/i386/i386ops.c b/src/emu/cpu/i386/i386ops.c index 6f653bee2e9..2a39681286c 100644 --- a/src/emu/cpu/i386/i386ops.c +++ b/src/emu/cpu/i386/i386ops.c @@ -6,7 +6,6 @@ static UINT8 I386OP(shift_rotate8)(i386_state *cpustate, UINT8 modrm, UINT32 val if( shift == 0 ) { CYCLES_RM(cpustate,modrm, 3, 7); } else if( shift == 1 ) { - switch( (modrm >> 3) & 0x7 ) { case 0: /* ROL rm8, 1 */ @@ -58,7 +57,6 @@ static UINT8 I386OP(shift_rotate8)(i386_state *cpustate, UINT8 modrm, UINT32 val } } else { - switch( (modrm >> 3) & 0x7 ) { case 0: /* ROL rm8, i8 */ diff --git a/src/emu/cpu/i86/instr186.c b/src/emu/cpu/i86/instr186.c index aa3cfe9bf59..72d1f5f9936 100644 --- a/src/emu/cpu/i86/instr186.c +++ b/src/emu/cpu/i86/instr186.c @@ -33,7 +33,6 @@ static void PREFIX186(_pusha)(i8086_state *cpustate) /* Opcode 0x60 */ static unsigned i186_popa_tmp; // hack around GCC 4.6 error because we need the side effects of POP static void PREFIX186(_popa)(i8086_state *cpustate) /* Opcode 0x61 */ { - #ifdef I80286 if(PM) i80286_check_permission(cpustate, SS, cpustate->regs.w[SP], 16, I80286_READ); #endif diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c index 0cdba2eff38..2c007ff3fa9 100644 --- a/src/emu/cpu/i86/instr86.c +++ b/src/emu/cpu/i86/instr86.c @@ -2954,7 +2954,6 @@ static void PREFIX86(_f6pre)(i8086_state *cpustate) case 0x38: /* IDIV AL, Ew */ ICOUNT -= (ModRM >= 0xc0) ? timing.idiv_r8 : timing.idiv_m8; { - INT16 result; result = cpustate->regs.w[AX]; diff --git a/src/emu/cpu/lc8670/lc8670.h b/src/emu/cpu/lc8670/lc8670.h index 852105830d1..d9490fcd8ca 100644 --- a/src/emu/cpu/lc8670/lc8670.h +++ b/src/emu/cpu/lc8670/lc8670.h @@ -61,8 +61,7 @@ typedef UINT32 (*lc8670_lcd_update)(device_t &device, bitmap_ind16 &bitmap, cons #define MCFG_LC8670_SET_CLOCK_SOURCES(_sub_clock, _rc_clock, _cf_clock) \ lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_SUB_CLOCK, _sub_clock); \ lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_RC_CLOCK, _rc_clock); \ - lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_CF_CLOCK, _cf_clock); \ - + lc8670_cpu_device::static_set_cpu_clock(*device, LC8670_CF_CLOCK, _cf_clock); #define MCFG_LC8670_BANKSWITCH_CB(_devcb) \ devcb = &lc8670_cpu_device::static_set_bankswitch_cb(*device, DEVCB2_##_devcb); diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h index 5255f667bce..13b6c393ca4 100644 --- a/src/emu/cpu/m37710/m37710op.h +++ b/src/emu/cpu/m37710/m37710op.h @@ -864,8 +864,7 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ m37710i_branch_8(cpustate, DST); \ BREAKOUT; \ } \ - CLK(CLK_OP + CLK_RELATIVE_8); \ - + CLK(CLK_OP + CLK_RELATIVE_8); /* M37710 Cause a Break interrupt */ #undef OP_BRK #define OP_BRK() \ diff --git a/src/emu/cpu/m68000/68307ser.c b/src/emu/cpu/m68000/68307ser.c index 50b552bc543..74e3c3249ee 100644 --- a/src/emu/cpu/m68000/68307ser.c +++ b/src/emu/cpu/m68000/68307ser.c @@ -28,7 +28,6 @@ READ8_HANDLER( m68307_internal_serial_r ) } else { - int pc = space.device().safe_pc(); switch (offset) @@ -170,5 +169,4 @@ WRITE8_HANDLER( m68307_internal_serial_w ) void m68307_serial::reset(void) { - } diff --git a/src/emu/cpu/m68000/68307sim.c b/src/emu/cpu/m68000/68307sim.c index e7a2c6ee15e..53a606e0ee5 100644 --- a/src/emu/cpu/m68000/68307sim.c +++ b/src/emu/cpu/m68000/68307sim.c @@ -53,7 +53,6 @@ WRITE16_HANDLER( m68307_internal_sim_w ) { switch (offset<<1) { - case m68307SIM_PACNT: logerror("%08x m68307_internal_sim_w %08x, %04x (%04x) (Port A (8-bit) Control Register - PACNT)\n", pc, offset*2,data,mem_mask); sim->write_pacnt(data,mem_mask); diff --git a/src/emu/cpu/m68000/68307tmu.c b/src/emu/cpu/m68000/68307tmu.c index 23aebd6714d..a296d92d52a 100644 --- a/src/emu/cpu/m68000/68307tmu.c +++ b/src/emu/cpu/m68000/68307tmu.c @@ -101,7 +101,6 @@ WRITE16_HANDLER( m68307_internal_timer_w ) static TIMER_CALLBACK( m68307_timer0_callback ) { - legacy_cpu_device *dev = (legacy_cpu_device *)ptr; m68ki_cpu_core* m68k = m68k_get_safe_token(dev); m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[0]; diff --git a/src/emu/cpu/m68000/68340dma.c b/src/emu/cpu/m68000/68340dma.c index 34d604bd064..b2e4c101113 100644 --- a/src/emu/cpu/m68000/68340dma.c +++ b/src/emu/cpu/m68000/68340dma.c @@ -34,5 +34,4 @@ WRITE32_HANDLER( m68340_internal_dma_w ) void m68340_dma::reset(void) { - } diff --git a/src/emu/cpu/m68000/68340ser.c b/src/emu/cpu/m68000/68340ser.c index 98565ed58c5..cbd5679dae7 100644 --- a/src/emu/cpu/m68000/68340ser.c +++ b/src/emu/cpu/m68000/68340ser.c @@ -35,5 +35,4 @@ WRITE32_HANDLER( m68340_internal_serial_w ) void m68340_serial::reset(void) { - } diff --git a/src/emu/cpu/m68000/68340sim.c b/src/emu/cpu/m68000/68340sim.c index dbe530da08a..2d3c95c10b0 100644 --- a/src/emu/cpu/m68000/68340sim.c +++ b/src/emu/cpu/m68000/68340sim.c @@ -300,5 +300,4 @@ WRITE32_HANDLER( m68340_internal_sim_cs_w ) void m68340_sim::reset(void) { - } diff --git a/src/emu/cpu/m68000/68340tmu.c b/src/emu/cpu/m68000/68340tmu.c index f19093c4e10..e410a9bf91e 100644 --- a/src/emu/cpu/m68000/68340tmu.c +++ b/src/emu/cpu/m68000/68340tmu.c @@ -35,5 +35,4 @@ WRITE32_HANDLER( m68340_internal_timer_w ) void m68340_timer::reset(void) { - } diff --git a/src/emu/cpu/m68000/m68kdasm.c b/src/emu/cpu/m68000/m68kdasm.c index 887f84b7cfd..bbc8bf318ce 100644 --- a/src/emu/cpu/m68000/m68kdasm.c +++ b/src/emu/cpu/m68000/m68kdasm.c @@ -1845,7 +1845,6 @@ static void d68040_fpu(void) case 0x5: // control to ea { - strcpy(g_dasm_str, "fmovem.l "); if (w2 & 0x1000) strcat(g_dasm_str, "fpcr"); if (w2 & 0x0800) strcat(g_dasm_str, "/fpsr"); diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h index c6a9dbd84d6..1f9b4423170 100644 --- a/src/emu/cpu/m6809/m6809.h +++ b/src/emu/cpu/m6809/m6809.h @@ -10,8 +10,7 @@ //************************************************************************** #define MCFG_CPU_M6809_CONFIG(_config) \ - m6809_base_device::static_set_config(*device, _config); \ - + m6809_base_device::static_set_config(*device, _config); //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 0a06445c1dd..492c0b91187 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -495,7 +495,6 @@ static CPU_RESET( hc11 ) static CPU_EXIT( hc11 ) { - } /* diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c index b69930223ae..ac2e69971df 100644 --- a/src/emu/cpu/mcs51/mcs51.c +++ b/src/emu/cpu/mcs51/mcs51.c @@ -1314,7 +1314,6 @@ static void execute_op(mcs51_state_t *mcs51_state, UINT8 op) switch( op ) { - case 0x00: nop(mcs51_state, op); break; //NOP case 0x01: ajmp(mcs51_state, op); break; //AJMP code addr case 0x02: ljmp(mcs51_state, op); break; //LJMP code addr @@ -2338,7 +2337,6 @@ static void ds5002fp_sfr_write(mcs51_state_t *mcs51_state, size_t offset, UINT8 { switch (offset) { - case ADDR_TA: mcs51_state->ds5002fp.previous_ta = TA; /* init the time window after having wrote 0xaa */ diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index 8a85b37a5c3..4808c048a34 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -949,7 +949,6 @@ static CPU_EXECUTE(mn10200) case 0xf1: opcode = mn102_read_byte(mn102, mn102->pc+1); switch(opcode>>6) { - // mov (di, an), am case 0: mn102->cycles -= 3; @@ -1483,7 +1482,6 @@ static CPU_EXECUTE(mn10200) case 0xf5: opcode = mn102_read_byte(mn102, mn102->pc+1); switch(opcode) { - // and imm8, dn case 0x00: case 0x01: case 0x02: case 0x03: mn102->cycles -= 2; diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index bae144a895b..2f8bfc41617 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -227,7 +227,6 @@ static CPU_RESET( nec ) static CPU_EXIT( nec ) { - } static void nec_interrupt(nec_state_t *nec_state, unsigned int_num, INTSOURCES source) diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c index 39501514750..a2a1ccc5bb1 100644 --- a/src/emu/cpu/nec/v25.c +++ b/src/emu/cpu/nec/v25.c @@ -210,7 +210,6 @@ static CPU_RESET( v25 ) static CPU_EXIT( v25 ) { - } static void nec_interrupt(v25_state_t *nec_state, unsigned int_num, INTSOURCES source) diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c index 58c513960a4..33d8a4ac1c5 100644 --- a/src/emu/cpu/pic16c62x/pic16c62x.c +++ b/src/emu/cpu/pic16c62x/pic16c62x.c @@ -700,7 +700,6 @@ static void swapf(pic16c62x_state *cpustate) static void tris(pic16c62x_state *cpustate) { - switch(cpustate->opcode.b.l & 0x7) { case 05: STORE_REGFILE(cpustate, 0x85, cpustate->W); break; diff --git a/src/emu/cpu/powerpc/drc_ops.c b/src/emu/cpu/powerpc/drc_ops.c index 1f15314df78..ebbe32cba9c 100644 --- a/src/emu/cpu/powerpc/drc_ops.c +++ b/src/emu/cpu/powerpc/drc_ops.c @@ -1872,7 +1872,6 @@ static UINT32 recompile_orcx(drc_core *drc, UINT32 op) static UINT32 recompile_ori(drc_core *drc, UINT32 op) { - emit_mov_r32_m32(DRCTOP, REG_EAX, MABS(®(RS))); emit_or_r32_imm(DRCTOP, REG_EAX, UIMM16); emit_mov_m32_r32(DRCTOP, MABS(®(RA)), REG_EAX); diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c index 3d748ae9f83..b87db93a412 100644 --- a/src/emu/cpu/powerpc/ppc.c +++ b/src/emu/cpu/powerpc/ppc.c @@ -889,7 +889,6 @@ static void ppc_init(void) /* Fill the opcode tables */ for( i=0; i < (sizeof(ppc_opcode_common) / sizeof(PPC_OPCODE)); i++ ) { - switch(ppc_opcode_common[i].code) { case 19: @@ -970,7 +969,6 @@ static CPU_INIT( ppc403 ) static CPU_EXIT( ppc403 ) { - } static CPU_INIT( ppc405 ) @@ -1016,7 +1014,6 @@ static CPU_INIT( ppc405 ) static CPU_EXIT( ppc405 ) { - } static CPU_INIT( ppc603 ) @@ -1160,7 +1157,6 @@ static CPU_INIT( ppc603 ) static CPU_EXIT( ppc603 ) { - } static CPU_INIT( ppc602 ) @@ -1293,17 +1289,14 @@ static CPU_INIT( ppc602 ) static CPU_EXIT( ppc602 ) { - } static void mpc8240_tlbli(UINT32 op) { - } static void mpc8240_tlbld(UINT32 op) { - } static CPU_INIT( mpc8240 ) @@ -1434,7 +1427,6 @@ static CPU_INIT( mpc8240 ) static CPU_EXIT( mpc8240 ) { - } static CPU_INIT( ppc601 ) @@ -1562,7 +1554,6 @@ static CPU_INIT( ppc601 ) static CPU_EXIT( ppc601 ) { - } static CPU_INIT( ppc604 ) @@ -1692,7 +1683,6 @@ static CPU_INIT( ppc604 ) static CPU_EXIT( ppc604 ) { - } diff --git a/src/emu/cpu/powerpc/ppc403.c b/src/emu/cpu/powerpc/ppc403.c index 8cd212c683e..ea026b89da3 100644 --- a/src/emu/cpu/powerpc/ppc403.c +++ b/src/emu/cpu/powerpc/ppc403.c @@ -489,27 +489,22 @@ static void ppc403_dma_set_irq_line(int dma, int state) #ifndef PPC_DRC static void ppc_dccci(UINT32 op) { - } static void ppc_dcread(UINT32 op) { - } static void ppc_icbt(UINT32 op) { - } static void ppc_iccci(UINT32 op) { - } static void ppc_icread(UINT32 op) { - } static void ppc_rfci(UINT32 op) @@ -732,7 +727,6 @@ void ppc403_install_spu_tx_handler(SPU_TX_HANDLER tx_handler) void ppc403_spu_rx_dma(UINT8 *data, int length) { - } void ppc403_install_spu_rx_dma_handler(PPC_DMA_HANDLER rx_dma_handler, UINT8 *buffer) @@ -797,7 +791,6 @@ static void ppc403_dma_exec(int ch) } else /* mem to peripheral */ { - /* check if the serial port is hooked to channel 2 or 3 */ if( (ch == 2 && ((ppc.spu.sptc >> 5) & 0x3) == 2) || (ch == 3 && ((ppc.spu.sptc >> 5) & 0x3) == 3) ) diff --git a/src/emu/cpu/powerpc/ppc602.c b/src/emu/cpu/powerpc/ppc602.c index 1c183112785..9632d0f42a1 100644 --- a/src/emu/cpu/powerpc/ppc602.c +++ b/src/emu/cpu/powerpc/ppc602.c @@ -32,12 +32,10 @@ static void ppc_esa(UINT32 op) #ifndef PPC_DRC static void ppc_tlbli(UINT32 op) { - } static void ppc_tlbld(UINT32 op) { - } #endif diff --git a/src/emu/cpu/powerpc/ppc_ops.c b/src/emu/cpu/powerpc/ppc_ops.c index db42657ccde..dddf2379c40 100644 --- a/src/emu/cpu/powerpc/ppc_ops.c +++ b/src/emu/cpu/powerpc/ppc_ops.c @@ -429,32 +429,26 @@ static void ppc_crxor(UINT32 op) #ifndef PPC_DRC static void ppc_dcbf(UINT32 op) { - } static void ppc_dcbi(UINT32 op) { - } static void ppc_dcbst(UINT32 op) { - } static void ppc_dcbt(UINT32 op) { - } static void ppc_dcbtst(UINT32 op) { - } static void ppc_dcbz(UINT32 op) { - } #endif @@ -512,7 +506,6 @@ static void ppc_divwux(UINT32 op) #ifndef PPC_DRC static void ppc_eieio(UINT32 op) { - } static void ppc_eqvx(UINT32 op) @@ -544,12 +537,10 @@ static void ppc_extshx(UINT32 op) static void ppc_icbi(UINT32 op) { - } static void ppc_isync(UINT32 op) { - } static void ppc_lbz(UINT32 op) @@ -1506,7 +1497,6 @@ static void ppc_subfzex(UINT32 op) #ifndef PPC_DRC static void ppc_sync(UINT32 op) { - } #endif diff --git a/src/emu/cpu/psx/psx.h b/src/emu/cpu/psx/psx.h index 1eb5b0aa064..e8ad804578a 100644 --- a/src/emu/cpu/psx/psx.h +++ b/src/emu/cpu/psx/psx.h @@ -111,11 +111,9 @@ enum psxcpu_device::getcpu( *owner, cputag )->subdevice("dma")->install_write_handler( channel, handler ); #define MCFG_PSX_GPU_READ_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_gpu_read_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxcpu_device::set_gpu_read_handler(*device, DEVCB2_##_devcb); #define MCFG_PSX_GPU_WRITE_HANDLER(_devcb) \ - devcb = &psxcpu_device::set_gpu_write_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxcpu_device::set_gpu_write_handler(*device, DEVCB2_##_devcb); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/cpu/psx/rcnt.h b/src/emu/cpu/psx/rcnt.h index c56b0c0c3b2..4730f4493f0 100644 --- a/src/emu/cpu/psx/rcnt.h +++ b/src/emu/cpu/psx/rcnt.h @@ -15,14 +15,11 @@ extern const device_type PSX_RCNT; #define MCFG_PSX_RCNT_IRQ0_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq0_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxrcnt_device::set_irq0_handler(*device, DEVCB2_##_devcb); #define MCFG_PSX_RCNT_IRQ1_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq1_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxrcnt_device::set_irq1_handler(*device, DEVCB2_##_devcb); #define MCFG_PSX_RCNT_IRQ2_HANDLER(_devcb) \ - devcb = &psxrcnt_device::set_irq2_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxrcnt_device::set_irq2_handler(*device, DEVCB2_##_devcb); #define PSX_RC_STOP ( 0x01 ) #define PSX_RC_RESET ( 0x04 ) /* guess */ #define PSX_RC_COUNTTARGET ( 0x08 ) diff --git a/src/emu/cpu/psx/sio.h b/src/emu/cpu/psx/sio.h index fc1d45632a3..aaa61fb429b 100644 --- a/src/emu/cpu/psx/sio.h +++ b/src/emu/cpu/psx/sio.h @@ -17,8 +17,7 @@ extern const device_type PSX_SIO0; extern const device_type PSX_SIO1; #define MCFG_PSX_SIO_IRQ_HANDLER(_devcb) \ - devcb = &psxsio_device::set_irq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &psxsio_device::set_irq_handler(*device, DEVCB2_##_devcb); #define SIO_BUF_SIZE ( 8 ) #define SIO_STATUS_TX_RDY ( 1 << 0 ) diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c index f48faed8e76..8e22c6a55bd 100644 --- a/src/emu/cpu/rsp/rsp.c +++ b/src/emu/cpu/rsp/rsp.c @@ -1912,10 +1912,8 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op) if (CARRY_FLAG(i) != 0) { - if (ZERO_FLAG(i) != 0) { - if (COMPARE_FLAG(i) != 0) { ACCUM_L(i) = -(UINT16)s2; @@ -1927,10 +1925,8 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op) } else//ZERO_FLAG(i)==0 { - if (rsp->flag[2] & (1 << (i))) { - if (((UINT32)(UINT16)(s1) + (UINT32)(UINT16)(s2)) > 0x10000) {//proper fix for Harvest Moon 64, r4 @@ -1939,7 +1935,6 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op) } else { - ACCUM_L(i) = -((UINT16)s2); SET_COMPARE_FLAG(i); } @@ -1961,10 +1956,8 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op) }// else//CARRY_FLAG(i)==0 { - if (ZERO_FLAG(i) != 0) { - if (rsp->flag[1] & (1 << (8+i))) { ACCUM_L(i) = s2; diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c index f1e83aec193..43ac9758561 100644 --- a/src/emu/cpu/rsp/rspdrc.c +++ b/src/emu/cpu/rsp/rspdrc.c @@ -2659,10 +2659,8 @@ INLINE void cfunc_rsp_vcl(void *param) if (CARRY_FLAG(i) != 0) { - if (ZERO_FLAG(i) != 0) { - if (COMPARE_FLAG(i) != 0) { ACCUM_L(i) = -(UINT16)s2; @@ -2674,10 +2672,8 @@ INLINE void cfunc_rsp_vcl(void *param) } else//ZERO_FLAG(i)==0 { - if (rsp->flag[2] & (1 << (i))) { - if (((UINT32)(UINT16)(s1) + (UINT32)(UINT16)(s2)) > 0x10000) {//proper fix for Harvest Moon 64, r4 @@ -2686,7 +2682,6 @@ INLINE void cfunc_rsp_vcl(void *param) } else { - ACCUM_L(i) = -((UINT16)s2); SET_COMPARE_FLAG(i); } @@ -2708,10 +2703,8 @@ INLINE void cfunc_rsp_vcl(void *param) }// else//CARRY_FLAG(i)==0 { - if (ZERO_FLAG(i) != 0) { - if (rsp->flag[1] & (1 << (8+i))) { ACCUM_L(i) = s2; diff --git a/src/emu/cpu/s2650/2650dasm.c b/src/emu/cpu/s2650/2650dasm.c index cd6d2dac053..6dedfe09acc 100644 --- a/src/emu/cpu/s2650/2650dasm.c +++ b/src/emu/cpu/s2650/2650dasm.c @@ -109,11 +109,9 @@ static char *IMM_PSU(int pc) int v = readarg(pc); if (v == 0xff) { - p += sprintf(p, "all"); } else { - if (v & 0x80) /* sense input */ p += sprintf(p, "si+"); if (v & 0x40) /* flag output */ diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 06640835a42..b15f4498f37 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -150,7 +150,6 @@ static CPU_SET_INFO( sc61860 ) sc61860_state *cpustate = get_safe_token(device); switch (state) { - case CPUINFO_INT_PC: case CPUINFO_INT_REGISTER + SC61860_PC: cpustate->pc = info->i; break; case CPUINFO_INT_SP: diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c index 9f32390ff03..6f8854618e9 100644 --- a/src/emu/cpu/se3208/se3208.c +++ b/src/emu/cpu/se3208/se3208.c @@ -1635,7 +1635,6 @@ static _OP DecodeOp(UINT16 Opcode) { if(Opcode&(1<<8)) { - } else { diff --git a/src/emu/cpu/se3208/se3208dis.c b/src/emu/cpu/se3208/se3208dis.c index 38f3e2adb7c..de90bd87f04 100644 --- a/src/emu/cpu/se3208/se3208dis.c +++ b/src/emu/cpu/se3208/se3208dis.c @@ -1335,7 +1335,6 @@ static _OP DecodeOp(UINT16 Opcode) { if(Opcode&(1<<8)) { - } else { diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index 5d934e94d6b..bbebb2a40a3 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -169,7 +169,6 @@ INLINE UINT32 RL(sh2_state *sh2, offs_t A) INLINE void WB(sh2_state *sh2, offs_t A, UINT8 V) { - if (A >= 0xe0000000) { sh2_internal_w(sh2->internal, (A & 0x1fc)>>2, V << (((~A) & 3)*8), 0xff << (((~A) & 3)*8)); diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c index 32afcf45de6..890d5bfe512 100644 --- a/src/emu/cpu/sh2/sh2comn.c +++ b/src/emu/cpu/sh2/sh2comn.c @@ -191,8 +191,6 @@ void sh2_do_dma(sh2_state *sh2, int dma) if (sh2->active_dma_count[dma] > 0) { - - // process current DMA switch(sh2->active_dma_size[dma]) { @@ -432,7 +430,6 @@ static void sh2_dmac_check(sh2_state *sh2, int dma) { if(!sh2->dma_timer_active[dma] && !(sh2->m[0x63+4*dma] & 2)) { - sh2->active_dma_incd[dma] = (sh2->m[0x63+4*dma] >> 14) & 3; sh2->active_dma_incs[dma] = (sh2->m[0x63+4*dma] >> 12) & 3; sh2->active_dma_size[dma] = (sh2->m[0x63+4*dma] >> 10) & 3; diff --git a/src/emu/cpu/sh4/sh3comn.c b/src/emu/cpu/sh4/sh3comn.c index 000bd4f4a13..ccc06959fc6 100644 --- a/src/emu/cpu/sh4/sh3comn.c +++ b/src/emu/cpu/sh4/sh3comn.c @@ -17,7 +17,6 @@ WRITE32_HANDLER( sh3_internal_high_w ) switch (offset) { - case SH3_ICR0_IPRA_ADDR: if (mem_mask & 0xffff0000) { @@ -81,7 +80,6 @@ READ32_HANDLER( sh3_internal_high_r ) switch (offset) { - case SH3_ICR0_IPRA_ADDR: logerror("'%s' (%08x): INTC internal read from %08x mask %08x (SH3_ICR0_IPRA_ADDR - %08x)\n",sh4->device->tag(), sh4->pc & AM,(offset *4)+SH3_UPPER_REGBASE,mem_mask, sh4->m_sh3internal_upper[offset]); return (sh4->m_sh3internal_upper[offset] & 0xffff0000) | (sh4->SH4_IPRA & 0xffff); @@ -144,10 +142,8 @@ READ32_HANDLER( sh3_internal_r ) if (offset<0x1000) { - switch (offset) { - case SH3_SAR0_ADDR: return sh4_handle_sar0_addr_r(sh4,mem_mask); case SH3_SAR1_ADDR: return sh4_handle_sar1_addr_r(sh4,mem_mask); case SH3_SAR2_ADDR: return sh4_handle_sar2_addr_r(sh4,mem_mask); @@ -371,7 +367,6 @@ READ32_HANDLER( sh3_internal_r ) } else { - logerror("'%s' (%08x): unmapped internal read from %08x mask %08x\n", sh4->device->tag(), sh4->pc & AM, (offset *4)+0x4000000, @@ -396,7 +391,6 @@ WRITE32_HANDLER( sh3_internal_w ) switch (offset) { - case SH3_SAR0_ADDR: sh4_handle_sar0_addr_w(sh4,data,mem_mask); break; case SH3_SAR1_ADDR: sh4_handle_sar1_addr_w(sh4,data,mem_mask); break; case SH3_SAR2_ADDR: sh4_handle_sar2_addr_w(sh4,data,mem_mask); break; @@ -443,7 +437,6 @@ WRITE32_HANDLER( sh3_internal_w ) case PINTER_IPRC: { - if (mem_mask & 0xffff0000) { logerror("'%s' (%08x): unmapped internal write to %08x = %08x & %08x (PINTER)\n",sh4->device->tag(), sh4->pc & AM,(offset *4)+0x4000000,data,mem_mask); diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c index b92b6acb4c4..27570afd351 100644 --- a/src/emu/cpu/sh4/sh4comn.c +++ b/src/emu/cpu/sh4/sh4comn.c @@ -415,7 +415,6 @@ void sh4_exception(sh4_state *sh4, const char *message, int exception) // handle } else { - if (sh4->sr & BL) return; if (((sh4->exception_priority[exception] >> 8) & 255) <= ((sh4->sr >> 4) & 15)) @@ -1009,7 +1008,6 @@ void sh4_set_frt_input(device_t *device, int state) if (sh4->cpu_type == CPU_TYPE_SH4) { - if(sh4->m[5] & 0x8000) { if(state == CLEAR_LINE) { return; diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 8e3b0ff0bce..3632ab433fb 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -403,7 +403,6 @@ void sharc_external_dma_write(device_t *device, UINT32 address, UINT64 data) if (shift == 2) { - cpustate->dma[6].int_index += cpustate->dma[6].int_modifier; } break; diff --git a/src/emu/cpu/sharc/sharcops.c b/src/emu/cpu/sharc/sharcops.c index 14e7a56ffd8..95d49abcc73 100644 --- a/src/emu/cpu/sharc/sharcops.c +++ b/src/emu/cpu/sharc/sharcops.c @@ -2729,7 +2729,6 @@ static void sharcop_push_pop_stacks(SHARC_REGS *cpustate) static void sharcop_nop(SHARC_REGS *cpustate) { - } /*****************************************************************************/ diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h index e18e90878a9..bbc4e070c62 100644 --- a/src/emu/cpu/tms32031/tms32031.h +++ b/src/emu/cpu/tms32031/tms32031.h @@ -120,8 +120,7 @@ enum //************************************************************************** #define MCFG_TMS3203X_CONFIG(_config) \ - tms3203x_device::static_set_config(*device, _config); \ - + tms3203x_device::static_set_config(*device, _config); //************************************************************************** diff --git a/src/emu/cpu/tms34010/34010ops.h b/src/emu/cpu/tms34010/34010ops.h index 484d601444e..f7a32c320e0 100644 --- a/src/emu/cpu/tms34010/34010ops.h +++ b/src/emu/cpu/tms34010/34010ops.h @@ -68,8 +68,7 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) { \ old = (UINT32)TMS34010_RDMEM_WORD(T, offset) & ~((MASK) << shift); \ TMS34010_WRMEM_WORD(T, offset, ((masked_data & (MASK)) << shift) | old); \ - } \ - + } #define WFIELDMAC_BIG(T,MASK,MAX) \ UINT32 shift = offset & 0x0f; \ UINT32 masked_data = data & (MASK); \ @@ -84,24 +83,21 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) shift = 32 - shift; \ old = (UINT32)TMS34010_RDMEM_WORD(T, offset + 4) & ~((MASK) >> shift); \ TMS34010_WRMEM_WORD(T, offset, (masked_data >> shift) | old); \ - } \ - + } #define WFIELDMAC_8(T) \ if (offset & 0x07) \ { \ WFIELDMAC(T,0xff,9); \ } \ else \ - TMS34010_WRMEM(T, TOBYTE(offset), data); \ - + TMS34010_WRMEM(T, TOBYTE(offset), data); #define RFIELDMAC_8(T) \ if (offset & 0x07) \ { \ RFIELDMAC(T,0xff,9); \ } \ else \ - return TMS34010_RDMEM(T, TOBYTE(offset)); \ - + return TMS34010_RDMEM(T, TOBYTE(offset)); #define WFIELDMAC_32(T) \ if (offset & 0x0f) \ { \ @@ -115,8 +111,7 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) TMS34010_WRMEM_DWORD(T, TOBYTE(offset+0x20),(data>>(0x20-shift))|hiword); \ } \ else \ - TMS34010_WRMEM_DWORD(T, TOBYTE(offset),data); \ - + TMS34010_WRMEM_DWORD(T, TOBYTE(offset),data); /*************************************************************************** @@ -130,8 +125,7 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) if (shift >= MAX) \ ret = (TMS34010_RDMEM_DWORD(T, offset) >> shift) & (MASK); \ else \ - ret = (TMS34010_RDMEM_WORD(T, offset) >> shift) & (MASK); \ - + ret = (TMS34010_RDMEM_WORD(T, offset) >> shift) & (MASK); #define RFIELDMAC_BIG(T,MASK,MAX) \ UINT32 shift = offset & 0x0f; \ offset = TOBYTE(offset & 0xfffffff0); \ @@ -139,8 +133,7 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) ret = (UINT32)TMS34010_RDMEM_DWORD(T, offset) >> shift; \ if (shift >= MAX) \ ret |= (TMS34010_RDMEM_WORD(T, offset + 4) << (32 - shift)); \ - ret &= MASK; \ - + ret &= MASK; #define RFIELDMAC_32(T) \ if (offset&0x0f) \ { \ @@ -150,8 +143,7 @@ INLINE void TMS34010_WRMEM_DWORD(tms34010_state *tms, offs_t A,UINT32 V) (TMS34010_RDMEM_DWORD (T, TOBYTE(offset+0x20))<<(0x20-shift)));\ } \ else \ - return TMS34010_RDMEM_DWORD(T, TOBYTE(offset)); \ - + return TMS34010_RDMEM_DWORD(T, TOBYTE(offset)); #endif /* __34010OPS_H__ */ diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index ac086c578c8..d47afa30362 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -337,8 +337,7 @@ static UINT32 read_pixel_shiftreg(tms34010_state *tms, offs_t offset) /* TODO: plane masking */ \ data &= m2; \ pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount); \ - TMS34010_WRMEM_WORD(T, a, pix); \ - + TMS34010_WRMEM_WORD(T, a, pix); /* No Raster Op + Transparency */ #define WP_T(T,m1,m2) \ /* TODO: plane masking */ \ @@ -352,8 +351,7 @@ static UINT32 read_pixel_shiftreg(tms34010_state *tms, offs_t offset) /* TODO: plane masking */ \ pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount); \ TMS34010_WRMEM_WORD(T, a, pix); \ - } \ - + } /* Raster Op + No Transparency */ #define WP_R(T,m1,m2) \ UINT32 a = TOBYTE(offset & 0xfffffff0); \ @@ -363,8 +361,7 @@ static UINT32 read_pixel_shiftreg(tms34010_state *tms, offs_t offset) /* TODO: plane masking */ \ data = (*(T)->raster_op)(tms, data & m2, (pix >> shiftcount) & m2) & m2; \ pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount); \ - TMS34010_WRMEM_WORD(T, a, pix); \ - + TMS34010_WRMEM_WORD(T, a, pix); /* Raster Op + Transparency */ #define WP_R_T(T,m1,m2) \ UINT32 a = TOBYTE(offset & 0xfffffff0); \ @@ -377,8 +374,7 @@ static UINT32 read_pixel_shiftreg(tms34010_state *tms, offs_t offset) { \ pix = (pix & ~(m2 << shiftcount)) | (data << shiftcount); \ TMS34010_WRMEM_WORD(T, a, pix); \ - } \ - + } /* No Raster Op + No Transparency */ static void write_pixel_1(tms34010_state *tms, offs_t offset, UINT32 data) { WP(tms, 0x0f, 0x01); } diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index cc9c30a602f..59a8090c779 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -496,7 +496,6 @@ static CPU_EXECUTE( tms7000_exl ) if( cpustate->idle_state == 0 ) { - op = cpustate->direct->read_decrypted_byte(pPC++); opfn_exl[op](cpustate); diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c index a5f9d4ca923..60708de5ba0 100755 --- a/src/emu/cpu/upd7725/upd7725.c +++ b/src/emu/cpu/upd7725/upd7725.c @@ -583,7 +583,6 @@ void necdsp_device::exec_ld(UINT32 opcode) { } UINT8 necdsp_device::snesdsp_read(bool mode) { - if (!mode) { return regs.sr >> 8; diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 014e62fba9f..75ef948f5c0 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -658,8 +658,7 @@ struct opcode_s { if ((after & 15) < (before & 15)) \ PSW |= HC; \ else \ - PSW &= ~HC; \ - + PSW &= ~HC; #define ZHC_SUB(after,before,carry) \ if (after == 0) PSW |= Z; else PSW &= ~Z; \ if (before == after) \ @@ -671,8 +670,7 @@ struct opcode_s { if ((after & 15) > (before & 15)) \ PSW |= HC; \ else \ - PSW &= ~HC; \ - + PSW &= ~HC; #define SKIP_CY if (CY == (PSW & CY)) PSW |= SK #define SKIP_NC if (0 == (PSW & CY)) PSW |= SK #define SKIP_Z if (Z == (PSW & Z)) PSW |= SK diff --git a/src/emu/cpu/x86emit.h b/src/emu/cpu/x86emit.h index 5ca12233d26..0034f33beaf 100644 --- a/src/emu/cpu/x86emit.h +++ b/src/emu/cpu/x86emit.h @@ -102,7 +102,6 @@ namespace x86emit namespace x64emit #endif { - //************************************************************************** // CONSTANTS //************************************************************************** diff --git a/src/emu/cpu/z180/z180ops.h b/src/emu/cpu/z180/z180ops.h index ff9f476a2e3..2480b1d92cf 100644 --- a/src/emu/cpu/z180/z180ops.h +++ b/src/emu/cpu/z180/z180ops.h @@ -194,8 +194,7 @@ INLINE UINT32 ARG16(z180_state *cpustate) cpustate->_PC += arg; /* so don't do cpustate->_PC += ARG(cpustate) */ \ CC(ex,opcode); \ } \ - else cpustate->_PC++; \ - + else cpustate->_PC++; /*************************************************************** * CALL ***************************************************************/ diff --git a/src/emu/debugint/debugint.c b/src/emu/debugint/debugint.c index 652e991c2f8..0a7e7a1d5cf 100644 --- a/src/emu/debugint/debugint.c +++ b/src/emu/debugint/debugint.c @@ -628,7 +628,6 @@ static int dview_on_mouse(DView *dv, int mx, int my, int button) INLINE void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg) { - *bg = MAKE_ARGB(0xff,0xff,0xff,0xff); *fg = MAKE_ARGB(0xff,0x00,0x00,0x00); @@ -1413,7 +1412,6 @@ static void update_views(void) void debugint_wait_for_debugger(device_t &device, bool firststop) { - if (firststop && list == NULL) { DView *dv; diff --git a/src/emu/device.h b/src/emu/device.h index 51132968ef9..d4cd2a9e1f3 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -63,17 +63,13 @@ // configure devices #define MCFG_DEVICE_CONFIG(_config) \ - device_t::static_set_static_config(*device, &(_config)); \ - + device_t::static_set_static_config(*device, &(_config)); #define MCFG_DEVICE_CONFIG_CLEAR() \ - device_t::static_set_static_config(*device, NULL); \ - + device_t::static_set_static_config(*device, NULL); #define MCFG_DEVICE_CLOCK(_clock) \ - device_t::static_set_clock(*device, _clock); \ - + device_t::static_set_clock(*device, _clock); #define MCFG_DEVICE_INPUT_DEFAULTS(_config) \ - device_t::static_set_input_default(*device, DEVICE_INPUT_DEFAULTS_NAME(_config)); \ - + device_t::static_set_input_default(*device, DEVICE_INPUT_DEFAULTS_NAME(_config)); // macros for defining read_line/write_line functions #define READ_LINE_DEVICE_HANDLER(name) int name(ATTR_UNUSED device_t *device) diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 5ba27962c02..8f59af7270f 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -113,26 +113,19 @@ enum //************************************************************************** #define MCFG_DEVICE_DISABLE() \ - device_execute_interface::static_set_disable(*device); \ - + device_execute_interface::static_set_disable(*device); #define MCFG_DEVICE_VBLANK_INT(_tag, _func) \ - device_execute_interface::static_set_vblank_int(*device, _func, _tag); \ - + device_execute_interface::static_set_vblank_int(*device, _func, _tag); #define MCFG_DEVICE_VBLANK_INT_DRIVER(_tag, _class, _func) \ - device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF_OWNER, (_class *)0), _tag); \ - + device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF_OWNER, (_class *)0), _tag); #define MCFG_DEVICE_VBLANK_INT_DEVICE(_devtag, _tag, _class, _func) \ - device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)0), _tag); \ - + device_execute_interface::static_set_vblank_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)0), _tag); #define MCFG_DEVICE_PERIODIC_INT(_func, _rate) \ - device_execute_interface::static_set_periodic_int(*device, _func, attotime::from_hz(_rate)); \ - + device_execute_interface::static_set_periodic_int(*device, _func, attotime::from_hz(_rate)); #define MCFG_DEVICE_PERIODIC_INT_DRIVER(_class, _func, _rate) \ - device_execute_interface::static_set_periodic_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF_OWNER, (_class *)0), attotime::from_hz(_rate)); \ - + device_execute_interface::static_set_periodic_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF_OWNER, (_class *)0), attotime::from_hz(_rate)); #define MCFG_DEVICE_PERIODIC_INT_DEVICE(_devtag, _class, _func, _rate) \ - device_execute_interface::static_set_periodic_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)0), attotime::from_hz(_rate)); \ - + device_execute_interface::static_set_periodic_int(*device, device_interrupt_delegate(&_class::_func, #_class "::" #_func, _devtag, (_class *)0), attotime::from_hz(_rate)); //************************************************************************** diff --git a/src/emu/diserial.c b/src/emu/diserial.c index 14b90b6cea4..fb0d0c84d21 100644 --- a/src/emu/diserial.c +++ b/src/emu/diserial.c @@ -386,7 +386,6 @@ static UINT8 serial_connection_spin_bits(UINT8 input_status) void device_serial_interface::serial_connection_out() { - if (m_other_connection!=NULL) { UINT8 state_at_other_end = serial_connection_spin_bits(m_connection_state); diff --git a/src/emu/dislot.h b/src/emu/dislot.h index aef6e4a8229..c1c1de0a08e 100644 --- a/src/emu/dislot.h +++ b/src/emu/dislot.h @@ -31,14 +31,11 @@ struct slot_interface #define SLOT_INTERFACE_START(name) \ const slot_interface slot_interface_##name[] = \ - { \ - + { #define SLOT_INTERFACE(tag,device) \ - { tag, device, false }, \ - + { tag, device, false }, #define SLOT_INTERFACE_INTERNAL(tag,device) \ - { tag, device, true }, \ - + { tag, device, true }, #define SLOT_INTERFACE_END \ { NULL, NULL, false } \ }; diff --git a/src/emu/disound.h b/src/emu/disound.h index a9bd58944e5..4a62a12d362 100644 --- a/src/emu/disound.h +++ b/src/emu/disound.h @@ -61,8 +61,7 @@ const int AUTO_ALLOC_INPUT = 65535; //************************************************************************** #define MCFG_SOUND_ADD(_tag, _type, _clock) \ - MCFG_DEVICE_ADD(_tag, _type, _clock) \ - + MCFG_DEVICE_ADD(_tag, _type, _clock) #define MCFG_SOUND_MODIFY(_tag) \ MCFG_DEVICE_MODIFY(_tag) @@ -76,18 +75,14 @@ const int AUTO_ALLOC_INPUT = 65535; MCFG_DEVICE_CONFIG(_config) #define MCFG_SOUND_ROUTE(_output, _target, _gain) \ - device_sound_interface::static_add_route(*device, _output, _target, _gain); \ - + device_sound_interface::static_add_route(*device, _output, _target, _gain); #define MCFG_SOUND_ROUTE_EX(_output, _target, _gain, _input) \ - device_sound_interface::static_add_route(*device, _output, _target, _gain, _input); \ - + device_sound_interface::static_add_route(*device, _output, _target, _gain, _input); #define MCFG_SOUND_ROUTES_RESET() \ - device_sound_interface::static_reset_routes(*device); \ - + device_sound_interface::static_reset_routes(*device); #define MCFG_MIXER_ROUTE(_output, _target, _gain, _mixoutput) \ - device_sound_interface::static_add_route(*device, _output, _target, _gain, AUTO_ALLOC_INPUT, _mixoutput); \ - + device_sound_interface::static_add_route(*device, _output, _target, _gain, AUTO_ALLOC_INPUT, _mixoutput); //************************************************************************** diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index 05d67fe2e3a..f5880783e12 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -82,8 +82,7 @@ do { \ (DEST) = SOURCE; \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_COPY_TRANSPEN - render all pixels @@ -98,8 +97,7 @@ do if (srcdata != transpen) \ (DEST) = SOURCE; \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REMAP_OPAQUE - render all pixels @@ -112,8 +110,7 @@ do { \ (DEST) = paldata[SOURCE]; \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_OPAQUE_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -121,8 +118,7 @@ do (DEST) = paldata[SOURCE]; \ (PRIORITY) = 31; \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REMAP_TRANSPEN - render all pixels @@ -137,8 +133,7 @@ do if (srcdata != transpen) \ (DEST) = paldata[srcdata]; \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSPEN_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -150,8 +145,7 @@ do (PRIORITY) = 31; \ } \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REBASE_TRANSPEN - render all pixels @@ -166,8 +160,7 @@ do if (srcdata != transpen) \ (DEST) = color + srcdata; \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REBASE_TRANSPEN_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -179,8 +172,7 @@ do (PRIORITY) = 31; \ } \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REMAP_TRANSMASK - render all pixels @@ -195,8 +187,7 @@ do if (((transmask >> srcdata) & 1) == 0) \ (DEST) = paldata[srcdata]; \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSMASK_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -208,8 +199,7 @@ do (PRIORITY) = 31; \ } \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REMAP_TRANSTABLE - look up each pen in @@ -233,8 +223,7 @@ do (DEST) = shadowtable[DEST]; \ } \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSTABLE32(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -248,8 +237,7 @@ do (DEST) = shadowtable[rgb_to_rgb15(DEST)]; \ } \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSTABLE16_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -271,8 +259,7 @@ do } \ } \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSTABLE32_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -294,8 +281,7 @@ do } \ } \ } \ -while (0) \ - +while (0) /*------------------------------------------------- PIXEL_OP_REMAP_TRANSPEN_ALPHA - render all @@ -312,8 +298,7 @@ do if (srcdata != transpen) \ (DEST) = alpha_blend_r32((DEST), paldata[srcdata], alpha); \ } \ -while (0) \ - +while (0) #define PIXEL_OP_REMAP_TRANSPEN_ALPHA32_PRIORITY(DEST, PRIORITY, SOURCE) \ do \ { \ @@ -325,8 +310,7 @@ do (PRIORITY) = 31; \ } \ } \ -while (0) \ - +while (0) /*************************************************************************** diff --git a/src/emu/driver.h b/src/emu/driver.h index 001f363d3db..e3ad1f0dd2d 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -53,48 +53,41 @@ // core machine callbacks #define MCFG_MACHINE_START(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_START, MACHINE_START_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_START, MACHINE_START_NAME(_func)); #define MCFG_MACHINE_START_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_START, driver_callback_delegate(&_class::MACHINE_START_NAME(_func), #_class "::machine_start_" #_func, downcast<_class *>(&config.root_device()))); #define MCFG_MACHINE_RESET(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_RESET, MACHINE_RESET_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_RESET, MACHINE_RESET_NAME(_func)); #define MCFG_MACHINE_RESET_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_MACHINE_RESET, driver_callback_delegate(&_class::MACHINE_RESET_NAME(_func), #_class "::machine_reset_" #_func, downcast<_class *>(&config.root_device()))); // core sound callbacks #define MCFG_SOUND_START(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_SOUND_START, SOUND_START_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_SOUND_START, SOUND_START_NAME(_func)); #define MCFG_SOUND_START_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_SOUND_START, driver_callback_delegate(&_class::_func, #_class "::" #_func, downcast<_class *>(&config.root_device()))); #define MCFG_SOUND_RESET(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_SOUND_RESET, SOUND_RESET_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_SOUND_RESET, SOUND_RESET_NAME(_func)); #define MCFG_SOUND_RESET_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_SOUND_RESET, driver_callback_delegate(&_class::_func, #_class "::" #_func, downcast<_class *>(&config.root_device()))); // core video callbacks #define MCFG_PALETTE_INIT(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, PALETTE_INIT_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, PALETTE_INIT_NAME(_func)); #define MCFG_PALETTE_INIT_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_PALETTE_INIT, driver_callback_delegate(&_class::PALETTE_INIT_NAME(_func), #_class "::palette_init_" #_func, downcast<_class *>(&config.root_device()))); #define MCFG_VIDEO_START(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_START, VIDEO_START_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_START, VIDEO_START_NAME(_func)); #define MCFG_VIDEO_START_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_START, driver_callback_delegate(&_class::VIDEO_START_NAME(_func), #_class "::video_start_" #_func, downcast<_class *>(&config.root_device()))); #define MCFG_VIDEO_RESET(_func) \ - driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); \ - + driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); #define MCFG_VIDEO_RESET_OVERRIDE(_class, _func) \ driver_device::static_set_callback(*owner, driver_device::CB_VIDEO_RESET, driver_callback_delegate(&_class::VIDEO_RESET_NAME(_func), #_class "::video_reset_" #_func, downcast<_class *>(&config.root_device()))); diff --git a/src/emu/emucore.h b/src/emu/emucore.h index 69ad52a8c23..90f2e815634 100644 --- a/src/emu/emucore.h +++ b/src/emu/emucore.h @@ -187,8 +187,7 @@ const endianness_t ENDIANNESS_NATIVE = ENDIANNESS_BIG; #define DISABLE_COPYING(_Type) \ private: \ _Type(const _Type &); \ - _Type &operator=(const _Type &) \ - + _Type &operator=(const _Type &) // macro for declaring enumerator operators that increment/decrement like plain old C #define DECLARE_ENUM_OPERATORS(_Type) \ diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 0f1eb1a708b..b4cb4522071 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -249,7 +249,6 @@ bool emu_options::add_slot_options(bool isfirst) // retrieve info about the device instance if (!exists(slot->device().tag() + 1)) { - // add the option entry[0].name = slot->device().tag() + 1; entry[0].description = NULL; diff --git a/src/emu/imagedev/cartslot.c b/src/emu/imagedev/cartslot.c index d8f536017ff..1476992bd25 100644 --- a/src/emu/imagedev/cartslot.c +++ b/src/emu/imagedev/cartslot.c @@ -30,7 +30,6 @@ cartslot_image_device::cartslot_image_device(const machine_config &mconfig, cons m_device_partialhash(NULL), m_device_displayinfo(NULL) { - } //------------------------------------------------- @@ -208,7 +207,6 @@ int cartslot_image_device::process_cartridge(bool load) void cartslot_image_device::device_start() { - /* if this cartridge has a custom DEVICE_START, use it */ if (m_device_start != NULL) { diff --git a/src/emu/imagedev/cartslot.h b/src/emu/imagedev/cartslot.h index a767d931adc..defafabda5a 100644 --- a/src/emu/imagedev/cartslot.h +++ b/src/emu/imagedev/cartslot.h @@ -90,11 +90,9 @@ extern const device_type CARTSLOT; ***************************************************************************/ #define MCFG_CARTSLOT_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, CARTSLOT, 0) \ - + MCFG_DEVICE_ADD(_tag, CARTSLOT, 0) #define MCFG_CARTSLOT_MODIFY(_tag) \ - MCFG_DEVICE_MODIFY(_tag) \ - + MCFG_DEVICE_MODIFY(_tag) #define MCFG_CARTSLOT_EXTENSION_LIST(_extensions) \ static_cast(device)->set_extensions(_extensions); diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c index 32bc1100973..2d1f5ec25a8 100644 --- a/src/emu/imagedev/cassette.c +++ b/src/emu/imagedev/cassette.c @@ -40,7 +40,6 @@ cassette_image_device::cassette_image_device(const machine_config &mconfig, cons : device_t(mconfig, CASSETTE, "Cassette", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- @@ -340,7 +339,6 @@ error: void cassette_image_device::call_unload() { - /* if we are recording, write the value to the image */ if ((m_state & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD) update(); diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c index 264dc2d78d6..a8a98ccdbe9 100644 --- a/src/emu/imagedev/chd_cd.c +++ b/src/emu/imagedev/chd_cd.c @@ -28,7 +28,6 @@ cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char : device_t(mconfig, CDROM, "Cdrom", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/emu/imagedev/chd_cd.h b/src/emu/imagedev/chd_cd.h index 98437e7be32..fb390f3e39d 100644 --- a/src/emu/imagedev/chd_cd.h +++ b/src/emu/imagedev/chd_cd.h @@ -74,6 +74,5 @@ extern const device_type CDROM; #define MCFG_CDROM_ADD(_tag, _config) \ MCFG_DEVICE_ADD(_tag, CDROM, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #endif /* CHD_CD_H */ diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c index ba9034723b1..46180994bb2 100644 --- a/src/emu/imagedev/flopdrv.c +++ b/src/emu/imagedev/flopdrv.c @@ -753,7 +753,6 @@ WRITE_LINE_DEVICE_HANDLER( floppy_drtn_w ) /* write data */ WRITE_LINE_DEVICE_HANDLER( floppy_wtd_w ) { - } /* step */ diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h index 9a7b2285d48..67717a85824 100644 --- a/src/emu/imagedev/floppy.h +++ b/src/emu/imagedev/floppy.h @@ -24,8 +24,7 @@ static const floppy_format_type _name []; #define FLOPPY_FORMATS_MEMBER(_member) \ - const floppy_format_type _member [] = { \ - + const floppy_format_type _member [] = { #define FLOPPY_FORMATS_END \ , \ FLOPPY_D88_FORMAT, \ diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c index 05b3c76ab3e..30cc8765d70 100644 --- a/src/emu/imagedev/harddriv.c +++ b/src/emu/imagedev/harddriv.c @@ -42,7 +42,6 @@ harddisk_image_device::harddisk_image_device(const machine_config &mconfig, cons m_chd(NULL), m_hard_disk_handle(NULL) { - } //------------------------------------------------- diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h index b04b06177a9..35d4e77ae7a 100644 --- a/src/emu/imagedev/harddriv.h +++ b/src/emu/imagedev/harddriv.h @@ -83,10 +83,8 @@ extern const device_type HARDDISK; ***************************************************************************/ #define MCFG_HARDDISK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, HARDDISK, 0) \ - + MCFG_DEVICE_ADD(_tag, HARDDISK, 0) #define MCFG_HARDDISK_CONFIG_ADD(_tag,_config) \ MCFG_DEVICE_ADD(_tag, HARDDISK, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #endif /* HARDDRIV_H */ diff --git a/src/emu/imagedev/printer.c b/src/emu/imagedev/printer.c index 98b21cd47c7..c062f125887 100644 --- a/src/emu/imagedev/printer.c +++ b/src/emu/imagedev/printer.c @@ -21,7 +21,6 @@ printer_image_device::printer_image_device(const machine_config &mconfig, const : device_t(mconfig, PRINTER, "Printer", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h index 59ce5066257..959f635e547 100644 --- a/src/emu/imagedev/printer.h +++ b/src/emu/imagedev/printer.h @@ -70,6 +70,5 @@ extern const device_type PRINTER; #define MCFG_PRINTER_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PRINTER, 0) \ - + MCFG_DEVICE_ADD(_tag, PRINTER, 0) #endif /* __PRINTER_H__ */ diff --git a/src/emu/imagedev/serial.c b/src/emu/imagedev/serial.c index 761f79449fd..a325520c9f0 100644 --- a/src/emu/imagedev/serial.c +++ b/src/emu/imagedev/serial.c @@ -22,7 +22,6 @@ serial_image_device::serial_image_device(const machine_config &mconfig, const ch device_serial_interface(mconfig, *this), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/emu/imagedev/serial.h b/src/emu/imagedev/serial.h index eae304d0e5f..7cd213e5651 100644 --- a/src/emu/imagedev/serial.h +++ b/src/emu/imagedev/serial.h @@ -105,6 +105,5 @@ extern const device_type SERIAL; #define MCFG_SERIAL_ADD(_tag,_config) \ MCFG_DEVICE_ADD(_tag, SERIAL, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #endif /* __SERIAL_H__ */ diff --git a/src/emu/ioport.c b/src/emu/ioport.c index 2abe71e2c81..5466136ac3f 100644 --- a/src/emu/ioport.c +++ b/src/emu/ioport.c @@ -3844,8 +3844,7 @@ void ioport_configurer::field_alloc(ioport_type type, ioport_value defval, iopor { // make sure we have a port if (m_curport == NULL) - throw emu_fatalerror("alloc_field called with no active port (mask=%X defval=%X)\n", mask, defval); \ - + throw emu_fatalerror("alloc_field called with no active port (mask=%X defval=%X)\n", mask, defval); // append the field if (type != IPT_UNKNOWN && type != IPT_UNUSED) m_curport->m_active |= mask; diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 869b7ded52e..436ecacc989 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -1428,8 +1428,7 @@ private: #define INPUT_PORTS_START(_name) \ ATTR_COLD void INPUT_PORTS_NAME(_name)(device_t &owner, ioport_list &portlist, astring &errorbuf) \ { \ - ioport_configurer configurer(owner, portlist, errorbuf); \ - + ioport_configurer configurer(owner, portlist, errorbuf); // end of table #define INPUT_PORTS_END \ } @@ -1440,26 +1439,21 @@ ATTR_COLD void INPUT_PORTS_NAME(_name)(device_t &owner, ioport_list &portlist, a // including #define PORT_INCLUDE(_name) \ - INPUT_PORTS_NAME(_name)(owner, portlist, errorbuf); \ - + INPUT_PORTS_NAME(_name)(owner, portlist, errorbuf); // start of a new input port (with included tag) #define PORT_START(_tag) \ - configurer.port_alloc(_tag); \ - + configurer.port_alloc(_tag); // modify an existing port #define PORT_MODIFY(_tag) \ - configurer.port_modify(_tag); \ - + configurer.port_modify(_tag); // input bit definition #define PORT_BIT(_mask, _default, _type) \ - configurer.field_alloc((_type), (_default), (_mask)); \ - + configurer.field_alloc((_type), (_default), (_mask)); #define PORT_SPECIAL_ONOFF(_mask, _default, _strindex) \ PORT_SPECIAL_ONOFF_DIPLOC(_mask, _default, _strindex, NULL) #define PORT_SPECIAL_ONOFF_DIPLOC(_mask, _default, _strindex, _diploc) \ - configurer.onoff_alloc(DEF_STR(_strindex), _default, _mask, _diploc); \ - + configurer.onoff_alloc(DEF_STR(_strindex), _default, _mask, _diploc); // append a code #define PORT_CODE(_code) \ configurer.field_add_code(SEQ_TYPE_STANDARD, _code); @@ -1520,8 +1514,7 @@ ATTR_COLD void INPUT_PORTS_NAME(_name)(device_t &owner, ioport_list &portlist, a configurer.field_set_sensitivity(_sensitivity); #define PORT_KEYDELTA(_delta) \ - configurer.field_set_delta(_delta); \ - + configurer.field_set_delta(_delta); // note that PORT_CENTERDELTA must appear after PORT_KEYDELTA #define PORT_CENTERDELTA(_delta) \ configurer.field_set_centerdelta(_delta); @@ -1585,29 +1578,23 @@ ATTR_COLD void INPUT_PORTS_NAME(_name)(device_t &owner, ioport_list &portlist, a // dip switch definition #define PORT_DIPNAME(_mask, _default, _name) \ - configurer.field_alloc(IPT_DIPSWITCH, (_default), (_mask), (_name)); \ - + configurer.field_alloc(IPT_DIPSWITCH, (_default), (_mask), (_name)); #define PORT_DIPSETTING(_default, _name) \ - configurer.setting_alloc((_default), (_name)); \ - + configurer.setting_alloc((_default), (_name)); // physical location, of the form: name:[!]sw,[name:][!]sw,... // note that these are specified LSB-first #define PORT_DIPLOCATION(_location) \ - configurer.field_set_diplocation(_location); \ - + configurer.field_set_diplocation(_location); // conditionals for dip switch settings #define PORT_CONDITION(_tag, _mask, _condition, _value) \ - configurer.set_condition(ioport_condition::_condition, _tag, _mask, _value); \ - + configurer.set_condition(ioport_condition::_condition, _tag, _mask, _value); // analog adjuster definition #define PORT_ADJUSTER(_default, _name) \ configurer.field_alloc(IPT_ADJUSTER, (_default), 0xff, (_name)); \ - configurer.field_set_min_max(0, 100); \ - + configurer.field_set_min_max(0, 100); // config definition #define PORT_CONFNAME(_mask, _default, _name) \ - configurer.field_alloc(IPT_CONFIG, (_default), (_mask), (_name)); \ - + configurer.field_alloc(IPT_CONFIG, (_default), (_mask), (_name)); #define PORT_CONFSETTING(_default, _name) \ configurer.setting_alloc((_default), (_name)); @@ -1625,11 +1612,9 @@ ATTR_COLD void INPUT_PORTS_NAME(_name)(device_t &owner, ioport_list &portlist, a // start of table #define DEVICE_INPUT_DEFAULTS_START(_name) \ const input_device_default DEVICE_INPUT_DEFAULTS_NAME(_name)[] = { - // end of table #define DEVICE_INPUT_DEFAULTS(_tag,_mask,_defval) \ - { _tag ,_mask, _defval }, \ - + { _tag ,_mask, _defval }, // end of table #define DEVICE_INPUT_DEFAULTS_END \ {NULL,0,0} }; diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index d934d91e4d3..5af27803813 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -151,7 +151,6 @@ via6522_device::via6522_device(const machine_config &mconfig, const char *tag, d : device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock), m_irq(CLEAR_LINE) { - } diff --git a/src/emu/machine/6551acia.c b/src/emu/machine/6551acia.c index 7ad80d36ee1..80771f0356c 100644 --- a/src/emu/machine/6551acia.c +++ b/src/emu/machine/6551acia.c @@ -397,7 +397,6 @@ WRITE8_MEMBER(acia6551_device::write) switch (rate) { - default: case 1: { diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c index 2c9169e1d2d..ca822a34464 100644 --- a/src/emu/machine/74123.c +++ b/src/emu/machine/74123.c @@ -29,7 +29,6 @@ const device_type TTL74123 = &device_creator; ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TTL74123, "TTL74123", tag, owner, clock) { - } diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h index 2174f409894..e66b25aef97 100644 --- a/src/emu/machine/7474.h +++ b/src/emu/machine/7474.h @@ -61,11 +61,9 @@ MCFG_7474_COMP_OUTPUT_CB(_comp_output_cb) #define MCFG_7474_OUTPUT_CB(_devcb) \ - devcb = &ttl7474_device::set_output_cb(*device, DEVCB2_##_devcb); \ - + devcb = &ttl7474_device::set_output_cb(*device, DEVCB2_##_devcb); #define MCFG_7474_COMP_OUTPUT_CB(_devcb) \ - devcb = &ttl7474_device::set_comp_output_cb(*device, DEVCB2_##_devcb); \ - + devcb = &ttl7474_device::set_comp_output_cb(*device, DEVCB2_##_devcb); //************************************************************************** diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c index 4566b41378e..016d5968089 100644 --- a/src/emu/machine/8237dma.c +++ b/src/emu/machine/8237dma.c @@ -265,7 +265,6 @@ void i8237_device::i8237_timerproc() switch ( m_state ) { - case DMA8237_SI: { /* Make sure EOP is high */ diff --git a/src/emu/machine/aakart.c b/src/emu/machine/aakart.c index bf35b0e7dbf..62887c3fbe3 100644 --- a/src/emu/machine/aakart.c +++ b/src/emu/machine/aakart.c @@ -40,7 +40,6 @@ const device_type AAKART = &device_creator; aakart_device::aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, AAKART, "aakart", tag, owner, clock) { - } diff --git a/src/emu/machine/aakart.h b/src/emu/machine/aakart.h index 6272e05a6b4..c2a0f31d41f 100644 --- a/src/emu/machine/aakart.h +++ b/src/emu/machine/aakart.h @@ -17,8 +17,7 @@ Acorn Archimedes KART interface #define MCFG_AAKART_ADD(_tag, _freq, _config) \ MCFG_DEVICE_ADD(_tag, AAKART, _freq) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #define AAKART_INTERFACE(name) \ const aakart_interface (name) = diff --git a/src/emu/machine/am53cf96.h b/src/emu/machine/am53cf96.h index 8f82cbeaafa..4fb8f5554e9 100644 --- a/src/emu/machine/am53cf96.h +++ b/src/emu/machine/am53cf96.h @@ -12,8 +12,7 @@ MCFG_DEVICE_ADD( _tag, AM53CF96, 0 ) #define MCFG_AM53CF96_IRQ_HANDLER(_devcb) \ - devcb = &am53cf96_device::set_irq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &am53cf96_device::set_irq_handler(*device, DEVCB2_##_devcb); // 53CF96 register set enum { diff --git a/src/emu/machine/cdp1871.c b/src/emu/machine/cdp1871.c index f87a8271aa9..4042d9197d9 100644 --- a/src/emu/machine/cdp1871.c +++ b/src/emu/machine/cdp1871.c @@ -100,7 +100,6 @@ cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *tag, d m_next_da(CLEAR_LINE), m_next_rpt(CLEAR_LINE) { - } diff --git a/src/emu/machine/ctronics.c b/src/emu/machine/ctronics.c index 50d941e8265..9e40888377d 100644 --- a/src/emu/machine/ctronics.c +++ b/src/emu/machine/ctronics.c @@ -23,7 +23,6 @@ centronics_device::centronics_device(const machine_config &mconfig, const char * device_slot_interface(mconfig, *this), m_dev(NULL) { - } //------------------------------------------------- @@ -232,7 +231,6 @@ void centronics_printer_device::device_start() void centronics_printer_device::device_reset() { - } /*------------------------------------------------- diff --git a/src/emu/machine/ctronics.h b/src/emu/machine/ctronics.h index 89b246fe086..021c66f190a 100644 --- a/src/emu/machine/ctronics.h +++ b/src/emu/machine/ctronics.h @@ -151,11 +151,9 @@ SLOT_INTERFACE_EXTERN(centronics_printer); #define MCFG_CENTRONICS_ADD(_tag, _intf, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, CENTRONICS, 0) \ MCFG_DEVICE_CONFIG(_intf) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) #define MCFG_CENTRONICS_PRINTER_ADD(_tag, _intf) \ - MCFG_CENTRONICS_ADD(_tag, _intf, centronics_printer, "printer", NULL) \ - + MCFG_CENTRONICS_ADD(_tag, _intf, centronics_printer, "printer", NULL) /*************************************************************************** DEFAULT INTERFACES diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h index 2a915b21921..da7f381d728 100644 --- a/src/emu/machine/eeprom.h +++ b/src/emu/machine/eeprom.h @@ -19,8 +19,7 @@ #define MCFG_EEPROM_ADD(_tag, _interface) \ MCFG_DEVICE_ADD(_tag, EEPROM, 0) \ - eeprom_device::static_set_interface(*device, _interface); \ - + eeprom_device::static_set_interface(*device, _interface); #define MCFG_EEPROM_93C46_ADD(_tag) \ MCFG_EEPROM_ADD(_tag, eeprom_interface_93C46) @@ -31,11 +30,9 @@ MCFG_EEPROM_ADD(_tag, eeprom_interface_93C66B) #define MCFG_EEPROM_DATA(_data, _size) \ - eeprom_device::static_set_default_data(*device, _data, _size); \ - + eeprom_device::static_set_default_data(*device, _data, _size); #define MCFG_EEPROM_DEFAULT_VALUE(_value) \ - eeprom_device::static_set_default_value(*device, _value); \ - + eeprom_device::static_set_default_value(*device, _value); //************************************************************************** diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h index e04d9a5face..2cbc8d792d7 100644 --- a/src/emu/machine/er2055.h +++ b/src/emu/machine/er2055.h @@ -49,8 +49,7 @@ //************************************************************************** #define MCFG_ER2055_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, ER2055, 0) \ - + MCFG_DEVICE_ADD(_tag, ER2055, 0) //************************************************************************** diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c index b9313326a8f..4a4163bcdbf 100644 --- a/src/emu/machine/f3853.c +++ b/src/emu/machine/f3853.c @@ -51,7 +51,6 @@ const device_type F3853 = &device_creator; f3853_device::f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, F3853, "F3853", tag, owner, clock) { - } diff --git a/src/emu/machine/i8155.c b/src/emu/machine/i8155.c index ff05fa0e950..db8cb7c0fd7 100644 --- a/src/emu/machine/i8155.c +++ b/src/emu/machine/i8155.c @@ -203,7 +203,6 @@ i8155_device::i8155_device(const machine_config &mconfig, const char *tag, devic device_memory_interface(mconfig, *this), m_space_config("ram", ENDIANNESS_LITTLE, 8, 8, 0, NULL, *ADDRESS_MAP_NAME(i8155)) { - } diff --git a/src/emu/machine/i8212.c b/src/emu/machine/i8212.c index fe2f94ebc22..d2a07b49177 100644 --- a/src/emu/machine/i8212.c +++ b/src/emu/machine/i8212.c @@ -36,7 +36,6 @@ i8212_device::i8212_device(const machine_config &mconfig, const char *tag, devic m_md(I8212_MODE_INPUT), m_stb(0) { - } diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h index f83460a54c7..12922adf706 100644 --- a/src/emu/machine/i8243.h +++ b/src/emu/machine/i8243.h @@ -25,14 +25,11 @@ #define MCFG_I8243_ADD(_tag, _read, _write) \ MCFG_DEVICE_ADD(_tag, I8243, 0) \ MCFG_I8243_READHANDLER(_read) \ - MCFG_I8243_WRITEHANDLER(_write) \ - + MCFG_I8243_WRITEHANDLER(_write) #define MCFG_I8243_READHANDLER(_devcb) \ - devcb = &i8243_device::set_read_handler(*device, DEVCB2_##_devcb); \ - + devcb = &i8243_device::set_read_handler(*device, DEVCB2_##_devcb); #define MCFG_I8243_WRITEHANDLER(_devcb) \ - devcb = &i8243_device::set_write_handler(*device, DEVCB2_##_devcb); \ - + devcb = &i8243_device::set_write_handler(*device, DEVCB2_##_devcb); /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c index d772e77dea9..73e7d841f29 100644 --- a/src/emu/machine/i8251.c +++ b/src/emu/machine/i8251.c @@ -168,7 +168,6 @@ void i8251_device::transmit_clock() /* transmit enable? */ if (m_command & (1<<0)) { - /* transmit register full? */ if ((m_status & I8251_STATUS_TX_READY)==0) { diff --git a/src/emu/machine/i8355.c b/src/emu/machine/i8355.c index 10f3476fd1f..826e0a6f2c2 100644 --- a/src/emu/machine/i8355.c +++ b/src/emu/machine/i8355.c @@ -96,7 +96,6 @@ i8355_device::i8355_device(const machine_config &mconfig, const char *tag, devic device_memory_interface(mconfig, *this), m_space_config("ram", ENDIANNESS_LITTLE, 8, 11, 0, NULL, *ADDRESS_MAP_NAME(i8355)) { - } diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 45658643caa..9fd2a67094f 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -1850,7 +1850,6 @@ ide_slot_device::ide_slot_device(const machine_config &mconfig, const char *tag, device_slot_interface(mconfig, *this), m_dev(NULL) { - } //------------------------------------------------- diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c index e8853a88196..bde8c351531 100644 --- a/src/emu/machine/ins8154.c +++ b/src/emu/machine/ins8154.c @@ -45,7 +45,6 @@ const device_type INS8154 = &device_creator; ins8154_device::ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, INS8154, "INS8154", tag, owner, clock) { - } diff --git a/src/emu/machine/jvsdev.h b/src/emu/machine/jvsdev.h index 23e01a88861..fb2adfe2afb 100644 --- a/src/emu/machine/jvsdev.h +++ b/src/emu/machine/jvsdev.h @@ -5,8 +5,7 @@ #define MCFG_JVS_DEVICE_ADD(_tag, _type, _host) \ MCFG_DEVICE_ADD(_tag, _type, 0) \ - jvs_device::static_set_jvs_host_tag(*device, _host); \ - + jvs_device::static_set_jvs_host_tag(*device, _host); class jvs_host; class jvs_device : public device_t diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c index 5570ba3ac3e..779611bf24d 100644 --- a/src/emu/machine/k033906.c +++ b/src/emu/machine/k033906.c @@ -24,7 +24,6 @@ const device_type K033906 = &device_creator; k033906_device::k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K033906, "Konami 033906", tag, owner, clock) { - } //------------------------------------------------- diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c index 28b0a335efb..26d8db27983 100644 --- a/src/emu/machine/k056230.c +++ b/src/emu/machine/k056230.c @@ -23,7 +23,6 @@ const device_type K056230 = &device_creator; k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K056230, "Konami 056230", tag, owner, clock) { - } diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h index f595d928549..d491d5bb922 100644 --- a/src/emu/machine/laserdsc.h +++ b/src/emu/machine/laserdsc.h @@ -87,29 +87,21 @@ enum laserdisc_field_code //************************************************************************** #define MCFG_LASERDISC_GET_DISC(_func) \ - laserdisc_device::static_set_get_disc(*device, _func); \ - + laserdisc_device::static_set_get_disc(*device, _func); #define MCFG_LASERDISC_AUDIO(_func) \ - laserdisc_device::static_set_audio(*device, _func); \ - + laserdisc_device::static_set_audio(*device, _func); #define MCFG_LASERDISC_OVERLAY_STATIC(_width, _height, _func) \ - laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func)); \ - + laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func)); #define MCFG_LASERDISC_OVERLAY_DRIVER(_width, _height, _class, _method) \ - laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, NULL)); \ - + laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, NULL)); #define MCFG_LASERDISC_OVERLAY_DEVICE(_width, _height, _device, _class, _method) \ - laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, _device)); \ - + laserdisc_device::static_set_overlay(*device, _width, _height, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, _device)); #define MCFG_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \ - laserdisc_device::static_set_overlay_clip(*device, _minx, _maxx, _miny, _maxy); \ - + laserdisc_device::static_set_overlay_clip(*device, _minx, _maxx, _miny, _maxy); #define MCFG_LASERDISC_OVERLAY_POSITION(_posx, _posy) \ - laserdisc_device::static_set_overlay_position(*device, _posx, _posy); \ - + laserdisc_device::static_set_overlay_position(*device, _posx, _posy); #define MCFG_LASERDISC_OVERLAY_SCALE(_scalex, _scaley) \ - laserdisc_device::static_set_overlay_scale(*device, _scalex, _scaley); \ - + laserdisc_device::static_set_overlay_scale(*device, _scalex, _scaley); // use these to add laserdisc screens with proper video update parameters #define MCFG_LASERDISC_SCREEN_ADD_NTSC(_tag, _ldtag) \ @@ -118,8 +110,7 @@ enum laserdisc_field_code MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ MCFG_SCREEN_ADD(_tag, RASTER) \ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \ - MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update) \ - + MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update) // not correct yet; fix me... #define MCFG_LASERDISC_SCREEN_ADD_PAL(_tag, _ldtag) \ MCFG_DEVICE_MODIFY(_ldtag) \ @@ -127,8 +118,7 @@ enum laserdisc_field_code MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \ MCFG_SCREEN_ADD(_tag, RASTER) \ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \ - MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update) \ - + MCFG_SCREEN_UPDATE_DEVICE(_ldtag, laserdisc_device, screen_update) //************************************************************************** diff --git a/src/emu/machine/lc89510.c b/src/emu/machine/lc89510.c index 8ce3988009d..be0aa027339 100644 --- a/src/emu/machine/lc89510.c +++ b/src/emu/machine/lc89510.c @@ -17,10 +17,8 @@ lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, d void lc89510_device::device_start() { - } void lc89510_device::device_reset() { - } diff --git a/src/emu/machine/ldpr8210.h b/src/emu/machine/ldpr8210.h index cee2a2ba842..bcc8fdbcf7a 100644 --- a/src/emu/machine/ldpr8210.h +++ b/src/emu/machine/ldpr8210.h @@ -51,11 +51,9 @@ //************************************************************************** #define MCFG_LASERDISC_PR8210_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PIONEER_PR8210, 0) \ - + MCFG_DEVICE_ADD(_tag, PIONEER_PR8210, 0) #define MCFG_LASERDISC_SIMUTREK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SIMUTREK_SPECIAL, 0) \ - + MCFG_DEVICE_ADD(_tag, SIMUTREK_SPECIAL, 0) //************************************************************************** diff --git a/src/emu/machine/ldstub.h b/src/emu/machine/ldstub.h index 1acb5e08877..86c5d2f0233 100644 --- a/src/emu/machine/ldstub.h +++ b/src/emu/machine/ldstub.h @@ -50,14 +50,11 @@ //************************************************************************** #define MCFG_LASERDISC_LDP1450_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SONY_LDP1450, 0) \ - + MCFG_DEVICE_ADD(_tag, SONY_LDP1450, 0) #define MCFG_LASERDISC_PR7820_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PIONEER_PR7820, 0) \ - + MCFG_DEVICE_ADD(_tag, PIONEER_PR7820, 0) #define MCFG_LASERDISC_22VP932_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PHILLIPS_22VP932, 0) \ - + MCFG_DEVICE_ADD(_tag, PHILLIPS_22VP932, 0) //************************************************************************** diff --git a/src/emu/machine/ldv1000.h b/src/emu/machine/ldv1000.h index 007705c59af..d57d3621749 100644 --- a/src/emu/machine/ldv1000.h +++ b/src/emu/machine/ldv1000.h @@ -53,8 +53,7 @@ //************************************************************************** #define MCFG_LASERDISC_LDV1000_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PIONEER_LDV1000, 0) \ - + MCFG_DEVICE_ADD(_tag, PIONEER_LDV1000, 0) //************************************************************************** diff --git a/src/emu/machine/ldvp931.h b/src/emu/machine/ldvp931.h index 163767dd846..f956f7fae1d 100644 --- a/src/emu/machine/ldvp931.h +++ b/src/emu/machine/ldvp931.h @@ -51,8 +51,7 @@ //************************************************************************** #define MCFG_LASERDISC_22VP931_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PHILLIPS_22VP931, 0) \ - + MCFG_DEVICE_ADD(_tag, PHILLIPS_22VP931, 0) //************************************************************************** diff --git a/src/emu/machine/m6m80011ap.c b/src/emu/machine/m6m80011ap.c index 7820e982be1..6640ed2e367 100644 --- a/src/emu/machine/m6m80011ap.c +++ b/src/emu/machine/m6m80011ap.c @@ -29,7 +29,6 @@ m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char * : device_t(mconfig, M6M80011AP, "m6m80011ap", tag, owner, clock), device_nvram_interface(mconfig, *this) { - } @@ -49,7 +48,6 @@ void m6m80011ap_device::device_validity_check(validity_checker &valid) const void m6m80011ap_device::device_start() { - } diff --git a/src/emu/machine/m6m80011ap.h b/src/emu/machine/m6m80011ap.h index 7d719c5731e..f42c980a81c 100644 --- a/src/emu/machine/m6m80011ap.h +++ b/src/emu/machine/m6m80011ap.h @@ -17,8 +17,7 @@ Template for skeleton device /* TODO: frequency */ #define MCFG_M6M80011AP_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, M6M80011AP, XTAL_32_768kHz) \ - + MCFG_DEVICE_ADD(_tag, M6M80011AP, XTAL_32_768kHz) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index 4dbe1a61890..61280ef375a 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -67,7 +67,6 @@ msm6242_device::msm6242_device(const machine_config &mconfig, const char *tag, d : device_t(mconfig, msm6242, "msm6242", tag, owner, clock), device_rtc_interface(mconfig, *this) { - } diff --git a/src/emu/machine/n68681.h b/src/emu/machine/n68681.h index 7488639d2bc..54d23bf7eff 100644 --- a/src/emu/machine/n68681.h +++ b/src/emu/machine/n68681.h @@ -12,8 +12,7 @@ MCFG_DEVICE_CONFIG(_config) #define MCFG_DUART68681_CHANNEL_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, DUART68681CHANNEL, 0) \ - + MCFG_DEVICE_ADD(_tag, DUART68681CHANNEL, 0) // forward declaration class duartn68681_device; diff --git a/src/emu/machine/net_lib.h b/src/emu/machine/net_lib.h index 441b01f332e..b47989108b0 100644 --- a/src/emu/machine/net_lib.h +++ b/src/emu/machine/net_lib.h @@ -55,33 +55,26 @@ // ---------------------------------------------------------------------------------------- #define NETDEV_CLOCK(_name) \ - NET_REGISTER_DEV(netdev_clock, _name) \ - + NET_REGISTER_DEV(netdev_clock, _name) #define NETDEV_LOGIC_INPUT(_name) \ - NET_REGISTER_DEV(netdev_logic_input, _name) \ - + NET_REGISTER_DEV(netdev_logic_input, _name) #define NETDEV_ANALOG_INPUT(_name) \ - NET_REGISTER_DEV(netdev_analog_input, _name) \ - + NET_REGISTER_DEV(netdev_analog_input, _name) #define NETDEV_CALLBACK(_name, _IN) \ NET_REGISTER_DEV(netdev_callback, _name) \ - NET_CONNECT(_name, IN, _IN) \ - + NET_CONNECT(_name, IN, _IN) #define NETDEV_SWITCH2(_name, _i1, _i2) \ NET_REGISTER_DEV(nicMultiSwitch, _name) \ NET_CONNECT(_name, i1, _i1) \ - NET_CONNECT(_name, i2, _i2) \ - + NET_CONNECT(_name, i2, _i2) #define NETDEV_DELAY_RISE(_name, _CLK, _D) \ NET_REGISTER_DEV(netdev_delay_lh, _name) \ NET_CONNECT(_name, CLK, _CLK) \ - NET_CONNECT(_name, D, _D) \ - + NET_CONNECT(_name, D, _D) #define NETDEV_RSFF(_name, _S, _R) \ NET_REGISTER_DEV(nicRSFF, _name) \ NET_CONNECT(_name, S, _S) \ - NET_CONNECT(_name, R, _R) \ - + NET_CONNECT(_name, R, _R) // ---------------------------------------------------------------------------------------- // TTL Logic chips @@ -90,43 +83,36 @@ #define TTL_7400_NAND(_name, _I1, _I2) \ NET_REGISTER_DEV(nic7400, _name) \ NET_CONNECT(_name, I1, _I1) \ - NET_CONNECT(_name, I2, _I2) \ - + NET_CONNECT(_name, I2, _I2) #define TTL_7402_NOR(_name, _I1, _I2) \ NET_REGISTER_DEV(nic7402, _name) \ NET_CONNECT(_name, I1, _I1) \ - NET_CONNECT(_name, I2, _I2) \ - + NET_CONNECT(_name, I2, _I2) #define TTL_7404_INVERT(_name, _I1) \ NET_REGISTER_DEV(nic7404, _name) \ - NET_CONNECT(_name, I1, _I1) \ - + NET_CONNECT(_name, I1, _I1) #define TTL_7410_NAND(_name, _I1, _I2, _I3) \ NET_REGISTER_DEV(nic7410, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ - NET_CONNECT(_name, I3, _I3) \ - + NET_CONNECT(_name, I3, _I3) #define TTL_7420_NAND(_name, _I1, _I2, _I3, _I4) \ NET_REGISTER_DEV(nic7420, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ NET_CONNECT(_name, I3, _I3) \ - NET_CONNECT(_name, I4, _I4) \ - + NET_CONNECT(_name, I4, _I4) #define TTL_7425_NOR(_name, _I1, _I2, _I3, _I4) \ NET_REGISTER_DEV(nic7425, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ NET_CONNECT(_name, I3, _I3) \ - NET_CONNECT(_name, I4, _I4) \ - + NET_CONNECT(_name, I4, _I4) #define TTL_7427_NOR(_name, _I1, _I2, _I3) \ NET_REGISTER_DEV(nic7427, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ - NET_CONNECT(_name, I3, _I3) \ - + NET_CONNECT(_name, I3, _I3) #define TTL_7430_NAND(_name, _I1, _I2, _I3, _I4, _I5, _I6, _I7, _I8) \ NET_REGISTER_DEV(nic7430, _name) \ NET_CONNECT(_name, I1, _I1) \ @@ -136,20 +122,17 @@ NET_CONNECT(_name, I5, _I5) \ NET_CONNECT(_name, I6, _I6) \ NET_CONNECT(_name, I7, _I7) \ - NET_CONNECT(_name, I8, _I8) \ - + NET_CONNECT(_name, I8, _I8) #define TTL_7450_ANDORINVERT(_name, _I1, _I2, _I3, _I4) \ NET_REGISTER_DEV(nic7450, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ NET_CONNECT(_name, I3, _I3) \ - NET_CONNECT(_name, I4, _I4) \ - + NET_CONNECT(_name, I4, _I4) #define TTL_7486_XOR(_name, _I1, _I2) \ NET_REGISTER_DEV(nic7486, _name) \ NET_CONNECT(_name, I1, _I1) \ - NET_CONNECT(_name, I2, _I2) \ - + NET_CONNECT(_name, I2, _I2) #define TTL_7448(_name, _A0, _A1, _A2, _A3, _LTQ, _BIQ, _RBIQ) \ NET_REGISTER_DEV(nic7448, _name) \ NET_CONNECT(_name, A0, _A0) \ @@ -158,15 +141,13 @@ NET_CONNECT(_name, A3, _A3) \ NET_CONNECT(_name, LTQ, _LTQ) \ NET_CONNECT(_name, BIQ, _BIQ) \ - NET_CONNECT(_name, RBIQ, _RBIQ) \ - + NET_CONNECT(_name, RBIQ, _RBIQ) #define TTL_7474(_name, _CLK, _D, _CLRQ, _PREQ) \ NET_REGISTER_DEV(nic7474, _name) \ NET_CONNECT(_name, CLK, _CLK) \ NET_CONNECT(_name, D, _D) \ NET_CONNECT(_name, CLRQ, _CLRQ) \ - NET_CONNECT(_name, PREQ, _PREQ) \ - + NET_CONNECT(_name, PREQ, _PREQ) #define TTL_7483(_name, _A1, _A2, _A3, _A4, _B1, _B2, _B3, _B4, _CI) \ NET_REGISTER_DEV(nic7483, _name) \ NET_CONNECT(_name, A1, _A1) \ @@ -177,30 +158,26 @@ NET_CONNECT(_name, B2, _B2) \ NET_CONNECT(_name, B3, _B3) \ NET_CONNECT(_name, B4, _B4) \ - NET_CONNECT(_name, CI, _CI) \ - + NET_CONNECT(_name, CI, _CI) #define TTL_7490(_name, _CLK, _R1, _R2, _R91, _R92) \ NET_REGISTER_DEV(nic7490, _name) \ NET_CONNECT(_name, CLK, _CLK) \ NET_CONNECT(_name, R1, _R1) \ NET_CONNECT(_name, R2, _R2) \ NET_CONNECT(_name, R91, _R91) \ - NET_CONNECT(_name, R92, _R92) \ - + NET_CONNECT(_name, R92, _R92) #define TTL_7493(_name, _CLKA, _CLKB, _R1, _R2) \ NET_REGISTER_DEV(nic7493, _name) \ NET_CONNECT(_name, CLKA, _CLKA) \ NET_CONNECT(_name, CLKB, _CLKB) \ NET_CONNECT(_name, R1, _R1) \ - NET_CONNECT(_name, R2, _R2) \ - + NET_CONNECT(_name, R2, _R2) #define TTL_74107A(_name, _CLK, _J, _K, _CLRQ) \ NET_REGISTER_DEV(nic74107A, _name) \ NET_CONNECT(_name, CLK, _CLK) \ NET_CONNECT(_name, J, _J) \ NET_CONNECT(_name, K, _K) \ - NET_CONNECT(_name, CLRQ, _CLRQ) \ - + NET_CONNECT(_name, CLRQ, _CLRQ) #define TTL_74107(_name, _CLK, _J, _K, _CLRQ) \ TTL_74107A(_name, _CLK, _J, _K, _CLRQ) @@ -212,8 +189,7 @@ NET_CONNECT(_name, A4, _A4) \ NET_CONNECT(_name, A, _A) \ NET_CONNECT(_name, B, _B) \ - NET_CONNECT(_name, GA, _GA) \ - + NET_CONNECT(_name, GA, _GA) #define TTL_9316(_name, _CLK, _ENP, _ENT, _CLRQ, _LOADQ, _A, _B, _C, _D) \ NET_REGISTER_DEV(nic9316, _name) \ NET_CONNECT(_name, CLK, _CLK) \ @@ -224,20 +200,17 @@ NET_CONNECT(_name, A, _A) \ NET_CONNECT(_name, B, _B) \ NET_CONNECT(_name, C, _C) \ - NET_CONNECT(_name, D, _D) \ - + NET_CONNECT(_name, D, _D) #define NE555N_MSTABLE(_name, _TRIG, _CV) \ NET_REGISTER_DEV(nicNE555N_MSTABLE, _name) \ NET_CONNECT(_name, TRIG, _TRIG) \ - NET_CONNECT(_name, CV, _CV) \ - + NET_CONNECT(_name, CV, _CV) #define NETDEV_MIXER3(_name, _I1, _I2, _I3) \ NET_REGISTER_DEV(nicMixer8, _name) \ NET_CONNECT(_name, I1, _I1) \ NET_CONNECT(_name, I2, _I2) \ - NET_CONNECT(_name, I3, _I3) \ - + NET_CONNECT(_name, I3, _I3) // ---------------------------------------------------------------------------------------- // Special support devices ... // ---------------------------------------------------------------------------------------- diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c index 328f34f72d6..7d6671842e7 100644 --- a/src/emu/machine/netlist.c +++ b/src/emu/machine/netlist.c @@ -382,7 +382,6 @@ void netlist_base_t::set_clock_freq(UINT64 clockfreq) ATTR_HOT ATTR_ALIGN void netlist_base_t::process_list(INT32 &atime) { - while ( (atime > 0) && (m_queue.is_not_empty())) { queue_t::entry_t e = m_queue.pop(); @@ -795,7 +794,6 @@ static inline void update_dev(const net_input_t *inp, const UINT32 mask) ATTR_HOT inline void net_output_t::update_devs() { - const UINT32 masks[4] = { 1, 5, 3, 1 }; m_Q = m_new_Q; m_Q_analog = m_new_Q_analog; @@ -900,7 +898,6 @@ void netlist_mame_device::device_config_complete() void netlist_mame_device::device_start() { - //double dt = clocks_to_attotime(1).as_double(); m_netlist = global_alloc_clear(netlist_t(*this)); m_netlist->set_clock_freq(this->clock()); @@ -942,12 +939,10 @@ void netlist_mame_device::device_stop() void netlist_mame_device::device_post_load() { - } void netlist_mame_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - } void netlist_mame_device::save_state() diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h index de4dd5dfdd3..c009d4554c1 100644 --- a/src/emu/machine/netlist.h +++ b/src/emu/machine/netlist.h @@ -73,22 +73,17 @@ //============================================================ #define NET_ALIAS(_alias, _name) \ - netlist.register_alias(# _alias, # _name); \ - + netlist.register_alias(# _alias, # _name); #define NET_NEW(_type , _name) net_create_device_by_classname(# _type, &netlist, # _name) #define NET_REGISTER_DEV(_type, _name) \ - netlist.register_dev(NET_NEW(_type, _name)); \ - + netlist.register_dev(NET_NEW(_type, _name)); #define NET_REMOVE_DEV(_name) \ - netlist.remove_dev(# _name); \ - + netlist.remove_dev(# _name); #define NET_REGISTER_SIGNAL(_type, _name) \ - NET_REGISTER_DEV(_type ## _ ## sig, _name) \ - + NET_REGISTER_DEV(_type ## _ ## sig, _name) #define NET_CONNECT(_name, _input, _output) \ - netlist.register_link(# _name "." # _input, # _output); \ - + netlist.register_link(# _name "." # _input, # _output); #define NETDEV_PARAM(_name, _val) \ netlist.find_param(# _name).initial(_val); @@ -96,17 +91,14 @@ #define NETLIST_START(_name) \ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ -{ \ - +{ #define NETLIST_END } #define NETLIST_INCLUDE(_name) \ - NETLIST_NAME(_name)(netlist); \ - + NETLIST_NAME(_name)(netlist); #define NETLIST_MEMREGION(_name) \ - netlist.parse((char *)downcast(netlist.netlist()).machine().root_device().memregion(_name)->base()); \ - + netlist.parse((char *)downcast(netlist.netlist()).machine().root_device().memregion(_name)->base()); #if defined(__GNUC__) && (__GNUC__ >= 3) #if !defined(__ppc__) && !defined (__PPC__) && !defined(__ppc64__) && !defined(__PPC64__) #define ATTR_ALIGN __attribute__ ((aligned(128))) @@ -131,8 +123,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ { \ public: \ _name () : net_signal_t<_num_input, _check>() { } \ - }; \ - + }; #define NETLIB_DEVICE(_name, _priv) \ class _name : public net_device_t \ { \ @@ -142,8 +133,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ ATTR_COLD void start(); \ protected: \ _priv \ - } \ - + } #define NETLIB_SUBDEVICE(_name, _priv) \ class _name : public net_core_device_t \ { \ @@ -152,8 +142,7 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ ATTR_HOT void update(); \ /*protected:*/ \ _priv \ - } \ - + } #define NETLIB_DEVICE_WITH_PARAMS(_name, _priv) \ class _name : public net_device_t \ { \ @@ -164,21 +153,17 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist_setup_t &netlist) \ ATTR_COLD void start(); \ /* protected: */ \ _priv \ - } \ - + } // MAME specific #define MCFG_NETLIST_ADD(_tag, _setup ) \ MCFG_DEVICE_ADD(_tag, NETLIST, NETLIST_CLOCK) \ - MCFG_NETLIST_SETUP(_setup) \ - + MCFG_NETLIST_SETUP(_setup) #define MCFG_NETLIST_REPLACE(_tag, _setup) \ MCFG_DEVICE_REPLACE(_tag, NETLIST, NETLIST_CLOCK) \ - MCFG_NETLIST_SETUP(_setup) \ - + MCFG_NETLIST_SETUP(_setup) #define MCFG_NETLIST_SETUP(_setup) \ - netlist_mame_device::static_set_constructor(*device, NETLIST_NAME(_setup)); \ - + netlist_mame_device::static_set_constructor(*device, NETLIST_NAME(_setup)); // ---------------------------------------------------------------------------------------- // Type definitions @@ -971,12 +956,10 @@ private: #define NETDEV_TTL_CONST(_name, _v) \ NET_REGISTER_DEV(netdev_ttl_const, _name) \ - NETDEV_PARAM(_name.CONST, _v) \ - + NETDEV_PARAM(_name.CONST, _v) #define NETDEV_ANALOG_CONST(_name, _v) \ NET_REGISTER_DEV(netdev_analog_const, _name) \ - NETDEV_PARAM(_name.CONST, _v) \ - + NETDEV_PARAM(_name.CONST, _v) NETLIB_DEVICE_WITH_PARAMS(netdev_ttl_const, ttl_output_t m_Q; diff --git a/src/emu/machine/nvram.h b/src/emu/machine/nvram.h index e96c3aa79b2..b052ea098e5 100644 --- a/src/emu/machine/nvram.h +++ b/src/emu/machine/nvram.h @@ -50,41 +50,32 @@ #define MCFG_NVRAM_ADD_0FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); #define MCFG_NVRAM_ADD_1FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); #define MCFG_NVRAM_ADD_RANDOM_FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); #define MCFG_NVRAM_ADD_NO_FILL(_tag) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_NONE); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_NONE); #define MCFG_NVRAM_ADD_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_NVRAM_REPLACE_0FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_0); #define MCFG_NVRAM_REPLACE_1FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_ALL_1); #define MCFG_NVRAM_REPLACE_RANDOM_FILL(_tag) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); \ - + nvram_device::static_set_default_value(*device, nvram_device::DEFAULT_RANDOM); #define MCFG_NVRAM_REPLACE_CUSTOM_DRIVER(_tag, _class, _method) \ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \ - nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + nvram_device::static_set_custom_handler(*device, nvram_init_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); //************************************************************************** diff --git a/src/emu/machine/pc16552d.c b/src/emu/machine/pc16552d.c index bd941eb1f8e..1d5857f502b 100644 --- a/src/emu/machine/pc16552d.c +++ b/src/emu/machine/pc16552d.c @@ -219,7 +219,6 @@ static UINT8 duart_r(running_machine &machine, int chip, int reg) } else { - } break; } diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h index c7d0d853516..a850c4077d5 100644 --- a/src/emu/machine/pci.h +++ b/src/emu/machine/pci.h @@ -71,14 +71,11 @@ extern const device_type PCI_BUS_LEGACY; #define MCFG_PCI_BUS_LEGACY_ADD(_tag, _busnum) \ MCFG_DEVICE_ADD(_tag, PCI_BUS_LEGACY, 0) \ - downcast(device)->set_busnum(_busnum); \ - + downcast(device)->set_busnum(_busnum); #define MCFG_PCI_BUS_LEGACY_DEVICE(_devnum, _devtag, _configread, _configwrite) \ - downcast(device)->set_device(_devnum, _devtag,_configread,_configwrite); \ - + downcast(device)->set_device(_devnum, _devtag,_configread,_configwrite); #define MCFG_PCI_BUS_LEGACY_SIBLING(_father_tag) \ - downcast(device)->set_father(_father_tag); \ - + downcast(device)->set_father(_father_tag); // NEW IMPLEMENTATION @@ -171,15 +168,13 @@ extern const device_type PCI_BUS; #define MCFG_PCI_BUS_ADD(_tag, _busnum) \ MCFG_DEVICE_ADD(_tag, PCI_BUS, 0) \ - downcast(device)->set_busnum(_busnum); \ - + downcast(device)->set_busnum(_busnum); #define MCFG_PCI_BUS_DEVICE(_tag, _slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) \ MCFG_DEVICE_ADD(_tag, PCI_CONNECTOR, 0) \ MCFG_DEVICE_SLOT_INTERFACE_FULL(_slot_intf, _def_slot, _def_inp, _def_config, _def_clock, _fixed) #define MCFG_PCI_BUS_SIBLING(_father_tag) \ - downcast(device)->set_father(_father_tag); \ - + downcast(device)->set_father(_father_tag); #endif /* PCI_H */ diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c index 1d2a8d15786..eab1779ef03 100644 --- a/src/emu/machine/roc10937.c +++ b/src/emu/machine/roc10937.c @@ -183,8 +183,6 @@ void rocvfd_t::device_reset() /////////////////////////////////////////////////////////////////////////// UINT32 rocvfd_t::set_display(UINT32 segin) { - - return BITSWAP32(segin, 31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,11,9,15,13,12,8,10,14,7,6,5,4,3,2,1,0); } diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h index 26c71f02357..40ad878a871 100644 --- a/src/emu/machine/roc10937.h +++ b/src/emu/machine/roc10937.h @@ -15,42 +15,34 @@ #define MCFG_ROC10937_ADD(_tag,_val,_reversed) \ MCFG_DEVICE_ADD(_tag, ROC10937,60)\ MCFG_ROC10937_PORT(_val) \ - MCFG_ROC10937_REVERSE(_reversed) \ - + MCFG_ROC10937_REVERSE(_reversed) #define MCFG_ROC10937_PORT(_val) \ - roc10937_t::static_set_value(*device, _val); \ - + roc10937_t::static_set_value(*device, _val); #define MCFG_ROC10937_REVERSE(_reversed) \ - roc10937_t::static_set_zero(*device, _reversed); \ - + roc10937_t::static_set_zero(*device, _reversed); #define MCFG_ROC10937_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) #define MCFG_ROC10957_ADD(_tag,_val,_reversed) \ MCFG_DEVICE_ADD(_tag, ROC10957,60)\ MCFG_ROC10957_PORT(_val) \ - MCFG_ROC10957_REVERSE(_reversed) \ - + MCFG_ROC10957_REVERSE(_reversed) #define MCFG_ROC10957_PORT(_val) \ - roc10957_t::static_set_value(*device, _val); \ - + roc10957_t::static_set_value(*device, _val); #define MCFG_ROC10957_REVERSE(_reversed) \ - roc10957_t::static_set_zero(*device, _reversed); \ - + roc10957_t::static_set_zero(*device, _reversed); #define MCFG_ROC10957_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) #define MCFG_MSC1937_ADD(_tag,_val,_reversed) \ MCFG_DEVICE_ADD(_tag, ROC10937,60)\ MCFG_MSC1937_PORT(_val) \ - MCFG_MSC1937_REVERSE(_reversed) \ - + MCFG_MSC1937_REVERSE(_reversed) #define MCFG_MSC1937_PORT(_val) \ MCFG_ROC10937_PORT(_val) #define MCFG_MSC1937_REVERSE(_reversed) \ - roc10937_t::static_set_zero(*device, _reversed); \ - + roc10937_t::static_set_zero(*device, _reversed); #define MCFG_MSC1937_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h index 54b3d2a853b..c2db1cad6ca 100644 --- a/src/emu/machine/rtc65271.h +++ b/src/emu/machine/rtc65271.h @@ -11,8 +11,7 @@ #define MCFG_RTC65271_ADD(_tag, _config) \ MCFG_DEVICE_ADD(_tag, RTC65271, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) // ======================> rtc65271_interface struct rtc65271_interface diff --git a/src/emu/machine/rtc9701.c b/src/emu/machine/rtc9701.c index 4ff82073a72..20c6dcc6a95 100644 --- a/src/emu/machine/rtc9701.c +++ b/src/emu/machine/rtc9701.c @@ -37,7 +37,6 @@ rtc9701_device::rtc9701_device(const machine_config &mconfig, const char *tag, d m_reset_line(CLEAR_LINE), m_clock_line(CLEAR_LINE) { - } void rtc9701_device::timer_callback() diff --git a/src/emu/machine/rtc9701.h b/src/emu/machine/rtc9701.h index 9598f893eda..ab5445d4d96 100644 --- a/src/emu/machine/rtc9701.h +++ b/src/emu/machine/rtc9701.h @@ -18,8 +18,7 @@ //************************************************************************** #define MCFG_RTC9701_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, rtc9701, XTAL_32_768kHz) \ - + MCFG_DEVICE_ADD(_tag, rtc9701, XTAL_32_768kHz) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/machine/s3520cf.c b/src/emu/machine/s3520cf.c index 39f9abb1f11..0e844cd41a5 100644 --- a/src/emu/machine/s3520cf.c +++ b/src/emu/machine/s3520cf.c @@ -36,7 +36,6 @@ const device_type S3520CF = &device_creator; s3520cf_device::s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, S3520CF, "s3520cf", tag, owner, clock) { - } void s3520cf_device::timer_callback() diff --git a/src/emu/machine/s3520cf.h b/src/emu/machine/s3520cf.h index 789c4be7664..85dc39516a0 100644 --- a/src/emu/machine/s3520cf.h +++ b/src/emu/machine/s3520cf.h @@ -16,8 +16,7 @@ Template for skeleton device //************************************************************************** #define MCFG_S3520CF_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, S3520CF, XTAL_32_768kHz) \ - + MCFG_DEVICE_ADD(_tag, S3520CF, XTAL_32_768kHz) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c index 5756bbb34b4..09ecf8fd9d4 100644 --- a/src/emu/machine/s3c24xx.c +++ b/src/emu/machine/s3c24xx.c @@ -3377,7 +3377,6 @@ static READ32_DEVICE_HANDLER( s3c24xx_nand_r ) #if defined(DEVICE_S3C2440) case S3C24XX_NFMECC0 : { - data = (s3c24xx->nand.mecc[3] << 24) | (s3c24xx->nand.mecc[2] << 16) | (s3c24xx->nand.mecc[1] << 8) | (s3c24xx->nand.mecc[0] << 0); } break; diff --git a/src/emu/machine/scsicb.h b/src/emu/machine/scsicb.h index be00e5598fb..5c6540c3cd3 100644 --- a/src/emu/machine/scsicb.h +++ b/src/emu/machine/scsicb.h @@ -87,32 +87,23 @@ private: MCFG_DEVICE_ADD(_tag, SCSICB, 0) #define MCFG_SCSICB_BSY_HANDLER(_devcb) \ - devcb = &scsicb_device::set_bsy_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_bsy_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_SEL_HANDLER(_devcb) \ - devcb = &scsicb_device::set_sel_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_sel_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_CD_HANDLER(_devcb) \ - devcb = &scsicb_device::set_cd_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_cd_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_IO_HANDLER(_devcb) \ - devcb = &scsicb_device::set_io_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_io_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_MSG_HANDLER(_devcb) \ - devcb = &scsicb_device::set_msg_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_msg_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_REQ_HANDLER(_devcb) \ - devcb = &scsicb_device::set_req_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_req_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_ACK_HANDLER(_devcb) \ - devcb = &scsicb_device::set_ack_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_ack_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_ATN_HANDLER(_devcb) \ - devcb = &scsicb_device::set_atn_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_atn_handler(*device, DEVCB2_##_devcb); #define MCFG_SCSICB_RST_HANDLER(_devcb) \ - devcb = &scsicb_device::set_rst_handler(*device, DEVCB2_##_devcb); \ - + devcb = &scsicb_device::set_rst_handler(*device, DEVCB2_##_devcb); // device type definition extern const device_type SCSICB; diff --git a/src/emu/machine/seibu_cop.c b/src/emu/machine/seibu_cop.c index 997255cc6b2..7418ea81ee7 100644 --- a/src/emu/machine/seibu_cop.c +++ b/src/emu/machine/seibu_cop.c @@ -71,7 +71,6 @@ seibu_cop_device::seibu_cop_device(const machine_config &mconfig, const char *ta device_memory_interface(mconfig, *this), m_space_config("io", ENDIANNESS_LITTLE, 16, 16, 0, NULL, *ADDRESS_MAP_NAME(seibu_cop_io)) { - } diff --git a/src/emu/machine/seibu_cop.h b/src/emu/machine/seibu_cop.h index d13326cb19f..07341874613 100644 --- a/src/emu/machine/seibu_cop.h +++ b/src/emu/machine/seibu_cop.h @@ -16,8 +16,7 @@ Template for skeleton device //************************************************************************** #define MCFG_SEIBU_COP_ADD(_tag,_freq) \ - MCFG_DEVICE_ADD(_tag, SEIBU_COP, _freq) \ - + MCFG_DEVICE_ADD(_tag, SEIBU_COP, _freq) #define SEIBU_COP_INTERFACE(_name) \ const seibu_cop_interface (_name) = diff --git a/src/emu/machine/tc009xlvc.c b/src/emu/machine/tc009xlvc.c index d995970e34e..e66ecbdc18f 100644 --- a/src/emu/machine/tc009xlvc.c +++ b/src/emu/machine/tc009xlvc.c @@ -278,7 +278,6 @@ void tc0091lvc_device::device_start() void tc0091lvc_device::device_reset() { - } const address_space_config *tc0091lvc_device::memory_space_config(address_spacenum spacenum) const diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c index 6183aff30f6..4b8c349eaf2 100644 --- a/src/emu/machine/timekpr.c +++ b/src/emu/machine/timekpr.c @@ -121,7 +121,6 @@ timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type : device_t(mconfig, type, name, tag, owner, clock), device_nvram_interface(mconfig, *this) { - } m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/machine/upd765.c b/src/emu/machine/upd765.c index 416fd890b5e..ebed6f335ed 100644 --- a/src/emu/machine/upd765.c +++ b/src/emu/machine/upd765.c @@ -642,7 +642,6 @@ void upd765_family_device::live_run(attotime limit) } for(;;) { - switch(cur_live.state) { case SEARCH_ADDRESS_MARK_HEADER: if(read_one_bit(limit)) diff --git a/src/emu/machine/v3021.c b/src/emu/machine/v3021.c index e95dc0ad509..819b4953440 100644 --- a/src/emu/machine/v3021.c +++ b/src/emu/machine/v3021.c @@ -34,7 +34,6 @@ const device_type v3021 = &device_creator; v3021_device::v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, v3021, "v3021", tag, owner, clock) { - } void v3021_device::timer_callback() diff --git a/src/emu/machine/v3021.h b/src/emu/machine/v3021.h index f4e38c08f39..3df1d90a821 100644 --- a/src/emu/machine/v3021.h +++ b/src/emu/machine/v3021.h @@ -20,8 +20,7 @@ //************************************************************************** #define MCFG_V3021_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, v3021, XTAL_32_768kHz) \ - + MCFG_DEVICE_ADD(_tag, v3021, XTAL_32_768kHz) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index 1bdd53647ec..19802c3e028 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -1169,7 +1169,6 @@ static TIMER_CALLBACK( wd17xx_write_sector_callback ) wd17xx_complete_command(device, DELAY_NOTREADY); else { - /* drive write protected? */ if (floppy_wpt_r(w->drive) == CLEAR_LINE) { @@ -1603,7 +1602,6 @@ WRITE8_DEVICE_HANDLER( wd17xx_command_w ) } else { - /* drive write protected? */ if (floppy_wpt_r(w->drive) == CLEAR_LINE) { diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h index 0db04924f8b..1370236696e 100644 --- a/src/emu/machine/x2212.h +++ b/src/emu/machine/x2212.h @@ -18,14 +18,12 @@ //************************************************************************** #define MCFG_X2212_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, X2212, 0) \ - + MCFG_DEVICE_ADD(_tag, X2212, 0) // some systems (like many early Atari games) wire up the /STORE signal // to fire on power-down, effectively creating an "auto-save" functionality #define MCFG_X2212_ADD_AUTOSAVE(_tag) \ MCFG_DEVICE_ADD(_tag, X2212, 0) \ - x2212_device::static_set_auto_save(*device); \ - + x2212_device::static_set_auto_save(*device); //************************************************************************** diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 9c3e1f9e264..809c98f8d3d 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -179,8 +179,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t (void)device; \ devcb2_base *devcb = NULL; \ (void)devcb; \ - if (owner == NULL) owner = config.device_add(NULL, "root", &driver_device_creator<_class>, 0); \ - + if (owner == NULL) owner = config.device_add(NULL, "root", &driver_device_creator<_class>, 0); #define MACHINE_CONFIG_FRAGMENT(_name) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner) \ { \ @@ -188,8 +187,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t (void)device; \ devcb2_base *devcb = NULL; \ (void)devcb; \ - assert(owner != NULL); \ - + assert(owner != NULL); #define MACHINE_CONFIG_DERIVED(_name, _base) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner) \ { \ @@ -198,8 +196,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t devcb2_base *devcb = NULL; \ (void)devcb; \ owner = MACHINE_CONFIG_NAME(_base)(config, owner); \ - assert(owner != NULL); \ - + assert(owner != NULL); #define MACHINE_CONFIG_DERIVED_CLASS(_name, _base, _class) \ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t *owner) \ { \ @@ -208,8 +205,7 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t devcb2_base *devcb = NULL; \ (void)devcb; \ if (owner == NULL) owner = config.device_add(NULL, "root", &driver_device_creator<_class>, 0); \ - owner = MACHINE_CONFIG_NAME(_base)(config, owner); \ - + owner = MACHINE_CONFIG_NAME(_base)(config, owner); #define MACHINE_CONFIG_END \ return owner; \ } @@ -226,58 +222,43 @@ ATTR_COLD device_t *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_t // scheduling parameters #define MCFG_QUANTUM_TIME(_time) \ - config.m_minimum_quantum = _time; \ - + config.m_minimum_quantum = _time; #define MCFG_QUANTUM_PERFECT_CPU(_cputag) \ - owner->subtag(config.m_perfect_cpu_quantum, _cputag); \ - + owner->subtag(config.m_perfect_cpu_quantum, _cputag); // watchdog configuration #define MCFG_WATCHDOG_VBLANK_INIT(_count) \ - config.m_watchdog_vblank_count = _count; \ - + config.m_watchdog_vblank_count = _count; #define MCFG_WATCHDOG_TIME_INIT(_time) \ - config.m_watchdog_time = _time; \ - + config.m_watchdog_time = _time; // core functions #define MCFG_NVRAM_HANDLER(_func) \ - config.m_nvram_handler = NVRAM_HANDLER_NAME(_func); \ - + config.m_nvram_handler = NVRAM_HANDLER_NAME(_func); #define MCFG_MEMCARD_HANDLER(_func) \ - config.m_memcard_handler = MEMCARD_HANDLER_NAME(_func); \ - + config.m_memcard_handler = MEMCARD_HANDLER_NAME(_func); #define MCFG_NVRAM_HANDLER_CLEAR() \ - config.m_nvram_handler = NULL; \ - + config.m_nvram_handler = NULL; // core video parameters #define MCFG_VIDEO_ATTRIBUTES(_flags) \ - config.m_video_attributes = _flags; \ - + config.m_video_attributes = _flags; #define MCFG_GFXDECODE(_gfx) \ - config.m_gfxdecodeinfo = GFXDECODE_NAME(_gfx); \ - + config.m_gfxdecodeinfo = GFXDECODE_NAME(_gfx); #define MCFG_PALETTE_LENGTH(_length) \ - config.m_total_colors = _length; \ - + config.m_total_colors = _length; #define MCFG_DEFAULT_LAYOUT(_layout) \ - config.m_default_layout = &(_layout)[0]; \ - + config.m_default_layout = &(_layout)[0]; // add/remove devices #define MCFG_DEVICE_ADD(_tag, _type, _clock) \ - device = config.device_add(owner, _tag, _type, _clock); \ - + device = config.device_add(owner, _tag, _type, _clock); #define MCFG_DEVICE_REPLACE(_tag, _type, _clock) \ - device = config.device_replace(owner, _tag, _type, _clock); \ - + device = config.device_replace(owner, _tag, _type, _clock); #define MCFG_DEVICE_REMOVE(_tag) \ - device = config.device_remove(owner, _tag); \ - + device = config.device_remove(owner, _tag); #define MCFG_DEVICE_MODIFY(_tag) \ - device = config.device_find(owner, _tag); \ - + device = config.device_find(owner, _tag); #endif /* __MCONFIG_H__ */ diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c index 206408fcd6d..52f6f6c96ba 100644 --- a/src/emu/rendlay.c +++ b/src/emu/rendlay.c @@ -1065,7 +1065,6 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 // only render the symbol / text if it's atually in view because the code is SLOW if ((endpos >= bounds.min_y) && (basey <= bounds.max_y)) { - while (1) { width = font->string_width(ourheight/num_shown, aspect, m_stopnames[fruit]); @@ -1102,7 +1101,6 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 int effx = x; if (effx >= bounds.min_x && effx <= bounds.max_x) { - UINT32 spix = RGB_ALPHA(src[x]); if (spix != 0) { @@ -1141,7 +1139,6 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 int effx = curx + x + chbounds.min_x; if (effx >= bounds.min_x && effx <= bounds.max_x) { - UINT32 spix = RGB_ALPHA(src[x]); if (spix != 0) { @@ -1211,7 +1208,6 @@ void layout_element::component::load_bitmap() void layout_element::component::load_reel_bitmap(int number) { - // load the basic bitmap assert(m_file != NULL); /*m_hasalpha[number] = */ render_load_png(m_bitmap[number], *m_file[number], m_dirname, m_imagefile[number]); diff --git a/src/emu/screen.h b/src/emu/screen.h index 2f07fc1b24f..634bff28c56 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -364,53 +364,39 @@ typedef device_type_iterator<&device_creator, screen_device> scre #define MCFG_SCREEN_ADD(_tag, _type) \ MCFG_DEVICE_ADD(_tag, SCREEN, 0) \ - MCFG_SCREEN_TYPE(_type) \ - + MCFG_SCREEN_TYPE(_type) #define MCFG_SCREEN_MODIFY(_tag) \ MCFG_DEVICE_MODIFY(_tag) #define MCFG_SCREEN_TYPE(_type) \ - screen_device::static_set_type(*device, SCREEN_TYPE_##_type); \ - + screen_device::static_set_type(*device, SCREEN_TYPE_##_type); #define MCFG_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \ screen_device::static_set_raw(*device, _pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart); #define MCFG_SCREEN_REFRESH_RATE(_rate) \ - screen_device::static_set_refresh(*device, HZ_TO_ATTOSECONDS(_rate)); \ - + screen_device::static_set_refresh(*device, HZ_TO_ATTOSECONDS(_rate)); #define MCFG_SCREEN_VBLANK_TIME(_time) \ - screen_device::static_set_vblank_time(*device, _time); \ - + screen_device::static_set_vblank_time(*device, _time); #define MCFG_SCREEN_SIZE(_width, _height) \ - screen_device::static_set_size(*device, _width, _height); \ - + screen_device::static_set_size(*device, _width, _height); #define MCFG_SCREEN_VISIBLE_AREA(_minx, _maxx, _miny, _maxy) \ - screen_device::static_set_visarea(*device, _minx, _maxx, _miny, _maxy); \ - + screen_device::static_set_visarea(*device, _minx, _maxx, _miny, _maxy); #define MCFG_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \ - screen_device::static_set_default_position(*device, _xscale, _xoffs, _yscale, _yoffs); \ - + screen_device::static_set_default_position(*device, _xscale, _xoffs, _yscale, _yoffs); #define MCFG_SCREEN_UPDATE_STATIC(_func) \ - screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func)); \ - + screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&screen_update_##_func, "screen_update_" #_func)); #define MCFG_SCREEN_UPDATE_DRIVER(_class, _method) \ - screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, NULL)); \ - + screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, NULL)); #define MCFG_SCREEN_UPDATE_DEVICE(_device, _class, _method) \ - screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, _device)); \ - + screen_device::static_set_screen_update(*device, screen_update_delegate_smart(&_class::_method, #_class "::" #_method, _device)); #define MCFG_SCREEN_VBLANK_NONE() \ - screen_device::static_set_screen_vblank(*device, screen_vblank_delegate()); \ - + screen_device::static_set_screen_vblank(*device, screen_vblank_delegate()); #define MCFG_SCREEN_VBLANK_STATIC(_func) \ - screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&screen_vblank_##_func, "screen_vblank_" #_func)); \ - + screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&screen_vblank_##_func, "screen_vblank_" #_func)); #define MCFG_SCREEN_VBLANK_DRIVER(_class, _method) \ - screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_SCREEN_VBLANK_DEVICE(_device, _class, _method) \ - screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&_class::_method, #_class "::" #_method, _device, (_class *)0)); \ - + screen_device::static_set_screen_vblank(*device, screen_vblank_delegate(&_class::_method, #_class "::" #_method, _device, (_class *)0)); //************************************************************************** diff --git a/src/emu/softlist.c b/src/emu/softlist.c index e258ca4ff52..bfb97287150 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -1377,7 +1377,6 @@ void software_list_find_approx_matches(software_list_device *swlistdev, software software_part *part = software_find_part(swinfo, NULL, NULL); if ((interface==NULL || softlist_contain_interface(interface, part->interface_)) && (is_software_compatible(part, swlistdev))) { - /* pick the best match between driver name and description */ curpenalty = softlist_penalty_compare(name, candidate->longname); tmp = softlist_penalty_compare(name, candidate->shortname); diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h index b8c42eb01e9..c8a866384ce 100644 --- a/src/emu/sound/2151intf.h +++ b/src/emu/sound/2151intf.h @@ -20,11 +20,9 @@ MCFG_DEVICE_ADD(_tag, YM2151, _clock) #define MCFG_YM2151_IRQ_HANDLER(_devcb) \ - devcb = &ym2151_device::set_irq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &ym2151_device::set_irq_handler(*device, DEVCB2_##_devcb); #define MCFG_YM2151_PORT_WRITE_HANDLER(_devcb) \ - devcb = &ym2151_device::set_port_write_handler(*device, DEVCB2_##_devcb); \ - + devcb = &ym2151_device::set_port_write_handler(*device, DEVCB2_##_devcb); //************************************************************************** diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index 3ef493af208..a9dcd298e17 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -820,7 +820,6 @@ static void AICA_UpdateReg(aica_state *AICA, address_space &space, int reg) static void AICA_UpdateSlotRegR(aica_state *AICA, int slot,int reg) { - } static void AICA_UpdateRegR(aica_state *AICA, address_space &space, int reg) diff --git a/src/emu/sound/asc.h b/src/emu/sound/asc.h index cc6c8288921..2dfe522c9c2 100644 --- a/src/emu/sound/asc.h +++ b/src/emu/sound/asc.h @@ -49,11 +49,9 @@ enum MCFG_IRQ_FUNC(_irqf) #define MCFG_ASC_TYPE(_type) \ - asc_device::static_set_type(*device, _type); \ - + asc_device::static_set_type(*device, _type); #define MCFG_IRQ_FUNC(_irqf) \ - asc_device::static_set_irqf(*device, _irqf); \ - + asc_device::static_set_irqf(*device, _irqf); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h index 1ae84979422..276050709f7 100644 --- a/src/emu/sound/bsmt2000.h +++ b/src/emu/sound/bsmt2000.h @@ -50,14 +50,11 @@ //************************************************************************** #define MCFG_BSMT2000_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, BSMT2000, _clock) \ - + MCFG_DEVICE_ADD(_tag, BSMT2000, _clock) #define MCFG_BSMT2000_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, BSMT2000, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, BSMT2000, _clock) #define MCFG_BSMT2000_READY_CALLBACK(_callback) \ - bsmt2000_device::static_set_ready_callback(*device, _callback); \ - + bsmt2000_device::static_set_ready_callback(*device, _callback); //************************************************************************** diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index 89ebe143ffd..c65b0f2d98c 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -329,7 +329,6 @@ cdp1869_device::cdp1869_device(const machine_config &mconfig, const char *tag, d m_stream(NULL), m_space_config("pageram", ENDIANNESS_LITTLE, 8, 11, 0, NULL, *ADDRESS_MAP_NAME(cdp1869)) { - } diff --git a/src/emu/sound/dac.h b/src/emu/sound/dac.h index fdafa4eaa9f..ab7dfdfb31e 100644 --- a/src/emu/sound/dac.h +++ b/src/emu/sound/dac.h @@ -46,8 +46,7 @@ //************************************************************************** #define MCFG_DAC_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, DAC, 0) \ - + MCFG_DEVICE_ADD(_tag, DAC, 0) //************************************************************************** diff --git a/src/emu/sound/disc_wav.c b/src/emu/sound/disc_wav.c index b1d64d06405..c73e721a754 100644 --- a/src/emu/sound/disc_wav.c +++ b/src/emu/sound/disc_wav.c @@ -164,7 +164,6 @@ DISCRETE_STEP(dss_counter) DISCRETE_RESET(dss_counter) { - if ((int)DSS_COUNTER__CLOCK_TYPE & DISC_COUNTER_IS_7492) { m_is_7492 = 1; diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index c729aeb75c3..1e4eb16903a 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -176,7 +176,6 @@ private: inline void discrete_task::step_nodes(void) { - for_each(input_buffer *, sn, &source_list) { sn->buffer = *sn->ptr++; @@ -284,7 +283,6 @@ void discrete_task::check(discrete_task *dest_task) */ for_each(discrete_step_interface **, node_entry, &step_list) { - discrete_base_node *task_node = (*node_entry)->self; for_each(discrete_step_interface **, step_entry, &dest_task->step_list) @@ -1003,7 +1001,6 @@ void discrete_sound_device::device_start() void discrete_device::device_reset() { - update_to_current_time(); /* loop over all nodes */ @@ -1018,7 +1015,6 @@ void discrete_device::device_reset() void discrete_sound_device::device_reset() { - discrete_device::device_reset(); } diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index efd8cf616a2..d5fc370a3b4 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -4272,8 +4272,7 @@ DECLARE_READ8_DEVICE_HANDLER( discrete_sound_r ); MCFG_DISCRETE_INTF(_intf) #define MCFG_DISCRETE_INTF(_intf) \ - discrete_device::static_set_intf(*device, (const discrete_block *)&(_intf##_discrete_interface)); \ - + discrete_device::static_set_intf(*device, (const discrete_block *)&(_intf##_discrete_interface)); #define MCFG_SOUND_CONFIG_DISCRETE(name) MCFG_SOUND_CONFIG(name##_discrete_interface) //************************************************************************** @@ -4530,7 +4529,6 @@ discrete_base_node * discrete_node_factory::Create(discrete_device * pdev, co #define DISCRETE_SOUND_EXTERN(name) extern const discrete_block name##_discrete_interface[] #define DISCRETE_SOUND_START(name) const discrete_block name##_discrete_interface[] = { - #define DSC_SND_ENTRY(_nod, _class, _dss, _num, _iact, _iinit, _custom, _name) { _nod, new discrete_node_factory< DISCRETE_CLASS_NAME(_class) >, _dss, _num, _iact, _iinit, _custom, _name, # _class } diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h index eb20a433505..e4bd6f58cca 100644 --- a/src/emu/sound/es5503.h +++ b/src/emu/sound/es5503.h @@ -18,14 +18,11 @@ MCFG_ES5503_ADC_FUNC(_adcf) #define MCFG_ES5503_OUTPUT_CHANNELS(_channels) \ - es5503_device::static_set_channels(*device, _channels); \ - + es5503_device::static_set_channels(*device, _channels); #define MCFG_ES5503_IRQ_FUNC(_irqf) \ - es5503_device::static_set_irqf(*device, _irqf); \ - + es5503_device::static_set_irqf(*device, _irqf); #define MCFG_ES5503_ADC_FUNC(_adcf) \ - es5503_device::static_set_adcf(*device, _adcf); \ - + es5503_device::static_set_adcf(*device, _adcf); // ======================> es5503_device class es5503_device : public device_t, diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c index 8e736522315..21d8751df53 100644 --- a/src/emu/sound/fm.c +++ b/src/emu/sound/fm.c @@ -207,7 +207,6 @@ static const UINT32 sl_table[16]={ #define RATE_STEPS (8) static const UINT8 eg_inc[19*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */ @@ -1083,7 +1082,6 @@ INLINE void advance_lfo(FM_OPN *OPN) /* actually I can't optimize is this way without rewriting chan_calc() to use chip->lfo_am instead of global lfo_am */ { - /* triangle */ /* AM: 0 to 126 step +2, 126 to 0 step -2 */ if (pos<64) @@ -1169,7 +1167,6 @@ static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT) { if ( !(OPN->eg_cnt & ((1<eg_sh_d2r)-1) ) ) { - SLOT->volume += 4 * eg_inc[SLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7)]; if ( SLOT->volume >= ENV_QUIET ) @@ -1886,20 +1883,17 @@ static void OPNWriteReg(FM_OPN *OPN, int r, int v) /* SSG-EG envelope shapes : E AtAlH - 1 0 0 0 \\\\ - + 1 0 0 0 \\\ 1 0 0 1 \___ 1 0 1 0 \/\/ ___ - 1 0 1 1 \ - + 1 0 1 1 1 1 0 0 //// ___ 1 1 0 1 / - 1 1 1 0 /\/\ - + 1 1 1 0 /\/ 1 1 1 1 /___ @@ -2695,7 +2689,6 @@ static const unsigned int YM2608_ADPCM_ROM_addr[2*6] = { */ static const unsigned char YM2608_ADPCM_ROM[0x2000] = { - /* Source: 01BD.ROM */ /* Length: 448 / 0x000001C0 */ @@ -3311,7 +3304,6 @@ void ym2608_update_one(void *chip, FMSAMPLE **buffer, int length) /* buffering */ for(i=0; i < length ; i++) { - advance_lfo(OPN); /* clear output acc. */ @@ -3857,7 +3849,6 @@ void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length) /* buffering */ for(i=0; i < length ; i++) { - advance_lfo(OPN); /* clear output acc. */ @@ -3988,7 +3979,6 @@ void ym2610b_update_one(void *chip, FMSAMPLE **buffer, int length) /* buffering */ for(i=0; i < length ; i++) { - advance_lfo(OPN); /* clear output acc. */ diff --git a/src/emu/sound/fm2612.c b/src/emu/sound/fm2612.c index 3b2877a7c58..49d8983e0dd 100644 --- a/src/emu/sound/fm2612.c +++ b/src/emu/sound/fm2612.c @@ -213,7 +213,6 @@ static const UINT32 sl_table[16]={ #define RATE_STEPS (8) static const UINT8 eg_inc[19*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */ @@ -1834,20 +1833,17 @@ static void OPNWriteReg(FM_OPN *OPN, int r, int v) /* SSG-EG envelope shapes : E AtAlH - 1 0 0 0 \\\\ - + 1 0 0 0 \\\ 1 0 0 1 \___ 1 0 1 0 \/\/ ___ - 1 0 1 1 \ - + 1 0 1 1 1 1 0 0 //// ___ 1 1 0 1 / - 1 1 1 0 /\/\ - + 1 1 1 0 /\/ 1 1 1 1 /___ diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c index 119d110ec73..372f5cc44e2 100644 --- a/src/emu/sound/fmopl.c +++ b/src/emu/sound/fmopl.c @@ -399,7 +399,6 @@ static const UINT32 sl_tab[16]={ #define RATE_STEPS (8) static const unsigned char eg_inc[15*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */ @@ -600,7 +599,6 @@ static const UINT8 lfo_am_table[LFO_AM_TAB_ELEMENTS] = { /* LFO Phase Modulation table (verified on real YM3812) */ static const INT8 lfo_pm_table[8*8*2] = { - /* FNUM2/FNUM = 00 0xxxxxxx (0x0000) */ 0, 0, 0, 0, 0, 0, 0, 0, /*LFO PM depth = 0*/ 0, 0, 0, 0, 0, 0, 0, 0, /*LFO PM depth = 1*/ @@ -1038,7 +1036,6 @@ INLINE void OPL_CALC_RH( FM_OPL *OPL, OPL_CH *CH, unsigned int noise ) env = volume_calc(SLOT7_1); if( env < ENV_QUIET ) { - /* high hat phase generation: phase = d0 or 234 (based on frequency only) phase = 34 or 2d0 (based on noise) diff --git a/src/emu/sound/gaelco.h b/src/emu/sound/gaelco.h index e454ec85c51..d697b057b15 100644 --- a/src/emu/sound/gaelco.h +++ b/src/emu/sound/gaelco.h @@ -12,17 +12,13 @@ //************************************************************************** #define MCFG_GAELCO_GAE1_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, GAELCO_GAE1, _clock) \ - + MCFG_DEVICE_ADD(_tag, GAELCO_GAE1, _clock) #define MCFG_GAELCO_GAE1_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, GAELCO_GAE1, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, GAELCO_GAE1, _clock) #define MCFG_GAELCO_CG1V_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, GAELCO_CG1V, _clock) \ - + MCFG_DEVICE_ADD(_tag, GAELCO_CG1V, _clock) #define MCFG_GAELCO_CG1V_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, GAELCO_CG1V, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, GAELCO_CG1V, _clock) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h index e53947cbfb2..d60dc6bcb40 100644 --- a/src/emu/sound/ics2115.h +++ b/src/emu/sound/ics2115.h @@ -10,15 +10,13 @@ #define MCFG_ICS2115_ADD(_tag, _clock, _irqf) \ MCFG_DEVICE_ADD(_tag, ICS2115, _clock) \ - MCFG_IRQ_FUNC(_irqf) \ - + MCFG_IRQ_FUNC(_irqf) #define MCFG_ICS2115_REPLACE(_tag, _clock, _irqf) \ MCFG_DEVICE_REPLACE(_tag, ICS2115, _clock) \ MCFG_IRQ_FUNC(_irqf) #define MCFG_IRQ_FUNC(_irqf) \ - ics2115_device::static_set_irqf(*device, _irqf); \ - + ics2115_device::static_set_irqf(*device, _irqf); //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index 096388eba57..95a753cb805 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -134,7 +134,6 @@ static STREAM_UPDATE( k053260_update ) } for ( j = 0; j < samples; j++ ) { - dataL = dataR = 0; for ( i = 0; i < 4; i++ ) { @@ -142,7 +141,6 @@ static STREAM_UPDATE( k053260_update ) if ( play[i] ) { /* see if we're done */ if ( ( pos[i] >> BASE_SHIFT ) >= end[i] ) { - ppcm_data[i] = 0; if ( loop[i] ) pos[i] = 0; @@ -160,7 +158,6 @@ static STREAM_UPDATE( k053260_update ) { int newdata; if ( pos[i] & 0x8000 ){ - newdata = ((rom[i][pos[i] >> BASE_SHIFT]) >> 4) & 0x0f; /*high nybble*/ } else{ @@ -261,7 +258,6 @@ static DEVICE_START( k053260 ) INLINE void check_bounds( k053260_state *ic, int channel ) { - int channel_start = ( ic->channels[channel].bank << 16 ) + ic->channels[channel].start; int channel_end = channel_start + ic->channels[channel].size - 1; diff --git a/src/emu/sound/k054539.h b/src/emu/sound/k054539.h index e79dd6cdc9b..dbfefba2f12 100644 --- a/src/emu/sound/k054539.h +++ b/src/emu/sound/k054539.h @@ -11,8 +11,7 @@ #define MCFG_K054539_ADD(_tag, _clock, _interface) \ MCFG_DEVICE_ADD(_tag, K054539, _clock) \ - k054539_device::static_set_interface(*device, _interface); \ - + k054539_device::static_set_interface(*device, _interface); struct k054539_interface { const char *rgnoverride; diff --git a/src/emu/sound/nile.h b/src/emu/sound/nile.h index 50cd2b5be4a..c6809e31eee 100644 --- a/src/emu/sound/nile.h +++ b/src/emu/sound/nile.h @@ -9,11 +9,9 @@ //************************************************************************** #define MCFG_NILE_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, NILE, _clock) \ - + MCFG_DEVICE_ADD(_tag, NILE, _clock) #define MCFG_NILE_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, NILE, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, NILE, _clock) //************************************************************************** diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h index cd366663a1f..2159d7b6510 100644 --- a/src/emu/sound/okim6295.h +++ b/src/emu/sound/okim6295.h @@ -40,8 +40,7 @@ enum MCFG_OKIM6295_PIN7(_pin7) #define MCFG_OKIM6295_PIN7(_pin7) \ - okim6295_device::static_set_pin7(*device, _pin7); \ - + okim6295_device::static_set_pin7(*device, _pin7); //************************************************************************** diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c index b6caf3db419..f59e72d98df 100644 --- a/src/emu/sound/okim6376.c +++ b/src/emu/sound/okim6376.c @@ -566,7 +566,6 @@ WRITE_LINE_DEVICE_HANDLER( okim6376_st_w ) if (info->st != state) { - info->st = state; info->st_update = 1; @@ -574,7 +573,6 @@ WRITE_LINE_DEVICE_HANDLER( okim6376_st_w ) { struct ADPCMVoice *voice = &info->voice[info->channel]; { - info->st_pulses ++; MSM6376LOG(("OKIM6376:'%s' ST pulses %x\n",device->tag(),info->st_pulses)); if (info->st_pulses > 3) diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c index 218bedc430c..e04ceff8dae 100644 --- a/src/emu/sound/qs1000.c +++ b/src/emu/sound/qs1000.c @@ -364,7 +364,6 @@ READ8_MEMBER( qs1000_device::p3_r ) //------------------------------------------------- WRITE8_MEMBER( qs1000_device::p0_w ) { - } diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h index 06e41af2305..29a608fc2e7 100644 --- a/src/emu/sound/qs1000.h +++ b/src/emu/sound/qs1000.h @@ -59,7 +59,6 @@ class qs1000_device : public device_t, public device_memory_interface, public qs1000_interface { - public: // construction/destruction qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/sound/qsound.h b/src/emu/sound/qsound.h index bfd7abfe344..7c4676d3424 100644 --- a/src/emu/sound/qsound.h +++ b/src/emu/sound/qsound.h @@ -22,11 +22,9 @@ typedef stream_sample_t QSOUND_SAMPLE; //************************************************************************** #define MCFG_QSOUND_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, QSOUND, _clock) \ - + MCFG_DEVICE_ADD(_tag, QSOUND, _clock) #define MCFG_QSOUND_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, QSOUND, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, QSOUND, _clock) //************************************************************************** diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 2b0fe12819e..0f803484c75 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -831,7 +831,6 @@ static void SCSP_UpdateReg(scsp_state *scsp, address_space &space, int reg) static void SCSP_UpdateSlotRegR(scsp_state *scsp, int slot,int reg) { - } static void SCSP_UpdateRegR(scsp_state *scsp, address_space &space, int reg) diff --git a/src/emu/sound/segapcm.h b/src/emu/sound/segapcm.h index 485f254b2d9..ea01e9a0784 100644 --- a/src/emu/sound/segapcm.h +++ b/src/emu/sound/segapcm.h @@ -20,11 +20,9 @@ //************************************************************************** #define MCFG_SEGAPCM_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, SEGAPCM, _clock) \ - + MCFG_DEVICE_ADD(_tag, SEGAPCM, _clock) #define MCFG_SEGAPCM_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, SEGAPCM, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, SEGAPCM, _clock) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/sound/snkwave.h b/src/emu/sound/snkwave.h index 19fcbd82fe0..97373410e37 100644 --- a/src/emu/sound/snkwave.h +++ b/src/emu/sound/snkwave.h @@ -10,11 +10,9 @@ //************************************************************************** #define MCFG_SNKWAVE_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, SNKWAVE, _clock) \ - + MCFG_DEVICE_ADD(_tag, SNKWAVE, _clock) #define MCFG_SNKWAVE_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, SNKWAVE, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, SNKWAVE, _clock) //************************************************************************** diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index 01be92167ff..9fd26c7ea82 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -427,7 +427,6 @@ void tms5110_process(tms5110_state *tms, INT16 *buffer, unsigned int size) /* if we're to speak, but haven't started */ if (!tms->talk_status) { - /* a "dummy read" is mentioned in the tms5200 datasheet */ /* The Bagman speech roms data are organized in such a way that ** the bit at address 0 is NOT a speech data. The bit at address 1 @@ -455,7 +454,6 @@ void tms5110_process(tms5110_state *tms, INT16 *buffer, unsigned int size) /* if we're ready for a new frame */ if ((tms->interp_count == 0) && (tms->sample_count == 0)) { - /* remember previous frame */ tms->old_energy = tms->new_energy; tms->old_pitch = tms->new_pitch; diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h index 8e4b3db69c3..07e51b9c8c9 100644 --- a/src/emu/sound/votrax.h +++ b/src/emu/sound/votrax.h @@ -51,8 +51,7 @@ #define MCFG_VOTRAX_SC01_ADD(_tag, _clock, _interface) \ MCFG_DEVICE_ADD(_tag, VOTRAX_SC01, _clock) \ - votrax_sc01_device::static_set_interface(*device, _interface); \ - + votrax_sc01_device::static_set_interface(*device, _interface); //************************************************************************** diff --git a/src/emu/sound/vrender0.h b/src/emu/sound/vrender0.h index 064fc359873..483c9f56b55 100644 --- a/src/emu/sound/vrender0.h +++ b/src/emu/sound/vrender0.h @@ -9,11 +9,9 @@ //************************************************************************** #define MCFG_SOUND_VRENDER0_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, VRENDER0, _clock) \ - + MCFG_DEVICE_ADD(_tag, VRENDER0, _clock) #define MCFG_SOUND_VRENDER0_REPLACE(_tag, _clock) \ - MCFG_DEVICE_REPLACE(_tag, VRENDER0, _clock) \ - + MCFG_DEVICE_REPLACE(_tag, VRENDER0, _clock) //************************************************************************** diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c index de5c21e4ba3..669115b1c9c 100644 --- a/src/emu/sound/ym2151.c +++ b/src/emu/sound/ym2151.c @@ -229,7 +229,6 @@ static UINT32 d1l_tab[16]; #define RATE_STEPS (8) static const UINT8 eg_inc[19*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */ diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c index ba0cb8acff1..7126c7f590e 100644 --- a/src/emu/sound/ym2413.c +++ b/src/emu/sound/ym2413.c @@ -335,7 +335,6 @@ static const UINT32 sl_tab[16]={ #define RATE_STEPS (8) static const unsigned char eg_inc[15*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */ @@ -536,7 +535,6 @@ static const UINT8 lfo_am_table[LFO_AM_TAB_ELEMENTS] = { /* LFO Phase Modulation table (verified on real YM2413) */ static const INT8 lfo_pm_table[8*8] = { - /* FNUM2/FNUM = 0 00xxxxxx (0x0000) */ 0, 0, 0, 0, 0, 0, 0, 0, @@ -673,7 +671,6 @@ INLINE void advance(YM2413 *chip) switch(op->state) { - case EG_DMP: /* dump phase */ /*dump phase is performed by both operators in each channel*/ /*when CARRIER envelope gets down to zero level, @@ -1051,7 +1048,6 @@ INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise ) env = volume_calc(SLOT7_1); if( env < ENV_QUIET ) { - /* high hat phase generation: phase = d0 or 234 (based on frequency only) phase = 34 or 2d0 (based on noise) diff --git a/src/emu/sound/ymdeltat.c b/src/emu/sound/ymdeltat.c index f5ed6f3ce00..285fe23ffdb 100644 --- a/src/emu/sound/ymdeltat.c +++ b/src/emu/sound/ymdeltat.c @@ -484,7 +484,6 @@ INLINE void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT) step = DELTAT->now_step >> YM_DELTAT_SHIFT; DELTAT->now_step &= (1<now_addr == (DELTAT->limit<<1) ) DELTAT->now_addr = 0; @@ -566,7 +565,6 @@ INLINE void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT) step = DELTAT->now_step >> YM_DELTAT_SHIFT; DELTAT->now_step &= (1<now_addr&1 ) { data = DELTAT->now_data & 0x0f; @@ -616,7 +614,6 @@ INLINE void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT) /* ADPCM B (Delta-T control type) */ void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT) { - /* some examples: value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning: diff --git a/src/emu/sound/ymf262.c b/src/emu/sound/ymf262.c index 9b2ba48f555..552cf603435 100644 --- a/src/emu/sound/ymf262.c +++ b/src/emu/sound/ymf262.c @@ -352,7 +352,6 @@ static const UINT32 sl_tab[16]={ #define RATE_STEPS (8) static const unsigned char eg_inc[15*RATE_STEPS]={ - /*cycle:0 1 2 3 4 5 6 7*/ /* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */ @@ -557,7 +556,6 @@ static const UINT8 lfo_am_table[LFO_AM_TAB_ELEMENTS] = { /* LFO Phase Modulation table (verified on real YM3812) */ static const INT8 lfo_pm_table[8*8*2] = { - /* FNUM2/FNUM = 00 0xxxxxxx (0x0000) */ 0, 0, 0, 0, 0, 0, 0, 0, /*LFO PM depth = 0*/ 0, 0, 0, 0, 0, 0, 0, 0, /*LFO PM depth = 1*/ @@ -1031,7 +1029,6 @@ INLINE void chan_calc_rhythm( OPL3 *chip, OPL3_CH *CH, unsigned int noise ) env = volume_calc(SLOT7_1); if( env < ENV_QUIET ) { - /* high hat phase generation: phase = d0 or 234 (based on frequency only) phase = 34 or 2d0 (based on noise) diff --git a/src/emu/speaker.h b/src/emu/speaker.h index 27df82e23e5..5b797e53492 100644 --- a/src/emu/speaker.h +++ b/src/emu/speaker.h @@ -63,8 +63,7 @@ extern const device_type SPEAKER; // add/remove speakers #define MCFG_SPEAKER_ADD(_tag, _x, _y, _z) \ MCFG_DEVICE_ADD(_tag, SPEAKER, 0) \ - speaker_device::static_set_position(*device, _x, _y, _z); \ - + speaker_device::static_set_position(*device, _x, _y, _z); #define MCFG_SPEAKER_STANDARD_MONO(_tag) \ MCFG_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0) diff --git a/src/emu/timer.h b/src/emu/timer.h index 5dc23d4c5de..77b43aaad26 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -62,50 +62,38 @@ #define MCFG_TIMER_ADD(_tag, _callback) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_generic(*device, timer_device_expired_delegate(&_callback, #_callback)); \ - + timer_device::static_configure_generic(*device, timer_device_expired_delegate(&_callback, #_callback)); #define MCFG_TIMER_ADD_NONE(_tag) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_generic(*device, timer_device_expired_delegate()); \ - + timer_device::static_configure_generic(*device, timer_device_expired_delegate()); #define MCFG_TIMER_ADD_PERIODIC(_tag, _callback, _period) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_periodic(*device, timer_device_expired_delegate(&_callback, #_callback), _period); \ - + timer_device::static_configure_periodic(*device, timer_device_expired_delegate(&_callback, #_callback), _period); #define MCFG_TIMER_ADD_SCANLINE(_tag, _callback, _screen, _first_vpos, _increment) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_scanline(*device, timer_device_expired_delegate(&_callback, #_callback), _screen, _first_vpos, _increment); \ - + timer_device::static_configure_scanline(*device, timer_device_expired_delegate(&_callback, #_callback), _screen, _first_vpos, _increment); #define MCFG_TIMER_DRIVER_ADD(_tag, _class, _callback) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_generic(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0)); \ - + timer_device::static_configure_generic(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0)); #define MCFG_TIMER_DRIVER_ADD_PERIODIC(_tag, _class, _callback, _period) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_periodic(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0), _period); \ - + timer_device::static_configure_periodic(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0), _period); #define MCFG_TIMER_DRIVER_ADD_SCANLINE(_tag, _class, _callback, _screen, _first_vpos, _increment) \ MCFG_DEVICE_ADD(_tag, TIMER, 0) \ - timer_device::static_configure_scanline(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0), _screen, _first_vpos, _increment); \ - + timer_device::static_configure_scanline(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0), _screen, _first_vpos, _increment); #define MCFG_TIMER_MODIFY(_tag) \ MCFG_DEVICE_MODIFY(_tag) #define MCFG_TIMER_CALLBACK(_callback) \ - timer_device::static_set_callback(*device, timer_device_expired_delegate(&_callback, #_callback)); \ - + timer_device::static_set_callback(*device, timer_device_expired_delegate(&_callback, #_callback)); #define MCFG_TIMER_DRIVER_CALLBACK(_class, _callback) \ - timer_device::static_set_callback(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0)); \ - + timer_device::static_set_callback(*device, timer_device_expired_delegate(&_class::_callback, #_class "::" #_callback, NULL, (_class *)0)); #define MCFG_TIMER_START_DELAY(_start_delay) \ - timer_device::static_set_start_delay(*device, _start_delay); \ - + timer_device::static_set_start_delay(*device, _start_delay); #define MCFG_TIMER_PARAM(_param) \ - timer_device::static_set_param(*device, _param); \ - + timer_device::static_set_param(*device, _param); #define MCFG_TIMER_PTR(_ptr) \ - timer_device::static_set_ptr(*device, (void *)(_ptr)); \ - + timer_device::static_set_ptr(*device, (void *)(_ptr)); //************************************************************************** diff --git a/src/emu/validity.c b/src/emu/validity.c index 59c965bf15a..42d2fe31bf0 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -336,7 +336,6 @@ void validity_checker::validate_one(const game_driver &driver) void validity_checker::validate_core() { - // basic system checks UINT8 a = 0xff; UINT8 b = a + 1; diff --git a/src/emu/video/bufsprite.h b/src/emu/video/bufsprite.h index 7d5b21cb32c..7c94ec3bba4 100644 --- a/src/emu/video/bufsprite.h +++ b/src/emu/video/bufsprite.h @@ -61,17 +61,13 @@ extern const device_type BUFFERED_SPRITERAM64; //************************************************************************** #define MCFG_BUFFERED_SPRITERAM8_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM8, 0) \ - + MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM8, 0) #define MCFG_BUFFERED_SPRITERAM16_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM16, 0) \ - + MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM16, 0) #define MCFG_BUFFERED_SPRITERAM32_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM32, 0) \ - + MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM32, 0) #define MCFG_BUFFERED_SPRITERAM64_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM64, 0) \ - + MCFG_DEVICE_ADD(_tag, BUFFERED_SPRITERAM64, 0) //************************************************************************** diff --git a/src/emu/video/huc6272.c b/src/emu/video/huc6272.c index 1a417fb3134..efb382f6bc6 100644 --- a/src/emu/video/huc6272.c +++ b/src/emu/video/huc6272.c @@ -68,7 +68,6 @@ huc6272_device::huc6272_device(const machine_config &mconfig, const char *tag, d device_memory_interface(mconfig, *this), m_space_config("videoram", ENDIANNESS_LITTLE, 32, 32, 0, NULL, *ADDRESS_MAP_NAME(huc6272_vram)) { - } @@ -88,7 +87,6 @@ void huc6272_device::device_validity_check(validity_checker &valid) const void huc6272_device::device_start() { - } @@ -168,7 +166,6 @@ WRITE32_MEMBER( huc6272_device::write ) { switch(m_register) { - case 0x09: // DMA addr //printf("%08x DMA ADDR\n",data); break; diff --git a/src/emu/video/m50458.c b/src/emu/video/m50458.c index 56e9feb9f62..fbce138f50d 100644 --- a/src/emu/video/m50458.c +++ b/src/emu/video/m50458.c @@ -92,7 +92,6 @@ WRITE16_MEMBER( m50458_device::vreg_123_w) WRITE16_MEMBER( m50458_device::vreg_124_w) { - } WRITE16_MEMBER( m50458_device::vreg_125_w) diff --git a/src/emu/video/m50458.h b/src/emu/video/m50458.h index 58b9c897fa6..7efcd0eb88f 100644 --- a/src/emu/video/m50458.h +++ b/src/emu/video/m50458.h @@ -17,8 +17,7 @@ Mitsubishi M50458 OSD chip #define MCFG_M50458_ADD(_tag,_config,_freq) \ MCFG_DEVICE_ADD(_tag, M50458,_freq) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #define M50458_INTERFACE(name) \ const m50458_interface (name) = diff --git a/src/emu/video/mb90082.c b/src/emu/video/mb90082.c index 7c6deff6c43..58290d60b97 100644 --- a/src/emu/video/mb90082.c +++ b/src/emu/video/mb90082.c @@ -109,7 +109,6 @@ void mb90082_device::device_validity_check(validity_checker &valid) const void mb90082_device::device_start() { - } diff --git a/src/emu/video/mb90082.h b/src/emu/video/mb90082.h index bb263c95475..0e53037d965 100644 --- a/src/emu/video/mb90082.h +++ b/src/emu/video/mb90082.h @@ -16,8 +16,7 @@ Template for skeleton device //************************************************************************** #define MCFG_MB90082_ADD(_tag,_freq) \ - MCFG_DEVICE_ADD(_tag, MB90082, _freq) \ - + MCFG_DEVICE_ADD(_tag, MB90082, _freq) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c index 2cf14f30a99..4aaf1725e84 100644 --- a/src/emu/video/psx.c +++ b/src/emu/video/psx.c @@ -950,8 +950,7 @@ void psxgpu_device::decode_tpage( UINT32 tpage ) n_distance--; \ } \ break; \ - } \ - + } #define FLATTEXTUREDPOLYGONUPDATE \ n_u.d += n_du; \ n_v.d += n_dv; @@ -969,7 +968,6 @@ void psxgpu_device::decode_tpage( UINT32 tpage ) #define TEXTURE_LOOP \ while( n_distance > 0 ) \ { - #define TEXTURE_ENDLOOP \ } diff --git a/src/emu/video/ramdac.c b/src/emu/video/ramdac.c index 4930f0e1878..4f3df8fffa5 100644 --- a/src/emu/video/ramdac.c +++ b/src/emu/video/ramdac.c @@ -42,7 +42,6 @@ ramdac_device::ramdac_device(const machine_config &mconfig, const char *tag, dev device_memory_interface(mconfig, *this), m_space_config("videoram", ENDIANNESS_LITTLE, 8, 10, 0, NULL, *ADDRESS_MAP_NAME(ramdac_palram)) { - } //------------------------------------------------- diff --git a/src/emu/video/resnet.c b/src/emu/video/resnet.c index 20f873ab28e..4b69fd0160a 100644 --- a/src/emu/video/resnet.c +++ b/src/emu/video/resnet.c @@ -59,7 +59,6 @@ double compute_resistor_weights( int count_2, const int * resistances_2, double * weights_2, int pulldown_2, int pullup_2, int count_3, const int * resistances_3, double * weights_3, int pulldown_3, int pullup_3 ) { - int networks_no; int rescount[MAX_NETS]; /* number of resistors in each of the nets */ @@ -239,7 +238,6 @@ double compute_resistor_net_outputs( int count_2, const int * resistances_2, double * outputs_2, int pulldown_2, int pullup_2, int count_3, const int * resistances_3, double * outputs_3, int pulldown_3, int pullup_3 ) { - int networks_no; int rescount[MAX_NETS]; /* number of resistors in each of the nets */ diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c index 1e1511e48ac..ec00d6b24eb 100644 --- a/src/emu/video/v9938.c +++ b/src/emu/video/v9938.c @@ -2272,7 +2272,6 @@ re-used here so that they have to be entered only once *************************************************************/ #define pre_loop \ while ((cnt-=delta) > 0) { - #define post_loop \ } @@ -2524,8 +2523,7 @@ void v99x8_device::srch_engine() #define post_srch(MX) \ { m_stat_reg[2]|=0x10; /* Border detected */ break; } \ - if ((SX+=TX) & MX) { m_stat_reg[2] &= 0xEF; /* Border not detected */ break; } \ - + if ((SX+=TX) & MX) { m_stat_reg[2] &= 0xEF; /* Border not detected */ break; } switch (m_mode) { default: case V9938_MODE_GRAPHIC4: pre_loop if ((VDPpoint5(MXD, SX, SY)==CL) ^ANX) post_srch(256) post_loop @@ -2761,7 +2759,6 @@ void v99x8_device::lmmm_engine() void v99x8_device::lmcm_engine() { if ((m_stat_reg[2]&0x80)!=0x80) { - m_stat_reg[7]=m_cont_reg[44]=VDP_POINT(((m_mode >= 5) && (m_mode <= 8)) ? (m_mode-5) : 0, m_mmc.MXS, m_mmc.ASX, m_mmc.SY); m_vdp_ops_count-=get_vdp_timing_value(lmmv_timing); m_stat_reg[2]|=0x80; @@ -2997,7 +2994,6 @@ void v99x8_device::ymmm_engine() void v99x8_device::hmmc_engine() { if ((m_stat_reg[2]&0x80)!=0x80) { - m_vram_space->write_byte(VDP_VRMP(((m_mode >= 5) && (m_mode <= 8)) ? (m_mode-5) : 0, m_mmc.MXD, m_mmc.ADX, m_mmc.DY), m_cont_reg[44]); m_vdp_ops_count -= get_vdp_timing_value(hmmv_timing); m_stat_reg[2]|=0x80; diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 14731a2b17a..f1f7722d7b7 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -18,13 +18,11 @@ #define MCFG_V9938_ADD(_tag, _screen, _vramsize) \ MCFG_DEVICE_ADD(_tag, V9938, 0) \ v9938_device::static_set_screen(*device, _screen); \ - v9938_device::static_set_vram_size(*device, _vramsize); \ - + v9938_device::static_set_vram_size(*device, _vramsize); #define MCFG_V9958_ADD(_tag, _screen, _vramsize) \ MCFG_DEVICE_ADD(_tag, V9958, 0) \ v9938_device::static_set_screen(*device, _screen); \ - v9938_device::static_set_vram_size(*device, _vramsize); \ - + v9938_device::static_set_vram_size(*device, _vramsize); #define MCFG_V99X8_INTERRUPT_CALLBACK_STATIC(_func) \ v9938_device::static_set_interrupt_callback(*device, v99x8_interrupt_delegate(_func, #_func, (device_t *)0), device->tag()); diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index 5f5c8e8bdd1..5e821c09237 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -1053,53 +1053,43 @@ static const UINT8 dither_matrix_2x2[16] = #define EXTRACT_565_TO_888(val, a, b, c) \ (a) = (((val) >> 8) & 0xf8) | (((val) >> 13) & 0x07); \ (b) = (((val) >> 3) & 0xfc) | (((val) >> 9) & 0x03); \ - (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); \ - + (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); #define EXTRACT_x555_TO_888(val, a, b, c) \ (a) = (((val) >> 7) & 0xf8) | (((val) >> 12) & 0x07); \ (b) = (((val) >> 2) & 0xf8) | (((val) >> 7) & 0x07); \ - (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); \ - + (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); #define EXTRACT_555x_TO_888(val, a, b, c) \ (a) = (((val) >> 8) & 0xf8) | (((val) >> 13) & 0x07); \ (b) = (((val) >> 3) & 0xf8) | (((val) >> 8) & 0x07); \ - (c) = (((val) << 2) & 0xf8) | (((val) >> 3) & 0x07); \ - + (c) = (((val) << 2) & 0xf8) | (((val) >> 3) & 0x07); #define EXTRACT_1555_TO_8888(val, a, b, c, d) \ (a) = ((INT16)(val) >> 15) & 0xff; \ - EXTRACT_x555_TO_888(val, b, c, d) \ - + EXTRACT_x555_TO_888(val, b, c, d) #define EXTRACT_5551_TO_8888(val, a, b, c, d) \ EXTRACT_555x_TO_888(val, a, b, c) \ - (d) = ((val) & 0x0001) ? 0xff : 0x00; \ - + (d) = ((val) & 0x0001) ? 0xff : 0x00; #define EXTRACT_x888_TO_888(val, a, b, c) \ (a) = ((val) >> 16) & 0xff; \ (b) = ((val) >> 8) & 0xff; \ - (c) = ((val) >> 0) & 0xff; \ - + (c) = ((val) >> 0) & 0xff; #define EXTRACT_888x_TO_888(val, a, b, c) \ (a) = ((val) >> 24) & 0xff; \ (b) = ((val) >> 16) & 0xff; \ - (c) = ((val) >> 8) & 0xff; \ - + (c) = ((val) >> 8) & 0xff; #define EXTRACT_8888_TO_8888(val, a, b, c, d) \ (a) = ((val) >> 24) & 0xff; \ (b) = ((val) >> 16) & 0xff; \ (c) = ((val) >> 8) & 0xff; \ - (d) = ((val) >> 0) & 0xff; \ - + (d) = ((val) >> 0) & 0xff; #define EXTRACT_4444_TO_8888(val, a, b, c, d) \ (a) = (((val) >> 8) & 0xf0) | (((val) >> 12) & 0x0f); \ (b) = (((val) >> 4) & 0xf0) | (((val) >> 8) & 0x0f); \ (c) = (((val) >> 0) & 0xf0) | (((val) >> 4) & 0x0f); \ - (d) = (((val) << 4) & 0xf0) | (((val) >> 0) & 0x0f); \ - + (d) = (((val) << 4) & 0xf0) | (((val) >> 0) & 0x0f); #define EXTRACT_332_TO_888(val, a, b, c) \ (a) = (((val) >> 0) & 0xe0) | (((val) >> 3) & 0x1c) | (((val) >> 6) & 0x03); \ (b) = (((val) << 3) & 0xe0) | (((val) >> 0) & 0x1c) | (((val) >> 3) & 0x03); \ - (c) = (((val) << 6) & 0xc0) | (((val) << 4) & 0x30) | (((val) << 2) & 0xc0) | (((val) << 0) & 0x03); \ - + (c) = (((val) << 6) & 0xc0) | (((val) << 4) & 0x30) | (((val) << 2) & 0xc0) | (((val) << 0) & 0x03); /************************************* @@ -2108,11 +2098,9 @@ INLINE UINT32 compute_raster_hash(const raster_info *info) #define DECLARE_DITHER_POINTERS \ const UINT8 *dither_lookup = NULL; \ const UINT8 *dither4 = NULL; \ - const UINT8 *dither = NULL \ - + const UINT8 *dither = NULL #define DECLARE_DITHER_POINTERS_NO_DITHER_VAR \ - const UINT8 *dither_lookup = NULL; \ - + const UINT8 *dither_lookup = NULL; #define COMPUTE_DITHER_POINTERS(FBZMODE, YY) \ do \ { \ diff --git a/src/lib/expat/xmlparse.c b/src/lib/expat/xmlparse.c index 64fcf76a53c..209d047591b 100644 --- a/src/lib/expat/xmlparse.c +++ b/src/lib/expat/xmlparse.c @@ -1967,7 +1967,6 @@ XML_ErrorString(enum XML_Error code) const XML_LChar * XMLCALL XML_ExpatVersion(void) { - /* V1 is used to string-ize the version number. However, it would string-ize the actual version macro *names* unless we get them substituted before being passed to V1. CPP is defined to expand @@ -3075,7 +3074,6 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId, && prefix->name[0] == XML_T(ASCII_x) && prefix->name[1] == XML_T(ASCII_m) && prefix->name[2] == XML_T(ASCII_l)) { - /* Not allowed to bind xmlns */ if (prefix->name[3] == XML_T(ASCII_n) && prefix->name[4] == XML_T(ASCII_s) diff --git a/src/lib/formats/ami_dsk.c b/src/lib/formats/ami_dsk.c index c1a187bd01e..96857c9fc0c 100644 --- a/src/lib/formats/ami_dsk.c +++ b/src/lib/formats/ami_dsk.c @@ -174,7 +174,6 @@ bool adf_format::save(io_generic *io, floppy_image *image) if(g32(trackbuf, track_size, i) == 0x44894489 && (g32(trackbuf, track_size, i+384) & 0x55555555) == checksum(trackbuf, track_size, i+32, 10) && (g32(trackbuf, track_size, i+448) & 0x55555555) == checksum(trackbuf, track_size, i+480, 256)) { - UINT32 head = ((g32(trackbuf, track_size, i+32) & 0x55555555) << 1) | (g32(trackbuf, track_size, i+64) & 0x55555555); int sect = (head >> 8) & 0xff; if(sect > (hd ? 22 : 11)) diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h index 550e1d16a95..bb1185c53cd 100644 --- a/src/lib/formats/cassimg.h +++ b/src/lib/formats/cassimg.h @@ -148,11 +148,9 @@ extern const struct CassetteFormat wavfile_format; #define CASSETTE_FORMATLIST_START(name) \ const struct CassetteFormat *const name[] = \ { \ - &wavfile_format, \ - + &wavfile_format, #define CASSETTE_FORMAT(name) \ - &(name), \ - + &(name), #define CASSETTE_FORMATLIST_END \ NULL \ }; diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h index 87b0a4d167c..58887426a92 100644 --- a/src/lib/formats/flopimg.h +++ b/src/lib/formats/flopimg.h @@ -116,18 +116,15 @@ FLOPPY_CONSTRUCT(fdi_dsk_construct); #define LEGACY_FLOPPY_OPTIONS_START(name) \ const struct FloppyFormat floppyoptions_##name[] = \ - { \ - + { #define LEGACY_FLOPPY_OPTIONS_END0 \ { NULL } \ }; #define LEGACY_FLOPPY_OPTIONS_EXTERN(name) \ - extern const struct FloppyFormat floppyoptions_##name[] \ - + extern const struct FloppyFormat floppyoptions_##name[] #define LEGACY_FLOPPY_OPTION(name, extensions_, description_, identify_, construct_, destruct_, ranges_)\ - { #name, extensions_, description_, identify_, construct_, destruct_, ranges_ }, \ - + { #name, extensions_, description_, identify_, construct_, destruct_, ranges_ }, #define LEGACY_FLOPPY_OPTIONS_END \ LEGACY_FLOPPY_OPTION( fdi, "fdi", "Formatted Disk Image", fdi_dsk_identify, fdi_dsk_construct, NULL, NULL) \ LEGACY_FLOPPY_OPTION( td0, "td0", "Teledisk floppy disk image", td0_dsk_identify, td0_dsk_construct, td0_dsk_destruct, NULL) \ diff --git a/src/lib/formats/gtp_cas.c b/src/lib/formats/gtp_cas.c index 7f786bf1ab6..47baa0aba7e 100644 --- a/src/lib/formats/gtp_cas.c +++ b/src/lib/formats/gtp_cas.c @@ -135,7 +135,6 @@ static int gtp_cas_fill_wave( INT16 *buffer, int length, UINT8 *bytes ) { int block_size = bytes[n+2]*256 + bytes[n+1]; n+=5; if (block_type==GTP_BLOCK_STANDARD) { - // Interblock pause wave_data = WAVE_NULL; gtp_output_wave(&buffer,INTERBLOCK_PAUSE); diff --git a/src/lib/formats/kc_cas.c b/src/lib/formats/kc_cas.c index 8469b2e0e54..1f39129c27e 100644 --- a/src/lib/formats/kc_cas.c +++ b/src/lib/formats/kc_cas.c @@ -45,7 +45,6 @@ INLINE int kc_cas_cycle(INT16 *buffer, int sample_pos, int len) if (buffer) { - for (int i=0; i (1 << kNumExtra0Bits)) { \ - *(p) |= 0x40000000; *((p) + 1) |= ((((size) - 1)>> kNumExtra0Bits) << kNumBitsMax); } } \ - + *(p) |= 0x40000000; *((p) + 1) |= ((((size) - 1)>> kNumExtra0Bits) << kNumBitsMax); } } static void SetGroupSize(UInt32 *p, UInt32 size) { if (--size == 0) diff --git a/src/lib/libflac/include/flac++/decoder.h b/src/lib/libflac/include/flac++/decoder.h index b00a917a6e0..6505a841e77 100644 --- a/src/lib/libflac/include/flac++/decoder.h +++ b/src/lib/libflac/include/flac++/decoder.h @@ -76,7 +76,6 @@ namespace FLAC { namespace Decoder { - /** \ingroup flacpp_decoder * \brief * This class wraps the ::FLAC__StreamDecoder. If you are diff --git a/src/lib/libflac/include/flac++/encoder.h b/src/lib/libflac/include/flac++/encoder.h index d16d889d870..0e3565d71c1 100644 --- a/src/lib/libflac/include/flac++/encoder.h +++ b/src/lib/libflac/include/flac++/encoder.h @@ -77,7 +77,6 @@ namespace FLAC { namespace Encoder { - /** \ingroup flacpp_encoder * \brief * This class wraps the ::FLAC__StreamEncoder. If you are diff --git a/src/lib/libflac/include/flac++/metadata.h b/src/lib/libflac/include/flac++/metadata.h index 3f6318f1b1e..2793ea11134 100644 --- a/src/lib/libflac/include/flac++/metadata.h +++ b/src/lib/libflac/include/flac++/metadata.h @@ -73,7 +73,6 @@ namespace FLAC { namespace Metadata { - // ============================================================ // // Metadata objects diff --git a/src/lib/libflac/include/flac/format.h b/src/lib/libflac/include/flac/format.h index 4f4c7f07ce4..2c838f34f8e 100644 --- a/src/lib/libflac/include/flac/format.h +++ b/src/lib/libflac/include/flac/format.h @@ -211,7 +211,6 @@ extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[]; /** Contents of a Rice partitioned residual */ typedef struct { - unsigned *parameters; /**< The Rice parameters for each context. */ @@ -230,7 +229,6 @@ typedef struct { /** Header for a Rice partitioned residual. (c.f. format specification) */ typedef struct { - unsigned order; /**< The partition order, i.e. # of contexts = 2 ^ \a order. */ @@ -486,7 +484,6 @@ typedef struct { /** An enumeration of the available metadata block types. */ typedef enum { - FLAC__METADATA_TYPE_STREAMINFO = 0, /**< STREAMINFO block */ diff --git a/src/lib/libflac/include/flac/metadata.h b/src/lib/libflac/include/flac/metadata.h index c07937bccab..879b0b40a63 100644 --- a/src/lib/libflac/include/flac/metadata.h +++ b/src/lib/libflac/include/flac/metadata.h @@ -306,7 +306,6 @@ typedef struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator; * The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status(). */ typedef enum { - FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0, /**< The iterator is in the normal OK state */ diff --git a/src/lib/libflac/include/flac/stream_decoder.h b/src/lib/libflac/include/flac/stream_decoder.h index 9ac159474af..1d44a36f204 100644 --- a/src/lib/libflac/include/flac/stream_decoder.h +++ b/src/lib/libflac/include/flac/stream_decoder.h @@ -199,7 +199,6 @@ extern "C" { * The decoder's state can be obtained by calling FLAC__stream_decoder_get_state(). */ typedef enum { - FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0, /**< The decoder is ready to search for metadata. */ @@ -253,7 +252,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderStateString[]; /** Possible return values for the FLAC__stream_decoder_init_*() functions. */ typedef enum { - FLAC__STREAM_DECODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -291,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[]; /** Return values for the FLAC__StreamDecoder read callback. */ typedef enum { - FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -322,7 +319,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[]; /** Return values for the FLAC__StreamDecoder seek callback. */ typedef enum { - FLAC__STREAM_DECODER_SEEK_STATUS_OK, /**< The seek was OK and decoding can continue. */ @@ -345,7 +341,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[]; /** Return values for the FLAC__StreamDecoder tell callback. */ typedef enum { - FLAC__STREAM_DECODER_TELL_STATUS_OK, /**< The tell was OK and decoding can continue. */ @@ -368,7 +363,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[]; /** Return values for the FLAC__StreamDecoder length callback. */ typedef enum { - FLAC__STREAM_DECODER_LENGTH_STATUS_OK, /**< The length call was OK and decoding can continue. */ @@ -391,7 +385,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[]; /** Return values for the FLAC__StreamDecoder write callback. */ typedef enum { - FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE, /**< The write was OK and decoding can continue. */ @@ -424,7 +417,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[]; * a future encoder. */ typedef enum { - FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, /**< An error in the stream caused the decoder to lose synchronization. */ diff --git a/src/lib/libflac/include/flac/stream_encoder.h b/src/lib/libflac/include/flac/stream_encoder.h index dbbbb23ee11..f533d8c8430 100644 --- a/src/lib/libflac/include/flac/stream_encoder.h +++ b/src/lib/libflac/include/flac/stream_encoder.h @@ -238,7 +238,6 @@ extern "C" { * must be deleted with FLAC__stream_encoder_delete(). */ typedef enum { - FLAC__STREAM_ENCODER_OK = 0, /**< The encoder is in the normal OK state and samples can be processed. */ @@ -290,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderStateString[]; /** Possible return values for the FLAC__stream_encoder_init_*() functions. */ typedef enum { - FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -360,7 +358,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[]; /** Return values for the FLAC__StreamEncoder read callback. */ typedef enum { - FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -386,7 +383,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[]; /** Return values for the FLAC__StreamEncoder write callback. */ typedef enum { - FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0, /**< The write was OK and encoding can continue. */ @@ -406,7 +402,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[]; /** Return values for the FLAC__StreamEncoder seek callback. */ typedef enum { - FLAC__STREAM_ENCODER_SEEK_STATUS_OK, /**< The seek was OK and encoding can continue. */ @@ -429,7 +424,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[]; /** Return values for the FLAC__StreamEncoder tell callback. */ typedef enum { - FLAC__STREAM_ENCODER_TELL_STATUS_OK, /**< The tell was OK and encoding can continue. */ diff --git a/src/lib/libflac/libflac/bitreader.c b/src/lib/libflac/libflac/bitreader.c index ae30011509e..36850538254 100644 --- a/src/lib/libflac/libflac/bitreader.c +++ b/src/lib/libflac/libflac/bitreader.c @@ -829,7 +829,6 @@ FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[ cwords = br->consumed_words; while(1) { - /* read unary part */ while(1) { while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ @@ -1012,7 +1011,6 @@ break2: ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; while(1) { - /* read unary part */ while(1) { while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ diff --git a/src/lib/libjpeg/jcmaster.c b/src/lib/libjpeg/jcmaster.c index 111e8309860..afc402d8150 100644 --- a/src/lib/libjpeg/jcmaster.c +++ b/src/lib/libjpeg/jcmaster.c @@ -577,7 +577,6 @@ per_scan_setup (j_compress_ptr cinfo) jpeg_component_info *compptr; if (cinfo->comps_in_scan == 1) { - /* Noninterleaved (single-component) scan */ compptr = cinfo->cur_comp_info[0]; @@ -603,7 +602,6 @@ per_scan_setup (j_compress_ptr cinfo) cinfo->MCU_membership[0] = 0; } else { - /* Interleaved (multi-component) scan */ if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN) ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan, diff --git a/src/lib/libjpeg/jdhuff.c b/src/lib/libjpeg/jdhuff.c index ef3c9c72201..121098b2536 100644 --- a/src/lib/libjpeg/jdhuff.c +++ b/src/lib/libjpeg/jdhuff.c @@ -715,7 +715,6 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) * This way, we return uniform gray for the remainder of the segment. */ if (! entropy->insufficient_data) { - /* Load up working state */ BITREAD_LOAD_STATE(cinfo,entropy->bitstate); ASSIGN_STATE(state, entropy->saved); @@ -785,7 +784,6 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) * This way, we return uniform gray for the remainder of the segment. */ if (! entropy->insufficient_data) { - Se = cinfo->Se; Al = cinfo->Al; natural_order = cinfo->natural_order; @@ -925,7 +923,6 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) /* If we've run out of data, don't modify the MCU. */ if (! entropy->insufficient_data) { - Se = cinfo->Se; p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */ @@ -1075,7 +1072,6 @@ decode_mcu_sub (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) * This way, we return uniform gray for the remainder of the segment. */ if (! entropy->insufficient_data) { - natural_order = cinfo->natural_order; Se = cinfo->lim_Se; @@ -1202,7 +1198,6 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) * This way, we return uniform gray for the remainder of the segment. */ if (! entropy->insufficient_data) { - /* Load up working state */ BITREAD_LOAD_STATE(cinfo,entropy->bitstate); ASSIGN_STATE(state, entropy->saved); diff --git a/src/lib/libjpeg/jdinput.c b/src/lib/libjpeg/jdinput.c index 57c3537c504..d9bffd0fa99 100644 --- a/src/lib/libjpeg/jdinput.c +++ b/src/lib/libjpeg/jdinput.c @@ -393,7 +393,6 @@ per_scan_setup (j_decompress_ptr cinfo) jpeg_component_info *compptr; if (cinfo->comps_in_scan == 1) { - /* Noninterleaved (single-component) scan */ compptr = cinfo->cur_comp_info[0]; @@ -419,7 +418,6 @@ per_scan_setup (j_decompress_ptr cinfo) cinfo->MCU_membership[0] = 0; } else { - /* Interleaved (multi-component) scan */ if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN) ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan, diff --git a/src/lib/libjpeg/jerror.h b/src/lib/libjpeg/jerror.h index 2713154b63b..4cd465e73b8 100644 --- a/src/lib/libjpeg/jerror.h +++ b/src/lib/libjpeg/jerror.h @@ -32,7 +32,6 @@ #ifdef JMAKE_ENUM_LIST typedef enum { - #define JMESSAGE(code,string) code , #endif /* JMAKE_ENUM_LIST */ diff --git a/src/lib/libjpeg/jpegtran.c b/src/lib/libjpeg/jpegtran.c index f68e529d318..02f3f062dfa 100644 --- a/src/lib/libjpeg/jpegtran.c +++ b/src/lib/libjpeg/jpegtran.c @@ -344,7 +344,6 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, /* Post-switch-scanning cleanup */ if (for_real) { - #ifdef C_PROGRESSIVE_SUPPORTED if (simple_progressive) /* process -progressive; -scans can override */ jpeg_simple_progression(cinfo); diff --git a/src/lib/portmidi/ptmacosx_cf.c b/src/lib/portmidi/ptmacosx_cf.c index 7848be5f0c5..c6103369ebb 100644 --- a/src/lib/portmidi/ptmacosx_cf.c +++ b/src/lib/portmidi/ptmacosx_cf.c @@ -98,7 +98,6 @@ PtError Pt_Start(int resolution, PtCallback *callback, void *userData) startTime = CFAbsoluteTimeGetCurrent(); if (callback) { - params->resolution = resolution; params->callback = callback; params->userData = userData; diff --git a/src/lib/softfloat/fsincos.c b/src/lib/softfloat/fsincos.c index 84c67c47270..084c753c231 100755 --- a/src/lib/softfloat/fsincos.c +++ b/src/lib/softfloat/fsincos.c @@ -46,7 +46,6 @@ static const floatx80 floatx80_default_nan = packFloatx80(0, 0xffff, U64(0xfffff INLINE bits64 extractFloatx80Frac( floatx80 a ) { - return a.low; } @@ -58,7 +57,6 @@ INLINE bits64 extractFloatx80Frac( floatx80 a ) INLINE int32 extractFloatx80Exp( floatx80 a ) { - return a.high & 0x7FFF; } @@ -70,7 +68,6 @@ INLINE int32 extractFloatx80Exp( floatx80 a ) INLINE flag extractFloatx80Sign( floatx80 a ) { - return a.high>>15; } diff --git a/src/lib/softfloat/fyl2x.c b/src/lib/softfloat/fyl2x.c index be5e134cc3b..9cda55fa39a 100644 --- a/src/lib/softfloat/fyl2x.c +++ b/src/lib/softfloat/fyl2x.c @@ -52,7 +52,6 @@ static const floatx80 floatx80_default_nan = packFloatx80(0, 0xffff, U64(0xfffff INLINE bits64 extractFloatx80Frac( floatx80 a ) { - return a.low; } @@ -64,7 +63,6 @@ INLINE bits64 extractFloatx80Frac( floatx80 a ) INLINE int32 extractFloatx80Exp( floatx80 a ) { - return a.high & 0x7FFF; } @@ -76,7 +74,6 @@ INLINE int32 extractFloatx80Exp( floatx80 a ) INLINE flag extractFloatx80Sign( floatx80 a ) { - return a.high>>15; } diff --git a/src/lib/softfloat/softfloat.c b/src/lib/softfloat/softfloat.c index 89a191aa681..edd4def337b 100644 --- a/src/lib/softfloat/softfloat.c +++ b/src/lib/softfloat/softfloat.c @@ -162,7 +162,6 @@ static int64 roundAndPackInt64( flag zSign, bits64 absZ0, bits64 absZ1 ) INLINE bits32 extractFloat32Frac( float32 a ) { - return a & 0x007FFFFF; } @@ -173,7 +172,6 @@ INLINE bits32 extractFloat32Frac( float32 a ) INLINE int16 extractFloat32Exp( float32 a ) { - return ( a>>23 ) & 0xFF; } @@ -184,7 +182,6 @@ INLINE int16 extractFloat32Exp( float32 a ) INLINE flag extractFloat32Sign( float32 a ) { - return a>>31; } @@ -220,7 +217,6 @@ static void INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig ) { - return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig; } @@ -324,7 +320,6 @@ static float32 INLINE bits64 extractFloat64Frac( float64 a ) { - return a & LIT64( 0x000FFFFFFFFFFFFF ); } @@ -335,7 +330,6 @@ INLINE bits64 extractFloat64Frac( float64 a ) INLINE int16 extractFloat64Exp( float64 a ) { - return ( a>>52 ) & 0x7FF; } @@ -346,7 +340,6 @@ INLINE int16 extractFloat64Exp( float64 a ) INLINE flag extractFloat64Sign( float64 a ) { - return a>>63; } @@ -382,7 +375,6 @@ static void INLINE float64 packFloat64( flag zSign, int16 zExp, bits64 zSig ) { - return ( ( (bits64) zSign )<<63 ) + ( ( (bits64) zExp )<<52 ) + zSig; } @@ -725,7 +717,6 @@ static floatx80 INLINE bits64 extractFloat128Frac1( float128 a ) { - return a.low; } @@ -737,7 +728,6 @@ INLINE bits64 extractFloat128Frac1( float128 a ) INLINE bits64 extractFloat128Frac0( float128 a ) { - return a.high & LIT64( 0x0000FFFFFFFFFFFF ); } @@ -749,7 +739,6 @@ INLINE bits64 extractFloat128Frac0( float128 a ) INLINE int32 extractFloat128Exp( float128 a ) { - return ( a.high>>48 ) & 0x7FFF; } @@ -760,7 +749,6 @@ INLINE int32 extractFloat128Exp( float128 a ) INLINE flag extractFloat128Sign( float128 a ) { - return a.high>>63; } @@ -1794,7 +1782,6 @@ float32 float32_sqrt( float32 a ) flag float32_eq( float32 a, float32 b ) { - if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) ) || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) ) ) { @@ -1863,7 +1850,6 @@ flag float32_lt( float32 a, float32 b ) flag float32_eq_signaling( float32 a, float32 b ) { - if ( ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) ) || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) ) ) { @@ -2714,7 +2700,6 @@ float64 float64_sqrt( float64 a ) flag float64_eq( float64 a, float64 b ) { - if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) ) || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) ) ) { @@ -2783,7 +2768,6 @@ flag float64_lt( float64 a, float64 b ) flag float64_eq_signaling( float64 a, float64 b ) { - if ( ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) ) || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) ) ) { @@ -3653,7 +3637,6 @@ floatx80 floatx80_sqrt( floatx80 a ) flag floatx80_eq( floatx80 a, floatx80 b ) { - if ( ( ( extractFloatx80Exp( a ) == 0x7FFF ) && (bits64) ( extractFloatx80Frac( a )<<1 ) ) || ( ( extractFloatx80Exp( b ) == 0x7FFF ) @@ -3749,7 +3732,6 @@ flag floatx80_lt( floatx80 a, floatx80 b ) flag floatx80_eq_signaling( floatx80 a, floatx80 b ) { - if ( ( ( extractFloatx80Exp( a ) == 0x7FFF ) && (bits64) ( extractFloatx80Frac( a )<<1 ) ) || ( ( extractFloatx80Exp( b ) == 0x7FFF ) @@ -4773,7 +4755,6 @@ float128 float128_sqrt( float128 a ) flag float128_eq( float128 a, float128 b ) { - if ( ( ( extractFloat128Exp( a ) == 0x7FFF ) && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) ) || ( ( extractFloat128Exp( b ) == 0x7FFF ) @@ -4868,7 +4849,6 @@ flag float128_lt( float128 a, float128 b ) flag float128_eq_signaling( float128 a, float128 b ) { - if ( ( ( extractFloat128Exp( a ) == 0x7FFF ) && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) ) || ( ( extractFloat128Exp( b ) == 0x7FFF ) diff --git a/src/lib/util/opresolv.h b/src/lib/util/opresolv.h index 3bd65801f24..da1389d2328 100644 --- a/src/lib/util/opresolv.h +++ b/src/lib/util/opresolv.h @@ -67,27 +67,20 @@ struct option_guide #define OPTION_GUIDE_START(option_guide_) \ const option_guide option_guide_[] = \ - { \ - + { #define OPTION_GUIDE_END \ { OPTIONTYPE_END } \ - }; \ - + }; #define OPTION_GUIDE_EXTERN(option_guide_) \ - extern const option_guide option_guide_[] \ - + extern const option_guide option_guide_[] #define OPTION_INT(option_char, identifier, display_name) \ - { OPTIONTYPE_INT, (option_char), (identifier), (display_name) }, \ - + { OPTIONTYPE_INT, (option_char), (identifier), (display_name) }, #define OPTION_STRING(option_char, identifier, display_name) \ - { OPTIONTYPE_STRING, (option_char), (identifier), (display_name) }, \ - + { OPTIONTYPE_STRING, (option_char), (identifier), (display_name) }, #define OPTION_ENUM_START(option_char, identifier, display_name) \ - { OPTIONTYPE_ENUM_BEGIN, (option_char), (identifier), (display_name) }, \ - + { OPTIONTYPE_ENUM_BEGIN, (option_char), (identifier), (display_name) }, #define OPTION_ENUM(value, identifier, display_name) \ - { OPTIONTYPE_ENUM_VALUE, (value), (identifier), (display_name) }, \ - + { OPTIONTYPE_ENUM_VALUE, (value), (identifier), (display_name) }, #define OPTION_ENUM_END diff --git a/src/lib/zlib/deflate.c b/src/lib/zlib/deflate.c index 1bddc5cdb0d..5c65bdc9ad9 100644 --- a/src/lib/zlib/deflate.c +++ b/src/lib/zlib/deflate.c @@ -1415,7 +1415,6 @@ local void fill_window(s) * move the upper half to the lower one to make room in the upper half. */ if (s->strstart >= wsize+MAX_DIST(s)) { - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); s->match_start -= wsize; s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ @@ -1577,7 +1576,6 @@ local block_state deflate_stored(s, flush) for (;;) { /* Fill the window as much as possible: */ if (s->lookahead <= 1) { - Assert(s->strstart < s->w_size+MAX_DIST(s) || s->block_start >= (long)s->w_size, "slide too late"); @@ -1775,7 +1773,6 @@ local block_state deflate_slow(s, flush) s->strstart - s->match_start > TOO_FAR) #endif )) { - /* If prev_match is also MIN_MATCH, match_start is garbage * but we will ignore the current match anyway. */ diff --git a/src/lib/zlib/trees.c b/src/lib/zlib/trees.c index e0ed1641a70..10346cfded2 100644 --- a/src/lib/zlib/trees.c +++ b/src/lib/zlib/trees.c @@ -915,7 +915,6 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) /* Build the Huffman trees unless a stored block is forced */ if (s->level > 0) { - /* Check if the file is binary or text */ if (s->strm->data_type == Z_UNKNOWN) s->strm->data_type = detect_data_type(s); diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c index 2c2ed5be752..ec83da36cf8 100644 --- a/src/mame/audio/8080bw.c +++ b/src/mame/audio/8080bw.c @@ -703,7 +703,6 @@ WRITE8_MEMBER(_8080bw_state::polaris_sh_port_2_w) WRITE8_MEMBER(_8080bw_state::polaris_sh_port_3_w) { - coin_lockout_global_w(machine(), data & 0x04); /* SX8 */ m_flip_screen = BIT(data, 5) & BIT(ioport("IN2")->read(), 2); /* SX11 */ diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c index e00d242463d..7c1e28f9f12 100644 --- a/src/mame/audio/astrof.c +++ b/src/mame/audio/astrof.c @@ -181,7 +181,6 @@ MACHINE_CONFIG_END WRITE8_MEMBER(astrof_state::tomahawk_audio_w) { - /* D0 - sonar */ /* D1 - UFO explosion */ diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c index dd07884e1d9..f6aa2818c81 100644 --- a/src/mame/audio/circus.c +++ b/src/mame/audio/circus.c @@ -172,7 +172,6 @@ DISCRETE_SOUND_END WRITE8_MEMBER(circus_state::circus_clown_z_w) { - m_clown_z = (data & 0x0f); *(machine().root_device().memregion("maincpu")->base() + 0x8000) = data; logerror("Z:%02x\n",data); //DEBUG diff --git a/src/mame/audio/copsnrob.c b/src/mame/audio/copsnrob.c index 7ded86937aa..6a11817f68b 100644 --- a/src/mame/audio/copsnrob.c +++ b/src/mame/audio/copsnrob.c @@ -180,7 +180,6 @@ static const discrete_dac_r1_ladder copsnrob_motor23_cv_dac = static const discrete_555_cc_desc copsnrob_motor01_555cc = { - DISC_555_OUT_COUNT_R | DISCRETE_555_CC_TO_DISCHARGE_PIN, 5, /* v_pos */ DEFAULT_555_CC_SOURCE, diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index f23f39e6184..f2724b297de 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -73,7 +73,6 @@ READ8_MEMBER(cyberbal_state::cyberbal_sound_68k_6502_r) WRITE8_MEMBER(cyberbal_state::cyberbal_sound_68k_6502_w) { - m_sound_data_from_6502 = data; m_sound_data_from_6502_ready = 1; diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c index 3e982887641..0fc7da872d0 100644 --- a/src/mame/audio/harddriv.c +++ b/src/mame/audio/harddriv.c @@ -157,7 +157,6 @@ READ16_MEMBER(harddriv_state::hdsnd68k_status_r) WRITE16_MEMBER(harddriv_state::hdsnd68k_latches_w) { - /* bit 3 selects the value; data is ignored */ data = (offset >> 3) & 1; @@ -243,7 +242,6 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_320ports_w) READ16_MEMBER(harddriv_state::hdsnd68k_320com_r) { - if (m_cramen) return m_comram[offset & 0x1ff]; @@ -254,7 +252,6 @@ READ16_MEMBER(harddriv_state::hdsnd68k_320com_r) WRITE16_MEMBER(harddriv_state::hdsnd68k_320com_w) { - if (m_cramen) COMBINE_DATA(&m_comram[offset & 0x1ff]); else @@ -295,7 +292,6 @@ READ16_MEMBER(harddriv_state::hdsnddsp_get_bio) WRITE16_MEMBER(harddriv_state::hdsnddsp_dac_w) { - /* DAC L */ if (!m_dacmute) downcast(machine().device("dac"))->write_signed16(data ^ 0x8000); diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index 6aeaf97e0ee..7c877faea12 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -94,7 +94,6 @@ WRITE8_MEMBER(jedi_state::jedi_audio_latch_w) READ8_MEMBER(jedi_state::audio_latch_r) { - *m_audio_comm_stat &= ~0x80; return m_audio_latch; } @@ -115,7 +114,6 @@ CUSTOM_INPUT_MEMBER(jedi_state::jedi_audio_comm_stat_r) READ8_MEMBER(jedi_state::jedi_audio_ack_latch_r) { - *m_audio_comm_stat &= ~0x40; return m_audio_ack_latch; } @@ -123,7 +121,6 @@ READ8_MEMBER(jedi_state::jedi_audio_ack_latch_r) WRITE8_MEMBER(jedi_state::audio_ack_latch_w) { - m_audio_ack_latch = data; *m_audio_comm_stat |= 0x40; } diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index b8daf3c973e..e2aad5cb660 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -516,7 +516,6 @@ WRITE8_MEMBER(mario_state::mario_sh_p2_w) WRITE8_MEMBER(mario_state::masao_sh_irqtrigger_w) { - if (m_last == 1 && data == 0) { /* setting bit 0 high then low triggers IRQ on the sound CPU */ @@ -548,7 +547,6 @@ WRITE8_MEMBER(mario_state::mario_sh2_w) /* Misc samples */ WRITE8_MEMBER(mario_state::mario_sh3_w) { - switch (offset) { case 0: /* death */ diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h index 7d6e90dcb41..988420333d0 100644 --- a/src/mame/audio/midway.h +++ b/src/mame/audio/midway.h @@ -69,20 +69,15 @@ extern const device_type MIDWAY_SQUAWK_N_TALK; //************************************************************************** #define MCFG_MIDWAY_SSIO_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MIDWAY_SSIO, 0) \ - + MCFG_DEVICE_ADD(_tag, MIDWAY_SSIO, 0) #define MCFG_MIDWAY_CHIP_SQUEAK_DELUXE_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MIDWAY_CHIP_SQUEAK_DELUXE, 0) \ - + MCFG_DEVICE_ADD(_tag, MIDWAY_CHIP_SQUEAK_DELUXE, 0) #define MCFG_MIDWAY_SOUNDS_GOOD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MIDWAY_SOUNDS_GOOD, 0) \ - + MCFG_DEVICE_ADD(_tag, MIDWAY_SOUNDS_GOOD, 0) #define MCFG_MIDWAY_TURBO_CHIP_SQUEAK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MIDWAY_TURBO_CHIP_SQUEAK, 0) \ - + MCFG_DEVICE_ADD(_tag, MIDWAY_TURBO_CHIP_SQUEAK, 0) #define MCFG_MIDWAY_SQUAWK_N_TALK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MIDWAY_SQUAWK_N_TALK, 0) \ - + MCFG_DEVICE_ADD(_tag, MIDWAY_SQUAWK_N_TALK, 0) //************************************************************************** diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index 0690e566a1a..507709e4909 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -227,7 +227,6 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::gunfight_audio_w) { - /* D0 and D1 are just tied to 1k resistors */ coin_counter_w(machine(), 0, (data >> 2) & 0x01); @@ -1280,7 +1279,6 @@ WRITE8_MEMBER(mw8080bw_state::desertgu_audio_1_w) WRITE8_MEMBER(mw8080bw_state::desertgu_audio_2_w) { - discrete_sound_w(m_discrete, space, DESERTGU_ROADRUNNER_BEEP_BEEP_EN, (data >> 0) & 0x01); discrete_sound_w(m_discrete, space, DESERTGU_TRIGGER_CLICK_EN, (data >> 1) & 0x01); @@ -2302,7 +2300,6 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::spacwalk_audio_1_w) { - coin_counter_w(machine(), 0, (data >> 0) & 0x01); m_clowns_controller_select = (data >> 1) & 0x01; @@ -3264,7 +3261,6 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_1_w) WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_2_w) { - /* set WIND SOUND FREQ(data & 0x0f) 0, if no wind */ discrete_sound_w(m_discrete, space, SPCENCTR_EXPLOSION_EN, (data >> 4) & 0x01); @@ -3279,7 +3275,6 @@ WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_2_w) WRITE8_MEMBER(mw8080bw_state::spcenctr_audio_3_w) { - /* if (data & 0x01) enable SCREECH (hit the sides) sound */ discrete_sound_w(m_discrete, space, SPCENCTR_ENEMY_SHIP_SHOT_EN, (data >> 1) & 0x01); @@ -4181,7 +4176,6 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::invaders_audio_1_w) { - sn76477_enable_w(m_sn, (~data >> 0) & 0x01); /* saucer sound */ discrete_sound_w(m_discrete, space, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); @@ -4197,7 +4191,6 @@ WRITE8_MEMBER(mw8080bw_state::invaders_audio_1_w) WRITE8_MEMBER(mw8080bw_state::invaders_audio_2_w) { - discrete_sound_w(m_discrete, space, INVADERS_NODE(INVADERS_FLEET_DATA, 1), data & 0x0f); discrete_sound_w(m_discrete, space, INVADERS_NODE(INVADERS_SAUCER_HIT_EN, 1), data & 0x10); @@ -4812,7 +4805,6 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_1_w) { - sn76477_enable_w(m_sn1, (~data >> 0) & 0x01); /* saucer sound */ discrete_sound_w(m_discrete, space, INVADERS_NODE(INVADERS_MISSILE_EN, 1), data & 0x02); @@ -4837,7 +4829,6 @@ WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_2_w) WRITE8_MEMBER(mw8080bw_state::invad2ct_audio_3_w) { - sn76477_enable_w(m_sn2, (~data >> 0) & 0x01); /* saucer sound */ discrete_sound_w(m_discrete, space, INVADERS_NODE(INVADERS_MISSILE_EN, 2), data & 0x02); diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c index aa402816502..865dc8e1f78 100644 --- a/src/mame/audio/n8080.c +++ b/src/mame/audio/n8080.c @@ -457,7 +457,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(n8080_state::helifire_dac_volume_timer) MACHINE_START_MEMBER(n8080_state,spacefev_sound) { - m_sound_timer[0] = machine().scheduler().timer_alloc(FUNC(stop_mono_flop_callback)); m_sound_timer[1] = machine().scheduler().timer_alloc(FUNC(stop_mono_flop_callback)); m_sound_timer[2] = machine().scheduler().timer_alloc(FUNC(stop_mono_flop_callback)); @@ -487,7 +486,6 @@ MACHINE_RESET_MEMBER(n8080_state,spacefev_sound) MACHINE_START_MEMBER(n8080_state,sheriff_sound) { - m_sound_timer[0] = machine().scheduler().timer_alloc(FUNC(stop_mono_flop_callback)); m_sound_timer[1] = machine().scheduler().timer_alloc(FUNC(stop_mono_flop_callback)); @@ -515,7 +513,6 @@ MACHINE_RESET_MEMBER(n8080_state,sheriff_sound) MACHINE_START_MEMBER(n8080_state,helifire_sound) { - save_item(NAME(m_prev_snd_data)); save_item(NAME(m_prev_sound_pins)); save_item(NAME(m_curr_sound_pins)); diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index 2894ecee996..452211419f8 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -115,33 +115,26 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; #define SEIBU_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu_sound_map) #define SEIBU2_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) #define SEIBU2_AIRRAID_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_airraid_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_airraid_sound_map) #define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) #define SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) #define SEIBU3_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) #define SEIBU3A_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) #define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -150,8 +143,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -160,8 +152,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) #define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -171,17 +162,14 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(1, "mono", 0.50) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_AIRRAID_SOUND_SYSTEM_YM2151_INTERFACE(freq1) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ MCFG_YM2151_ADD("ymsnd", freq1) \ MCFG_YM2151_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line)) \ MCFG_SOUND_ROUTE(0, "mono", 0.50) \ - MCFG_SOUND_ROUTE(1, "mono", 0.50) \ - \ - + MCFG_SOUND_ROUTE(1, "mono", 0.50) #define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ @@ -195,8 +183,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ \ MCFG_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(freq) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ @@ -206,8 +193,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \ \ MCFG_SOUND_ADD("ym2", YM2203, freq) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) #define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE \ MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \ MCFG_SOUND_CONFIG(seibu_adpcm1_intf) \ @@ -215,7 +201,6 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; \ MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \ MCFG_SOUND_CONFIG(seibu_adpcm2_intf) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /**************************************************************************/ diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c index 358178838f1..03dbc275b1a 100644 --- a/src/mame/audio/senjyo.c +++ b/src/mame/audio/senjyo.c @@ -14,7 +14,6 @@ const z80_daisy_config senjyo_daisy_chain[] = READ8_MEMBER(senjyo_state::pio_pa_r) { - return m_sound_cmd; } diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h index a6629fe498d..909506ea112 100644 --- a/src/mame/audio/williams.h +++ b/src/mame/audio/williams.h @@ -62,14 +62,11 @@ extern const device_type WILLIAMS_ADPCM_SOUND; //************************************************************************** #define MCFG_WILLIAMS_NARC_SOUND_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, WILLIAMS_NARC_SOUND, 0) \ - + MCFG_DEVICE_ADD(_tag, WILLIAMS_NARC_SOUND, 0) #define MCFG_WILLIAMS_CVSD_SOUND_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, WILLIAMS_CVSD_SOUND, 0) \ - + MCFG_DEVICE_ADD(_tag, WILLIAMS_CVSD_SOUND, 0) #define MCFG_WILLIAMS_ADPCM_SOUND_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, WILLIAMS_ADPCM_SOUND, 0) \ - + MCFG_DEVICE_ADD(_tag, WILLIAMS_ADPCM_SOUND, 0) //************************************************************************** diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 9e16fb8b78b..ebc01dc2c3d 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -238,7 +238,6 @@ GFXDECODE_END void _1942_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_palette_bank)); @@ -247,7 +246,6 @@ void _1942_state::machine_start() void _1942_state::machine_reset() { - m_palette_bank = 0; m_scroll[0] = 0; m_scroll[1] = 0; diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 2a86459df1e..fe1d9f66166 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -245,7 +245,6 @@ GFXDECODE_END void _1943_state::machine_reset() { - m_char_on = 0; m_obj_on = 0; m_bg1_on = 0; diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 1d4a32d7114..17b6e96b566 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -109,7 +109,6 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro WRITE8_MEMBER(_20pacgal_state::irqack_w) { - m_irq_mask = data & 1; if (!m_irq_mask) @@ -191,7 +190,6 @@ WRITE8_MEMBER(_20pacgal_state::ram_bank_select_w) WRITE8_MEMBER(_20pacgal_state::ram_48000_w) { - if (m_game_selected) { if (offset < 0x0800) @@ -341,7 +339,6 @@ INPUT_PORTS_END void _20pacgal_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_eeprom = machine().device("eeprom"); @@ -357,13 +354,11 @@ void _20pacgal_state::machine_start() void _20pacgal_state::machine_reset() { - m_game_selected = 0; } INTERRUPT_GEN_MEMBER(_20pacgal_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); // TODO: assert breaks the inputs in 25pacman test mode } diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 605acaee421..ff271c5c32b 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -73,8 +73,6 @@ public: READ16_MEMBER(_2mindril_state::drill_io_r) { - - // if (offset * 2 == 0x4) /*popmessage("PC=%08x %04x %04x %04x %04x %04x %04x %04x %04x", space.device().safe_pc(), m_iodata[0/2], m_iodata[2/2], m_iodata[4/2], m_iodata[6/2], m_iodata[8/2], m_iodata[0xa/2], m_iodata[0xc/2], m_iodata[0xe/2]);*/ @@ -103,7 +101,6 @@ READ16_MEMBER(_2mindril_state::drill_io_r) WRITE16_MEMBER(_2mindril_state::drill_io_w) { - COMBINE_DATA(&m_iodata[offset]); switch(offset) @@ -148,8 +145,6 @@ TIMER_CALLBACK_MEMBER(_2mindril_state::defender_req) WRITE16_MEMBER(_2mindril_state::sensors_w) { - - /*---- xxxx ---- ---- select "lamps" (guess)*/ /*---- ---- ---- -x-- lamp*/ if (data & 1) @@ -177,13 +172,11 @@ WRITE16_MEMBER(_2mindril_state::sensors_w) READ16_MEMBER(_2mindril_state::drill_irq_r) { - return irq_reg; } WRITE16_MEMBER(_2mindril_state::drill_irq_w) { - /* (note: could rather be irq mask) ---- ---- ---x ---- irq lv 5 ack, 0->1 latch @@ -429,7 +422,6 @@ static const ym2610_interface ym2610_config = MACHINE_START_MEMBER(_2mindril_state,drill) { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_defender_sensor)); @@ -438,7 +430,6 @@ MACHINE_START_MEMBER(_2mindril_state,drill) MACHINE_RESET_MEMBER(_2mindril_state,drill) { - m_defender_sensor = 0; m_shutter_sensor = 0; irq_reg = 0; diff --git a/src/mame/drivers/30test.c b/src/mame/drivers/30test.c index c3a94a06455..930ca81308b 100644 --- a/src/mame/drivers/30test.c +++ b/src/mame/drivers/30test.c @@ -222,14 +222,12 @@ INPUT_PORTS_END void namco_30test_state::machine_start() { - save_item(NAME(m_mux_data)); save_item(NAME(m_oki_bank)); } void namco_30test_state::machine_reset() { - } static const hc11_config namco_30test_config = diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 4cbd268cc85..26cbac0b49c 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -1348,7 +1348,6 @@ READ32_MEMBER(_39in1_state::unknown_r) READ32_MEMBER(_39in1_state::cpld_r) { - //if (space.device().safe_pc() != 0xe3af4) printf("CPLD read @ %x (PC %x state %d)\n", offset, space.device().safe_pc(), state); if (space.device().safe_pc() == 0x3f04) @@ -1404,7 +1403,6 @@ READ32_MEMBER(_39in1_state::cpld_r) WRITE32_MEMBER(_39in1_state::cpld_w) { - if (mem_mask == 0xffff) { m_seed = data<<16; diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 4ead185ce2c..7e92145feb1 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -272,7 +272,6 @@ WRITE8_MEMBER(fortyl_state::fortyl_coin_counter_w) WRITE8_MEMBER(fortyl_state::bank_select_w) { - if ((data != 0x02) && (data != 0xfd)) { // logerror("WRONG BANK SELECT = %x !!!!\n",data); @@ -975,7 +974,6 @@ static const msm5232_interface msm5232_config = MACHINE_START_MEMBER(fortyl_state,40love) { - m_audiocpu = machine().device("audiocpu"); /* video */ @@ -995,7 +993,6 @@ MACHINE_START_MEMBER(fortyl_state,40love) MACHINE_START_MEMBER(fortyl_state,undoukai) { - MACHINE_START_CALL_MEMBER(40love); /* fake mcu */ @@ -1009,7 +1006,6 @@ MACHINE_START_MEMBER(fortyl_state,undoukai) MACHINE_RESET_MEMBER(fortyl_state,common) { - MACHINE_RESET_CALL_MEMBER(ta7630); /* video */ diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index b2b917aea3b..73e6543083b 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -294,14 +294,12 @@ GFXDECODE_END void _4enraya_state::machine_start() { - save_item(NAME(m_soundlatch)); save_item(NAME(m_last_snd_ctrl)); } void _4enraya_state::machine_reset() { - m_soundlatch = 0; m_last_snd_ctrl = 0; } diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c index 36161a2d6ee..f38ec2eb343 100644 --- a/src/mame/drivers/4roses.c +++ b/src/mame/drivers/4roses.c @@ -462,7 +462,6 @@ ROM_END DRIVER_INIT_MEMBER(_4roses_state,4roses) { - } diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 269cc8fce36..c9298ff056b 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -513,7 +513,6 @@ WRITE8_MEMBER(_5clown_state::fclown_colorram_w) TILE_GET_INFO_MEMBER(_5clown_state::get_fclown_tile_info) { - /* - bits - 7654 3210 ---- ---x Tiles extended address (MSB). diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 9496bd2526b..3b70224a375 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -24,14 +24,12 @@ INTERRUPT_GEN_MEMBER(_88games_state::k88games_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) irq0_line_hold(device); } READ8_MEMBER(_88games_state::bankedram_r) { - if (m_videobank) return m_ram[offset]; else @@ -45,7 +43,6 @@ READ8_MEMBER(_88games_state::bankedram_r) WRITE8_MEMBER(_88games_state::bankedram_w) { - if (m_videobank) m_ram[offset] = data; else @@ -54,7 +51,6 @@ WRITE8_MEMBER(_88games_state::bankedram_w) WRITE8_MEMBER(_88games_state::k88games_5f84_w) { - /* bits 0/1 coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -94,7 +90,6 @@ WRITE8_MEMBER(_88games_state::speech_msg_w) /* special handlers to combine 052109 & 051960 */ READ8_MEMBER(_88games_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -110,7 +105,6 @@ READ8_MEMBER(_88games_state::k052109_051960_r) WRITE8_MEMBER(_88games_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -306,7 +300,6 @@ static KONAMI_SETLINES_CALLBACK( k88games_banking ) void _88games_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); m_k052109 = machine().device("k052109"); m_k051960 = machine().device("k051960"); @@ -325,7 +318,6 @@ void _88games_state::machine_start() void _88games_state::machine_reset() { - konami_configure_set_lines(machine().device("maincpu"), k88games_banking); m_generic_paletteram_8.set_target(&memregion("maincpu")->base()[0x20000], 0x1000); diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c index 8581e4f2c1b..dac043e1444 100644 --- a/src/mame/drivers/acesp.c +++ b/src/mame/drivers/acesp.c @@ -107,8 +107,7 @@ MACHINE_CONFIG_END #define SP_CBOWL_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ ROM_LOAD( "cashbowlsnd1.bin", 0x0000, 0x80000, CRC(44e67cef) SHA1(3cfe48122da527e82f9058e0c5b81b5096bf4181) ) \ - ROM_LOAD( "cashbowlsnd2.bin", 0x80000, 0x80000, CRC(a28291a2) SHA1(c07b585cee89bc35c880d24eb6124796d6df423c) ) \ - + ROM_LOAD( "cashbowlsnd2.bin", 0x80000, 0x80000, CRC(a28291a2) SHA1(c07b585cee89bc35c880d24eb6124796d6df423c) ) ROM_START( sp_cbowl ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "cashbowlgam2.bin", 0x0000, 0x8000, CRC(b20fa6f3) SHA1(63ded9527650e7810d6432fce762fe4691b87c1b) ) @@ -269,8 +268,7 @@ ROM_END #define SP_CRIME_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_crime ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "crimwatchnew2.bin", 0x0000, 0x8000, CRC(b799fa39) SHA1(7d701d9368c3db26d4f6dae9a68f2833e2d48a40) ) @@ -338,8 +336,7 @@ ROM_END #define SP_EMMRD_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ ROM_LOAD( "edsnd1.bin", 0x0000, 0x80000, CRC(e91382d7) SHA1(499a0606e9bbabcf207c8778323899b7b81ae372) ) \ - ROM_LOAD( "edsnd2.bin", 0x80000, 0x80000, CRC(0e103080) SHA1(2dcfcb35d04f34e4bc6da32f2d23bd8685654f8e) ) \ - + ROM_LOAD( "edsnd2.bin", 0x80000, 0x80000, CRC(0e103080) SHA1(2dcfcb35d04f34e4bc6da32f2d23bd8685654f8e) ) ROM_START( sp_emmrd ) @@ -440,8 +437,7 @@ ROM_END #define SP_WOOLP_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_woolp ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -559,8 +555,7 @@ ROM_END #define SP_ZIGZAG_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_zigzg ) @@ -663,8 +658,7 @@ ROM_END #define SP_GOLDM_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ ROM_LOAD( "gmilesnd1.bin", 0x0000, 0x80000, CRC(cb1d49a2) SHA1(ed212041017cf1305821a5d99c48723d06c16f0f) ) \ - ROM_LOAD( "gmilesnd2.bin", 0x80000, 0x80000, CRC(a58e01a9) SHA1(5cdeb10c451eaf93cc4d6a0208408b00f134f8f4) ) \ - + ROM_LOAD( "gmilesnd2.bin", 0x80000, 0x80000, CRC(a58e01a9) SHA1(5cdeb10c451eaf93cc4d6a0208408b00f134f8f4) ) ROM_START( sp_goldm ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -889,8 +883,7 @@ ROM_END #define SP_GNAT_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_gnat ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1008,8 +1001,7 @@ ROM_END #define SP_GPRIX_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_gprix ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "gp567p6b", 0x0000, 0x8000, CRC(e0ca19a5) SHA1(8b4eec4223d29f0f4098d0539fded5adca22070b) ) @@ -1075,8 +1067,7 @@ ROM_END #define SP_HIDEH_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_hideh ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1201,8 +1192,7 @@ ROM_END #define SP_HIFLY_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_hifly ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1326,8 +1316,7 @@ ROM_END #define SP_JURAS_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ ROM_LOAD( "jt8_snd1.bin", 0x0000, 0x80000, CRC(54f02e21) SHA1(1f2142e3cad828f3f07b729ad8394392c3a5ef46) ) \ - ROM_LOAD( "jt8_snd2.bin", 0x80000, 0x80000, CRC(6ae75d87) SHA1(f6a73c26f7715b2a2d69b05d7729571b05b2fdaa) ) \ - + ROM_LOAD( "jt8_snd2.bin", 0x80000, 0x80000, CRC(6ae75d87) SHA1(f6a73c26f7715b2a2d69b05d7729571b05b2fdaa) ) ROM_START( sp_juras ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1338,8 +1327,7 @@ ROM_END #define SP_OPENB_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_openb ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1413,8 +1401,7 @@ ROM_END #define SP_PAYRS_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_payrs ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1485,8 +1472,7 @@ ROM_END #define SP_PLAYA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_playa ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "playitagain-v1-6pound1.bin", 0x0000, 0x8000, CRC(e377e7af) SHA1(4ca7c8ddd15791f4d45bebe861fd3c193c7227e0) ) @@ -1561,8 +1547,7 @@ ROM_END #define SP_SPELL_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ ROM_LOAD( "spellboundsnd1.bin", 0x0000, 0x80000, CRC(ab462981) SHA1(a88728eb8c5dbf114007551c7b5d4eb06cc7eb0b) ) \ - ROM_LOAD( "spellboundsnd2.bin", 0x80000, 0x80000, CRC(9ada4413) SHA1(2dc9b42cdd3a64b5e5d3eab0d68b109258d12eda) ) \ - + ROM_LOAD( "spellboundsnd2.bin", 0x80000, 0x80000, CRC(9ada4413) SHA1(2dc9b42cdd3a64b5e5d3eab0d68b109258d12eda) ) ROM_START( sp_spell ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1635,8 +1620,7 @@ ROM_END #define SP_SWOP_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_swop ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1699,8 +1683,7 @@ ROM_END #define SP_TIMEM_SOUND \ ROM_REGION( 0x100000, "oki", 0 ) \ ROM_LOAD( "002rs1a.bin", 0x0000, 0x80000, CRC(b7f7dcc4) SHA1(5c4f991c25c56e837502c395eeb62e2adc4dd089) ) \ - ROM_LOAD( "002rs1b.bin", 0x80000, 0x80000, CRC(a7261ad8) SHA1(cdef00bf6db78309cbf9a49117d82bda2496c0a8) ) \ - + ROM_LOAD( "002rs1b.bin", 0x80000, 0x80000, CRC(a7261ad8) SHA1(cdef00bf6db78309cbf9a49117d82bda2496c0a8) ) ROM_START( sp_timem ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1788,8 +1771,7 @@ ROM_END #define SP_TZ_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_tz ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -1863,8 +1845,7 @@ ROM_END #define SP_TZFE_SOUND \ ROM_REGION( 0x100000, "oki", 0 ) /* from the filename and size I'm going to guess this isn't genuine */ \ - ROM_LOAD( "tzfe_hacksound.bin", 0x0000, 0x05ea7c, BAD_DUMP CRC(e333e740) SHA1(332106987943d3043902887a0f4b2aea75d3fb04) ) \ - + ROM_LOAD( "tzfe_hacksound.bin", 0x0000, 0x05ea7c, BAD_DUMP CRC(e333e740) SHA1(332106987943d3043902887a0f4b2aea75d3fb04) ) ROM_START( sp_tzfe ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "tz679d8b", 0x0000, 0x8000, CRC(b5f66994) SHA1(869a6a4c784a320b17d6552032e45d170af0e95f) ) @@ -2022,8 +2003,7 @@ ROM_END #define SP_BEAU_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_beau ) @@ -2092,8 +2072,7 @@ ROM_END #define SP_BIGBD_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_bigbd ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "bb10d13b", 0x0000, 0x8000, CRC(011bbbd8) SHA1(9fc0fff292badcf636d9d22a8a16f5e832e498a5) ) @@ -2112,8 +2091,7 @@ ROM_END #define SP_BRKBK_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_brkbk ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2153,8 +2131,7 @@ ROM_END #define SP_CAMEL_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_camel ) @@ -2273,8 +2250,7 @@ ROM_END #define SP_CLBNA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_clbna ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2295,8 +2271,7 @@ ROM_END #define SP_CODER_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_coder ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2359,8 +2334,7 @@ ROM_END #define SP_CRISS_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_criss ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2422,8 +2396,7 @@ ROM_END #define SP_DAYTR_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_daytr ) @@ -2458,8 +2431,7 @@ ROM_END #define SP_DONKY_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_donky ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2521,8 +2493,7 @@ ROM_END #define SP_DYOUR_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_dyour ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2534,8 +2505,7 @@ ROM_END #define SP_FESTI_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_festi ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2545,8 +2515,7 @@ ROM_END #define SP_BEAU2_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_beau2 ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2601,8 +2570,7 @@ ROM_END #define SP_GHOST_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_ghost ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2748,8 +2716,7 @@ ROM_END #define SP_GLOBE_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_globe ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2810,8 +2777,7 @@ ROM_END #define SP_GOL_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_gol ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "gl706p04.bin", 0x0000, 0x010000, CRC(01a48714) SHA1(0a48cfad05905450aa2a7c9dc22f937377894ff0) ) // merged rom @@ -2821,8 +2787,7 @@ ROM_END #define SP_GOLDA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_golda ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2843,8 +2808,7 @@ ROM_END #define SP_GOLDS_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_golds ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2912,8 +2876,7 @@ ROM_END #define SP_GOLDT_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_goldt ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "729p2-0b.bin", 0x0000, 0x8000, CRC(a29a7084) SHA1(2a5ac792fd5a7514b74063475ca9419d03f17959) ) @@ -2924,8 +2887,7 @@ ROM_END #define SP_HERE_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_here ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "hw674d8b", 0x0000, 0x8000, CRC(f3f83196) SHA1(4bdca9380632ae3be6b842e24df7597a9f6d073c) ) @@ -2985,8 +2947,7 @@ ROM_END #define SP_HOLID_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_holid ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "hc669p3b", 0x0000, 0x8000, CRC(c703c949) SHA1(6a97a5a93f811054887feb3bc822f88ddd3d217b) ) @@ -3004,8 +2965,7 @@ ROM_END #define SP_LOTTO_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_lotto ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "sp705p14.bin", 0x0000, 0x010000, CRC(46a8a503) SHA1(39d40c6d34ec1879b037d13b47e648ae09f345d8) ) // merged rom @@ -3015,8 +2975,7 @@ ROM_END #define SP_MAGMO_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_magmo ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3056,8 +3015,7 @@ ROM_END #define SP_MEGMO_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_megmo ) @@ -3119,8 +3077,7 @@ ROM_END #define SP_MONMA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_monma ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3162,8 +3119,7 @@ ROM_END #define SP_MONMO_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_monmo ) @@ -3225,8 +3181,7 @@ ROM_END #define SP_NUDEX_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_nudex ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3246,8 +3201,7 @@ ROM_END #define SP_ONBOX_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_onbox ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3356,8 +3310,7 @@ ROM_END #define SP_PISTE_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_piste ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3482,8 +3435,7 @@ ROM_END #define SP_POUND_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_pound ) @@ -3662,8 +3614,7 @@ ROM_END #define SP_PRZNA_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_przna ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3724,8 +3675,7 @@ ROM_END #define SP_ROAD_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_road ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "rh654p2b", 0x0000, 0x8000, CRC(05e052eb) SHA1(a69dd44bad0d83de3ba4f284e1cbff49ec0bbe3d) ) @@ -3735,8 +3685,7 @@ ROM_END #define SP_SKYLM_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_skylm ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "sk617d7d.bin", 0x0000, 0x8000, CRC(6eb99fb3) SHA1(fe1decff1ed5a68117673bf4834eda9d7975c9c3) ) // was in a merged rom as 'sk617d7b' ?! @@ -3754,8 +3703,7 @@ ROM_END #define SP_TKPIK_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_tkpik ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -3808,8 +3756,7 @@ ROM_END #define SP_CARRY_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_carry ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "carry on 10p payout p2.bin", 0x0000, 0x8000, CRC(1db4062c) SHA1(92098a145c9cdf04758b92998dd4fca7945cf991) ) @@ -3828,8 +3775,7 @@ ROM_END #define SP_FRONT_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_front ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -3844,8 +3790,7 @@ ROM_END ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ /* actually I think this rom is just a bad dump, there is a rom which is the same in the JPM HW set, */ \ /* but twice the size. Also this isn't an oki rom! */ \ - ROM_LOAD( "atw80snd.bin", 0x0000, 0x020000, CRC(b002e11c) SHA1(f7133f4bb8c31feaad0a7b9ee88749f9b7877575) ) \ - + ROM_LOAD( "atw80snd.bin", 0x0000, 0x020000, CRC(b002e11c) SHA1(f7133f4bb8c31feaad0a7b9ee88749f9b7877575) ) ROM_START( sp_atw ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "artwld80", 0x0000, 0x010000, CRC(3ff314c3) SHA1(345df80243953b35916449b0aa6ffaf9d3501d2b) ) // pre-decrypted? bootleg? @@ -3854,8 +3799,7 @@ ROM_END #define SP_FIVE_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_five ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -3872,8 +3816,7 @@ ROM_END #define SP_CRUN_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_crun ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -3895,8 +3838,7 @@ ROM_END #define SP_ROOF_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_roof ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "034p1-2h.bin", 0x0000, 0x8000, CRC(2b0353fa) SHA1(5c9f06fdda33c4a4a09c69f1e969ae4041513fd9) ) @@ -3913,8 +3855,7 @@ ROM_END #define SP_CPAL_SOUND \ ROM_REGION( 0x100000, "oki", ROMREGION_ERASE00 ) \ - /* not used, or missing? */ \ - + /* not used, or missing? */ ROM_START( sp_cpal ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -3932,7 +3873,6 @@ DRIVER_INIT_MEMBER(ace_sp_state,ace_cr) DRIVER_INIT_MEMBER(ace_sp_state,ace_sp) { - } GAME( 199?, sp_cbowl ,0 ,ace_sp ,ace_sp , ace_sp_state,ace_sp ,ROT0 ,"Ace", "Cash Bowl (Ace) (sp.ACE) (set 1)",GAME_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index 381c09aed71..c0a7340ae7d 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -63,7 +63,6 @@ WRITE8_MEMBER(actfancr_state::actfancr_sound_w) WRITE8_MEMBER(actfancr_state::actfancr_buffer_spriteram_w) { - UINT8 *src = reinterpret_cast(memshare("spriteram")->ptr()); // copy to a 16-bit region for our sprite draw code too for (int i=0;i<0x800/2;i++) @@ -291,14 +290,12 @@ static const ym3812_interface ym3812_config = MACHINE_START_MEMBER(actfancr_state,actfancr) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); } MACHINE_START_MEMBER(actfancr_state,triothep) { - MACHINE_START_CALL_MEMBER(actfancr); save_item(NAME(m_trio_control_select)); @@ -311,7 +308,6 @@ MACHINE_RESET_MEMBER(actfancr_state,actfancr) MACHINE_RESET_MEMBER(actfancr_state,triothep) { - MACHINE_RESET_CALL_MEMBER(actfancr); m_trio_control_select = 0; } diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index ad35aa455c3..9671c44c7f7 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -207,7 +207,6 @@ UINT32 adp_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con #if 0 UINT32 adp_state::screen_update_adp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_h63484->update_screen(bitmap, cliprect); #if 0 @@ -302,7 +301,6 @@ static const microtouch_interface adb_microtouch_config = MACHINE_START_MEMBER(adp_state,skattv) { - m_maincpu = machine().device("maincpu"); m_duart = machine().device("duart68681"); //m_h63484 = machine().device("h63484"); @@ -340,7 +338,6 @@ MACHINE_START_MEMBER(adp_state,skattv) MACHINE_RESET_MEMBER(adp_state,skattv) { - m_mux_data = 0; m_register_active = 0; } diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index 689daedc589..02f8b574b5d 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -41,7 +41,6 @@ READ8_MEMBER(aeroboto_state::aeroboto_201_r) INTERRUPT_GEN_MEMBER(aeroboto_state::aeroboto_interrupt) { - if (!m_disable_irq) device.execute().set_input_line(0, ASSERT_LINE); else @@ -56,14 +55,12 @@ READ8_MEMBER(aeroboto_state::aeroboto_irq_ack_r) READ8_MEMBER(aeroboto_state::aeroboto_2973_r) { - m_mainram[0x02be] = 0; return 0xff; } WRITE8_MEMBER(aeroboto_state::aeroboto_1a2_w) { - m_mainram[0x01a2] = data; if (data) m_disable_irq = 1; @@ -224,7 +221,6 @@ static const ay8910_interface ay8910_config = void aeroboto_state::machine_start() { - m_stars_rom = memregion("gfx2")->base(); m_stars_length = memregion("gfx2")->bytes(); @@ -234,7 +230,6 @@ void aeroboto_state::machine_start() void aeroboto_state::machine_reset() { - m_disable_irq = 0; m_count = 0; diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index c63e2985cd7..7cc3a7df4c1 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1294,7 +1294,6 @@ static const ym3812_interface ym3812_config = MACHINE_START_MEMBER(aerofgt_state,common) { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_pending_command)); } diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index c6a613b3099..414f41394bc 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -227,7 +227,6 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit /* Read/Write Handlers */ READ8_MEMBER(airbustr_state::devram_r) { - // There's an MCU here, possibly switch (offset) { @@ -271,7 +270,6 @@ WRITE8_MEMBER(airbustr_state::master_bankswitch_w) WRITE8_MEMBER(airbustr_state::slave_bankswitch_w) { - membank("bank2")->set_entry(data & 0x07); flip_screen_set(data & 0x10); @@ -287,7 +285,6 @@ WRITE8_MEMBER(airbustr_state::sound_bankswitch_w) READ8_MEMBER(airbustr_state::soundcommand_status_r) { - // bits: 2 <-> ? 1 <-> soundlatch full 0 <-> soundlatch2 empty return 4 + m_soundlatch_status * 2 + (1 - m_soundlatch2_status); } @@ -597,7 +594,6 @@ void airbustr_state::machine_start() void airbustr_state::machine_reset() { - m_soundlatch_status = m_soundlatch2_status = 0; m_bg_scrollx = 0; m_bg_scrolly = 0; diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index 1dfc8a6bc09..ba564b1fd22 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -140,7 +140,6 @@ WRITE8_MEMBER(albazc_state::hanaroku_out_2_w) WRITE8_MEMBER(albazc_state::albazc_vregs_w) { - #ifdef UNUSED_FUNCTION { static UINT8 x[5]; diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index 5a6169a40e3..520437f4505 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -115,7 +115,6 @@ VIDEO_START_MEMBER(alg_state,alg) MACHINE_START_MEMBER(alg_state,alg) { - m_serial_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(alg_state::response_timer),this)); m_serial_timer_active = FALSE; } @@ -136,7 +135,6 @@ MACHINE_RESET_MEMBER(alg_state,alg) TIMER_CALLBACK_MEMBER(alg_state::response_timer) { - /* if we still have data to send, do it now */ if (m_laserdisc->data_available_r() == ASSERT_LINE) { @@ -212,7 +210,6 @@ CUSTOM_INPUT_MEMBER(alg_state::lightgun_pos_r) CUSTOM_INPUT_MEMBER(alg_state::lightgun_trigger_r) { - /* read the trigger control based on the input select */ return (ioport("TRIGGERS")->read() >> m_input_select) & 1; } @@ -220,7 +217,6 @@ CUSTOM_INPUT_MEMBER(alg_state::lightgun_trigger_r) CUSTOM_INPUT_MEMBER(alg_state::lightgun_holster_r) { - /* read the holster control based on the input select */ return (ioport("TRIGGERS")->read() >> (2 + m_input_select)) & 1; } diff --git a/src/mame/drivers/alien.c b/src/mame/drivers/alien.c index 65066bbf329..ad82f538872 100644 --- a/src/mame/drivers/alien.c +++ b/src/mame/drivers/alien.c @@ -43,7 +43,6 @@ protected: void alien_state::video_start() { - } UINT32 alien_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index fe452edba81..cc056b09aa8 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -21,7 +21,6 @@ static KONAMI_SETLINES_CALLBACK( aliens_banking ); INTERRUPT_GEN_MEMBER(aliens_state::aliens_interrupt) { - if (k051960_is_irq_enabled(m_k051960)) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } @@ -44,7 +43,6 @@ WRITE8_MEMBER(aliens_state::bankedram_w) WRITE8_MEMBER(aliens_state::aliens_coin_counter_w) { - /* bits 0-1 = coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -67,14 +65,12 @@ WRITE8_MEMBER(aliens_state::aliens_coin_counter_w) WRITE8_MEMBER(aliens_state::aliens_sh_irqtrigger_w) { - soundlatch_byte_w(space, offset, data); m_audiocpu->set_input_line(0, HOLD_LINE); } WRITE8_MEMBER(aliens_state::aliens_snd_bankswitch_w) { - /* b1: bank for chanel A */ /* b0: bank for chanel B */ @@ -87,7 +83,6 @@ WRITE8_MEMBER(aliens_state::aliens_snd_bankswitch_w) READ8_MEMBER(aliens_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -103,7 +98,6 @@ READ8_MEMBER(aliens_state::k052109_051960_r) WRITE8_MEMBER(aliens_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -237,7 +231,6 @@ void aliens_state::machine_start() void aliens_state::machine_reset() { - konami_configure_set_lines(machine().device("maincpu"), aliens_banking); m_palette_selected = 0; diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index c7d9bc89cc3..caba26b361c 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -873,8 +873,7 @@ ADDRESS_MAP_END PORT_DIPSETTING( 0x03, "A 1C/5C B 5C/1C" ) \ PORT_DIPSETTING( 0x02, "A 1C/6C B 6C/1C" ) \ PORT_DIPSETTING( 0x01, "A 2C/3C B 7C/1C" ) \ - PORT_DIPSETTING( 0x00, "A 3C/2C B 8C/1C" ) \ - + PORT_DIPSETTING( 0x00, "A 3C/2C B 8C/1C" ) #define ALPHA68K_COINAGE_BITS_1TO3 \ PORT_DIPNAME( 0x0e, 0x0e, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:4,5,6") \ PORT_DIPSETTING( 0x0e, "A 1C/1C B 1C/1C" ) \ @@ -900,8 +899,7 @@ ADDRESS_MAP_END #define ALPHA68K_MCU \ PORT_START("IN2") /* Coin input to microcontroller */\ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )\ - PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )\ - + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) static INPUT_PORTS_START( sstingry ) PORT_START("IN0") @@ -1865,7 +1863,6 @@ static const ym3812_interface ym3812_config = MACHINE_START_MEMBER(alpha68k_state,common) { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_trigstate)); @@ -1880,7 +1877,6 @@ MACHINE_START_MEMBER(alpha68k_state,common) MACHINE_RESET_MEMBER(alpha68k_state,common) { - m_trigstate = 0; m_deposits1 = 0; m_deposits2 = 0; @@ -1905,7 +1901,6 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_V) MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_V) { - MACHINE_RESET_CALL_MEMBER(common); m_bank_base = 0; @@ -1914,7 +1909,6 @@ MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_V) MACHINE_RESET_MEMBER(alpha68k_state,alpha68k_II) { - MACHINE_RESET_CALL_MEMBER(common); m_bank_base = 0; @@ -2119,7 +2113,6 @@ MACHINE_CONFIG_END INTERRUPT_GEN_MEMBER(alpha68k_state::alpha68k_sound_nmi) { - if(m_sound_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 2bb7b35061b..86fa6c7c529 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -852,7 +852,6 @@ void amaticmg_state::machine_start() void amaticmg_state::machine_reset() { - membank("bank1")->set_entry(0); m_nmi_mask = 0; } @@ -906,7 +905,6 @@ MACHINE_CONFIG_END INTERRUPT_GEN_MEMBER(amaticmg_state::amaticmg2_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 3fc9fd888ca..2d8b04eb4f8 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1402,7 +1402,6 @@ ROM_END DRIVER_INIT_MEMBER(ampoker2_state,rabbitpk) { - UINT8 *rom = machine().root_device().memregion("maincpu")->base(); int size = machine().root_device().memregion("maincpu")->bytes(); int start = 0; diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index 889821ae153..6d1a4a95baf 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -241,7 +241,6 @@ GFXDECODE_END void amspdwy_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_flipscreen)); diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index fb5d48a04c2..4d334433326 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -570,7 +570,6 @@ GFXDECODE_END void angelkds_state::machine_start() { - m_subcpu = machine().device("sub"); save_item(NAME(m_layer_ctrl)); diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 735d85421de..91e38c7d451 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -199,7 +199,6 @@ static void appoooh_adpcm_int(device_t *device) /* adpcm address write */ WRITE8_MEMBER(appoooh_state::appoooh_adpcm_w) { - m_adpcm_address = data << 8; msm5205_reset_w(m_adpcm, 0); m_adpcm_data = 0xffffffff; @@ -412,7 +411,6 @@ static const sn76496_config psg_intf = void appoooh_state::machine_start() { - m_adpcm = machine().device("msm"); save_item(NAME(m_adpcm_data)); @@ -422,7 +420,6 @@ void appoooh_state::machine_start() void appoooh_state::machine_reset() { - m_adpcm_address = 0xffffffff; m_adpcm_data = 0; m_scroll_x = 0; @@ -431,7 +428,6 @@ void appoooh_state::machine_reset() INTERRUPT_GEN_MEMBER(appoooh_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 909eac2921e..abd241aab70 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -44,7 +44,6 @@ Notes: READ16_MEMBER(aquarium_state::aquarium_coins_r) { - int data; data = (ioport("SYSTEM")->read() & 0x7fff); data |= m_aquarium_snd_ack; @@ -290,7 +289,6 @@ GFXDECODE_END void aquarium_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_aquarium_snd_ack)); diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index c7c52df222f..bdb1e200593 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -60,7 +60,6 @@ WRITE8_MEMBER(arabian_state::ay8910_porta_w) { - /* bit 7 = ENA bit 6 = ENB @@ -99,7 +98,6 @@ WRITE8_MEMBER(arabian_state::ay8910_portb_w) READ8_MEMBER(arabian_state::mcu_port_r_r) { - UINT8 val = m_mcu_port_r[offset]; /* RAM mode is enabled */ @@ -111,7 +109,6 @@ READ8_MEMBER(arabian_state::mcu_port_r_r) WRITE8_MEMBER(arabian_state::mcu_port_r_w) { - if (offset == 0) { UINT32 ram_addr = ((m_mcu_port_p & 7) << 8) | m_mcu_port_o; @@ -342,7 +339,6 @@ static const ay8910_interface ay8910_config = void arabian_state::machine_start() { - save_item(NAME(m_mcu_port_o)); save_item(NAME(m_mcu_port_p)); save_item(NAME(m_mcu_port_r)); @@ -350,7 +346,6 @@ void arabian_state::machine_start() void arabian_state::machine_reset() { - m_video_control = 0; } diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index f3874b36d3e..d9b0c3520c5 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -154,7 +154,6 @@ WRITE8_MEMBER(arcadia_amiga_state::arcadia_cia_0_portb_w) /* writing a 0 in the low bit clears one of the coins */ if ((data & 1) == 0) { - if (coin_counter[0] > 0) coin_counter[0]--; else if (coin_counter[1] > 0) diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index 710fb13ecf4..6e24bf8d8f4 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -407,7 +407,6 @@ UINT32 aristmk4_state::screen_update_aristmk4(screen_device &screen, bitmap_ind1 READ8_MEMBER(aristmk4_state::ldsw) { - int U3_p2_ret= ioport("5002")->read(); if(U3_p2_ret & 0x1) { @@ -418,7 +417,6 @@ READ8_MEMBER(aristmk4_state::ldsw) READ8_MEMBER(aristmk4_state::cgdrr) { - if(m_cgdrsw) // is the LC closed { return m_ripple; // return a positive value from the ripple counter @@ -428,13 +426,11 @@ READ8_MEMBER(aristmk4_state::cgdrr) WRITE8_MEMBER(aristmk4_state::cgdrw) { - m_ripple = data; } WRITE8_MEMBER(aristmk4_state::u3_p0) { - m_u3_p0_w = data; if ((data&0x80)==0) //Printer Motor Off @@ -447,7 +443,6 @@ WRITE8_MEMBER(aristmk4_state::u3_p0) READ8_MEMBER(aristmk4_state::u3_p2) { - int u3_p2_ret= ioport("5002")->read(); int u3_p3_ret= ioport("5003")->read(); @@ -473,7 +468,6 @@ READ8_MEMBER(aristmk4_state::u3_p2) READ8_MEMBER(aristmk4_state::u3_p3) { - int u3_p3_ret= ioport("5003")->read(); if ((m_printer_motor)==1) // Printer Motor Off @@ -495,7 +489,6 @@ TIMER_CALLBACK_MEMBER(aristmk4_state::note_input_reset) READ8_MEMBER(aristmk4_state::bv_p0) { - int bv_p0_ret=0x00; switch(m_insnote) @@ -519,7 +512,6 @@ READ8_MEMBER(aristmk4_state::bv_p0) READ8_MEMBER(aristmk4_state::bv_p1) { - int bv_p1_ret=0x00; if (m_insnote==0) @@ -591,7 +583,6 @@ WRITE8_MEMBER(aristmk4_state::mkiv_pia_cb2) //output b WRITE8_MEMBER(aristmk4_state::mkiv_pia_outb) { - UINT8 emet[5]; int i = 0; //pia_data = data; @@ -664,7 +655,6 @@ READ8_MEMBER(aristmk4_state::via_a_r) READ8_MEMBER(aristmk4_state::via_b_r) { - int ret=ioport("via_port_b")->read(); // Not expecting to read anything from port B on the AY8910's ( controls BC1, BC2 and BDIR ) @@ -715,7 +705,6 @@ READ8_MEMBER(aristmk4_state::via_b_r) WRITE8_MEMBER(aristmk4_state::via_a_w) { - //logerror("VIA port A write %02X\n",data); m_psg_data = data; } @@ -864,7 +853,6 @@ WRITE8_MEMBER(aristmk4_state::mlamps) WRITE8_MEMBER(aristmk4_state::zn434_w) { - // Introducted to prevent warning in log for write to AY1 PORT B // this is a write to the ZN434 DA convertors.. } @@ -1638,7 +1626,6 @@ DRIVER_INIT_MEMBER(aristmk4_state,aristmk4) void aristmk4_state::machine_start() { - m_samples = machine().device("samples"); state_save_register_global_pointer(machine(), m_nvram, 0x1000); // m_nvram } diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index c1be9badaaf..93d29959e5e 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -96,7 +96,6 @@ TIMER_CALLBACK_MEMBER(aristmk5_state::mk5_VSYNC_callback) WRITE32_MEMBER(aristmk5_state::Ns5w48) { - /* There is one writeable register which is written with the Ns5w48 strobe. It contains four bits which are taken from bits 16 to 19 of the word being written. The register is cleared whenever the chip is reset. The @@ -526,8 +525,7 @@ MACHINE_CONFIG_END ROM_REGION( 0x400000, "clear_chip", ROMREGION_ERASEFF ) \ /* clear chip */ \ ROM_LOAD32_WORD( "clear.u7", 0x000000, 0x80000, CRC(5a254b22) SHA1(8444f237b392df2a3cb42ea349e7af32f47dd544) ) \ - ROM_LOAD32_WORD( "clear.u11", 0x000002, 0x80000, CRC(def36617) SHA1(c7ba5b08e884a8fb36c9fb51c08e243e32c81f89) ) \ - + ROM_LOAD32_WORD( "clear.u11", 0x000002, 0x80000, CRC(def36617) SHA1(c7ba5b08e884a8fb36c9fb51c08e243e32c81f89) ) ROM_START( aristmk5 ) ARISTOCRAT_MK5_BIOS diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c index 924d7ca73a2..819cd9bdd8b 100644 --- a/src/mame/drivers/aristmk6.c +++ b/src/mame/drivers/aristmk6.c @@ -28,7 +28,6 @@ void aristmk6_state::video_start() UINT32 aristmk6_state::screen_update_aristmk6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - int x,y,count; const UINT8 *blit_ram = memregion("maincpu")->base(); diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 4a4b89b5c85..1bc76a51472 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -974,7 +974,6 @@ static const ay8910_interface hexa_ay8910_config = MACHINE_START_MEMBER(arkanoid_state,arkanoid) { - m_mcu = machine().device("mcu"); save_item(NAME(m_bootleg_cmd)); @@ -998,7 +997,6 @@ MACHINE_START_MEMBER(arkanoid_state,arkanoid) MACHINE_RESET_MEMBER(arkanoid_state,arkanoid) { - m_port_a_in = 0; m_port_a_out = 0; m_z80write = 0; diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 41c3a7767ed..dafff4e4690 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -315,7 +315,6 @@ Notes: WRITE16_MEMBER(armedf_state::terraf_io_w) { - if(data & 0x4000 && ((m_vreg & 0x4000) == 0)) //0 -> 1 transition nb_1414m4_exec(space,(m_text_videoram[0] << 8) | (m_text_videoram[1] & 0xff),m_text_videoram,m_fg_scrollx,m_fg_scrolly,m_tx_tilemap); @@ -330,7 +329,6 @@ WRITE16_MEMBER(armedf_state::terraf_io_w) WRITE16_MEMBER(armedf_state::terrafb_io_w) { - if(data & 0x4000 && ((m_vreg & 0x4000) == 0)) //0 -> 1 transition machine().device("extra")->execute().set_input_line(0, HOLD_LINE); @@ -344,7 +342,6 @@ WRITE16_MEMBER(armedf_state::terrafb_io_w) WRITE16_MEMBER(armedf_state::bootleg_io_w) { - if(data & 0x4000 && ((m_vreg & 0x4000) == 0)) //0 -> 1 transition { // NOP @@ -465,7 +462,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(armedf_state::legiono_fg_scroll_w) { - if(offset >= 0xb && offset < 0xf) m_legion_cmd[offset-0xb] = data & 0xff; @@ -522,7 +518,6 @@ ADDRESS_MAP_END READ16_MEMBER(bigfghtr_state::latch_r) { - m_read_latch = 1; return 0; } @@ -542,7 +537,6 @@ WRITE16_MEMBER(bigfghtr_state::sharedram_w) READ16_MEMBER(bigfghtr_state::sharedram_r) { - if(m_mcu_input_snippet) { switch(offset+0x600/2) @@ -708,32 +702,27 @@ ADDRESS_MAP_END READ8_MEMBER(armedf_state::blitter_txram_r) { - return m_text_videoram[offset] & 0xff; } WRITE8_MEMBER(armedf_state::blitter_txram_w) { - m_text_videoram[offset] = (data & 0xff) | (m_text_videoram[offset] & 0xff00); m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(armedf_state::fg_scrollx_w) { - m_fg_scrollx = (data & 0xff) | (m_fg_scrollx & 0x300); } WRITE8_MEMBER(armedf_state::fg_scrolly_w) { - m_fg_scrolly = (data & 0xff) | (m_fg_scrolly & 0x300); } WRITE8_MEMBER(armedf_state::fg_scroll_msb_w) { - m_fg_scrolly = (((data & 0x03) >> 0) << 8) | (m_fg_scrolly & 0xff); m_fg_scrollx = (((data & 0x0c) >> 2) << 8) | (m_fg_scrollx & 0xff); } @@ -1149,7 +1138,6 @@ GFXDECODE_END MACHINE_START_MEMBER(armedf_state,armedf) { - save_item(NAME(m_old_mcu_mode)); save_item(NAME(m_scroll_msb)); save_item(NAME(m_waiting_msb)); @@ -1162,7 +1150,6 @@ MACHINE_START_MEMBER(armedf_state,armedf) MACHINE_RESET_MEMBER(armedf_state,armedf) { - m_old_mcu_mode = 0; m_scroll_msb = 0; m_waiting_msb = 0; @@ -1489,14 +1476,12 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(bigfghtr_state,bigfghtr) { - MACHINE_START_CALL_MEMBER(armedf); save_item(NAME(m_read_latch)); } MACHINE_RESET_MEMBER(bigfghtr_state,bigfghtr) { - MACHINE_RESET_CALL_MEMBER(armedf); m_read_latch = 0; } @@ -2103,7 +2088,6 @@ DRIVER_INIT_MEMBER(armedf_state,legiono) DRIVER_INIT_MEMBER(armedf_state,cclimbr2) { - machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this)); m_scroll_type = 3; diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index 6ddee78660f..3e4b6087be2 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -329,7 +329,6 @@ static const msm5205_interface msm5205_config = void ashnojoe_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_adpcm_byte)); @@ -339,7 +338,6 @@ void ashnojoe_state::machine_start() void ashnojoe_state::machine_reset() { - m_adpcm_byte = 0; m_soundlatch_status = 0; m_msm5205_vclk_toggle = 0; diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 1690926babc..4000e44368e 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -39,7 +39,6 @@ READ16_MEMBER(asterix_state::control2_r) WRITE16_MEMBER(asterix_state::control2_w) { - if (ACCESSING_BITS_0_7) { m_cur_control2 = data; @@ -55,7 +54,6 @@ WRITE16_MEMBER(asterix_state::control2_w) INTERRUPT_GEN_MEMBER(asterix_state::asterix_interrupt) { - // global interrupt masking if (!k056832_is_irq_enabled(m_k056832, 0)) return; @@ -76,7 +74,6 @@ TIMER_CALLBACK_MEMBER(asterix_state::nmi_callback) WRITE8_MEMBER(asterix_state::sound_arm_nmi_w) { - m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); machine().scheduler().timer_set(attotime::from_usec(5), timer_expired_delegate(FUNC(asterix_state::nmi_callback),this)); } @@ -243,7 +240,6 @@ static const k05324x_interface asterix_k05324x_intf = void asterix_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_k053260 = machine().device("k053260"); diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index fc6616cb1b0..35b7670ac49 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -250,7 +250,6 @@ TIMER_CALLBACK_MEMBER(astinvad_state::kamizake_int_gen) MACHINE_START_MEMBER(astinvad_state,kamikaze) { - m_samples = machine().device("samples"); m_int_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(astinvad_state::kamizake_int_gen),this)); @@ -263,7 +262,6 @@ MACHINE_START_MEMBER(astinvad_state,kamikaze) MACHINE_RESET_MEMBER(astinvad_state,kamikaze) { - m_screen_flip = 0; m_screen_red = 0; m_sound_state[0] = 0; @@ -273,7 +271,6 @@ MACHINE_RESET_MEMBER(astinvad_state,kamikaze) MACHINE_START_MEMBER(astinvad_state,spaceint) { - m_samples = machine().device("samples"); save_item(NAME(m_screen_flip)); @@ -282,7 +279,6 @@ MACHINE_START_MEMBER(astinvad_state,spaceint) MACHINE_RESET_MEMBER(astinvad_state,spaceint) { - m_screen_flip = 0; m_sound_state[0] = 0; m_sound_state[1] = 0; @@ -319,7 +315,6 @@ READ8_MEMBER(astinvad_state::kamikaze_ppi_r) WRITE8_MEMBER(astinvad_state::kamikaze_ppi_w) { - /* the address lines are used for /CS; yes, they can overlap! */ if (!(offset & 4)) m_ppi8255_0->write(space, offset, data); @@ -749,7 +744,6 @@ ROM_END DRIVER_INIT_MEMBER(astinvad_state,kamikaze) { - /* the flip screen logic adds 32 to the Y after flipping */ m_flip_yoffs = 32; } @@ -757,7 +751,6 @@ DRIVER_INIT_MEMBER(astinvad_state,kamikaze) DRIVER_INIT_MEMBER(astinvad_state,spcking2) { - /* don't have the schematics, but the blanking must center the screen here */ m_flip_yoffs = 0; } diff --git a/src/mame/drivers/astrafr.c b/src/mame/drivers/astrafr.c index a40c5b4f51c..6b4bfa14182 100644 --- a/src/mame/drivers/astrafr.c +++ b/src/mame/drivers/astrafr.c @@ -266,7 +266,6 @@ INPUT_PORTS_END MACHINE_START_MEMBER(astrafr_state,astra_common) { - m_cpuregion = (UINT32*)memregion( "maincpu" )->base(); m_cpuregion_size = memregion( "maincpu" )->bytes()/4; m_mainram = (UINT32*)auto_alloc_array_clear(machine(), UINT32, 0x10000); diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index 666e63e9de1..ffab5563334 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -77,7 +77,6 @@ public: VIDEO_START_MEMBER(astrocorp_state,astrocorp) { - machine().primary_screen->register_screen_bitmap(m_bitmap); save_item(NAME(m_bitmap)); @@ -157,7 +156,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 astrocorp_state::screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_screen_enable & 1) copybitmap(bitmap, m_bitmap, 0,0,0,0, cliprect); else @@ -173,7 +171,6 @@ UINT32 astrocorp_state::screen_update_astrocorp(screen_device &screen, bitmap_in WRITE16_MEMBER(astrocorp_state::astrocorp_draw_sprites_w) { - UINT16 old = m_draw_sprites; UINT16 now = COMBINE_DATA(&m_draw_sprites); diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 4f2b103cfea..dbb8d3c79e7 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -102,7 +102,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrof_state::irq_callback) INPUT_CHANGED_MEMBER(astrof_state::coin_inserted) { - /* coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); coin_counter_w(machine(), 0, newval); @@ -111,7 +110,6 @@ INPUT_CHANGED_MEMBER(astrof_state::coin_inserted) INPUT_CHANGED_MEMBER(astrof_state::service_coin_inserted) { - /* service coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); } @@ -169,7 +167,6 @@ CUSTOM_INPUT_MEMBER(astrof_state::tomahawk_controls_r) void astrof_state::video_start() { - /* allocate the color RAM -- half the size of the video RAM as A0 is not connected */ m_colorram = auto_alloc_array(machine(), UINT8, m_videoram.bytes() / 2); save_pointer(NAME(m_colorram), m_videoram.bytes() / 2); @@ -276,7 +273,6 @@ static void tomahawk_get_pens( running_machine &machine, pen_t *pens ) WRITE8_MEMBER(astrof_state::astrof_videoram_w) { - m_videoram[offset] = data; m_colorram[offset >> 1] = *m_astrof_color & 0x0e; } @@ -284,7 +280,6 @@ WRITE8_MEMBER(astrof_state::astrof_videoram_w) WRITE8_MEMBER(astrof_state::tomahawk_videoram_w) { - m_videoram[offset] = data; m_colorram[offset >> 1] = (*m_astrof_color & 0x0e) | ((*m_astrof_color & 0x01) << 4); } @@ -292,7 +287,6 @@ WRITE8_MEMBER(astrof_state::tomahawk_videoram_w) WRITE8_MEMBER(astrof_state::video_control_1_w) { - m_flipscreen = ((data >> 0) & 0x01) & ioport("CAB")->read(); /* this ties to the CLR pin of the shift registers */ @@ -452,7 +446,6 @@ READ8_MEMBER(astrof_state::shoot_r) READ8_MEMBER(astrof_state::abattle_coin_prot_r) { - m_abattle_count = (m_abattle_count + 1) % 0x0101; return m_abattle_count ? 0x07 : 0x00; } @@ -460,7 +453,6 @@ READ8_MEMBER(astrof_state::abattle_coin_prot_r) READ8_MEMBER(astrof_state::afire_coin_prot_r) { - m_abattle_count = m_abattle_count ^ 0x01; return m_abattle_count ? 0x07 : 0x00; } @@ -468,7 +460,6 @@ READ8_MEMBER(astrof_state::afire_coin_prot_r) READ8_MEMBER(astrof_state::tomahawk_protection_r) { - /* flip the byte */ return BITSWAP8(*m_tomahawk_protection, 0, 1, 2, 3, 4, 5, 6, 7); } @@ -483,7 +474,6 @@ READ8_MEMBER(astrof_state::tomahawk_protection_r) MACHINE_START_MEMBER(astrof_state,astrof) { - /* the 74175 outputs all HI's if not otherwise set */ astrof_set_video_control_2(machine(), 0xff); @@ -505,7 +495,6 @@ MACHINE_START_MEMBER(astrof_state,astrof) MACHINE_START_MEMBER(astrof_state,abattle) { - /* register for state saving */ save_item(NAME(m_abattle_count)); @@ -515,7 +504,6 @@ MACHINE_START_MEMBER(astrof_state,abattle) MACHINE_START_MEMBER(astrof_state,spfghmk2) { - /* the 74175 outputs all HI's if not otherwise set */ spfghmk2_set_video_control_2(machine(), 0xff); @@ -533,7 +521,6 @@ MACHINE_START_MEMBER(astrof_state,spfghmk2) MACHINE_START_MEMBER(astrof_state,tomahawk) { - /* the 74175 outputs all HI's if not otherwise set */ tomahawk_set_video_control_2(machine(), 0xff); diff --git a/src/mame/drivers/astropc.c b/src/mame/drivers/astropc.c index c8143a0795e..22b673e2519 100644 --- a/src/mame/drivers/astropc.c +++ b/src/mame/drivers/astropc.c @@ -158,7 +158,6 @@ ROM_END DRIVER_INIT_MEMBER(astropc_state,astropc) { - } GAME( 2002, blackbd, 0, astropc, astropc, astropc_state, astropc, ROT0, "Astro", "Black Beard (Russia, set 1)", GAME_IS_SKELETON ) diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index f8a02acb7ac..473b73a7736 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -826,7 +826,6 @@ static const tc0110pcr_interface asuka_tc0110pcr_intf = void asuka_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_pc090oj = machine().device("pc090oj"); @@ -850,7 +849,6 @@ void asuka_state::machine_start() void asuka_state::machine_reset() { - m_adpcm_pos = 0; m_adpcm_data = -1; m_current_round = 0; diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index 2a335ef4c78..7404fc9969e 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -506,7 +506,6 @@ GFXDECODE_END void atarifb_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_CTRLD)); @@ -530,7 +529,6 @@ void atarifb_state::machine_start() void atarifb_state::machine_reset() { - m_CTRLD = 0; m_sign_x_1 = 0; m_sign_y_1 = 0; diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index 0a3435658de..99dff1e7bc2 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -94,7 +94,6 @@ WRITE16_MEMBER(atarig42_state::io_latch_w) /* upper byte */ if (ACCESSING_BITS_8_15) { - /* bit 14 controls the ASIC65 reset line */ asic65_reset(machine(), (~data >> 14) & 1); diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 224b1af63d8..b03b77b0209 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -218,7 +218,6 @@ WRITE32_MEMBER(atarigt_state::latch_w) /* upper byte */ if (ACCESSING_BITS_24_31) { - /* bits 13-11 are the MO control bits */ atarirle_control_w(m_rle, (data >> 27) & 7); } @@ -1314,7 +1313,6 @@ WRITE32_MEMBER(atarigt_state::tmek_pf_w) DRIVER_INIT_MEMBER(atarigt_state,tmek) { - m_eeprom_default = NULL; m_is_primrage = 0; diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c index 2c0d1593ebf..b0d8d50ac30 100644 --- a/src/mame/drivers/atarigx2.c +++ b/src/mame/drivers/atarigx2.c @@ -106,7 +106,6 @@ WRITE32_MEMBER(atarigx2_state::latch_w) /* upper byte */ if (ACCESSING_BITS_24_31) { - /* bits 13-11 are the MO control bits */ atarirle_control_w(m_rle, (data >> 27) & 7); } @@ -2177,7 +2176,6 @@ ROM_END DRIVER_INIT_MEMBER(atarigx2_state,spclords) { - atarijsa_init(machine(), "SERVICE", 0x0040); m_playfield_base = 0x000; @@ -2186,7 +2184,6 @@ DRIVER_INIT_MEMBER(atarigx2_state,spclords) DRIVER_INIT_MEMBER(atarigx2_state,motofren) { - atarijsa_init(machine(), "SERVICE", 0x0040); m_playfield_base = 0x400; @@ -2221,7 +2218,6 @@ READ32_MEMBER(atarigx2_state::rrreveng_prot_r) DRIVER_INIT_MEMBER(atarigx2_state,rrreveng) { - atarijsa_init(machine(), "SERVICE", 0x0040); m_playfield_base = 0x000; diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 494adfd4a05..9e3074508ac 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -374,7 +374,6 @@ READ8_MEMBER(atarisy2_state::switch_6502_r) WRITE8_MEMBER(atarisy2_state::switch_6502_w) { - if (m_has_tms5220) { data = 12 | ((data >> 5) & 1); @@ -687,7 +686,6 @@ WRITE8_MEMBER(atarisy2_state::mixer_w) WRITE8_MEMBER(atarisy2_state::sound_reset_w) { - /* if no change, do nothing */ if ((data & 1) == m_sound_reset_state) return; @@ -3245,7 +3243,6 @@ DRIVER_INIT_MEMBER(atarisy2_state,csprint) DRIVER_INIT_MEMBER(atarisy2_state,apb) { - slapstic_init(machine(), 110); m_pedal_count = 2; diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index a434d909e80..167007b3631 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -104,7 +104,6 @@ static void reset_bank(running_machine &machine) void atetris_state::machine_start() { - /* Allocate interrupt timer */ m_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(atetris_state::interrupt_gen),this)); @@ -117,7 +116,6 @@ void atetris_state::machine_start() void atetris_state::machine_reset() { - /* reset the slapstic */ slapstic_reset(); m_current_bank = slapstic_bank() & 1; @@ -173,7 +171,6 @@ WRITE8_MEMBER(atetris_state::coincount_w) WRITE8_MEMBER(atetris_state::nvram_w) { - if (m_nvram_write_enable) m_nvram[offset] = data; m_nvram_write_enable = 0; @@ -182,7 +179,6 @@ WRITE8_MEMBER(atetris_state::nvram_w) WRITE8_MEMBER(atetris_state::nvram_enable_w) { - m_nvram_write_enable = 1; } diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 17cf88ab2d0..a7ea092670d 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -233,13 +233,11 @@ INPUT_PORTS_END void avalnche_state::machine_start() { - save_item(NAME(m_avalance_video_inverted)); } void avalnche_state::machine_reset() { - m_avalance_video_inverted = 0; } diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index af65ffa1744..f23bb45b65d 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -884,7 +884,6 @@ static const ay8910_interface ay8910_config = /* IM 2 */ INTERRUPT_GEN_MEMBER(avt_state::avt_vblank_irq) { - m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x06); } diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index c9a4ebe0b2a..837fe46b48e 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -89,7 +89,6 @@ public: /* I'm using the functions in deco16ic.c ... same chips, why duplicate code? */ void backfire_state::video_start() { - m_spriteram_1 = auto_alloc_array(machine(), UINT16, 0x2000/2); m_spriteram_2 = auto_alloc_array(machine(), UINT16, 0x2000/2); @@ -113,7 +112,6 @@ void backfire_state::video_start() UINT32 backfire_state::screen_update_backfire_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - //FIXME: flip_screen_x should not be written! flip_screen_set_no_update(1); @@ -145,7 +143,6 @@ UINT32 backfire_state::screen_update_backfire_left(screen_device &screen, bitmap UINT32 backfire_state::screen_update_backfire_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - //FIXME: flip_screen_x should not be written! flip_screen_set_no_update(1); @@ -190,7 +187,6 @@ READ32_MEMBER(backfire_state::backfire_eeprom_r) READ32_MEMBER(backfire_state::backfire_control2_r) { - // logerror("%08x:Read eprom %08x (%08x)\n", space.device().safe_pc(), offset << 1, mem_mask); return (m_eeprom->read_bit() << 24) | ioport("IN1")->read() | (ioport("IN1")->read() << 16); } @@ -198,7 +194,6 @@ READ32_MEMBER(backfire_state::backfire_control2_r) #ifdef UNUSED_FUNCTION READ32_MEMBER(backfire_state::backfire_control3_r) { - // logerror("%08x:Read eprom %08x (%08x)\n", space.device().safe_pc(), offset << 1, mem_mask); return (m_eeprom->read_bit() << 24) | ioport("IN2")->read() | (ioport("IN2")->read() << 16); } @@ -475,7 +470,6 @@ static const deco16ic_interface backfire_deco16ic_tilegen2_intf = void backfire_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_deco_tilegen1 = machine().device("tilegen1"); m_deco_tilegen2 = machine().device("tilegen2"); @@ -697,7 +691,6 @@ static void descramble_sound( running_machine &machine ) READ32_MEMBER(backfire_state::backfire_speedup_r) { - //mame_printf_debug( "%08x\n",space.device().safe_pc()); if (space.device() .safe_pc()== 0xce44) space.device().execute().spin_until_time(attotime::from_usec(400)); // backfire diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index a4707abeca9..c3c4dd45bcd 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -576,7 +576,6 @@ ROM_END DRIVER_INIT_MEMBER(badlands_state,badlands) { - /* initialize the audio system */ m_bank_base = &memregion("audiocpu")->base()[0x03000]; m_bank_source_data = &memregion("audiocpu")->base()[0x10000]; @@ -621,7 +620,6 @@ GAME( 1989, badlands, 0, badlands, badlands, badlands_state, badlands, ROT0, "At READ16_MEMBER(badlands_state::badlandsb_unk_r) { - return 0xffff; } diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 7af2546bc32..e7df288b6b4 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -103,7 +103,6 @@ WRITE8_MEMBER(bagman_state::bagman_coin_counter_w) WRITE8_MEMBER(bagman_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -464,7 +463,6 @@ static const tms5110_interface bagman_tms5110_interface = INTERRUPT_GEN_MEMBER(bagman_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } @@ -929,7 +927,6 @@ ROM_END DRIVER_INIT_MEMBER(bagman_state,bagman) { - /* Unmap video enable register, not available on earlier hardware revision(s) Bagman is supposed to have glitches during screen transitions */ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa003, 0xa003); diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c index 1e9a3256464..4a229b20224 100644 --- a/src/mame/drivers/bankp.c +++ b/src/mame/drivers/bankp.c @@ -284,14 +284,12 @@ static const sn76496_config psg_intf = void bankp_state::machine_reset() { - m_scroll_x = 0; m_priority = 0; } INTERRUPT_GEN_MEMBER(bankp_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index b2fea834e83..21554ce2776 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -174,7 +174,6 @@ ADDRESS_MAP_END READ8_MEMBER(baraduke_state::soundkludge_r) { - return ((m_counter++) >> 4) & 0xff; } diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c index a72e48dd3ee..dc558d4a9c3 100644 --- a/src/mame/drivers/battlane.c +++ b/src/mame/drivers/battlane.c @@ -22,7 +22,6 @@ WRITE8_MEMBER(battlane_state::battlane_cpu_command_w) { - m_cpu_control = data; /* @@ -80,7 +79,6 @@ WRITE8_MEMBER(battlane_state::battlane_cpu_command_w) INTERRUPT_GEN_MEMBER(battlane_state::battlane_cpu1_interrupt) { - /* See note in battlane_cpu_command_w */ if (~m_cpu_control & 0x08) { @@ -268,7 +266,6 @@ static const ym3526_interface ym3526_config = void battlane_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); @@ -278,7 +275,6 @@ void battlane_state::machine_start() void battlane_state::machine_reset() { - m_video_ctrl = 0; m_cpu_control = 0; } diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index fe2c7afe917..8a24b3c1d3f 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -226,7 +226,6 @@ static const ay8910_interface battlex_ay8910_interface = void battlex_state::machine_start() { - /* register for save states */ save_item(NAME(m_scroll_lsb)); save_item(NAME(m_scroll_msb)); @@ -236,7 +235,6 @@ void battlex_state::machine_start() void battlex_state::machine_reset() { - m_scroll_lsb = 0; m_scroll_msb = 0; m_starfield_enabled = 0; diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index c8df76b4795..2e608f34fdf 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -236,7 +236,6 @@ void battlnts_state::machine_start() void battlnts_state::machine_reset() { - m_layer_colorbase[0] = 0; m_layer_colorbase[1] = 0; m_spritebank = 0; diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index f31a300ea99..c1444e526a3 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -239,13 +239,11 @@ Country : READ16_MEMBER(bbusters_state::sound_status_r) { - return m_sound_status; } WRITE8_MEMBER(bbusters_state::sound_status_w) { - m_sound_status = data; } @@ -261,7 +259,6 @@ WRITE16_MEMBER(bbusters_state::sound_cpu_w) /* Eprom is byte wide, top half of word _must_ be 0xff */ READ16_MEMBER(bbusters_state::eprom_r) { - return (m_eprom_data[offset]&0xff) | 0xff00; } @@ -278,7 +275,6 @@ READ16_MEMBER(bbusters_state::control_3_r) WRITE16_MEMBER(bbusters_state::gun_select_w) { - logerror("%08x: gun r\n",space.device().safe_pc()); space.device().execute().set_input_line(2, HOLD_LINE); diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index f9ce7ea8a72..56961879c91 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -505,7 +505,6 @@ READ32_MEMBER( beathead_state::movie_speedup_r ) DRIVER_INIT_MEMBER(beathead_state,beathead) { - /* initialize the common systems */ atarijsa_init(machine(), "IN2", 0x0040); diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 77ddf0908a9..e04f77579b6 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -79,7 +79,6 @@ INPUT_PORTS_END void beezer_state::machine_start() { - m_maincpu = machine().device("maincpu"); } diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index f1cb6848341..82d0a084cee 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -549,7 +549,6 @@ static void RunBlit(address_space &space) } if( blitter.source.addr0 < blitter.step ) { - blitter.source.addr0 -=blitter.step ; blitter.source.addr0 +=blitter.source.addr1; diff --git a/src/mame/drivers/bfm_ad5sw.c b/src/mame/drivers/bfm_ad5sw.c index 5ab40e05e0c..15ad15e3e49 100644 --- a/src/mame/drivers/bfm_ad5sw.c +++ b/src/mame/drivers/bfm_ad5sw.c @@ -19,8 +19,7 @@ MACHINE_CONFIG_EXTERN( bfm_ad5 ); INPUT_PORTS_EXTERN( bfm_ad5 ); #define ad5crcpt_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5crcpt ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211599.bin", 0x0000, 0x1000000, CRC(0fa50547) SHA1(95b1890851e82ad827b739a8d359309529c0b5b7) ) @@ -39,8 +38,7 @@ ROM_END ROM_LOAD( "95890494.bin", 0x0000, 0x5000, CRC(84513cb2) SHA1(8d45cff91953263c4aa8e7cb4a437c27371bd8a1) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008987.bin", 0x0000, 0x0fe101, CRC(798c9559) SHA1(4afb21a78be73353741b5903099d3c48e44fcebb) ) /* ITSBULLSEYE SOUNDS */ \ - ROM_LOAD( "95008994.bin", 0x0000, 0x0fb8bc, CRC(2c7a4446) SHA1(b1e327747043c795e179643e8bd485f51f838021) ) /* BULLSEYEPFP SOUNDS */ \ - + ROM_LOAD( "95008994.bin", 0x0000, 0x0fb8bc, CRC(2c7a4446) SHA1(b1e327747043c795e179643e8bd485f51f838021) ) /* BULLSEYEPFP SOUNDS */ ROM_START( ad5bpfpm ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211339.bin", 0x0000, 0xa91458, CRC(e653ce23) SHA1(8cf3ad73974d97f3ed1d715c607e7888cf0992b1) ) @@ -74,8 +72,7 @@ ROM_END #define ad5cmons_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008434.bin", 0x0000, 0x100000, CRC(2d35e8ab) SHA1(a2e39beb891416bc5fae3d17125d146fe3ec3a12) ) /* PR1601 CRAZY MONEY SOUNDS11 */ \ - + ROM_LOAD( "95008434.bin", 0x0000, 0x100000, CRC(2d35e8ab) SHA1(a2e39beb891416bc5fae3d17125d146fe3ec3a12) ) /* PR1601 CRAZY MONEY SOUNDS11 */ ROM_START( ad5cmons ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211009.bin", 0x0000, 0x8ba10c, CRC(3883c4ea) SHA1(ac5876d252ef9900bbd86a43c73b2e3ba08f4e04) ) @@ -92,8 +89,7 @@ ROM_END #define ad5dndpl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009108.bin", 0x000000, 0x100000, CRC(113b7f60) SHA1(62a8ca9dd9fc663971037936ddbd634273c3055f) ) /* PR3314 DOND PLATINUM SOUNDS11 */ \ - ROM_LOAD( "95009109.bin", 0x100000, 0x100000, CRC(edf5a701) SHA1(3514b4a46dd921446c74c5b87a3a4b272e7b0fdb) ) \ - + ROM_LOAD( "95009109.bin", 0x100000, 0x100000, CRC(edf5a701) SHA1(3514b4a46dd921446c74c5b87a3a4b272e7b0fdb) ) ROM_START( ad5dndpl ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -123,8 +119,7 @@ ROM_END #define ad5hir_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009143.bin", 0x000000, 0x100000, CRC(e8bab23e) SHA1(dc8e5173fcb301ee4abedc76d42ebf4d58d07af1) ) /* PR3401 HI ROLLER SOUNDS11 */ \ - ROM_LOAD( "95009144.bin", 0x100000, 0x100000, CRC(73b81f14) SHA1(0a8d7949a290dce2b9cd6c4ec42a64ac8f18836d) ) \ - + ROM_LOAD( "95009144.bin", 0x100000, 0x100000, CRC(73b81f14) SHA1(0a8d7949a290dce2b9cd6c4ec42a64ac8f18836d) ) ROM_START( ad5hir ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -152,8 +147,7 @@ ROM_END #define ad5hircl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* game header wants SOUNDS12, check */\ - ROM_LOAD( "95008555.bin", 0x0000, 0x100000, CRC(51d07478) SHA1(1e678b61d594d4884601e92485ab22206dc425d4) ) /* PR1755 HI ROLLER SOUNDS11 */ \ - + ROM_LOAD( "95008555.bin", 0x0000, 0x100000, CRC(51d07478) SHA1(1e678b61d594d4884601e92485ab22206dc425d4) ) /* PR1755 HI ROLLER SOUNDS11 */ ROM_START( ad5hircl ) @@ -178,8 +172,7 @@ ROM_END #define ad5dnd_others \ ROM_REGION( 0x1000000, "ymz", ROMREGION_ERASE00 ) \ PR1945_CASINO_D_O_N_D_SOUNDS11 \ - PR1945_CASINO_DOND_R_SOUNDS12 \ - + PR1945_CASINO_DOND_R_SOUNDS12 ROM_START( ad5dnd ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -309,8 +302,7 @@ ROM_END #define ad5dndcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008727.bin", 0x0000, 0x100000, CRC(b4c343a0) SHA1(d67faa1bcac1547cdc68874a411624f5c025cdbd) ) /* R3078 TWIN */ \ - + ROM_LOAD( "95008727.bin", 0x0000, 0x100000, CRC(b4c343a0) SHA1(d67faa1bcac1547cdc68874a411624f5c025cdbd) ) /* R3078 TWIN */ ROM_START( ad5dndcl ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -364,8 +356,7 @@ ROM_END #define ad5dnddd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3402 DOUBLE DELUXE SOUNDS11 */ \ ROM_LOAD( "95009137.bin", 0x000000, 0x100000, CRC(1d1fe8df) SHA1(d3aebec1a956d563de96069b587ebd2d40123497) ) \ - ROM_LOAD( "95009138.bin", 0x100000, 0x100000, CRC(c16971e0) SHA1(45df220ffe61db6a5319f495ff36efa793d428a4) ) \ - + ROM_LOAD( "95009138.bin", 0x100000, 0x100000, CRC(c16971e0) SHA1(45df220ffe61db6a5319f495ff36efa793d428a4) ) ROM_START( ad5dnddd ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -383,8 +374,7 @@ ROM_END #define ad5dndpg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3526 DOND PERFG CLUB SOUNDS12 */ \ ROM_LOAD( "95009043.bin", 0x000000, 0x100000, CRC(8f24fedd) SHA1(4168f057c91968ccdc1d87966cd191a53d4969f5) ) \ - ROM_LOAD( "95009044.bin", 0x100000, 0x100000, CRC(21c8e0b5) SHA1(700c9dad452f86e013329db0182c8494af166378) ) \ - + ROM_LOAD( "95009044.bin", 0x100000, 0x100000, CRC(21c8e0b5) SHA1(700c9dad452f86e013329db0182c8494af166378) ) ROM_START( ad5dndpg ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211613.bin", 0x0000, 0x1000000, CRC(98495946) SHA1(4c3d5d0731dfdaad37cee317a5d862ff46665ebd) ) @@ -687,8 +677,7 @@ ROM_END #define ad5gldmn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008808.bin", 0x0000, 0x100000, CRC(0982179a) SHA1(ea962cc30d191c8e581bb1672a201d6f56a29b22) ) /* PR3217 GOLD MINE SOUNDS11 */ \ - ROM_LOAD( "95008809.bin", 0x0000, 0x100000, CRC(fcd6f506) SHA1(3d2b8768d9b168f06c01568ed248ee9f687a56b5) ) \ - + ROM_LOAD( "95008809.bin", 0x0000, 0x100000, CRC(fcd6f506) SHA1(3d2b8768d9b168f06c01568ed248ee9f687a56b5) ) ROM_START( ad5gldmn ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211462.bin", 0x0000, 0x1000000, CRC(811a32ab) SHA1(d37238fd6b4a5d13594cc80da48a6b45f44e7c4b) ) @@ -849,8 +838,7 @@ ROM_END #define ad5pp_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5pp ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211267.bin", 0x0000, 0xb071f3, CRC(51d49618) SHA1(0053ecf1b2d2ad20444f05daf80138d4c8c0c885) ) @@ -923,8 +911,7 @@ ROM_END #define ad5rsclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1826 RANDOM SPINNER SOUNDS11 */ \ - ROM_LOAD( "95008546.bin", 0x0000, 0x100000, CRC(3d97132f) SHA1(b611617b21b6b7afafa300604ec09e0a84bde8ba) ) \ - + ROM_LOAD( "95008546.bin", 0x0000, 0x100000, CRC(3d97132f) SHA1(b611617b21b6b7afafa300604ec09e0a84bde8ba) ) ROM_START( ad5rsclb ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -993,8 +980,7 @@ ROM_END #define ad5monop_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5monop ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211239.bin", 0x0000, 0x6a78e0, CRC(024795a6) SHA1(aba82d4a61efaa4c48750fc62e6a369aa2a8df9d) ) @@ -1070,8 +1056,7 @@ ROM_END #define ad5rspin_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1826 RANDOM SPINNER SOUNDS12 */\ - ROM_LOAD( "95008549.bin", 0x0000, 0x100000, CRC(dd7399cf) SHA1(1d4f475dde67048c6a425623a696a06e49231308) ) \ - + ROM_LOAD( "95008549.bin", 0x0000, 0x100000, CRC(dd7399cf) SHA1(1d4f475dde67048c6a425623a696a06e49231308) ) ROM_START( ad5rspin ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211388.bin", 0x0000, 0x1000000, CRC(56fca244) SHA1(56890695c230a62b50c9dc2ecb4e8d6c123ed8dc) ) @@ -1115,8 +1100,7 @@ ROM_END #define ad5rsnw_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5rsnw ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211205.bin", 0x0000, 0x6a39e0, CRC(bb426781) SHA1(b1e21abd85589a7ca0e77b123f18b61c16e47971) ) @@ -1186,8 +1170,7 @@ ROM_END #define ad5mr2r_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5mr2r ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1247,8 +1230,7 @@ ROM_END // might be wrong, our sets have SOUNDS12 in the header #define ad5rwclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1756 RANDOM WINNER SOUNDS11 */ \ - ROM_LOAD( "95008569.bin", 0x0000, 0x080000, CRC(1a966dd9) SHA1(1314b7ee5b6e22d504e12e9eba3b2b88f6f5d64c) ) \ - + ROM_LOAD( "95008569.bin", 0x0000, 0x080000, CRC(1a966dd9) SHA1(1314b7ee5b6e22d504e12e9eba3b2b88f6f5d64c) ) ROM_START( ad5rwclb ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1290,8 +1272,7 @@ ROM_END #define ad5gldwn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008945.bin", 0x0000, 0x0ff168, CRC(a467d802) SHA1(4120b3a21598f1c3642f0ce05a3c35c15bf6d811) ) /* GOLDEN WINNER SOUNDS */ \ - + ROM_LOAD( "95008945.bin", 0x0000, 0x0ff168, CRC(a467d802) SHA1(4120b3a21598f1c3642f0ce05a3c35c15bf6d811) ) /* GOLDEN WINNER SOUNDS */ ROM_START( ad5gldwn ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211347.bin", 0x0000, 0x1000000, CRC(9db14fec) SHA1(ade5ae1764eb1889624b11ccc5a1faea093fc3ef) ) @@ -1308,8 +1289,7 @@ ROM_END #define ad5rapid_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1712 RAPID PAY SOUNDS11 */ \ - ROM_LOAD( "95008570.bin", 0x0000, 0x080000, CRC(edd2bff6) SHA1(213b16eb091f96633dec5ec8df5084062dd68ba0) ) \ - + ROM_LOAD( "95008570.bin", 0x0000, 0x080000, CRC(edd2bff6) SHA1(213b16eb091f96633dec5ec8df5084062dd68ba0) ) ROM_START( ad5rapid ) @@ -1325,8 +1305,7 @@ ROM_START( ad5rapida ) ROM_END #define ad5jckmo_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5jckmo ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1370,8 +1349,7 @@ ROM_END ROM_LOAD( "95890416.bin", 0x0000, 0x5000, CRC(2becd79f) SHA1(e87c668c651adf55c234aaa2f9d8a0ed66792356) ) \ ROM_LOAD( "95890417.bin", 0x0000, 0x5000, CRC(373a2723) SHA1(61795c8e22e97903f0a4388b3aff6db3ca3af981) ) \ ROM_LOAD( "95890418.bin", 0x0000, 0x5000, CRC(f46005b3) SHA1(58b6369c0a9414f8ccf16ccbe05adfa47c188e1b) ) \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) ROM_START( ad5ppbtb ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1404,8 +1382,7 @@ ROM_END #define ad5vlv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3507 VIVA LAS VEGAS SOUNDS11 */ \ ROM_LOAD( "95009055.bin", 0x000000, 0x100000, CRC(6fa39bdb) SHA1(a78b02d4b7d38da529db590b32d5d22ed7b46870) ) \ - ROM_LOAD( "95009056.bin", 0x100000, 0x100000, CRC(d530f185) SHA1(a3a8ac81ce7d9a8e8e005cfaab3f9ae82804cbd9) ) \ - + ROM_LOAD( "95009056.bin", 0x100000, 0x100000, CRC(d530f185) SHA1(a3a8ac81ce7d9a8e8e005cfaab3f9ae82804cbd9) ) ROM_START( ad5vlv ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211605.bin", 0x0000, 0x1000000, CRC(b8fab0a2) SHA1(68ad9810549d9d01934182cb578e17af05ffa3c2) ) @@ -1453,8 +1430,7 @@ ROM_END ROM_LOAD( "95890491.bin", 0x0000, 0x5000, CRC(50cd0335) SHA1(db2bcf0e2be67eb8c657ab3536a5056bb66649b8) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008986.bin", 0x0000, 0x0c18ab, CRC(f69f04b5) SHA1(b1095592120c3f4f3bac8963362611def14f7233) ) /* REEL ROULETTE SOUNDS */ \ - ROM_LOAD( "95008996.bin", 0x0000, 0x0ce354, CRC(a462a168) SHA1(6598605123407bb2206928e82a903f9a41ba524c) ) /* REEL ROULETTE SOUNDS (different) */ \ - + ROM_LOAD( "95008996.bin", 0x0000, 0x0ce354, CRC(a462a168) SHA1(6598605123407bb2206928e82a903f9a41ba524c) ) /* REEL ROULETTE SOUNDS (different) */ ROM_START( ad5rroul ) @@ -1484,8 +1460,7 @@ ROM_END #define ad5mcob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* MMONTE SOUNDS */ \ - ROM_LOAD( "95009011.bin", 0x0000, 0x0ff73b, CRC(9f6e0643) SHA1(d0f76b8a45aef2dd42939f1fca7b010637aaabe1) ) \ - + ROM_LOAD( "95009011.bin", 0x0000, 0x0ff73b, CRC(9f6e0643) SHA1(d0f76b8a45aef2dd42939f1fca7b010637aaabe1) ) ROM_START( ad5mcob ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1516,8 +1491,7 @@ ROM_END #define ad5pking_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1625 POKER KING SOUNDS11 */ \ - ROM_LOAD( "95008495.bin", 0x0000, 0x080000, CRC(dac8c4a8) SHA1(0192e1d2b9558a789753a5e58d97503cc09dfa27) ) \ - + ROM_LOAD( "95008495.bin", 0x0000, 0x080000, CRC(dac8c4a8) SHA1(0192e1d2b9558a789753a5e58d97503cc09dfa27) ) ROM_START( ad5pking ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1535,8 +1509,7 @@ ROM_END #define ad5vpa_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3073 POKER ACE SOUNDS11 */ \ - ROM_LOAD( "95008722.bin", 0x0000, 0x080000, CRC(0643d71d) SHA1(027e096a82d5c13a98ef773548c8f5e16257e863) ) \ - + ROM_LOAD( "95008722.bin", 0x0000, 0x080000, CRC(0643d71d) SHA1(027e096a82d5c13a98ef773548c8f5e16257e863) ) ROM_START( ad5vpa ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1568,8 +1541,7 @@ ROM_END #define ad5tornc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1627 TORNADO CLUB SOUNDS11 */ \ - ROM_LOAD( "95008564.bin", 0x0000, 0x100000, CRC(55d0d855) SHA1(343cfe935c34c8f95a638eccb1397238fa7698e4) ) \ - + ROM_LOAD( "95008564.bin", 0x0000, 0x100000, CRC(55d0d855) SHA1(343cfe935c34c8f95a638eccb1397238fa7698e4) ) ROM_START( ad5tornc ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1624,8 +1596,7 @@ ROM_END ROM_LOAD( "95890391.bin", 0x0000, 0x5000, CRC(e5a52b29) SHA1(ac408585a14060b81651e14f0cae6a77edee1985) ) \ ROM_LOAD( "95890392.bin", 0x0000, 0x5000, CRC(26ff09b9) SHA1(236d0808126d517e4a1c86bebad3c877252de4d8) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* REEL CASH SOUNDS */ \ - ROM_LOAD( "95008946.bin", 0x0000, 0x0f7b10, CRC(9a70fd7b) SHA1(692908750bea92af5f06d7151b15aec294aaf686) ) \ - + ROM_LOAD( "95008946.bin", 0x0000, 0x0f7b10, CRC(9a70fd7b) SHA1(692908750bea92af5f06d7151b15aec294aaf686) ) ROM_START( ad5rcash ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) @@ -1642,8 +1613,7 @@ ROM_END #define ad5mww_others \ - ROM_REGION( 0x400000, "pics", ROMREGION_ERASEFF ) \ - + ROM_REGION( 0x400000, "pics", ROMREGION_ERASEFF ) ROM_START( ad5mww ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211269.bin", 0x0000, 0x7a0866, CRC(0fae0667) SHA1(5356149061413c71b662371aa08f616a28ddbafb) ) @@ -1664,8 +1634,7 @@ ROM_END ROM_LOAD( "95890305.bin", 0x0000, 0x5000, CRC(0281445e) SHA1(b93460a79c906fb0f33bd898054f4c7aaea8fe12) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008933.bin", 0x0000, 0x03fc55, CRC(5f01c246) SHA1(b5e2b79f780d48935b8eb158b3292ab26340ba7f) ) /* EDWNS16 SOUNDS */ \ - ROM_LOAD( "95008959.bin", 0x0000, 0x07daf0, CRC(61e7fb11) SHA1(039efe731866314770800224e2b8536822252193) ) /* EDMULTI SOUNDS */ \ - + ROM_LOAD( "95008959.bin", 0x0000, 0x07daf0, CRC(61e7fb11) SHA1(039efe731866314770800224e2b8536822252193) ) /* EDMULTI SOUNDS */ ROM_START( ad5eyes ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) ROM_LOAD( "39211248.bin", 0x0000, 0x4d88b4, CRC(a2b799c9) SHA1(9088de779c31d33d9f1eb83e46ec28c30181a0fc) ) @@ -1720,8 +1689,7 @@ ROM_END #define ad5rsrm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3302 RONNIE ROCKET SOUNDS11 */ \ ROM_LOAD( "95008828.bin", 0x0000, 0x100000, CRC(35a1b9aa) SHA1(a6d03645994b36a9e506b950f752a6c1c899e110) ) \ - ROM_LOAD( "95008829.bin", 0x0000, 0x100000, CRC(3745f572) SHA1(ffc9e67ed92552e7b2790433ea4838df10712f4d) ) \ - + ROM_LOAD( "95008829.bin", 0x0000, 0x100000, CRC(3745f572) SHA1(ffc9e67ed92552e7b2790433ea4838df10712f4d) ) ROM_START( ad5rsrm ) ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASEFF ) diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index 1d04a45b847..fc40a734520 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -220,7 +220,6 @@ WRITE8_MEMBER(bfm_sc1_state::bankswitch_w) INTERRUPT_GEN_MEMBER(bfm_sc1_state::timer_irq) { - if ( m_is_timer_enabled ) { m_irq_status = 0x01 |0x02; //0xff; @@ -1181,7 +1180,6 @@ int sc1_find_project_string(running_machine &machine ) for (int search=0;search<7;search++) { - int strlength = strlen(title_string[search]); for (int i=0;ireset(); m_vfd1->reset(); @@ -4049,56 +4044,44 @@ DRIVER_INIT_MEMBER(bfm_sc2_state,luvjub) //these differ by only two bytes, and with no obvious labelling, this has been a bit of a guess #define sc2_gslam_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "grandslamsnd.bin", 0x0000, 0x080000, CRC(e4af3787) SHA1(9aa40f7c4c4db3618b553505b02663c1d5f297c3) )\ - + ROM_LOAD( "grandslamsnd.bin", 0x0000, 0x080000, CRC(e4af3787) SHA1(9aa40f7c4c4db3618b553505b02663c1d5f297c3) ) #define sc2_gslam_sound_alt \ ROM_REGION( 0x80000, "upd", 0 )\ ROM_LOAD( "gslamsndb.bin", 0x0000, 0x080000, CRC(c9dfb6f5) SHA1(6e529c210b26e7ce164cebbff8ec314c6fa8f7bf) ) #define sc2_catms_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "catandmousesnd.bin", 0x0000, 0x080000, CRC(00d3b224) SHA1(5ae35a7bfa65e8343564e6f6a219bc674710fadc) )\ - + ROM_LOAD( "catandmousesnd.bin", 0x0000, 0x080000, CRC(00d3b224) SHA1(5ae35a7bfa65e8343564e6f6a219bc674710fadc) ) #define sc2_gsclb_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "95004024.bin", 0x0000, 0x080000, CRC(e1a0323f) SHA1(a015d99c882962651869d8ec71a6c17a1cba687f) )\ - + ROM_LOAD( "95004024.bin", 0x0000, 0x080000, CRC(e1a0323f) SHA1(a015d99c882962651869d8ec71a6c17a1cba687f) ) #define sc2_cpg_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "pharaohsgoldsnd.bin", 0x0000, 0x080000, CRC(7d67d53e) SHA1(159e0e9af1cfd6adc141daaa0f75d38af55218c3) )\ - + ROM_LOAD( "pharaohsgoldsnd.bin", 0x0000, 0x080000, CRC(7d67d53e) SHA1(159e0e9af1cfd6adc141daaa0f75d38af55218c3) ) #define sc2_suprz_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "surprisesurprizesnd.bin", 0x0000, 0x01fedb, CRC(c0981343) SHA1(71278c3446cf204a31415dd2ed8f1de7f7a16645) )\ - + ROM_LOAD( "surprisesurprizesnd.bin", 0x0000, 0x01fedb, CRC(c0981343) SHA1(71278c3446cf204a31415dd2ed8f1de7f7a16645) ) #define sc2_motd_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "modsndf.bin", 0x0000, 0x080000, CRC(088471f5) SHA1(49fb22daf04450186e9a83aee3312bb85ccf6842) )\ - + ROM_LOAD( "modsndf.bin", 0x0000, 0x080000, CRC(088471f5) SHA1(49fb22daf04450186e9a83aee3312bb85ccf6842) ) #define sc2_easy_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "easy-money_snd.bin", 0x0000, 0x080000, CRC(56d224c5) SHA1(43b81a1a9a7d30ef7bfb2bbc61e3106faa927778) )\ - + ROM_LOAD( "easy-money_snd.bin", 0x0000, 0x080000, CRC(56d224c5) SHA1(43b81a1a9a7d30ef7bfb2bbc61e3106faa927778) ) #define sc2_luvv_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD("snd.bin", 0x00000, 0x80000, CRC(19efac32) SHA1(26f901fc11f052a4d3cff67f8f61dcdd04f3dc22))\ - + ROM_LOAD("snd.bin", 0x00000, 0x80000, CRC(19efac32) SHA1(26f901fc11f052a4d3cff67f8f61dcdd04f3dc22)) #define sc2_ofool_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "onlyfools_snd.bin", 0x0000, 0x080000, CRC(c073bb0c) SHA1(54b3df8c8d814af1fbb662834739a32a693fc7ee) )\ - + ROM_LOAD( "onlyfools_snd.bin", 0x0000, 0x080000, CRC(c073bb0c) SHA1(54b3df8c8d814af1fbb662834739a32a693fc7ee) ) #define sc2_ofool_matrix\ ROM_REGION( 0x20000, "matrix", 0 )\ - ROM_LOAD( "onlyfoolsnhorsesdotmatrix.bin", 0x0000, 0x010000, CRC(521611f7) SHA1(08cdc9f7434657151d90fcfd26ce4668477c2998) )\ - + ROM_LOAD( "onlyfoolsnhorsesdotmatrix.bin", 0x0000, 0x010000, CRC(521611f7) SHA1(08cdc9f7434657151d90fcfd26ce4668477c2998) ) #define sc2_town_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "attsnd.bin", 0x0000, 0x040000, CRC(9b5327c8) SHA1(b9e5aeb3e9a6ece796e9164e425829d97c5f3a82) )\ - + ROM_LOAD( "attsnd.bin", 0x0000, 0x040000, CRC(9b5327c8) SHA1(b9e5aeb3e9a6ece796e9164e425829d97c5f3a82) ) #define sc2_cpe_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD("cpe1_snd.bin", 0x00000, 0x80000, CRC(ca8a56bb) SHA1(36434dae4369f004fa5b4dd00eb6b1a965be60f9))\ - + ROM_LOAD("cpe1_snd.bin", 0x00000, 0x80000, CRC(ca8a56bb) SHA1(36434dae4369f004fa5b4dd00eb6b1a965be60f9)) #define sc2_cpe_sound_alt1 \ ROM_REGION( 0x80000, "upd", 0 )\ ROM_LOAD( "pen1c_snd.bin", 0x0000, 0x080000, CRC(57f3d152) SHA1(f5ccd11042d54396352df149e85c4aa271342d49) ) @@ -4109,67 +4092,52 @@ DRIVER_INIT_MEMBER(bfm_sc2_state,luvjub) #define sc2_cops_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "copssnd.bin", 0x0000, 0x040000, CRC(4bebbc37) SHA1(10eb8542a9de35efc0f75b532c94e1b3e0d21e47) )\ - + ROM_LOAD( "copssnd.bin", 0x0000, 0x040000, CRC(4bebbc37) SHA1(10eb8542a9de35efc0f75b532c94e1b3e0d21e47) ) #define sc2_copcl_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "club-cops-and-robbers-sound.bin", 0x0000, 0x040000, CRC(b5ba009d) SHA1(806b1d739fbf00b7e55ed0b8056440e47bfba87a) )\ - + ROM_LOAD( "club-cops-and-robbers-sound.bin", 0x0000, 0x040000, CRC(b5ba009d) SHA1(806b1d739fbf00b7e55ed0b8056440e47bfba87a) ) //missing a sound rom - is it the same as the non-deluxe version? #define sc2_copdc_sound\ - ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - + ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) //can't tell any difference between these audibly, could one have the 'ruder' samples dummied out in the code? //For now, I'm putting the first ROM with Bellfruit sets, and the second with Mazooma ones #define sc2_dels_sound\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "dmsnd.bin", 0x0000, 0x080000, CRC(0a68550b) SHA1(82a4a8d2a754a59da553b3568df870107e33f978) )\ - + ROM_LOAD( "dmsnd.bin", 0x0000, 0x080000, CRC(0a68550b) SHA1(82a4a8d2a754a59da553b3568df870107e33f978) ) #define sc2_dels_sound_alt\ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "delssnd.bin", 0x0000, 0x080000, CRC(cb298f06) SHA1(fdc857101ad15d58aeb7ffc4a489c3de9373fc80) )\ - + ROM_LOAD( "delssnd.bin", 0x0000, 0x080000, CRC(cb298f06) SHA1(fdc857101ad15d58aeb7ffc4a489c3de9373fc80) ) #define sc2_wembl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "wembley_sound.bin", 0x0000, 0x080000, CRC(5ce2fc50) SHA1(26533428582058f0cd618e3657f967bc64e551fc) )\ - + ROM_LOAD( "wembley_sound.bin", 0x0000, 0x080000, CRC(5ce2fc50) SHA1(26533428582058f0cd618e3657f967bc64e551fc) ) #define sc2_prem_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "premclubsnd.bin", 0x0000, 0x080000, CRC(b20c74f1) SHA1(b43a79f8f59387ef777fffd07a39b7333811d464) )\ - + ROM_LOAD( "premclubsnd.bin", 0x0000, 0x080000, CRC(b20c74f1) SHA1(b43a79f8f59387ef777fffd07a39b7333811d464) ) #define sc2_downt_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "dtownsnd.dat", 0x0000, 0x080000, CRC(a41b109b) SHA1(22470d731741521321d004fc56ff8217e506ef69) )\ - + ROM_LOAD( "dtownsnd.dat", 0x0000, 0x080000, CRC(a41b109b) SHA1(22470d731741521321d004fc56ff8217e506ef69) ) #define sc2_goldr_sound\ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "gold_reserve_snd", 0x0000, 0x080000, CRC(e8e7ab7b) SHA1(ce43e8ffccc0421548c6683a72267b7e5f805db4) )\ - + ROM_LOAD( "gold_reserve_snd", 0x0000, 0x080000, CRC(e8e7ab7b) SHA1(ce43e8ffccc0421548c6683a72267b7e5f805db4) ) #define sc2_hifly_sound\ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "hiflyersound.bin", 0x0000, 0x080000, CRC(acdef7dc) SHA1(c2cc219ca8f4a3e3cdcb1147ad49cd69adb3751b) )\ - + ROM_LOAD( "hiflyersound.bin", 0x0000, 0x080000, CRC(acdef7dc) SHA1(c2cc219ca8f4a3e3cdcb1147ad49cd69adb3751b) ) #define sc2_inst_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "instantjackpotssnd.bin", 0x0000, 0x080000, CRC(ba922860) SHA1(7d84c7fa72b1fb567faccf8464e0fd859c76838d) )\ - + ROM_LOAD( "instantjackpotssnd.bin", 0x0000, 0x080000, CRC(ba922860) SHA1(7d84c7fa72b1fb567faccf8464e0fd859c76838d) ) #define sc2_mam_sound\ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "mamsnd.bin", 0x0000, 0x080000, CRC(32537b18) SHA1(c26697162edde97ec999ed0459656edb85a01a50) )\ - + ROM_LOAD( "mamsnd.bin", 0x0000, 0x080000, CRC(32537b18) SHA1(c26697162edde97ec999ed0459656edb85a01a50) ) //This was also in the non-club, so may be an alt set #define sc2_mamcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "cmamsnd.bin", 0x0000, 0x080000, CRC(9a80977a) SHA1(0a6dc9465efa9e3d12894daf88a2746e74409349))\ - + ROM_LOAD( "cmamsnd.bin", 0x0000, 0x080000, CRC(9a80977a) SHA1(0a6dc9465efa9e3d12894daf88a2746e74409349)) #define sc2_showt_sound\ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "stspec", 0x0000, 0x080000, CRC(01e4a017) SHA1(f2f0cadf2334edf35db98af0dcb6d827c991f3f2) )\ - + ROM_LOAD( "stspec", 0x0000, 0x080000, CRC(01e4a017) SHA1(f2f0cadf2334edf35db98af0dcb6d827c991f3f2) ) #define sc2_sstar_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "superstarsnd.bin", 0x0000, 0x080000, CRC(9a2609b5) SHA1(d29a5029e39cd44739682954f034f2d1f2e1cebf) )\ - + ROM_LOAD( "superstarsnd.bin", 0x0000, 0x080000, CRC(9a2609b5) SHA1(d29a5029e39cd44739682954f034f2d1f2e1cebf) ) //missing #define sc2_wwcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ @@ -4178,42 +4146,35 @@ DRIVER_INIT_MEMBER(bfm_sc2_state,luvjub) //is this upd? #define sc2_dick_sound \ ROM_REGION( 0x100000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "global-spotted-dick_snd.bin", 0x0000, 0x100000, CRC(f2c66aab) SHA1(6fe94a193779c91711588365591cf42d197cb7b9) )\ - + ROM_LOAD( "global-spotted-dick_snd.bin", 0x0000, 0x100000, CRC(f2c66aab) SHA1(6fe94a193779c91711588365591cf42d197cb7b9) ) //is this upd? #define sc2_pick_sound\ ROM_REGION( 0x200000, "upd", ROMREGION_ERASE00 )\ ROM_LOAD( "pickofthebunchsnd1.bin", 0x000000, 0x100000, CRC(f717b9c7) SHA1(06c90cc9779d475100926e986c742f0acffa0dc3) )\ - ROM_LOAD( "pickofthebunchsnd2.bin", 0x100000, 0x100000, CRC(eaac3e67) SHA1(3aaed6514eeeb41c26f365789d8736908785b1c2) )\ - + ROM_LOAD( "pickofthebunchsnd2.bin", 0x100000, 0x100000, CRC(eaac3e67) SHA1(3aaed6514eeeb41c26f365789d8736908785b1c2) ) //Is this upd? #define sc2_rock_sound \ ROM_REGION( 0x200000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "hbiyr_snd.bin", 0x0000, 0x100000, CRC(96cc0d54) SHA1(612f8c7f353bb847c1a28e2b76b64916d5b2d36a) )\ - + ROM_LOAD( "hbiyr_snd.bin", 0x0000, 0x100000, CRC(96cc0d54) SHA1(612f8c7f353bb847c1a28e2b76b64916d5b2d36a) ) //this is a guess #define sc2_gcclb_sound\ ROM_REGION( 0x200000, "upd", ROMREGION_ERASE00 )\ ROM_LOAD( "gold_cas.snd", 0x0000, 0x080000, CRC(d93d39fb) SHA1(ce0c0c1430a6136ce39ffae018b009e629cbad61) )\ ROM_REGION( 0x80000, "altupd", 0 )/* looks bad */ \ - ROM_LOAD( "95004065.p1", 0x0000, 0x080000, CRC(2670726b) SHA1(0f8045c68131191fceea5728e14c901d159bfb57) ) \ - + ROM_LOAD( "95004065.p1", 0x0000, 0x080000, CRC(2670726b) SHA1(0f8045c68131191fceea5728e14c901d159bfb57) ) #define sc2_gcclb_matrix \ ROM_REGION( 0x20000, "matrix", 0 ) \ - ROM_LOAD( "95000589.p1", 0x0000, 0x010000, CRC(36400074) SHA1(611b48650e59b52f661be2730afaef2e5772607c) ) \ - + ROM_LOAD( "95000589.p1", 0x0000, 0x010000, CRC(36400074) SHA1(611b48650e59b52f661be2730afaef2e5772607c) ) // The below file also matches superstarsnd.bin #define sc2_cb7_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - ROM_LOAD( "casinobar7_bfm_snd1.bin", 0x0000, 0x080000, CRC(9a2609b5) SHA1(d29a5029e39cd44739682954f034f2d1f2e1cebf) )\ - + ROM_LOAD( "casinobar7_bfm_snd1.bin", 0x0000, 0x080000, CRC(9a2609b5) SHA1(d29a5029e39cd44739682954f034f2d1f2e1cebf) ) // The below file also matches football-club_mtx_ass.bin #define sc2_foot_matrix \ ROM_REGION( 0x20000, "matrix", 0 )\ - ROM_LOAD( "95000590.p1", 0x0000, 0x010000, CRC(6b78de57) SHA1(84638836cdbfa6e4b3b76cd38e238d12bb312c53) )\ - + ROM_LOAD( "95000590.p1", 0x0000, 0x010000, CRC(6b78de57) SHA1(84638836cdbfa6e4b3b76cd38e238d12bb312c53) ) ROM_START( sc2brkfs ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD("big-breakfast_std_ar_var_a.bin", 0x00000, 0x10000, CRC(5f016daa) SHA1(25ee10138bddf453588e3c458268533a88a51217) ) @@ -7434,8 +7395,7 @@ ROM_END /* was in an SC4 set, is it meant to link with the SC4 units? */ ROM_START( sc2cb7p ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD( "95751960.p1", 0x0000, 0x010000, CRC(9f944d0c) SHA1(feb8fe4ce0a8f5c4a034aafec0f5aae29a834e8d) ) \ - + ROM_LOAD( "95751960.p1", 0x0000, 0x010000, CRC(9f944d0c) SHA1(feb8fe4ce0a8f5c4a034aafec0f5aae29a834e8d) ) sc2_cb7_sound ROM_END @@ -8335,8 +8295,7 @@ GAME( 199?, sc2pe1g , 0 , scorpion2 , drwho , bfm_sc2_st // taken from the sc1 set, might be wrong here #define sc2_winst_sound \ ROM_REGION( 0x80000, "upd", 0 )\ - ROM_LOAD( "winningstreaksnd.bin", 0x0000, 0x080000, CRC(ba30cb97) SHA1(e7f5ca36ca993ad14b3a348868e73d7ba02be7c5) )\ - + ROM_LOAD( "winningstreaksnd.bin", 0x0000, 0x080000, CRC(ba30cb97) SHA1(e7f5ca36ca993ad14b3a348868e73d7ba02be7c5) ) ROM_START( sc2winstb ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "winning-streak_std_ac_var_8-10pnd_ass.bin", 0x00000, 0x10000, CRC(f2d16bd5) SHA1(bd6a9da9da24459b14917386c64ecbc46c8adfda) ) sc2_winst_sound ROM_END ROM_START( sc2winstbp ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "winning-streak_dat_ac_var_8-10pnd_ass.bin", 0x00000, 0x10000, CRC(351560f4) SHA1(b33c6bdeadeabbe5a4231b8bd5b134f9ea402133) ) sc2_winst_sound ROM_END ROM_START( sc2winst ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "winning-streak_std_ar_var_8pnd_ass.bin", 0x00000, 0x10000, CRC(d7a10aeb) SHA1(7346c83df7fd3de57a1b6f0ce498daabacb11491) ) sc2_winst_sound ROM_END @@ -8373,8 +8332,7 @@ GAME( 198?, sc2winstfp , sc2winst , scorpion2 , drwho , bfm_sc2_st ********************************************************************************************************************************************************************************************************************/ #define sc2_cexpl_sound \ - ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 )\ - + ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) ROM_START( sc2cexpl ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cash_explosion_dat_ac_8_10pnd_20p_a.bin", 0x0000, 0x010000, CRC(1d155799) SHA1(4e76328a4d093d1f9c64c633c3558db2dce4e219) ) sc2_cexpl_sound ROM_END ROM_START( sc2cexpla ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cash_explosion_dat_ac_var_8pnd_a.bin", 0x0000, 0x010000, CRC(4aa53121) SHA1(cf0510e224de62b837915d39c2fe3559cfe8c85f) ) sc2_cexpl_sound ROM_END ROM_START( sc2cexplb ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cash_explosion_dat_wi_ac_10pnd_20p_a.bin", 0x0000, 0x010000, CRC(889eb206) SHA1(91b23a2cc475e68470d01976b88b9ea7aa0afed9) ) sc2_cexpl_sound ROM_END diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c index e67fde5b25d..c077e4eacf4 100644 --- a/src/mame/drivers/bfm_sc4.c +++ b/src/mame/drivers/bfm_sc4.c @@ -120,7 +120,6 @@ int find_project_string(running_machine &machine, int addrxor, int mode) if (found!=0) { - int end=0; int count = 0; int blankcount = 0; @@ -23533,8 +23532,7 @@ ROM_END #define sc4milro_sound \ ROM_REGION( 0x100000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "millionaires row s16 sound (8meg)", 0x000000, 0x100000, CRC(4086df3f) SHA1(7fd358d901db48d1f8edc4b22789c73b5fb84874) ) \ - + ROM_LOAD( "millionaires row s16 sound (8meg)", 0x000000, 0x100000, CRC(4086df3f) SHA1(7fd358d901db48d1f8edc4b22789c73b5fb84874) ) ROM_START( sc4milro ) ROM_REGION( 0x400000, "maincpu", 0 ) ROM_LOAD16_BYTE( "millionaires row s16 v1-0 lo (4meg)", 0x00001, 0x080000, CRC(8436aab9) SHA1(815000121e93c9a8e4f6c6d6d12a06c4484eb50c) ) diff --git a/src/mame/drivers/bfm_sc4h.c b/src/mame/drivers/bfm_sc4h.c index 64db7a0393c..d2a35035786 100644 --- a/src/mame/drivers/bfm_sc4h.c +++ b/src/mame/drivers/bfm_sc4h.c @@ -44,7 +44,6 @@ UINT8 read_input_matrix(running_machine &machine, int row) { - static const char *const portnames[16] = { "IN-0", "IN-1", "IN-2", "IN-3", "IN-4", "IN-5", "IN-6", "IN-7", "IN-8", "IN-9", "IN-A", "IN-B" }; UINT8 value; @@ -299,7 +298,6 @@ WRITE16_MEMBER(sc4_state::sc4_mem_w) if (addr < 0x0200) { - if (mem_mask&0xff00) { logerror("lamp write mem_mask&0xff00 unhandled\n"); @@ -586,7 +584,6 @@ UINT16 bfm_sc4_68307_portb_r(address_space &space, bool dedicated, UINT16 line_m MACHINE_RESET_MEMBER(sc4_state,sc4) { - int pattern =0, i; for ( i = 0; i < m_reels; i++) diff --git a/src/mame/drivers/bfm_swp.c b/src/mame/drivers/bfm_swp.c index f0d2b69d013..070f6b3e5bc 100644 --- a/src/mame/drivers/bfm_swp.c +++ b/src/mame/drivers/bfm_swp.c @@ -105,7 +105,6 @@ TEST.TXT - suggests the content of a prototype version, which was expanded to ma static void irqhandler(device_t *device, int state) { - } static const ymz280b_interface ymz280b_config = diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 3506481f4e8..27412ebf808 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -685,7 +685,6 @@ int b85_find_project_string(running_machine &machine ) for (int search=0;search<7;search++) { - int strlength = strlen(title_string[search]); for (int i=0;iset_input_line(INPUT_LINE_NMI, PULSE_LINE); else @@ -173,7 +172,6 @@ WRITE8_MEMBER(bigevglf_state::beg13_b_set_w) READ8_MEMBER(bigevglf_state::beg_status_r) { - /* d0 = Q of 74ls74 IC13(partA) d1 = Q of 74ls74 IC13(partB) d2 = @@ -416,7 +414,6 @@ static const msm5232_interface msm5232_config = void bigevglf_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -452,7 +449,6 @@ void bigevglf_state::machine_start() void bigevglf_state::machine_reset() { - m_vidram_bank = 0; m_plane_selected = 0; m_plane_visible = 0; diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 322ab39d5d9..c031c279498 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -54,7 +54,6 @@ public: void bingoc_state::video_start() { - } UINT32 bingoc_state::screen_update_bingoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -76,7 +75,6 @@ READ16_MEMBER(bingoc_state::bingoc_rand_r) */ READ8_MEMBER(bingoc_state::sound_test_r) { - if(machine().input().code_pressed_once(KEYCODE_Z)) m_x++; diff --git a/src/mame/drivers/bingoman.c b/src/mame/drivers/bingoman.c index 48e307a3dd3..5ec97ba01e4 100644 --- a/src/mame/drivers/bingoman.c +++ b/src/mame/drivers/bingoman.c @@ -266,7 +266,6 @@ protected: void bingoman_state::video_start() { - } UINT32 bingoman_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 163658185eb..900700ba851 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -72,21 +72,18 @@ WRITE16_MEMBER(bionicc_state::hacked_controls_w) { - logerror("%06x: hacked_controls_w %04x %02x\n", space.device().safe_pc(), offset, data); COMBINE_DATA(&m_inp[offset]); } READ16_MEMBER(bionicc_state::hacked_controls_r) { - logerror("%06x: hacked_controls_r %04x %04x\n", space.device().safe_pc(), offset, m_inp[offset]); return m_inp[offset]; } WRITE16_MEMBER(bionicc_state::bionicc_mpu_trigger_w) { - data = ioport("SYSTEM")->read() >> 12; m_inp[0] = data ^ 0x0f; @@ -100,14 +97,12 @@ WRITE16_MEMBER(bionicc_state::bionicc_mpu_trigger_w) WRITE16_MEMBER(bionicc_state::hacked_soundcommand_w) { - COMBINE_DATA(&m_soundcommand); soundlatch_byte_w(space, 0, m_soundcommand & 0xff); } READ16_MEMBER(bionicc_state::hacked_soundcommand_r) { - return m_soundcommand; } @@ -330,7 +325,6 @@ GFXDECODE_END void bionicc_state::machine_start() { - save_item(NAME(m_soundcommand)); save_item(NAME(m_inp)); save_item(NAME(m_scroll)); @@ -338,7 +332,6 @@ void bionicc_state::machine_start() void bionicc_state::machine_reset() { - m_inp[0] = 0; m_inp[1] = 0; m_inp[2] = 0; diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index 75fe9b80a16..f71ff0ed1de 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -389,7 +389,6 @@ static const k054338_interface bishi_k054338_intf = void bishi_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_k056832 = machine().device("k056832"); m_k054338 = machine().device("k054338"); diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index fb656b11b3c..7e4051f26be 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -390,7 +390,6 @@ static const ay8910_interface ay8910_config = void bking_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); /* video */ @@ -415,7 +414,6 @@ void bking_state::machine_start() MACHINE_START_MEMBER(bking_state,bking3) { - bking_state::machine_start(); /* misc */ @@ -426,7 +424,6 @@ MACHINE_START_MEMBER(bking_state,bking3) void bking_state::machine_reset() { - /* video */ m_pc3259_output[0] = 0; m_pc3259_output[1] = 0; @@ -452,7 +449,6 @@ void bking_state::machine_reset() MACHINE_RESET_MEMBER(bking_state,bking3) { - machine().device("mcu")->execute().set_input_line(0, CLEAR_LINE); bking_state::machine_reset(); diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 74160b6a2e0..f25aa0e8e1f 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -159,8 +159,7 @@ public: int flipyx = (ram[tile_index*2+1] & 0xc000)>>14; \ int col = (ram[tile_index*2] & 0x00ff); \ if (rgn==1) col >>=4; \ - SET_TILE_INFO_MEMBER(1-rgn, tileno, col, TILE_FLIPYX(flipyx)); \ - + SET_TILE_INFO_MEMBER(1-rgn, tileno, col, TILE_FLIPYX(flipyx)); TILE_GET_INFO_MEMBER(blackt96_state::get_bg0_tile_info){ GET_INFO(m_spriteram0); } TILE_GET_INFO_MEMBER(blackt96_state::get_bg1_tile_info){ GET_INFO(m_spriteram1); } @@ -182,7 +181,6 @@ WRITE16_MEMBER(blackt96_state::bg_videoram7_w) { COMBINE_DATA(&m_spriteram7[offs void blackt96_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg0_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blackt96_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index f02fe3ef63b..b598e968522 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -67,7 +67,6 @@ READ8_MEMBER(bladestl_state::trackball_r) WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w) { - /* bits 0 & 1 = coin counters */ coin_counter_w(machine(), 0,data & 0x01); coin_counter_w(machine(), 1,data & 0x02); @@ -88,7 +87,6 @@ WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w) WRITE8_MEMBER(bladestl_state::bladestl_sh_irqtrigger_w) { - soundlatch_byte_w(space, offset, data); m_audiocpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); //logerror("(sound) write %02x\n", data); diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 61c625f599f..b6d48e8849f 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -277,7 +277,6 @@ static const ym2203_interface ym2203_config = void blktiger_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -297,7 +296,6 @@ void blktiger_state::machine_start() void blktiger_state::machine_reset() { - /* configure bankswitching */ membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x4000); diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 89cf64cbeb9..cbbe873ec20 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -60,14 +60,12 @@ WRITE16_MEMBER(blmbycar_state::blmbycar_okibank_w) WRITE16_MEMBER(blmbycar_state::blmbycar_pot_wheel_reset_w) { - if (ACCESSING_BITS_0_7) m_pot_wheel = ~ioport("WHEEL")->read() & 0xff; } WRITE16_MEMBER(blmbycar_state::blmbycar_pot_wheel_shift_w) { - if (ACCESSING_BITS_0_7) { if ( ((m_old_val & 0xff) == 0xff) && ((data & 0xff) == 0) ) @@ -127,7 +125,6 @@ ADDRESS_MAP_END READ16_MEMBER(blmbycar_state::waterball_unk_r) { - m_retvalue ^= 0x0008; // must toggle.. but not vblank? return m_retvalue; } @@ -337,14 +334,12 @@ GFXDECODE_END MACHINE_START_MEMBER(blmbycar_state,blmbycar) { - save_item(NAME(m_pot_wheel)); save_item(NAME(m_old_val)); } MACHINE_RESET_MEMBER(blmbycar_state,blmbycar) { - m_pot_wheel = 0; m_old_val = 0; } @@ -383,13 +378,11 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(blmbycar_state,watrball) { - save_item(NAME(m_retvalue)); } MACHINE_RESET_MEMBER(blmbycar_state,watrball) { - m_retvalue = 0; } diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 8fcfa0c14d3..65b0e7be92c 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -85,7 +85,6 @@ READ8_MEMBER(blockade_state::blockade_input_port_0_r) WRITE8_MEMBER(blockade_state::blockade_coin_latch_w) { - if (data & 0x80) { if (BLOCKADE_LOG) mame_printf_debug("Reset Coin Latch\n"); @@ -453,14 +452,12 @@ void blockade_state::palette_init() void blockade_state::machine_start() { - save_item(NAME(m_coin_latch)); save_item(NAME(m_just_been_reset)); } void blockade_state::machine_reset() { - m_coin_latch = 1; m_just_been_reset = 0; } diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 328a28644cb..6b1bc971f61 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -32,14 +32,12 @@ static KONAMI_SETLINES_CALLBACK( blockhl_banking ); INTERRUPT_GEN_MEMBER(blockhl_state::blockhl_interrupt) { - if (k052109_is_irq_enabled(m_k052109) && m_rombank == 0) /* kludge to prevent crashes */ device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } READ8_MEMBER(blockhl_state::bankedram_r) { - if (m_palette_selected) return m_generic_paletteram_8[offset]; else @@ -48,7 +46,6 @@ READ8_MEMBER(blockhl_state::bankedram_r) WRITE8_MEMBER(blockhl_state::bankedram_w) { - if (m_palette_selected) paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data); else @@ -64,7 +61,6 @@ WRITE8_MEMBER(blockhl_state::blockhl_sh_irqtrigger_w) /* special handlers to combine 052109 & 051960 */ READ8_MEMBER(blockhl_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -80,7 +76,6 @@ READ8_MEMBER(blockhl_state::k052109_051960_r) WRITE8_MEMBER(blockhl_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -202,7 +197,6 @@ void blockhl_state::machine_start() void blockhl_state::machine_reset() { - konami_configure_set_lines(machine().device("maincpu"), blockhl_banking); m_palette_selected = 0; diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index cb1a1f7a1c1..e5af89bfa40 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -76,7 +76,6 @@ WRITE16_MEMBER(blockout_state::blockout_sound_command_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, offset, data & 0xff); @@ -86,13 +85,11 @@ WRITE16_MEMBER(blockout_state::blockout_sound_command_w) WRITE16_MEMBER(blockout_state::blockout_irq6_ack_w) { - m_maincpu->set_input_line(6, CLEAR_LINE); } WRITE16_MEMBER(blockout_state::blockout_irq5_ack_w) { - m_maincpu->set_input_line(5, CLEAR_LINE); } @@ -274,7 +271,6 @@ WRITE_LINE_MEMBER(blockout_state::irq_handler) void blockout_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -283,7 +279,6 @@ void blockout_state::machine_start() void blockout_state::machine_reset() { - m_color = 0; } diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index 7b4b2e9d4cf..e6029995f3b 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -223,7 +223,6 @@ UINT32 bmcpokr_state::screen_update_bmcpokr(screen_device &screen, bitmap_ind16 void bmcpokr_state::video_start() { - } diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 15a379f63ff..60ee5b18c99 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -535,7 +535,6 @@ void bnstars_state::video_start() UINT32 bnstars_state::screen_update_bnstars_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0, cliprect); /* bg color */ @@ -559,7 +558,6 @@ UINT32 bnstars_state::screen_update_bnstars_left(screen_device &screen, bitmap_i UINT32 bnstars_state::screen_update_bnstars_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); bitmap.fill(0x8000+0, cliprect); /* bg color */ diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c index ead4bec5250..bc94c62d15b 100644 --- a/src/mame/drivers/bogeyman.c +++ b/src/mame/drivers/bogeyman.c @@ -28,7 +28,6 @@ WRITE8_MEMBER(bogeyman_state::bogeyman_8910_latch_w) WRITE8_MEMBER(bogeyman_state::bogeyman_8910_control_w) { - // bit 0 is flipscreen flip_screen_set(data & 0x01); @@ -204,21 +203,18 @@ GFXDECODE_END void bogeyman_state::machine_start() { - save_item(NAME(m_psg_latch)); save_item(NAME(m_last_write)); } void bogeyman_state::machine_reset() { - m_psg_latch = 0; m_last_write = 0; } WRITE8_MEMBER(bogeyman_state::bogeyman_colbank_w) { - if((data & 1) != (m_colbank & 1)) { m_colbank = data & 1; diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index 731771817ce..a7be0d9acad 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -130,7 +130,6 @@ READ8_MEMBER(bombjack_state::bombjack_soundlatch_r) WRITE8_MEMBER(bombjack_state::irq_mask_w) { - m_nmi_mask = data & 1; } @@ -332,7 +331,6 @@ GFXDECODE_END void bombjack_state::machine_start() { - save_item(NAME(m_latch)); save_item(NAME(m_background_image)); } @@ -340,7 +338,6 @@ void bombjack_state::machine_start() void bombjack_state::machine_reset() { - m_latch = 0; m_background_image = 0; } @@ -348,7 +345,6 @@ void bombjack_state::machine_reset() INTERRUPT_GEN_MEMBER(bombjack_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 4272e877da5..196332ac49d 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -22,14 +22,12 @@ INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) device.execute().set_input_line(0, HOLD_LINE); } READ8_MEMBER(bottom9_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -45,7 +43,6 @@ READ8_MEMBER(bottom9_state::k052109_051960_r) WRITE8_MEMBER(bottom9_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -56,7 +53,6 @@ WRITE8_MEMBER(bottom9_state::k052109_051960_w) READ8_MEMBER(bottom9_state::bottom9_bankedram1_r) { - if (m_k052109_selected) return k052109_051960_r(space, offset); else @@ -70,7 +66,6 @@ READ8_MEMBER(bottom9_state::bottom9_bankedram1_r) WRITE8_MEMBER(bottom9_state::bottom9_bankedram1_w) { - if (m_k052109_selected) k052109_051960_w(space, offset, data); else @@ -79,7 +74,6 @@ WRITE8_MEMBER(bottom9_state::bottom9_bankedram1_w) READ8_MEMBER(bottom9_state::bottom9_bankedram2_r) { - if (m_k052109_selected) return k052109_051960_r(space, offset + 0x2000); else @@ -88,7 +82,6 @@ READ8_MEMBER(bottom9_state::bottom9_bankedram2_r) WRITE8_MEMBER(bottom9_state::bottom9_bankedram2_w) { - if (m_k052109_selected) k052109_051960_w(space, offset + 0x2000, data); else @@ -114,7 +107,6 @@ WRITE8_MEMBER(bottom9_state::bankswitch_w) WRITE8_MEMBER(bottom9_state::bottom9_1f90_w) { - /* bits 0/1 = coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -339,7 +331,6 @@ void bottom9_state::machine_start() void bottom9_state::machine_reset() { - m_video_enable = 0; m_zoomreadroms = 0; m_k052109_selected = 0; diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 765da82543b..e94d12eea1b 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -427,7 +427,6 @@ GFXDECODE_END void boxer_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_pot_state)); diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index 903ab5fb9f5..0ac229d8f2e 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -67,7 +67,6 @@ WRITE8_MEMBER(brkthru_state::brkthru_1803_w) { - /* bit 0 = NMI enable */ m_nmi_mask = ~data & 1; @@ -364,7 +363,6 @@ static const ym3526_interface ym3526_config = void brkthru_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -375,7 +373,6 @@ void brkthru_state::machine_start() void brkthru_state::machine_reset() { - m_bgscroll = 0; m_bgbasecolor = 0; m_flipscreen = 0; @@ -383,7 +380,6 @@ void brkthru_state::machine_reset() INTERRUPT_GEN_MEMBER(brkthru_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index 01cd69ec9fa..9051ba3c695 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -211,7 +211,6 @@ GFXDECODE_END void bsktball_state::machine_start() { - save_item(NAME(m_nmi_on)); // save_item(NAME(m_i256v)); save_item(NAME(m_ld1)); @@ -228,7 +227,6 @@ void bsktball_state::machine_start() void bsktball_state::machine_reset() { - m_nmi_on = 0; // m_i256v = 0; m_ld1 = 0; diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index 110eb9e0eab..f5944aa3453 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -722,7 +722,6 @@ static const ym2203_interface ym2203_config = MACHINE_START_MEMBER(bublbobl_state,common) { - m_maincpu = machine().device("maincpu"); m_mcu = machine().device("mcu"); m_audiocpu = machine().device("audiocpu"); @@ -736,7 +735,6 @@ MACHINE_START_MEMBER(bublbobl_state,common) MACHINE_RESET_MEMBER(bublbobl_state,common) { - m_sound_nmi_enable = 0; m_pending_nmi = 0; m_sound_status = 0; @@ -745,7 +743,6 @@ MACHINE_RESET_MEMBER(bublbobl_state,common) MACHINE_START_MEMBER(bublbobl_state,tokio) { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_tokio_prot_count)); @@ -753,7 +750,6 @@ MACHINE_START_MEMBER(bublbobl_state,tokio) MACHINE_RESET_MEMBER(bublbobl_state,tokio) { - MACHINE_RESET_CALL_MEMBER(common); m_tokio_prot_count = 0; @@ -800,7 +796,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(bublbobl_state,bublbobl) { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_ddr1)); @@ -819,7 +814,6 @@ MACHINE_START_MEMBER(bublbobl_state,bublbobl) MACHINE_RESET_MEMBER(bublbobl_state,bublbobl) { - MACHINE_RESET_CALL_MEMBER(common); m_ddr1 = 0; @@ -881,7 +875,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(bublbobl_state,boblbobl) { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_ic43_a)); @@ -890,7 +883,6 @@ MACHINE_START_MEMBER(bublbobl_state,boblbobl) MACHINE_RESET_MEMBER(bublbobl_state,boblbobl) { - MACHINE_RESET_CALL_MEMBER(common); m_ic43_a = 0; @@ -912,7 +904,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(bublbobl_state,bub68705) { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_port_a_in)); @@ -927,7 +918,6 @@ MACHINE_START_MEMBER(bublbobl_state,bub68705) MACHINE_RESET_MEMBER(bublbobl_state,bub68705) { - MACHINE_RESET_CALL_MEMBER(common); m_port_a_in = 0; @@ -1549,7 +1539,6 @@ static void configure_banks( running_machine& machine ) DRIVER_INIT_MEMBER(bublbobl_state,bublbobl) { - configure_banks(machine()); /* we init this here, so that it does not conflict with tokio init, below */ diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 1c88e242862..67f766ab73d 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -93,7 +93,6 @@ WRITE8_MEMBER(buggychl_state::bankswitch_w) TIMER_CALLBACK_MEMBER(buggychl_state::nmi_callback) { - if (m_sound_nmi_enable) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); else @@ -376,7 +375,6 @@ void buggychl_state::machine_start() void buggychl_state::machine_reset() { - machine().device("mcu")->execute().set_input_line(0, CLEAR_LINE); m_sound_nmi_enable = 0; diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index d0ef37bcca3..31c13b8f5bd 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -34,7 +34,6 @@ Known issues: INTERRUPT_GEN_MEMBER(bwing_state::bwp3_interrupt) { - if (!m_bwp3_nmimask) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -65,7 +64,6 @@ WRITE8_MEMBER(bwing_state::bwp3_nmiack_w) READ8_MEMBER(bwing_state::bwp1_io_r) { - if (offset == 0) return(ioport("DSW0")->read()); if (offset == 1) return(ioport("DSW1")->read()); if (offset == 2) return(ioport("IN0")->read()); @@ -78,7 +76,6 @@ READ8_MEMBER(bwing_state::bwp1_io_r) WRITE8_MEMBER(bwing_state::bwp1_ctrl_w) { - switch (offset) { // MSSTB @@ -334,7 +331,6 @@ GFXDECODE_END void bwing_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); m_audiocpu = machine().device("audiocpu"); @@ -351,7 +347,6 @@ void bwing_state::machine_start() void bwing_state::machine_reset() { - m_palatch = 0; m_srbank = 0; m_mapmask = 0; @@ -578,7 +573,6 @@ static void fix_bwp3( running_machine &machine ) DRIVER_INIT_MEMBER(bwing_state,bwing) { - m_bwp123_membase[0] = memregion("maincpu")->base(); m_bwp123_membase[1] = memregion("sub")->base(); m_bwp123_membase[2] = memregion("audiocpu")->base(); diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index 374a9896fc0..928100e4256 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -62,7 +62,6 @@ MACHINE_RESET_MEMBER(cabal_state,cabalbl) WRITE16_MEMBER(cabal_state::cabalbl_sndcmd_w) { - switch (offset) { case 0x0: @@ -88,7 +87,6 @@ WRITE16_MEMBER(cabal_state::track_reset_w) READ16_MEMBER(cabal_state::track_r) { - switch (offset) { default: @@ -158,13 +156,11 @@ ADDRESS_MAP_END READ8_MEMBER(cabal_state::cabalbl_snd2_r) { - return BITSWAP8(m_sound_command2, 7,2,4,5,3,6,1,0); } READ8_MEMBER(cabal_state::cabalbl_snd1_r) { - return BITSWAP8(m_sound_command1, 7,2,4,5,3,6,1,0); } diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 58952c632f6..6e604b0cd03 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -144,7 +144,6 @@ TILE_GET_INFO_MEMBER(calorie_state::get_fg_tile_info) void calorie_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(calorie_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 16, 16); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(calorie_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -426,13 +425,11 @@ GFXDECODE_END void calorie_state::machine_start() { - save_item(NAME(m_bg_bank)); } void calorie_state::machine_reset() { - m_bg_bank = 0; } diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 05f43be2a76..424c03c800c 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -164,7 +164,6 @@ READ8_MEMBER(capbowl_state::track_1_r) WRITE8_MEMBER(capbowl_state::track_reset_w) { - /* reset the trackball counters */ m_last_trackball_val[0] = ioport("TRACKY")->read(); m_last_trackball_val[1] = ioport("TRACKX")->read(); @@ -336,7 +335,6 @@ static const ym2203_interface ym2203_config = void capbowl_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -347,7 +345,6 @@ void capbowl_state::machine_start() void capbowl_state::machine_reset() { - machine().scheduler().timer_set(machine().primary_screen->time_until_pos(32), timer_expired_delegate(FUNC(capbowl_state::capbowl_update),this), 32); m_blitter_addr = 0; diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c index 270e637c531..871637dfc0c 100644 --- a/src/mame/drivers/carjmbre.c +++ b/src/mame/drivers/carjmbre.c @@ -52,7 +52,6 @@ Notes: WRITE8_MEMBER(carjmbre_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -185,14 +184,12 @@ GFXDECODE_END void carjmbre_state::machine_reset() { - m_flipscreen = 0; m_bgcolor = 0; } INTERRUPT_GEN_MEMBER(carjmbre_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index bd006e8564b..a09e1201e4a 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -250,7 +250,6 @@ GFXDECODE_END UINT32 carrera_state::screen_update_carrera(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int x,y; int count = 0; diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index b706d712b6d..1a017761fe3 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -1792,7 +1792,6 @@ GFXDECODE_END MACHINE_START_MEMBER(cave_state,cave) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -1807,7 +1806,6 @@ MACHINE_START_MEMBER(cave_state,cave) MACHINE_RESET_MEMBER(cave_state,cave) { - memset(m_soundbuf_data, 0, 32); m_soundbuf_len = 0; @@ -2711,8 +2709,7 @@ BP962A.U77 23C16000 GFX ROM_LOAD( "bp962a.u48", 0x000000, 0x200000, CRC(ae00a1ce) SHA1(5e8c74df0ac77efb3080406870856f958be14f79) ) \ \ ROM_REGION( 0x200000, "oki2", 0 ) \ - ROM_LOAD( "bp962a.u47", 0x000000, 0x200000, CRC(6d4e9737) SHA1(81c7ecdfc2d38d0b35e26745866f6672f566f936) ) \ - + ROM_LOAD( "bp962a.u47", 0x000000, 0x200000, CRC(6d4e9737) SHA1(81c7ecdfc2d38d0b35e26745866f6672f566f936) ) /* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */ ROM_START( agallet ) ROMS_AGALLET @@ -3652,8 +3649,7 @@ U55 ROM_LOAD( "bp943a-0.u63", 0x000000, 0x200000, CRC(c1fed98a) SHA1(c276505f80a49b129862966a19db507f97153e45) ) \ \ ROM_REGION( 0x080000, "oki", 0 ) \ - ROM_LOAD( "bp943a-4.u64", 0x000000, 0x080000, CRC(3fc7f29a) SHA1(feb21b918243c0a03dfa4a80cc80b86be4f62680) ) \ - + ROM_LOAD( "bp943a-4.u64", 0x000000, 0x080000, CRC(3fc7f29a) SHA1(feb21b918243c0a03dfa4a80cc80b86be4f62680) ) /* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */ ROM_START( mazinger ) ROMS_MAZINGER @@ -4179,8 +4175,7 @@ BPSM.U77 23C16000 GFX ROM_LOAD( "bpsm.u47", 0x000000, 0x080000, CRC(0f2901b9) SHA1(ebd3e9e39e8d2bc91688dac19b99548a28b4733c) ) \ ROM_RELOAD( 0x080000, 0x080000 ) \ ROM_RELOAD( 0x100000, 0x080000 ) \ - ROM_RELOAD( 0x180000, 0x080000 ) \ - + ROM_RELOAD( 0x180000, 0x080000 ) /* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */ ROM_START( sailormn ) ROMS_SAILORMN @@ -4264,8 +4259,7 @@ ROM_END ROM_LOAD( "bpsm.u47", 0x000000, 0x080000, CRC(0f2901b9) SHA1(ebd3e9e39e8d2bc91688dac19b99548a28b4733c) ) \ ROM_RELOAD( 0x080000, 0x080000 ) \ ROM_RELOAD( 0x100000, 0x080000 ) \ - ROM_RELOAD( 0x180000, 0x080000 ) \ - + ROM_RELOAD( 0x180000, 0x080000 ) /* the regions differ only in the EEPROM, hence the macro above - all EEPROMs are Factory Defaulted */ ROM_START( sailormno ) ROMS_SAILORMNO diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 87c02f035ae..95f51d8f75f 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -60,7 +60,6 @@ void cball_state::video_start() UINT32 cball_state::screen_update_cball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* draw playfield */ m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index 81edadf3164..a78c8f4a3d9 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -29,7 +29,6 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_bankswitch_w) { - /* bits 0-4 select ROM bank */ //logerror("%04x: bankswitch %02x\n", space.device().safe_pc(), data); membank("bank1")->set_entry(data & 0x1f); @@ -43,7 +42,6 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_bankswitch_w) READ8_MEMBER(cbasebal_state::bankedram_r) { - switch (m_rambank) { case 2: @@ -61,7 +59,6 @@ READ8_MEMBER(cbasebal_state::bankedram_r) WRITE8_MEMBER(cbasebal_state::bankedram_w) { - switch (m_rambank) { case 2: @@ -241,7 +238,6 @@ GFXDECODE_END void cbasebal_state::machine_start() { - membank("bank1")->configure_entries(0, 32, memregion("maincpu")->base() + 0x10000, 0x4000); save_item(NAME(m_rambank)); @@ -257,7 +253,6 @@ void cbasebal_state::machine_start() void cbasebal_state::machine_reset() { - m_rambank = 0; m_tilebank = 0; m_spritebank = 0; diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index a9250404f19..583e82631b1 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -28,7 +28,6 @@ WRITE16_MEMBER(cbuster_state::twocrude_control_w) { - switch (offset << 1) { case 0: /* DMA flag */ @@ -80,7 +79,6 @@ WRITE16_MEMBER(cbuster_state::twocrude_control_w) READ16_MEMBER(cbuster_state::twocrude_control_r) { - switch (offset << 1) { case 0: /* Player 1 & Player 2 joysticks & fire buttons */ @@ -293,7 +291,6 @@ static const deco16ic_interface twocrude_deco16ic_tilegen2_intf = void cbuster_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); @@ -305,7 +302,6 @@ void cbuster_state::machine_start() void cbuster_state::machine_reset() { - m_prot = 0; m_pri = 0; } diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 5ccd0e8970f..dfb4e810b5d 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -154,7 +154,6 @@ INLINE void schedule_next_irq( running_machine &machine, int curscanline ) TIMER_CALLBACK_MEMBER(ccastles_state::clock_irq) { - /* assert the IRQ if not already asserted */ if (!m_irq_state) { diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c index 5161434c7b9..750b3024bb5 100644 --- a/src/mame/drivers/cchance.c +++ b/src/mame/drivers/cchance.c @@ -56,7 +56,6 @@ public: WRITE8_MEMBER(cchance_state::output_0_w) { - //---- --x- divider? coin_lockout_w(machine(), 0, ~data & 1); @@ -66,14 +65,11 @@ WRITE8_MEMBER(cchance_state::output_0_w) READ8_MEMBER(cchance_state::input_1_r) { - return (m_hop_io) | (m_bell_io) | (ioport("SP")->read() & 0xff); } WRITE8_MEMBER(cchance_state::output_1_w) { - - m_hop_io = (data & 0x40)>>4; m_bell_io = (data & 0x80)>>4; } @@ -209,7 +205,6 @@ MACHINE_START_MEMBER(cchance_state,cchance) MACHINE_RESET_MEMBER(cchance_state,cchance) { - m_screenflip = 0; m_mcu_type = -1; m_hop_io = 0; diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index e9a85fe84f6..35d9f399a47 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -253,7 +253,6 @@ WRITE8_MEMBER(cclimber_state::toprollr_rombank_w) MACHINE_RESET_MEMBER(cclimber_state,cclimber) { - /* Disable interrupts, River Patrol / Silver Land needs this otherwise returns bad RAM on POST */ m_nmi_mask = 0; @@ -263,7 +262,6 @@ MACHINE_RESET_MEMBER(cclimber_state,cclimber) WRITE8_MEMBER(cclimber_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -975,7 +973,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(cclimber_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c index 90fcae16e6e..861da32c7d0 100644 --- a/src/mame/drivers/cd32.c +++ b/src/mame/drivers/cd32.c @@ -840,8 +840,7 @@ MACHINE_CONFIG_END #define CD32_BIOS \ ROM_REGION32_BE(0x100000, "user1", 0 ) \ ROM_SYSTEM_BIOS(0, "cd32", "Kickstart v3.1 rev 40.60 with CD32 Extended-ROM" ) \ - ROM_LOAD16_WORD_BIOS(0, "391640-03.u6a", 0x000000, 0x100000, CRC(d3837ae4) SHA1(06807db3181637455f4d46582d9972afec8956d9) ) \ - + ROM_LOAD16_WORD_BIOS(0, "391640-03.u6a", 0x000000, 0x100000, CRC(d3837ae4) SHA1(06807db3181637455f4d46582d9972afec8956d9) ) ROM_START( cd32 ) CD32_BIOS diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c index 437bba60689..f4f873de536 100644 --- a/src/mame/drivers/cdi.c +++ b/src/mame/drivers/cdi.c @@ -191,7 +191,6 @@ INPUT_PORTS_END void cdi_state::machine_start() { - scc68070_register_globals(machine(), &m_scc68070_regs); } diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 8578624385d..1ae84bf5dfd 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -456,7 +456,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(centiped_state::generate_interrupt) MACHINE_START_MEMBER(centiped_state,centiped) { - save_item(NAME(m_oldpos)); save_item(NAME(m_sign)); save_item(NAME(m_dsw_select)); @@ -466,7 +465,6 @@ MACHINE_START_MEMBER(centiped_state,centiped) MACHINE_RESET_MEMBER(centiped_state,centiped) { - machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE); m_dsw_select = 0; m_control_select = 0; @@ -476,7 +474,6 @@ MACHINE_RESET_MEMBER(centiped_state,centiped) MACHINE_RESET_MEMBER(centiped_state,magworm) { - MACHINE_RESET_CALL_MEMBER(centiped); /* kludge: clear RAM so that magworm can be reset cleanly */ @@ -2177,7 +2174,6 @@ ROM_END DRIVER_INIT_MEMBER(centiped_state,bullsdrt) { - m_dsw_select = 0; } diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index c78da89b6d2..755f34e84db 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -360,7 +360,6 @@ void chaknpop_state::machine_start() void chaknpop_state::machine_reset() { - m_gfxmode = 0; m_flip_x = 0; m_flip_y = 0; diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 59b8adc974a..783f7150c4f 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -127,7 +127,6 @@ CUSTOM_INPUT_MEMBER(champbas_state::champbas_watchdog_bit2) WRITE8_MEMBER(champbas_state::irq_enable_w) { - m_irq_mask = data & 1; if (!m_irq_mask) @@ -172,7 +171,6 @@ WRITE8_MEMBER(champbas_state::champbas_mcu_switch_w) WRITE8_MEMBER(champbas_state::champbas_mcu_halt_w) { - // MCU not present/not used in champbas if (m_mcu == NULL) return; @@ -576,7 +574,6 @@ GFXDECODE_END MACHINE_START_MEMBER(champbas_state,champbas) { - m_maincpu = machine().device("maincpu"); m_mcu = machine().device(CPUTAG_MCU); @@ -598,14 +595,12 @@ MACHINE_START_MEMBER(champbas_state,exctsccr) MACHINE_RESET_MEMBER(champbas_state,champbas) { - m_palette_bank = 0; m_gfx_bank = 0; // talbot has only 1 bank } INTERRUPT_GEN_MEMBER(champbas_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 91b57bdac37..b45e1febfe1 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -448,7 +448,6 @@ MACHINE_START_MEMBER(champbwl_state,champbwl) MACHINE_RESET_MEMBER(champbwl_state,champbwl) { - m_screenflip = 0; m_mcu_type = -1; m_last_trackball_val[0] = 0; diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index 5f12cf40461..e3768dee49b 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -113,28 +113,24 @@ void chanbara_state::palette_init() WRITE8_MEMBER(chanbara_state::chanbara_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(chanbara_state::chanbara_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(chanbara_state::chanbara_videoram2_w) { - m_videoram2[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(chanbara_state::chanbara_colorram2_w) { - m_colorram2[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset); } @@ -209,7 +205,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 chanbara_state::screen_update_chanbara(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg2_tilemap->set_scrolly(0, m_scroll | (m_scrollhi << 8)); m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); @@ -389,7 +384,6 @@ static const ym2203_interface ym2203_config = void chanbara_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_scroll)); @@ -398,7 +392,6 @@ void chanbara_state::machine_start() void chanbara_state::machine_reset() { - m_scroll = 0; m_scrollhi = 0; } diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index 5db10358804..98a9230e735 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -91,7 +91,6 @@ TILE_GET_INFO_MEMBER(chance32_state::get_bg_tile_info) void chance32_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(chance32_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 35, 29); m_fg_tilemap->set_transparent_pen(0); @@ -104,7 +103,6 @@ void chance32_state::video_start() UINT32 chance32_state::screen_update_chance32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* TODO: wtf? */ m_bg_tilemap->set_scrollx(0, 352); m_bg_tilemap->set_scrolly(0, 160); @@ -441,12 +439,10 @@ GFXDECODE_END void chance32_state::machine_start() { - } void chance32_state::machine_reset() { - } diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c index 2d7acef8f68..e60eb40c6ef 100644 --- a/src/mame/drivers/changela.c +++ b/src/mame/drivers/changela.c @@ -19,7 +19,6 @@ Tomasz Slanina READ8_MEMBER(changela_state::mcu_r) { - //mame_printf_debug("Z80 MCU R = %x\n", m_mcu_out); return m_mcu_out; } @@ -414,13 +413,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(changela_state::changela_scanline) INTERRUPT_GEN_MEMBER(changela_state::chl_mcu_irq) { - generic_pulse_irq_line(m_mcu->execute(), 0, 1); } void changela_state::machine_start() { - m_mcu = machine().device("mcu"); /* video */ @@ -461,7 +458,6 @@ void changela_state::machine_start() void changela_state::machine_reset() { - /* video */ m_slopeROM_bank = 0; m_tree_en = 0; diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c index f4ac1ea45f5..b9732cc6ee4 100644 --- a/src/mame/drivers/cheekyms.c +++ b/src/mame/drivers/cheekyms.c @@ -14,7 +14,6 @@ INPUT_CHANGED_MEMBER(cheekyms_state::coin_inserted) { - /* this starts a 556 one-shot timer (and triggers a sound effect) */ if (newval) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); @@ -110,14 +109,12 @@ GFXDECODE_END void cheekyms_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_dac = machine().device("dac"); } INTERRUPT_GEN_MEMBER(cheekyms_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c index 29859eebc9a..ddf1d264b51 100644 --- a/src/mame/drivers/chihiro.c +++ b/src/mame/drivers/chihiro.c @@ -1874,8 +1874,7 @@ MACHINE_CONFIG_END ROM_LOAD16_WORD_SWAP_BIOS( 0, "ic10_g24lc64.bin", 0x200000, 0x2000, CRC(cfc5e06f) SHA1(3ababd4334d8d57abb22dd98bd2d347df39648d9) ) \ ROM_LOAD16_WORD_SWAP_BIOS( 0, "ic11_24lc024.bin", 0x202000, 0x80, CRC(8dc8374e) SHA1(cc03a0650bfac4bf6cb66e414bbef121cba53efe) ) \ ROM_LOAD16_WORD_SWAP_BIOS( 0, "pc20_g24lc64.bin", 0x202080, 0x2000, CRC(7742ab62) SHA1(82dad6e2a75bab4a4840dc6939462f1fb9b95101) ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 0, "ver1305.bin", 0x204080, 0x200000, CRC(a738ea1c) SHA1(45d94d0c39be1cb3db9fab6610a88a550adda4e9) ) \ - + ROM_LOAD16_WORD_SWAP_BIOS( 0, "ver1305.bin", 0x204080, 0x200000, CRC(a738ea1c) SHA1(45d94d0c39be1cb3db9fab6610a88a550adda4e9) ) ROM_START( chihiro ) CHIHIRO_BIOS diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index 285b3ab6b50..e2b91463e77 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -518,7 +518,6 @@ static const ym2203_interface ym2203_config = MACHINE_START_MEMBER(ddragon_state,chinagat) { - m_maincpu = machine().device("maincpu"); m_sub_cpu = machine().device("sub"); m_snd_cpu = machine().device("audiocpu"); @@ -544,7 +543,6 @@ MACHINE_START_MEMBER(ddragon_state,chinagat) MACHINE_RESET_MEMBER(ddragon_state,chinagat) { - m_scrollx_hi = 0; m_scrolly_hi = 0; m_adpcm_sound_irq = 0; diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 00503c239e2..5de81e65791 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -157,7 +157,6 @@ static const ym2203_interface ym2203_config = WRITE8_MEMBER(chinsan_state::chinsan_port00_w) { - m_port_select = data; if ( @@ -174,7 +173,6 @@ WRITE8_MEMBER(chinsan_state::chinsan_port00_w) READ8_MEMBER(chinsan_state::chinsan_input_port_0_r) { - //return 0xff; // the inputs don't seem to work, so just return ff for now switch (m_port_select) @@ -206,7 +204,6 @@ READ8_MEMBER(chinsan_state::chinsan_input_port_0_r) READ8_MEMBER(chinsan_state::chinsan_input_port_1_r) { - switch (m_port_select) { /* i doubt these are both really the same.. */ @@ -578,7 +575,6 @@ static const msm5205_interface msm5205_config = void chinsan_state::machine_start() { - membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x4000); save_item(NAME(m_adpcm_idle)); @@ -590,7 +586,6 @@ void chinsan_state::machine_start() void chinsan_state::machine_reset() { - m_adpcm_idle = 1; m_port_select = 0; m_adpcm_pos = 0; diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index d82024fec59..9b89496e0e2 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -68,7 +68,6 @@ WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w) WRITE8_MEMBER(chqflag_state::chqflag_vreg_w) { - /* bits 0 & 1 = coin counters */ coin_counter_w(machine(), 1, data & 0x01); coin_counter_w(machine(), 0, data & 0x02); @@ -330,7 +329,6 @@ void chqflag_state::machine_start() void chqflag_state::machine_reset() { - m_k051316_readroms = 0; m_last_vreg = 0; m_analog_ctrl = 0; diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 0ba82dfa9ea..daf2dbe0770 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -272,7 +272,6 @@ ADDRESS_MAP_END CUSTOM_INPUT_MEMBER(cidelsa_state::cdp1869_pcb_r) { - return m_cdp1869_pcb; } @@ -427,7 +426,6 @@ INPUT_PORTS_END TIMER_CALLBACK_MEMBER(cidelsa_state::set_cpu_mode) { - m_reset = 1; } diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index a8fc9bc382b..dde6f49d627 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -1157,8 +1157,7 @@ MACHINE_CONFIG_END ROM_LOAD("prom.d14", 0x120, 0x020, CRC(9a05afbf) SHA1(5d806a42424942ba5ef0b70a1d629315b37f931b) ) \ ROM_LOAD("prom.c14", 0x140, 0x020, CRC(07492cda) SHA1(32df9148797c23f70db47b840139c40e046dd710) ) \ ROM_LOAD("prom.j14", 0x160, 0x020, CRC(a481ca71) SHA1(ce145d61686f600cc16b77febfd5c783bf8c13b0) ) \ - ROM_LOAD("prom.e8", 0x180, 0x020, CRC(791ec9e1) SHA1(6f7fcce4aa3be9020595235568381588adaab88e) ) \ - + ROM_LOAD("prom.e8", 0x180, 0x020, CRC(791ec9e1) SHA1(6f7fcce4aa3be9020595235568381588adaab88e) ) ROM_START( spacewar ) ROM_REGION( 0x1000, "maincpu", 0 ) diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 11b90260045..072b5cbf4f7 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -263,7 +263,6 @@ GFXDECODE_END ***************************************************************************/ void circus_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_samples = machine().device("samples"); @@ -274,7 +273,6 @@ void circus_state::machine_start() void circus_state::machine_reset() { - m_clown_x = 0; m_clown_y = 0; m_clown_z = 0; diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 604fbb7ea52..81ed0974a5b 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -58,7 +58,6 @@ To enter service mode, keep 1&2 pressed on reset void circusc_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); m_dac = machine().device("dac"); @@ -102,7 +101,6 @@ WRITE8_MEMBER(circusc_state::circusc_coin_counter_w) WRITE8_MEMBER(circusc_state::circusc_sound_w) { - switch (offset & 7) { /* CS2 */ @@ -136,7 +134,6 @@ WRITE8_MEMBER(circusc_state::circusc_sound_w) WRITE8_MEMBER(circusc_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -346,7 +343,6 @@ DISCRETE_SOUND_END INTERRUPT_GEN_MEMBER(circusc_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index dadc980efc2..82db69944c2 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -188,7 +188,6 @@ static const ym2203_interface ym2203_config = void citycon_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_bg_image)); @@ -196,7 +195,6 @@ void citycon_state::machine_start() void citycon_state::machine_reset() { - m_bg_image = 0; } diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index afb698cf8f2..fe0d0d09559 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -320,7 +320,6 @@ INPUT_PORTS_END void clayshoo_state::machine_reset() { - m_input_port_select = 0; m_analog_port_val = 0; } diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 533098cef4b..7d6a60f6c06 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -125,7 +125,6 @@ WRITE8_MEMBER(cliffhgr_state::cliff_test_led_w) WRITE8_MEMBER(cliffhgr_state::cliff_port_bank_w) { - /* writing 0x0f clears the LS174 flip flop */ if (data == 0x0f) m_port_bank = 0; diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index c43e04ef0c8..ed590600f51 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -73,7 +73,6 @@ public: void cmmb_state::video_start() { - } UINT32 cmmb_state::screen_update_cmmb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 0ad60afbf1f..6df01ef788d 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -76,7 +76,6 @@ READ16_MEMBER(cninja_state::cninja_irq_r) { switch (offset) { - case 1: /* Raster IRQ scanline position */ return m_scanline; diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 098e6cfdff4..0d01fc52fcb 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -283,7 +283,6 @@ static void cntsteer_draw_sprites( running_machine &machine, bitmap_ind16 &bitma UINT32 cntsteer_state::screen_update_zerotrgt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_disable_roz) bitmap.fill(machine().pens[8 * m_bg_color_bank], cliprect); else @@ -333,7 +332,6 @@ UINT32 cntsteer_state::screen_update_zerotrgt(screen_device &screen, bitmap_ind1 UINT32 cntsteer_state::screen_update_cntsteer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_disable_roz) bitmap.fill(machine().pens[8 * m_bg_color_bank], cliprect); else @@ -818,7 +816,6 @@ GFXDECODE_END MACHINE_START_MEMBER(cntsteer_state,cntsteer) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_subcpu = machine().device("subcpu"); @@ -838,7 +835,6 @@ MACHINE_START_MEMBER(cntsteer_state,cntsteer) MACHINE_START_MEMBER(cntsteer_state,zerotrgt) { - save_item(NAME(m_nmimask)); MACHINE_START_CALL_MEMBER(cntsteer); } @@ -846,7 +842,6 @@ MACHINE_START_MEMBER(cntsteer_state,zerotrgt) MACHINE_RESET_MEMBER(cntsteer_state,cntsteer) { - m_flipscreen = 0; m_bg_bank = 0; m_scrolly = 0; @@ -863,7 +858,6 @@ MACHINE_RESET_MEMBER(cntsteer_state,cntsteer) MACHINE_RESET_MEMBER(cntsteer_state,zerotrgt) { - m_nmimask = 0; MACHINE_RESET_CALL_MEMBER(cntsteer); } diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c index 125d44a645a..7803d661b0d 100644 --- a/src/mame/drivers/cobra.c +++ b/src/mame/drivers/cobra.c @@ -500,7 +500,6 @@ const device_type COBRA_JVS = &device_creator; cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, COBRA_JVS, "COBRA_JVS", tag, owner, clock) { - } bool cobra_jvs::switches(UINT8 *&buf, UINT8 count_players, UINT8 bytes_per_switch) @@ -991,7 +990,6 @@ static void cobra_video_exit(running_machine *machine) void cobra_state::video_start() { - machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(cobra_video_exit), &machine())); m_renderer = auto_alloc(machine(), cobra_renderer(machine())); @@ -1000,7 +998,6 @@ void cobra_state::video_start() UINT32 cobra_state::screen_update_cobra(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (m_has_psac) { device_t *k001604 = machine().device("k001604"); @@ -1280,12 +1277,10 @@ void cobra_state::s2mfifo_event_callback(cobra_fifo::EventType event) void cobra_state::gfxfifo_in_event_callback(cobra_fifo::EventType event) { - } void cobra_state::gfxfifo_out_event_callback(cobra_fifo::EventType event) { - } /*****************************************************************************/ @@ -1814,7 +1809,6 @@ READ32_MEMBER(cobra_state::sub_config_r) WRITE32_MEMBER(cobra_state::sub_config_w) { - } READ32_MEMBER(cobra_state::sub_ata0_r) @@ -1921,7 +1915,6 @@ READ32_MEMBER(cobra_state::sub_psac2_r) WRITE32_MEMBER(cobra_state::sub_psac2_w) { - } static void sub_sound_dma_w(device_t *device, int width, UINT32 data) @@ -3190,7 +3183,6 @@ WRITE_LINE_MEMBER(cobra_state::ide_interrupt) INTERRUPT_GEN_MEMBER(cobra_state::cobra_vblank) { - if (m_vblank_enable & 0x80) { device.execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); @@ -3283,7 +3275,6 @@ MACHINE_CONFIG_END DRIVER_INIT_MEMBER(cobra_state, cobra) { - m_gfxfifo_in = auto_alloc(machine(), cobra_fifo(machine(), 8192, diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index 1dc18356e21..9e2df1b822e 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -278,7 +278,6 @@ UINT32 coinmvga_state::screen_update_coinmvga(screen_device &screen, bitmap_ind1 void coinmvga_state::palette_init() { - } diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index 6a140ba572c..3dac382a25d 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -163,7 +163,6 @@ READ8_MEMBER(combatsc_state::combatscb_io_r) WRITE8_MEMBER(combatsc_state::combatscb_priority_w) { - if (data & 0x40) { m_video_circuit = 1; @@ -182,7 +181,6 @@ WRITE8_MEMBER(combatsc_state::combatscb_priority_w) WRITE8_MEMBER(combatsc_state::combatsc_bankselect_w) { - m_priority = data & 0x20; if (data & 0x40) @@ -206,7 +204,6 @@ WRITE8_MEMBER(combatsc_state::combatsc_bankselect_w) WRITE8_MEMBER(combatsc_state::combatscb_io_w) { - switch (offset) { case 0x400: combatscb_priority_w(space, 0, data); break; @@ -218,7 +215,6 @@ WRITE8_MEMBER(combatsc_state::combatscb_io_w) WRITE8_MEMBER(combatsc_state::combatscb_bankselect_w) { - if (data & 0x40) { m_video_circuit = 1; @@ -269,7 +265,6 @@ WRITE8_MEMBER(combatsc_state::combatsc_coin_counter_w) READ8_MEMBER(combatsc_state::trackball_r) { - if (offset == 0) { int i, dir[4]; diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index 48f9db74469..f1bf53cad52 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -225,7 +225,6 @@ INTERRUPT_GEN_MEMBER(commando_state::commando_interrupt) void commando_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_scroll_x)); @@ -234,7 +233,6 @@ void commando_state::machine_start() void commando_state::machine_reset() { - m_scroll_x[0] = 0; m_scroll_x[1] = 0; m_scroll_y[0] = 0; diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 2c32f4e5756..87dcf8ee00a 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -34,7 +34,6 @@ WRITE8_MEMBER(compgolf_state::compgolf_scrolly_lo_w) WRITE8_MEMBER(compgolf_state::compgolf_ctrl_w) { - /* bit 4 and 6 are always set */ int new_bank = (data & 4) >> 2; @@ -225,7 +224,6 @@ static const ym2203_interface ym2203_config = void compgolf_state::machine_start() { - save_item(NAME(m_bank)); save_item(NAME(m_scrollx_lo)); save_item(NAME(m_scrollx_hi)); @@ -235,7 +233,6 @@ void compgolf_state::machine_start() void compgolf_state::machine_reset() { - m_bank = -1; m_scrollx_lo = 0; m_scrollx_hi = 0; diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index 5d0462936d2..5c9558901cf 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -134,7 +134,6 @@ static void coolpool_from_shiftreg(address_space &space, UINT32 address, UINT16 MACHINE_RESET_MEMBER(coolpool_state,amerdart) { - m_maincpu = machine().device("maincpu"); m_dsp = machine().device("dsp"); @@ -225,7 +224,6 @@ WRITE16_MEMBER(coolpool_state::amerdart_misc_w) READ16_MEMBER(coolpool_state::amerdart_dsp_bio_line_r) { - /* Skip idle checking */ if (m_old_cmd == m_cmd_pending) m_same_cmd_count += 1; @@ -244,7 +242,6 @@ READ16_MEMBER(coolpool_state::amerdart_dsp_bio_line_r) READ16_MEMBER(coolpool_state::amerdart_iop_r) { - // logerror("%08x:IOP read %04x\n",space.device().safe_pc(),m_iop_answer); machine().device("maincpu")->execute().set_input_line(1, CLEAR_LINE); @@ -253,7 +250,6 @@ READ16_MEMBER(coolpool_state::amerdart_iop_r) WRITE16_MEMBER(coolpool_state::amerdart_iop_w) { - // logerror("%08x:IOP write %04x\n", space.device().safe_pc(), data); COMBINE_DATA(&m_iop_cmd); m_cmd_pending = 1; @@ -261,7 +257,6 @@ WRITE16_MEMBER(coolpool_state::amerdart_iop_w) READ16_MEMBER(coolpool_state::amerdart_dsp_cmd_r) { - // logerror("%08x:DSP cmd_r %04x\n", space.device().safe_pc(), m_iop_cmd); m_cmd_pending = 0; return m_iop_cmd; @@ -269,7 +264,6 @@ READ16_MEMBER(coolpool_state::amerdart_dsp_cmd_r) WRITE16_MEMBER(coolpool_state::amerdart_dsp_answer_w) { - // logerror("%08x:DSP answer %04x\n", space.device().safe_pc(), data); m_iop_answer = data; machine().device("maincpu")->execute().set_input_line(1, ASSERT_LINE); @@ -453,7 +447,6 @@ WRITE16_MEMBER(coolpool_state::coolpool_misc_w) TIMER_CALLBACK_MEMBER(coolpool_state::deferred_iop_w) { - m_iop_cmd = param; m_cmd_pending = 1; machine().device("dsp")->execute().set_input_line(0, HOLD_LINE); /* ??? I have no idea who should generate this! */ @@ -472,7 +465,6 @@ WRITE16_MEMBER(coolpool_state::coolpool_iop_w) READ16_MEMBER(coolpool_state::coolpool_iop_r) { - logerror("%08x:IOP read %04x\n",space.device().safe_pc(),m_iop_answer); machine().device("maincpu")->execute().set_input_line(1, CLEAR_LINE); @@ -490,7 +482,6 @@ READ16_MEMBER(coolpool_state::coolpool_iop_r) READ16_MEMBER(coolpool_state::dsp_cmd_r) { - m_cmd_pending = 0; logerror("%08x:IOP cmd_r %04x\n", space.device().safe_pc(), m_iop_cmd); return m_iop_cmd; @@ -499,7 +490,6 @@ READ16_MEMBER(coolpool_state::dsp_cmd_r) WRITE16_MEMBER(coolpool_state::dsp_answer_w) { - logerror("%08x:IOP answer %04x\n", space.device().safe_pc(), data); m_iop_answer = data; machine().device("maincpu")->execute().set_input_line(1, ASSERT_LINE); @@ -508,7 +498,6 @@ WRITE16_MEMBER(coolpool_state::dsp_answer_w) READ16_MEMBER(coolpool_state::dsp_bio_line_r) { - return m_cmd_pending ? CLEAR_LINE : ASSERT_LINE; } @@ -536,7 +525,6 @@ READ16_MEMBER(coolpool_state::dsp_rom_r) WRITE16_MEMBER(coolpool_state::dsp_romaddr_w) { - switch (offset) { case 0: @@ -566,7 +554,6 @@ WRITE16_MEMBER(coolpool_state::dsp_dac_w) READ16_MEMBER(coolpool_state::coolpool_input_r) { - m_result = (ioport("IN1")->read() & 0x00ff) | (m_lastresult & 0xff00); m_newx[1] = ioport("XAXIS")->read(); m_newy[1] = ioport("YAXIS")->read(); @@ -1171,7 +1158,6 @@ static void register_state_save(running_machine &machine) DRIVER_INIT_MEMBER(coolpool_state,amerdart) { - m_lastresult = 0xffff; register_state_save(machine()); @@ -1179,7 +1165,6 @@ DRIVER_INIT_MEMBER(coolpool_state,amerdart) DRIVER_INIT_MEMBER(coolpool_state,coolpool) { - machine().device("dsp")->memory().space(AS_IO).install_read_handler(0x07, 0x07, read16_delegate(FUNC(coolpool_state::coolpool_input_r),this)); register_state_save(machine()); diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 4257647f01f..1e9025a08ab 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -405,7 +405,6 @@ READ32_MEMBER(coolridr_state::sysh1_unk_r) { case 0x08/4: { - m_vblank^=1; return (m_h1_unk[offset] & 0xfdffffff) | (m_vblank<<25); @@ -441,7 +440,6 @@ WRITE32_MEMBER(coolridr_state::sysh1_ioga_w) /* This is a RLE-based sprite blitter (US Patent #6,141,122), very unusual from Sega... */ WRITE32_MEMBER(coolridr_state::sysh1_txt_blit_w) { - COMBINE_DATA(&m_sysh1_txt_blit[offset]); switch(offset) diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index 7e5d3402c29..9087aa7046b 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -103,13 +103,11 @@ CUSTOM_INPUT_MEMBER(cop01_state::mightguy_area_r) WRITE8_MEMBER(cop01_state::cop01_irq_ack_w) { - m_maincpu->set_input_line(0, CLEAR_LINE ); } READ8_MEMBER(cop01_state::cop01_sound_irq_ack_w) { - m_audiocpu->set_input_line(0, CLEAR_LINE ); return 0; } @@ -427,7 +425,6 @@ GFXDECODE_END void cop01_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -438,7 +435,6 @@ void cop01_state::machine_start() void cop01_state::machine_reset() { - m_pulse = 0; m_timer = 0; m_vreg[0] = 0; diff --git a/src/mame/drivers/cops.c b/src/mame/drivers/cops.c index c6edd635684..602b1ef122f 100644 --- a/src/mame/drivers/cops.c +++ b/src/mame/drivers/cops.c @@ -92,7 +92,6 @@ public: void cops_state::video_start() { - } UINT32 cops_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index 8544ae9fae2..1609285d5e0 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -86,7 +86,6 @@ READ8_MEMBER(copsnrob_state::copsnrob_misc_r) WRITE8_MEMBER(copsnrob_state::copsnrob_misc2_w) { - m_misc = data & 0x7f; /* Multi Player Start */ set_led_status(machine(), 1, !((data >> 6) & 0x01)); @@ -250,14 +249,12 @@ GFXDECODE_END void copsnrob_state::machine_start() { - save_item(NAME(m_ic_h3_data)); save_item(NAME(m_misc)); } void copsnrob_state::machine_reset() { - m_ic_h3_data = 0; m_misc = 0; } diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 53314f15fb7..7ddcfbc353b 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -40,7 +40,6 @@ a physical DSW B but only read when SWA:3,4 are both set to OFF. Currently, WRITE8_MEMBER(cosmic_state::panic_sound_output_w) { - /* Sound Enable / Disable */ if (offset == 11) { @@ -115,7 +114,6 @@ WRITE8_MEMBER(cosmic_state::panic_sound_output2_w) WRITE8_MEMBER(cosmic_state::cosmicg_output_w) { - /* Sound Enable / Disable */ if (offset == 12) { @@ -178,7 +176,6 @@ WRITE8_MEMBER(cosmic_state::cosmicg_output_w) WRITE8_MEMBER(cosmic_state::cosmica_sound_output_w) { - /* Sound Enable / Disable */ if (offset == 11) { @@ -960,7 +957,6 @@ static const samples_interface cosmicg_samples_interface = MACHINE_START_MEMBER(cosmic_state,cosmic) { - m_samples = machine().device("samples"); m_dac = machine().device("dac"); @@ -976,7 +972,6 @@ MACHINE_START_MEMBER(cosmic_state,cosmic) MACHINE_RESET_MEMBER(cosmic_state,cosmic) { - m_pixel_clock = 0; m_background_enable = 0; m_color_registers[0] = 0; diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 7b9fb97e246..eb30a594925 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -376,7 +376,6 @@ READ16_MEMBER(cps_state::qsound_sharedram1_r) WRITE16_MEMBER(cps_state::qsound_sharedram1_w) { - if (ACCESSING_BITS_0_7) m_qsound_sharedram1[offset] = data; } @@ -388,7 +387,6 @@ READ16_MEMBER(cps_state::qsound_sharedram2_r) WRITE16_MEMBER(cps_state::qsound_sharedram2_w) { - if (ACCESSING_BITS_0_7) m_qsound_sharedram2[offset] = data; } @@ -3132,7 +3130,6 @@ GFXDECODE_END MACHINE_START_MEMBER(cps_state,common) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index ba9873120f9..9ef07df4b89 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1246,7 +1246,6 @@ GFXDECODE_END MACHINE_START_MEMBER(cps_state,cps2) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -8288,7 +8287,6 @@ ROM_END DRIVER_INIT_MEMBER(cps_state,cps2) { - /* Decrypt the game - see machine/cps2crpt.c */ DRIVER_INIT_CALL(cps2crpt); @@ -8304,7 +8302,6 @@ DRIVER_INIT_MEMBER(cps_state,cps2) DRIVER_INIT_MEMBER(cps_state,ssf2tb) { - DRIVER_INIT_CALL(cps2); m_cps2networkpresent = 0; @@ -8317,7 +8314,6 @@ DRIVER_INIT_MEMBER(cps_state,ssf2tb) DRIVER_INIT_MEMBER(cps_state,pzloop2) { - DRIVER_INIT_CALL(cps2); m_readpaddle = 0; diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index ae2a40f42d9..307328836df 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -911,7 +911,6 @@ static void cps3_draw_tilemapsprite_line(running_machine &machine, int tmnum, in for (x=0;x<(cliprect.max_x/16)+2;x++) { - UINT32 dat; int tileno; int colour; @@ -1016,7 +1015,6 @@ UINT32 cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitma for (j=0;j<(length)*4;j+=4) { - UINT32 value1 = (m_spriteram[start+j+0]); UINT32 value2 = (m_spriteram[start+j+1]); UINT32 value3 = (m_spriteram[start+j+2]); diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c index d95f5f4ee19..e1696122941 100644 --- a/src/mame/drivers/crbaloon.c +++ b/src/mame/drivers/crbaloon.c @@ -355,7 +355,6 @@ void crbaloon_state::machine_reset() INTERRUPT_GEN_MEMBER(crbaloon_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index ed4d59ed6f3..af531d065ad 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -73,7 +73,6 @@ WRITE8_MEMBER(crgolf_state::rom_bank_select_w) void crgolf_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -92,7 +91,6 @@ void crgolf_state::machine_start() void crgolf_state::machine_reset() { - m_port_select = 0; m_main_to_sound_data = 0; m_sound_to_main_data = 0; @@ -123,7 +121,6 @@ READ8_MEMBER(crgolf_state::analog_input_r) WRITE8_MEMBER(crgolf_state::switch_input_select_w) { - if (!(data & 0x40)) m_port_select = 6; if (!(data & 0x20)) m_port_select = 5; if (!(data & 0x10)) m_port_select = 4; @@ -149,7 +146,6 @@ WRITE8_MEMBER(crgolf_state::unknown_w) TIMER_CALLBACK_MEMBER(crgolf_state::main_to_sound_callback) { - m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_main_to_sound_data = param; } @@ -163,7 +159,6 @@ WRITE8_MEMBER(crgolf_state::main_to_sound_w) READ8_MEMBER(crgolf_state::main_to_sound_r) { - m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); return m_main_to_sound_data; } @@ -178,7 +173,6 @@ READ8_MEMBER(crgolf_state::main_to_sound_r) TIMER_CALLBACK_MEMBER(crgolf_state::sound_to_main_callback) { - m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_sound_to_main_data = param; } @@ -192,7 +186,6 @@ WRITE8_MEMBER(crgolf_state::sound_to_main_w) READ8_MEMBER(crgolf_state::sound_to_main_r) { - m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); return m_sound_to_main_data; } diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 28c7e11628b..11fabcf16d6 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -25,7 +25,6 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking ); INTERRUPT_GEN_MEMBER(crimfght_state::crimfght_interrupt) { - if (k051960_is_irq_enabled(m_k051960)) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } @@ -55,7 +54,6 @@ WRITE8_MEMBER(crimfght_state::crimfght_snd_bankswitch_w) READ8_MEMBER(crimfght_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -71,7 +69,6 @@ READ8_MEMBER(crimfght_state::k052109_051960_r) WRITE8_MEMBER(crimfght_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 28c3f1cc50a..e1501afeb8c 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -329,7 +329,6 @@ static const ym3812_interface ym3812_config = void crospang_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_bestri_tilebank)); @@ -338,7 +337,6 @@ void crospang_state::machine_start() void crospang_state::machine_reset() { - m_bestri_tilebank = 0; } diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 55325def0fc..c40759b0a34 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -161,7 +161,6 @@ WRITE8_MEMBER(crshrace_state::crshrace_sh_bankswitch_w) WRITE16_MEMBER(crshrace_state::sound_command_w) { - if (ACCESSING_BITS_0_7) { m_pending_command = 1; @@ -440,7 +439,6 @@ static const k053936_interface crshrace_k053936_intf = void crshrace_state::machine_start() { - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000); save_item(NAME(m_roz_bank)); @@ -451,7 +449,6 @@ void crshrace_state::machine_start() void crshrace_state::machine_reset() { - m_roz_bank = 0; m_gfxctrl = 0; m_flipscreen = 0; diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index cbc86b9cb4e..7c6e9576c83 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -216,7 +216,6 @@ static void IntReq( running_machine &machine, int num ) READ32_MEMBER(crystal_state::FlipCount_r) { - #ifdef IDLE_LOOP_SPEEDUP UINT32 IntPend = space.read_dword(0x01800c0c); m_FlipCntRead++; @@ -228,7 +227,6 @@ READ32_MEMBER(crystal_state::FlipCount_r) WRITE32_MEMBER(crystal_state::FlipCount_w) { - if (mem_mask & 0x00ff0000) { int fc = (data >> 16) & 0xff; @@ -241,7 +239,6 @@ WRITE32_MEMBER(crystal_state::FlipCount_w) READ32_MEMBER(crystal_state::Input_r) { - if (offset == 0) return ioport("P1_P2")->read(); else if (offset == 1) @@ -293,7 +290,6 @@ static IRQ_CALLBACK( icallback ) WRITE32_MEMBER(crystal_state::Banksw_w) { - m_Bank = (data >> 1) & 7; if (m_Bank <= 2) membank("bank1")->set_base(machine().root_device().memregion("user1")->base() + m_Bank * 0x1000000); @@ -372,7 +368,6 @@ READ32_MEMBER(crystal_state::Timer3_r) READ32_MEMBER(crystal_state::FlashCmd_r) { - if ((m_FlashCmd & 0xff) == 0xff) { if (m_Bank <= 2) diff --git a/src/mame/drivers/cupidon.c b/src/mame/drivers/cupidon.c index 23c6fe86dca..54ddbaa6278 100644 --- a/src/mame/drivers/cupidon.c +++ b/src/mame/drivers/cupidon.c @@ -90,7 +90,6 @@ ROM_END DRIVER_INIT_MEMBER(cupidon_state,cupidon) { - } /* (c) date is from string in ROM, revision date is noted next to sets - Spellings are as found in ROM */ diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index a8ba9e4a278..c79726a45ac 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -114,7 +114,6 @@ Todo & FIXME: READ8_MEMBER(cvs_state::cvs_video_or_color_ram_r) { - if (*m_fo_state) return m_video_ram[offset]; else @@ -123,7 +122,6 @@ READ8_MEMBER(cvs_state::cvs_video_or_color_ram_r) WRITE8_MEMBER(cvs_state::cvs_video_or_color_ram_w) { - if (*m_fo_state) m_video_ram[offset] = data; else @@ -133,7 +131,6 @@ WRITE8_MEMBER(cvs_state::cvs_video_or_color_ram_w) READ8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_r) { - if (*m_fo_state) return m_palette_ram[offset & 0x0f]; else @@ -142,7 +139,6 @@ READ8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_r) WRITE8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_w) { - if (*m_fo_state) m_palette_ram[offset & 0x0f] = data; else @@ -152,7 +148,6 @@ WRITE8_MEMBER(cvs_state::cvs_bullet_ram_or_palette_w) READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r) { - if (*m_fo_state) return m_character_ram[(0 * 0x800) | 0x400 | m_character_ram_page_start | offset]; else @@ -161,7 +156,6 @@ READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r) WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w) { - if (*m_fo_state) { offset |= (0 * 0x800) | 0x400 | m_character_ram_page_start; @@ -175,7 +169,6 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w) READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r) { - if (*m_fo_state) return m_character_ram[(1 * 0x800) | 0x400 | m_character_ram_page_start | offset]; else @@ -184,7 +177,6 @@ READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r) WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w) { - if (*m_fo_state) { offset |= (1 * 0x800) | 0x400 | m_character_ram_page_start; @@ -198,7 +190,6 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w) READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r) { - if (*m_fo_state) return m_character_ram[(2 * 0x800) | 0x400 | m_character_ram_page_start | offset]; else @@ -207,7 +198,6 @@ READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r) WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w) { - if (*m_fo_state) { offset |= (2 * 0x800) | 0x400 | m_character_ram_page_start; @@ -371,7 +361,6 @@ WRITE8_MEMBER(cvs_state::cvs_unknown_w) WRITE8_MEMBER(cvs_state::cvs_speech_rom_address_lo_w) { - /* assuming that d0-d2 are cleared here */ m_speech_rom_bit_address = (m_speech_rom_bit_address & 0xf800) | (data << 3); LOG(("%04x : CVS: Speech Lo %02x Address = %04x\n", space.device().safe_pc(), data, m_speech_rom_bit_address >> 3)); @@ -386,7 +375,6 @@ WRITE8_MEMBER(cvs_state::cvs_speech_rom_address_hi_w) READ8_MEMBER(cvs_state::cvs_speech_command_r) { - /* FIXME: this was by observation on board ??? * -bit 7 is TMS status (active LO) */ return ((tms5110_ctl_r(m_tms, space, 0) ^ 1) << 7) | (soundlatch_byte_r(space, 0) & 0x7f); @@ -454,7 +442,6 @@ static const tms5110_interface tms5100_interface = WRITE8_MEMBER(cvs_state::audio_command_w) { - LOG(("data %02x\n", data)); /* cause interrupt on audio CPU if bit 7 set */ soundlatch_byte_w(space, 0, data); @@ -989,7 +976,6 @@ static const s2636_interface s2636_2_config = MACHINE_START_MEMBER(cvs_state,cvs) { - /* allocate memory */ if (machine().gfx[1] != NULL) machine().gfx[1]->set_source(m_character_ram); @@ -1023,7 +1009,6 @@ MACHINE_START_MEMBER(cvs_state,cvs) MACHINE_RESET_MEMBER(cvs_state,cvs) { - m_character_banking_mode = 0; m_character_ram_page_start = 0; m_speech_rom_bit_address = 0; @@ -1107,8 +1092,7 @@ MACHINE_CONFIG_END \ ROM_REGION( 0x0820, "proms", 0 ) \ ROM_LOAD( "82s185.10h", 0x0000, 0x0800, CRC(c205bca6) SHA1(ec9bd220e75f7b067ede6139763ef8aca0fb7a29) ) \ - ROM_LOAD( "82s123.10k", 0x0800, 0x0020, CRC(b5221cec) SHA1(71d9830b33b1a8140b0fe1a2ba8024ba8e6e48e0) ) \ - + ROM_LOAD( "82s123.10k", 0x0800, 0x0020, CRC(b5221cec) SHA1(71d9830b33b1a8140b0fe1a2ba8024ba8e6e48e0) ) #define CVS_ROM_REGION_SPEECH_DATA(name, len, hash) \ ROM_REGION( 0x1000, "speechdata", 0 ) \ ROM_LOAD( name, 0x0000, len, hash ) diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 58cf8f05d44..2d4dbfb0d8a 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -155,7 +155,6 @@ void cyclemb_state::palette_init() void cyclemb_state::video_start() { - } static void cyclemb_draw_tilemap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -269,7 +268,6 @@ static void skydest_draw_tilemap(screen_device &screen, bitmap_ind16 &bitmap, co for (y=0;y<32;y++) { - for (x=2;x<62;x++) { /* upper bits of the first address of cram seems to be related to colour cycling */ @@ -441,7 +439,6 @@ READ8_MEMBER( cyclemb_state::skydest_i8741_0_r ) { //printf("READ PC=%04x\n",m_maincpu->pc()); { - switch(m_mcu[0].state) { case 1: diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index ffd67b440d3..678af04572b 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -155,7 +155,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 dacholer_state::screen_update_dacholer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (flip_screen()) { m_bg_tilemap->set_scrollx(0, 256 - m_scroll_x); @@ -583,7 +582,6 @@ static const msm5205_interface msm_interface = void dacholer_state::machine_start() { - save_item(NAME(m_bg_bank)); save_item(NAME(m_msm_data)); save_item(NAME(m_msm_toggle)); @@ -594,7 +592,6 @@ void dacholer_state::machine_start() void dacholer_state::machine_reset() { - m_msm_data = 0; m_msm_toggle = 0; diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c index 8dde415b3f4..f6518c3fbf1 100644 --- a/src/mame/drivers/dai3wksi.c +++ b/src/mame/drivers/dai3wksi.c @@ -296,7 +296,6 @@ WRITE8_MEMBER(dai3wksi_state::dai3wksi_audio_1_w) WRITE8_MEMBER(dai3wksi_state::dai3wksi_audio_2_w) { - device_t *ic77 = machine().device("ic77"); device_t *ic78 = machine().device("ic78"); device_t *ic80 = machine().device("ic80"); @@ -565,7 +564,6 @@ INPUT_PORTS_END void dai3wksi_state::machine_start() { - /* Set up save state */ save_item(NAME(m_dai3wksi_flipscreen)); save_item(NAME(m_dai3wksi_redscreen)); @@ -578,7 +576,6 @@ void dai3wksi_state::machine_start() void dai3wksi_state::machine_reset() { - m_port_last1 = 0; m_port_last2 = 0; m_enabled_sound = 0; diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index ea5a04b6f40..a94fba5b8f2 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -150,7 +150,6 @@ static void parse_control( running_machine &machine ) /* assumes Z80 sandwiche WRITE16_MEMBER(darius_state::cpua_ctrl_w) { - if ((data & 0xff00) && ((data & 0xff) == 0)) data = data >> 8; @@ -173,7 +172,6 @@ WRITE16_MEMBER(darius_state::darius_watchdog_w) READ16_MEMBER(darius_state::darius_ioc_r) { - switch (offset) { case 0x01: @@ -202,7 +200,6 @@ logerror("CPU #0 PC %06x: warning - read unmapped ioc offset %06x\n",space.devic WRITE16_MEMBER(darius_state::darius_ioc_w) { - switch (offset) { case 0x00: /* sound interface write */ @@ -279,7 +276,6 @@ static void reset_sound_region( running_machine &machine ) WRITE8_MEMBER(darius_state::sound_bankswitch_w) { - m_banknum = data & 0x03; reset_sound_region(machine()); // banknum = data; @@ -424,7 +420,6 @@ WRITE8_MEMBER(darius_state::darius_da_pan) WRITE8_MEMBER(darius_state::darius_write_portA0) { - // volume control FM #0 PSG #0 A //popmessage(" pan %02x %02x %02x %02x %02x", m_pan[0], m_pan[1], m_pan[2], m_pan[3], m_pan[4] ); //popmessage(" A0 %02x A1 %02x B0 %02x B1 %02x", port[0], port[1], port[2], port[3] ); @@ -437,7 +432,6 @@ WRITE8_MEMBER(darius_state::darius_write_portA0) WRITE8_MEMBER(darius_state::darius_write_portA1) { - // volume control FM #1 PSG #1 A //popmessage(" pan %02x %02x %02x %02x %02x", m_pan[0], m_pan[1], m_pan[2], m_pan[3], m_pan[4] ); @@ -449,7 +443,6 @@ WRITE8_MEMBER(darius_state::darius_write_portA1) WRITE8_MEMBER(darius_state::darius_write_portB0) { - // volume control PSG #0 B/C //popmessage(" pan %02x %02x %02x %02x %02x", m_pan[0], m_pan[1], m_pan[2], m_pan[3], m_pan[4] ); @@ -461,7 +454,6 @@ WRITE8_MEMBER(darius_state::darius_write_portB0) WRITE8_MEMBER(darius_state::darius_write_portB1) { - // volume control PSG #1 B/C //popmessage(" pan %02x %02x %02x %02x %02x", m_pan[0], m_pan[1], m_pan[2], m_pan[3], m_pan[4] ); @@ -515,7 +507,6 @@ static const msm5205_interface msm5205_config = READ8_MEMBER(darius_state::adpcm_command_read) { - /* logerror("read port 0: %02x PC=%4x\n",adpcm_command, space.device().safe_pc() ); */ return m_adpcm_command; } @@ -532,7 +523,6 @@ READ8_MEMBER(darius_state::readport3) WRITE8_MEMBER(darius_state::adpcm_nmi_disable) { - m_nmi_enable = 0; /* logerror("write port 0: NMI DISABLE PC=%4x\n", data, space.device().safe_pc() ); */ } @@ -838,7 +828,6 @@ static void darius_postload(running_machine &machine) void darius_state::machine_start() { - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000); membank("bank1")->configure_entry(4, memregion("audiocpu")->base()); membank("bank1")->set_entry(4); diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 974f2b65e26..8ddeb893bd5 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -447,7 +447,6 @@ GFXDECODE_END WRITE8_MEMBER(dassault_state::sound_bankswitch_w) { - /* the second OKIM6295 ROM is bank switched */ m_oki2->set_bank_base((data & 1) * 0x40000); } diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index e109d9898e1..22753c6d742 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -132,7 +132,6 @@ UINT32 dblewing_state::screen_update_dblewing(screen_device &screen, bitmap_ind1 */ READ16_MEMBER(dblewing_state::dblewing_prot_r) { - switch (offset * 2) { case 0x16a: return m_boss_move; // boss 1 movement @@ -195,7 +194,6 @@ READ16_MEMBER(dblewing_state::dblewing_prot_r) WRITE16_MEMBER(dblewing_state::dblewing_prot_w) { - // if (offset * 2 != 0x380) // printf("dblewing prot w %08x, %04x, %04x %04x\n", space.device().safe_pc(), offset * 2, mem_mask, data); @@ -342,7 +340,6 @@ ADDRESS_MAP_END READ8_MEMBER(dblewing_state::irq_latch_r) { - /* bit 1 of dblewing_sound_irq specifies IRQ command writes */ m_sound_irq &= ~0x02; m_audiocpu->set_input_line(0, (m_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE); @@ -560,7 +557,6 @@ static const deco16ic_interface dblewing_deco16ic_tilegen1_intf = void dblewing_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); @@ -598,7 +594,6 @@ void dblewing_state::machine_start() void dblewing_state::machine_reset() { - m_008_data = 0; m_104_data = 0; m_406_data = 0; diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 88f3739a7e2..d788d7a8a71 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -335,7 +335,6 @@ static const k053252_interface dbz_k053252_intf = void dbz_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_k053936_1 = machine().device("k053936_1"); diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 00a0572dfd1..ff6cba335c5 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -95,7 +95,6 @@ INTERRUPT_GEN_MEMBER(dcheese_state::dcheese_vblank) void dcheese_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_bsmt = machine().device("bsmt"); @@ -136,7 +135,6 @@ WRITE16_MEMBER(dcheese_state::eeprom_control_w) WRITE16_MEMBER(dcheese_state::sound_command_w) { - if (ACCESSING_BITS_0_7) { /* write the latch and set the IRQ */ @@ -156,7 +154,6 @@ WRITE16_MEMBER(dcheese_state::sound_command_w) READ8_MEMBER(dcheese_state::sound_command_r) { - /* read the latch and clear the IRQ */ m_soundlatch_full = 0; m_audiocpu->set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c index 07219f5b063..00bbe1d8ec0 100644 --- a/src/mame/drivers/dday.c +++ b/src/mame/drivers/dday.c @@ -236,7 +236,6 @@ GFXDECODE_END void dday_state::machine_start() { - m_ay1 = machine().device("ay1"); save_item(NAME(m_control)); @@ -247,7 +246,6 @@ void dday_state::machine_start() void dday_state::machine_reset() { - m_control = 0; m_sl_enable = 0; m_sl_image = 0; diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 12b51b81f6e..4387ef7781f 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -171,7 +171,6 @@ WRITE8_MEMBER(ddayjlc_state::char_bank_w) WRITE8_MEMBER(ddayjlc_state::ddayjlc_bgram_w) { - if (!offset) m_bg_tilemap->set_scrollx(0, data + 8); @@ -207,7 +206,6 @@ WRITE8_MEMBER(ddayjlc_state::bg1_w) WRITE8_MEMBER(ddayjlc_state::bg2_w) { - m_bgadr = (m_bgadr & 0xfb) | ((data & 1) << 2); if (m_bgadr > 2) m_bgadr = 0; @@ -217,21 +215,18 @@ WRITE8_MEMBER(ddayjlc_state::bg2_w) WRITE8_MEMBER(ddayjlc_state::sound_w) { - soundlatch_byte_w(space, offset, data); m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } WRITE8_MEMBER(ddayjlc_state::i8257_CH0_w) { - m_e00x_d[offset][m_e00x_l[offset]] = data; m_e00x_l[offset] ^= 1; } WRITE8_MEMBER(ddayjlc_state::i8257_LMSR_w) { - if (!data) { INT32 src = m_e00x_d[0][1] * 256 + m_e00x_d[0][0]; @@ -452,7 +447,6 @@ INTERRUPT_GEN_MEMBER(ddayjlc_state::ddayjlc_snd_interrupt) void ddayjlc_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_char_bank)); diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 744f8b4e51d..08e3b633fca 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -310,7 +310,6 @@ UINT32 ddealer_state::screen_update_ddealer(screen_device &screen, bitmap_ind16 TIMER_DEVICE_CALLBACK_MEMBER(ddealer_state::ddealer_mcu_sim) { - /*coin/credit simulation*/ /*$fe002 is used,might be for multiple coins for one credit settings.*/ m_coin_input = (~(machine().root_device().ioport("IN0")->read())); @@ -399,8 +398,7 @@ Protection handling,identical to Hacha Mecha Fighter / Thunder Dragon with diffe m_mcu_shared_ram[(_offs_+2-0x10)/2] = 0x4ef9;/*JMP*/\ m_mcu_shared_ram[(_offs_+4-0x10)/2] = 0x0000;/*HI-DWORD*/\ m_mcu_shared_ram[(_offs_+6-0x10)/2] = _pc_; /*LO-DWORD*/\ - } \ - + } #define PROT_INPUT(_offs_,_protvalue_,_protinput_,_input_) \ if(m_mcu_shared_ram[_offs_] == _protvalue_) \ {\ @@ -603,7 +601,6 @@ GFXDECODE_END void ddealer_state::machine_start() { - save_item(NAME(m_respcount)); save_item(NAME(m_flipscreen)); save_item(NAME(m_input_pressed)); @@ -612,7 +609,6 @@ void ddealer_state::machine_start() void ddealer_state::machine_reset() { - m_respcount = 0; m_flipscreen = 0; m_input_pressed = 0; diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index ad51a847cf4..6ee0161e190 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1297,7 +1297,6 @@ static void copylayer(running_machine &machine, bitmap_ind16 &bitmap, const rect UINT32 dynax_state::screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - static const int order[24][4] = { { 3,2,1,0 }, { 2,3,1,0 }, { 3,1,2,0 }, { 1,3,2,0 }, { 2,1,3,0 }, { 1,2,3,0 }, diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 129aadd8cec..53acc997198 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -146,7 +146,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon_state::ddragon_scanline) MACHINE_START_MEMBER(ddragon_state,ddragon) { - /* configure banks */ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000); @@ -169,7 +168,6 @@ MACHINE_START_MEMBER(ddragon_state,ddragon) MACHINE_RESET_MEMBER(ddragon_state,ddragon) { - m_dd_sub_cpu_busy = 1; m_adpcm_pos[0] = m_adpcm_pos[1] = 0; m_adpcm_end[0] = m_adpcm_end[1] = 0; @@ -365,7 +363,6 @@ READ8_MEMBER(ddragon_state::ddragon_hd63701_internal_registers_r) WRITE8_MEMBER(ddragon_state::ddragon_hd63701_internal_registers_w) { - /* I don't know why port 0x17 is used.. Doesn't seem to be a standard MCU port */ if (offset == 0x17) { @@ -390,7 +387,6 @@ WRITE8_MEMBER(ddragon_state::ddragon_hd63701_internal_registers_w) READ8_MEMBER(ddragon_state::ddragon_spriteram_r) { - /* Double Dragon crash fix - see notes above */ if (offset == 0x49 && space.device().safe_pc() == 0x6261 && m_spriteram[offset] == 0x1f) return 0x1; @@ -401,7 +397,6 @@ READ8_MEMBER(ddragon_state::ddragon_spriteram_r) WRITE8_MEMBER(ddragon_state::ddragon_spriteram_w) { - if (&space.device() == m_sub_cpu && offset == 0) m_dd_sub_cpu_busy = 1; diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index 1b121afdd4f..6f694cfd4f9 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -163,7 +163,6 @@ WRITE8_MEMBER(ddragon3_state::oki_bankswitch_w) WRITE16_MEMBER(ddragon3_state::ddragon3_io_w) { - COMBINE_DATA(&m_io_reg[offset]); switch (offset) @@ -543,7 +542,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon3_state::ddragon3_scanline) void ddragon3_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index 89600205dbc..f291a4d89d0 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -45,7 +45,6 @@ UINT32 ddz_state::screen_update_ddz(screen_device &screen, bitmap_rgb32 &bitmap, void ddz_state::screen_eof_ddz(screen_device &screen, bool state) { - } INTERRUPT_GEN_MEMBER(ddz_state::ddz_interrupt) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 7c5e3f4b169..5989d6b14af 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -434,7 +434,6 @@ void slyspy_set_protection_map(running_machine& machine, int type) switch (type) { - case 0: space.install_legacy_write_handler( *tilegen2, 0x240000, 0x240007, FUNC(deco_bac06_pf_control_0_w)); space.install_legacy_write_handler( *tilegen2, 0x240010, 0x240017, FUNC(deco_bac06_pf_control_1_w)); diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index c87bed77a95..b41035eef74 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -141,7 +141,6 @@ TIMER_CALLBACK_MEMBER(dec8_state::dec8_i8751_timer_callback) WRITE8_MEMBER(dec8_state::dec8_i8751_w) { - switch (offset) { case 0: /* High byte - SECIRQ is trigged on activating this latch */ @@ -163,7 +162,6 @@ WRITE8_MEMBER(dec8_state::dec8_i8751_w) WRITE8_MEMBER(dec8_state::lastmisn_i8751_w) { - /* Japan coinage first, then World coinage - US coinage shall be the same as the Japan one */ int lneed1[2][4] = {{1, 1, 1, 2}, {1, 1, 1, 1}}; /* slot 1 : coins needed */ int lcred1[2][4] = {{1, 2, 3, 1}, {1, 2, 3, 5}}; /* slot 1 : credits awarded */ @@ -264,7 +262,6 @@ WRITE8_MEMBER(dec8_state::shackled_i8751_w) WRITE8_MEMBER(dec8_state::csilver_i8751_w) { - /* Japan coinage first, then World coinage - US coinage shall be the same as the Japan one */ int lneed1[2][4] = {{1, 1, 1, 2}, {1, 1, 1, 1}}; /* slot 1 : coins needed */ int lcred1[2][4] = {{1, 2, 3, 1}, {2, 3, 4, 6}}; /* slot 1 : credits awarded */ @@ -332,7 +329,6 @@ WRITE8_MEMBER(dec8_state::csilver_i8751_w) WRITE8_MEMBER(dec8_state::srdarwin_i8751_w) { - /* Japan coinage first, then World coinage - US coinage shall be the same as the Japan one */ int lneed1[2][4] = {{1, 1, 1, 2}, {1, 1, 1, 1}}; /* slot 1 : coins needed */ int lcred1[2][4] = {{1, 2, 3, 1}, {2, 3, 4, 6}}; /* slot 1 : credits awarded */ @@ -450,7 +446,6 @@ WRITE8_MEMBER(dec8_state::dec8_bank_w) /* Used by Ghostbusters, Meikyuu Hunter G & Gondomania */ WRITE8_MEMBER(dec8_state::ghostb_bank_w) { - /* Bit 0: SECCLR - acknowledge interrupt from I8751 Bit 1: NMI enable/disable Bit 2: Not connected according to schematics @@ -905,7 +900,6 @@ ADDRESS_MAP_END READ8_MEMBER(dec8_state::dec8_mcu_from_main_r) { - switch (offset) { case 0: @@ -923,7 +917,6 @@ READ8_MEMBER(dec8_state::dec8_mcu_from_main_r) WRITE8_MEMBER(dec8_state::dec8_mcu_to_main_w) { - // Outputs P0 and P1 are latched if (offset==0) m_i8751_port0=data; else if (offset==1) m_i8751_port1=data; @@ -1958,7 +1951,6 @@ INTERRUPT_GEN_MEMBER(dec8_state::oscar_interrupt) void dec8_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); m_audiocpu = machine().device("audiocpu"); diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index fbcd2622177..c6efefb8895 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -638,7 +638,6 @@ WRITE32_MEMBER(deco32_state::tattass_control_w) READ32_MEMBER(deco32_state::nslasher_prot_r) { - switch (offset<<1) { case 0x280: return ioport("IN0")->read() << 16| 0xffff; /* IN0 */ case 0x4c4: return ioport("IN1")->read() << 16| 0xffff; /* IN1 */ @@ -670,7 +669,6 @@ WRITE32_MEMBER(deco32_state::nslasher_prot_w) /* Only sound port of chip is used - no protection */ if (offset==0x700/4) { - /* bit 1 of nslasher_sound_irq specifies IRQ command writes */ soundlatch_byte_w(space,0,(data>>16)&0xff); m_nslasher_sound_irq |= 0x02; diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index ed2916e6ccd..452d5ab03da 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -993,8 +993,7 @@ MACHINE_CONFIG_END ROM_REGION( 0x00060, "proms", 0 ) /* PROMS */ \ ROM_LOAD( "v2.3m", 0x0000, 0x0020, CRC(238fdb40) SHA1(b88e8fabb82092105c3828154608ea067acbf2e5) ) /* from DSP-8 board: M3-7603-5 (82s123 equiv, 32x8 TS) PROM @3M w/'V2' stamp, unknown purpose (gfx related: row/interrupt/vblank related? vertical counter related) */ \ ROM_LOAD( "v4.10d", 0x0020, 0x0020, CRC(3b5836b4) SHA1(b630bb277d9ec09d46ef26b944014dd6165b35d8) ) /* from DSP-8 board: M3-7603-5 (82s123 equiv, 32x8 TS) PROM @10D w/'V4' stamp, unknown purpose (gfx related: tile banking? horizontal counter related) */ \ - ROM_LOAD( "v3.3j", 0x0040, 0x0020, CRC(51eef657) SHA1(eaedce5caf55624ad6ae706aedf82c5717c60f1f) ) /* from RMS-8 board: M3-7603-5 (82s123 equiv, 32x8 TS) PROM @3J w/'V3' stamp, handles DRAM banking and timing */ \ - + ROM_LOAD( "v3.3j", 0x0040, 0x0020, CRC(51eef657) SHA1(eaedce5caf55624ad6ae706aedf82c5717c60f1f) ) /* from RMS-8 board: M3-7603-5 (82s123 equiv, 32x8 TS) PROM @3J w/'V3' stamp, handles DRAM banking and timing */ #define DECOCASS_BIOS_A_ROMS \ /* v0a.7e, New boardset bios, revision A */ \ @@ -1002,8 +1001,7 @@ MACHINE_CONFIG_END ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( "v0a-.7e", 0xf000, 0x1000, CRC(3D33AC34) SHA1(909D59E7A993AFFD10224402B4370E82A5F5545C) ) /* from RMS-8 board: 2732 EPROM @7E w/'V0A-' label (has HDRA01HDR string inside it), bios code */ \ \ - DECOCASS_COMMON_ROMS \ - + DECOCASS_COMMON_ROMS #define DECOCASS_BIOS_B_ROMS \ /* rms8.7e, New boardset bios, revision B */ \ @@ -1011,8 +1009,7 @@ MACHINE_CONFIG_END ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( "v0b-.7e", 0xf000, 0x1000, CRC(23d929b7) SHA1(063f83020ba3d6f43ab8471f95ca919767b93aa4) ) /* from RMS-8 board: 2732 EPROM @7E w/'V0B-' label (has HDRB01HDR string inside it), bios code */ \ \ - DECOCASS_COMMON_ROMS \ - + DECOCASS_COMMON_ROMS #define DECOCASS_BIOS_B2_ROMS \ /* dsp3.p0b/p1b, Old boardset bios, revision B?; from DSP-3 board? has HDRB01x string in it, 2x 2716 EPROM? */ \ @@ -1021,8 +1018,7 @@ MACHINE_CONFIG_END ROM_LOAD( "dsp3.p0b", 0xf000, 0x0800, CRC(b67a91d9) SHA1(681c040be0f0ed1ba0a50161b36d0ad8e1c8c5cb) ) \ ROM_LOAD( "dsp3.p1b", 0xf800, 0x0800, CRC(3bfff5f3) SHA1(4e9437cb1b76d64da6b37f01bd6e879fb399e8ce) ) \ \ - DECOCASS_COMMON_ROMS \ - + DECOCASS_COMMON_ROMS ROM_START( decocass ) DECOCASS_BIOS_B_ROMS diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 7535c3a0e94..45f4efcfec9 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -240,7 +240,6 @@ static const ym3812_interface ym3812_config = void deniam_state::machine_start() { - m_audio_cpu = machine().device("audiocpu"); save_item(NAME(m_display_enable)); diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 9aef701feac..129b74261c5 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -156,7 +156,6 @@ TIMER_CALLBACK_MEMBER(destroyr_state::destroyr_frame_callback) void destroyr_state::machine_reset() { - machine().scheduler().timer_set(machine().primary_screen->time_until_pos(0), timer_expired_delegate(FUNC(destroyr_state::destroyr_frame_callback),this)); m_cursor = 0; @@ -173,7 +172,6 @@ void destroyr_state::machine_reset() WRITE8_MEMBER(destroyr_state::destroyr_misc_w) { - /* bits 0 to 2 connect to the sound circuits */ m_attract = data & 0x01; m_noise = data & 0x02; @@ -236,7 +234,6 @@ WRITE8_MEMBER(destroyr_state::destroyr_output_w) READ8_MEMBER(destroyr_state::destroyr_input_r) { - if (offset & 1) { return ioport("IN1")->read(); @@ -435,7 +432,6 @@ void destroyr_state::palette_init() void destroyr_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_cursor)); diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 3f74ed2a263..187e8c68d19 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -185,7 +185,6 @@ static const deco16ic_interface dietgo_deco16ic_tilegen1_intf = void dietgo_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 81b8cb1f212..0005ad8878d 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -224,7 +224,6 @@ WRITE8_MEMBER(discoboy_state::discoboy_port_00_w) WRITE8_MEMBER(discoboy_state::discoboy_port_01_w) { - // 00 10 20 30 during gameplay 1,2,3 other times?? title screen bit 0x40 toggle //printf("unk discoboy_port_01_w %02x\n",data); // discoboy gfxbank @@ -250,7 +249,6 @@ WRITE8_MEMBER(discoboy_state::discoboy_port_06_w) WRITE8_MEMBER(discoboy_state::rambank_w) { - if (m_ram_bank & 0x20) m_ram_2[offset] = data; else @@ -259,7 +257,6 @@ WRITE8_MEMBER(discoboy_state::rambank_w) READ8_MEMBER(discoboy_state::rambank_r) { - if (m_ram_bank & 0x20) return m_ram_2[offset]; else @@ -268,7 +265,6 @@ READ8_MEMBER(discoboy_state::rambank_r) READ8_MEMBER(discoboy_state::rambank2_r) { - if (m_port_00 == 0x00) return m_ram_3[offset]; else if (m_port_00 == 0x01) @@ -281,7 +277,6 @@ READ8_MEMBER(discoboy_state::rambank2_r) WRITE8_MEMBER(discoboy_state::rambank2_w) { - if (m_port_00 == 0x00) m_ram_3[offset] = data; else if (m_port_00 == 0x01) @@ -343,7 +338,6 @@ WRITE8_MEMBER(discoboy_state::yunsung8_sound_bankswitch_w) WRITE8_MEMBER(discoboy_state::yunsung8_adpcm_w) { - /* Swap the nibbles */ m_adpcm = ((data & 0xf) << 4) | ((data >> 4) & 0xf); } @@ -456,7 +450,6 @@ GFXDECODE_END void discoboy_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_ram_bank)); @@ -468,7 +461,6 @@ void discoboy_state::machine_start() void discoboy_state::machine_reset() { - m_ram_bank = 0; m_port_00 = 0; m_gfxbank = 0; diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 31a1c59dcf3..ae3960b303f 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -124,7 +124,6 @@ UINT32 diverboy_state::screen_update_diverboy(screen_device &screen, bitmap_ind1 WRITE16_MEMBER(diverboy_state::soundcmd_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -249,7 +248,6 @@ GFXDECODE_END void diverboy_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 87116dc6d52..b08469e1dc0 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -149,7 +149,6 @@ Notes: WRITE8_MEMBER(djboy_state::beast_data_w) { - m_data_to_beast = data; m_z80_to_beast_full = 1; m_beast_int0_l = 0; @@ -158,7 +157,6 @@ WRITE8_MEMBER(djboy_state::beast_data_w) READ8_MEMBER(djboy_state::beast_data_r) { - m_beast_to_z80_full = 0; return m_data_to_z80; } @@ -177,7 +175,6 @@ WRITE8_MEMBER(djboy_state::trigger_nmi_on_cpu0) WRITE8_MEMBER(djboy_state::cpu0_bankswitch_w) { - data ^= m_bankxor; membank("bank1")->set_entry(data); membank("bank4")->set_entry(0); /* unsure if/how this area is banked */ @@ -308,7 +305,6 @@ READ8_MEMBER(djboy_state::beast_p0_r) WRITE8_MEMBER(djboy_state::beast_p0_w) { - if (!BIT(m_beast_p0, 1) && BIT(data, 1)) { m_beast_to_z80_full = 1; @@ -323,7 +319,6 @@ WRITE8_MEMBER(djboy_state::beast_p0_w) READ8_MEMBER(djboy_state::beast_p1_r) { - if (BIT(m_beast_p0, 0) == 0) return m_data_to_beast; else @@ -332,7 +327,6 @@ READ8_MEMBER(djboy_state::beast_p1_r) WRITE8_MEMBER(djboy_state::beast_p1_w) { - if (data == 0xff) { m_beast_int0_l = 1; @@ -344,7 +338,6 @@ WRITE8_MEMBER(djboy_state::beast_p1_w) READ8_MEMBER(djboy_state::beast_p2_r) { - switch ((m_beast_p0 >> 2) & 3) { case 0: return ioport("IN1")->read(); @@ -361,7 +354,6 @@ WRITE8_MEMBER(djboy_state::beast_p2_w) READ8_MEMBER(djboy_state::beast_p3_r) { - UINT8 dsw = 0; UINT8 dsw1 = ~ioport("DSW1")->read(); UINT8 dsw2 = ~ioport("DSW2")->read(); @@ -378,7 +370,6 @@ READ8_MEMBER(djboy_state::beast_p3_r) WRITE8_MEMBER(djboy_state::beast_p3_w) { - m_beast_p3 = data; m_cpu1->execute().set_input_line(INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE); } @@ -557,7 +548,6 @@ void djboy_state::machine_start() void djboy_state::machine_reset() { - m_videoreg = 0; m_scrollx = 0; m_scrolly = 0; diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 773f77fb526..ef84e36ca4e 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -676,7 +676,6 @@ READ8_MEMBER(dkong_state::s2650_port0_r) READ8_MEMBER(dkong_state::s2650_port1_r) { - #if DEBUG_PROTECTION logerror("port 1 : pc = %04x, loopback = %02x fo=%d\n",space.device().safe_pc(), m_hunchloopback, m_main_fo); #endif @@ -747,7 +746,6 @@ WRITE8_MEMBER(dkong_state::dkong_z80dma_rdy_w) WRITE8_MEMBER(dkong_state::nmi_mask_w) { - m_nmi_mask = data & 1; } diff --git a/src/mame/drivers/dlair2.c b/src/mame/drivers/dlair2.c index 3fdae9d4d2e..1023d51f35a 100644 --- a/src/mame/drivers/dlair2.c +++ b/src/mame/drivers/dlair2.c @@ -56,7 +56,6 @@ protected: void dlair2_state::video_start() { - } UINT32 dlair2_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index eb0872939eb..1fc057cbb84 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -586,7 +586,6 @@ void docastle_state::machine_reset() void docastle_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_slave = machine().device("slave"); diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c index ad61d3f1c3a..8f582415fbc 100644 --- a/src/mame/drivers/dogfgt.c +++ b/src/mame/drivers/dogfgt.c @@ -43,7 +43,6 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_soundlatch_w) WRITE8_MEMBER(dogfgt_state::dogfgt_soundcontrol_w) { - /* bit 5 goes to 8910 #0 BDIR pin */ if ((m_last_snd_ctrl & 0x20) == 0x20 && (data & 0x20) == 0x00) ay8910_data_address_w(machine().device("ay1"), space, m_last_snd_ctrl >> 4, m_soundlatch); @@ -208,7 +207,6 @@ GFXDECODE_END void dogfgt_state::machine_start() { - m_subcpu = machine().device("sub"); save_item(NAME(m_bm_plane)); diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 428148c5b36..9732a60e27a 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -103,7 +103,6 @@ WRITE8_MEMBER(dooyong_state::flip_screen_w) MACHINE_RESET_MEMBER(dooyong_state,sound_ym2203) { - m_interrupt_line_1=0; m_interrupt_line_2=0; } diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 4f4f606afc2..f23942aef22 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -132,7 +132,6 @@ WRITE8_MEMBER(dorachan_state::dorachan_ctrl_w) CUSTOM_INPUT_MEMBER(dorachan_state::dorachan_v128_r) { - /* to avoid resetting (when player 2 starts) bit 0 need to be inverted when screen is flipped */ return ((machine().primary_screen->vpos() >> 7) & 0x01) ^ m_flip_screen; } @@ -225,7 +224,6 @@ INPUT_PORTS_END void dorachan_state::machine_start() { - m_main_cpu = machine().device("maincpu"); save_item(NAME(m_flip_screen)); @@ -233,7 +231,6 @@ void dorachan_state::machine_start() void dorachan_state::machine_reset() { - m_flip_screen = 0; } diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index 0a9376f8ec1..5ffcb0bb46a 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -143,7 +143,6 @@ void dotrikun_state::machine_start() void dotrikun_state::machine_reset() { - m_color = 0; } diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index e2d7917df62..1459152b44e 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -269,7 +269,6 @@ TILE_GET_INFO_MEMBER(dreamwld_state::get_dreamwld_bg2_tile_info) void dreamwld_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dreamwld_state::get_dreamwld_bg2_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 64,32); m_bg2_tilemap->set_transparent_pen(0); @@ -567,7 +566,6 @@ GFXDECODE_END void dreamwld_state::machine_start() { - save_item(NAME(m_protindex)); save_item(NAME(m_tilebank)); save_item(NAME(m_tilebankold)); @@ -575,7 +573,6 @@ void dreamwld_state::machine_start() void dreamwld_state::machine_reset() { - m_tilebankold[0] = m_tilebankold[1] = -1; m_tilebank[0] = m_tilebank[1] = 0; m_protindex = 0; diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 002b3d755ce..c18512e4cb4 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -50,7 +50,6 @@ WRITE16_MEMBER(drgnmst_state::drgnmst_coin_w) WRITE16_MEMBER(drgnmst_state::drgnmst_snd_command_w) { - if (ACCESSING_BITS_0_7) { m_snd_command = (data & 0xff); @@ -60,7 +59,6 @@ WRITE16_MEMBER(drgnmst_state::drgnmst_snd_command_w) WRITE16_MEMBER(drgnmst_state::drgnmst_snd_flag_w) { - /* Enables the following 68K write operation to latch through to the PIC */ if (ACCESSING_BITS_0_7) m_snd_flag = 1; @@ -371,7 +369,6 @@ GFXDECODE_END void drgnmst_state::machine_start() { - save_item(NAME(m_snd_flag)); save_item(NAME(m_snd_command)); save_item(NAME(m_oki_control)); @@ -383,7 +380,6 @@ void drgnmst_state::machine_start() void drgnmst_state::machine_reset() { - m_snd_flag = 0; m_snd_command = 0; m_oki_control = 0; diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c index 112b5b0cd04..c089b4ebaca 100644 --- a/src/mame/drivers/dribling.c +++ b/src/mame/drivers/dribling.c @@ -54,7 +54,6 @@ INTERRUPT_GEN_MEMBER(dribling_state::dribling_irq_gen) READ8_MEMBER(dribling_state::dsr_r) { - /* return DSR0-7 */ return (m_ds << m_sh) | (m_dr >> (8 - m_sh)); } @@ -62,7 +61,6 @@ READ8_MEMBER(dribling_state::dsr_r) READ8_MEMBER(dribling_state::input_mux0_r) { - /* low value in the given bit selects */ if (!(m_input_mux & 0x01)) return ioport("MUX0")->read(); @@ -83,7 +81,6 @@ READ8_MEMBER(dribling_state::input_mux0_r) WRITE8_MEMBER(dribling_state::misc_w) { - /* bit 7 = di */ m_di = (data >> 7) & 1; if (!m_di) @@ -128,7 +125,6 @@ WRITE8_MEMBER(dribling_state::pb_w) WRITE8_MEMBER(dribling_state::shr_w) { - /* bit 3 = watchdog */ if (data & 0x08) machine().watchdog_reset(); @@ -147,7 +143,6 @@ WRITE8_MEMBER(dribling_state::shr_w) READ8_MEMBER(dribling_state::ioread) { - if (offset & 0x08) return m_ppi8255_0->read(space, offset & 3); else if (offset & 0x10) @@ -158,7 +153,6 @@ READ8_MEMBER(dribling_state::ioread) WRITE8_MEMBER(dribling_state::iowrite) { - if (offset & 0x08) m_ppi8255_0->write(space, offset & 3, data); else if (offset & 0x10) @@ -277,7 +271,6 @@ INPUT_PORTS_END void dribling_state::machine_start() { - save_item(NAME(m_abca)); save_item(NAME(m_di)); save_item(NAME(m_dr)); @@ -288,7 +281,6 @@ void dribling_state::machine_start() void dribling_state::machine_reset() { - m_abca = 0; m_di = 0; m_dr = 0; diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index 1bd6c0c878c..9b49ed34823 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -25,14 +25,12 @@ Quite similar to Appoooh INTERRUPT_GEN_MEMBER(drmicro_state::drmicro_interrupt) { - if (m_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } WRITE8_MEMBER(drmicro_state::nmi_enable_w) { - m_nmi_enable = data & 1; m_flipscreen = (data & 2) ? 1 : 0; flip_screen_set(data & 2); @@ -239,7 +237,6 @@ static const sn76496_config psg_intf = void drmicro_state::machine_start() { - m_msm = machine().device("msm"); save_item(NAME(m_nmi_enable)); @@ -249,7 +246,6 @@ void drmicro_state::machine_start() void drmicro_state::machine_reset() { - m_nmi_enable = 0; m_pcm_adr = 0; m_flipscreen = 0; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index fbff67092a4..99d8406f75a 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -111,7 +111,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const { for (x = 0; x < spr_size; x++) { - ex = xflip ? (spr_size - 1 - x) : x; ey = yflip ? (spr_size - 1 - y) : y; @@ -125,7 +124,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const void drtomy_state::video_start() { - m_tilemap_bg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_bg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap_fg = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(drtomy_state::get_tile_info_fg),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -134,7 +132,6 @@ void drtomy_state::video_start() UINT32 drtomy_state::screen_update_drtomy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap_bg->draw(bitmap, cliprect, 0, 0); m_tilemap_fg->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); @@ -285,13 +282,11 @@ INPUT_PORTS_END void drtomy_state::machine_start() { - save_item(NAME(m_oki_bank)); } void drtomy_state::machine_reset() { - m_oki_bank = 0; } diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index b992291f195..5486491c2bf 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -287,7 +287,6 @@ READ8_MEMBER(drw80pkr_state::drw80pkr_io_r) if ((m_attract_mode == 0x01 && m_p1 == 0xef) || m_p1 == 0xf7) { - // TODO: Get Input Port Values kbdin = ((ioport("IN1")->read() & 0xaf ) << 8) + ioport("IN0")->read(); diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index fff8bf5507f..ed3100f8f29 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -464,7 +464,6 @@ READ8_MEMBER(dunhuang_state::dunhuang_input_r) WRITE8_MEMBER(dunhuang_state::dunhuang_rombank_w) { - // ? data & 0x01 // ? data & 0x02 @@ -792,7 +791,6 @@ void dunhuang_state::machine_start() void dunhuang_state::machine_reset() { - m_written = 0; m_written2 = 0; m_pos_x = 0; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 4eb648d3aa1..60b8baab85c 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -393,7 +393,6 @@ enum WRITE8_MEMBER(dwarfd_state::i8275_preg_w)//param reg { - switch (m_i8275Command) { case I8275_COMMAND_RESET: @@ -492,13 +491,11 @@ WRITE8_MEMBER(dwarfd_state::i8275_preg_w)//param reg case I8275_COMMAND_START: { - } break; case I8275_COMMAND_STOP: { - } break; @@ -513,7 +510,6 @@ READ8_MEMBER(dwarfd_state::i8275_preg_r)//param reg WRITE8_MEMBER(dwarfd_state::i8275_creg_w)//comand reg { - switch (data>>5) { case 0: @@ -557,7 +553,6 @@ READ8_MEMBER(dwarfd_state::i8275_sreg_r)//status READ8_MEMBER(dwarfd_state::dwarfd_ram_r) { - if (m_crt_access == 0) { return m_dw_ram[offset]; @@ -1022,7 +1017,6 @@ static const ay8910_interface ay8910_config = void dwarfd_state::machine_start() { - save_item(NAME(m_bank)); save_item(NAME(m_line)); save_item(NAME(m_idx)); @@ -1045,7 +1039,6 @@ void dwarfd_state::machine_start() void dwarfd_state::machine_reset() { - m_bank = 0; m_line = 0; m_idx = 0; diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index e25d03cd709..a91ddf78eaa 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -206,7 +206,6 @@ TILE_GET_INFO_MEMBER(dynadice_state::get_tile_info) void dynadice_state::video_start() { - /* pacman - style videoram layout */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_top_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dynadice_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 2, 32); diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 16878f9b02c..7834cad8ff3 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -294,7 +294,6 @@ WRITE8_MEMBER(dynax_state::hnoridur_palbank_w) WRITE8_MEMBER(dynax_state::hnoridur_palette_w) { - switch (m_hnoridur_bank) { case 0x10: @@ -687,7 +686,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(dynax_state::yarunara_input_w) { - switch (offset) { case 0: m_input_sel = data; @@ -1129,7 +1127,6 @@ READ8_MEMBER(dynax_state::htengoku_dsw_r) WRITE8_MEMBER(dynax_state::htengoku_coin_w) { - switch (m_input_sel) { case 0x0c: @@ -1168,7 +1165,6 @@ READ8_MEMBER(dynax_state::htengoku_input_r) READ8_MEMBER(dynax_state::htengoku_coin_r) { - switch (m_input_sel) { case 0x00: return ioport("COINS")->read(); @@ -1182,7 +1178,6 @@ READ8_MEMBER(dynax_state::htengoku_coin_r) WRITE8_MEMBER(dynax_state::htengoku_rombank_w) { - membank("bank1")->set_entry(data & 0x07); m_hnoridur_bank = data; } @@ -1252,7 +1247,6 @@ WRITE8_MEMBER(dynax_state::tenkai_ipsel_w) WRITE8_MEMBER(dynax_state::tenkai_ip_w) { - switch (m_input_sel) { case 0x0c: @@ -1327,7 +1321,6 @@ WRITE8_MEMBER(dynax_state::tenkai_dswsel_w) READ8_MEMBER(dynax_state::tenkai_dsw_r) { - if (!BIT(m_dsw_sel, 0)) return ioport("DSW0")->read(); if (!BIT(m_dsw_sel, 1)) return ioport("DSW1")->read(); if (!BIT(m_dsw_sel, 2)) return ioport("DSW2")->read(); @@ -1415,7 +1408,6 @@ READ8_MEMBER(dynax_state::tenkai_p8_r) READ8_MEMBER(dynax_state::tenkai_8000_r) { - if (m_rombank < 0x10) return m_romptr[offset]; else if ((m_rombank == 0x10) && (offset < 0x10)) @@ -1433,7 +1425,6 @@ READ8_MEMBER(dynax_state::tenkai_8000_r) WRITE8_MEMBER(dynax_state::tenkai_8000_w) { - if ((m_rombank == 0x10) && (offset < 0x10)) { msm6242_device *rtc = machine().device("rtc"); @@ -1571,7 +1562,6 @@ WRITE8_MEMBER(dynax_state::gekisha_p4_w) READ8_MEMBER(dynax_state::gekisha_8000_r) { - if (m_gekisha_rom_enable) return m_romptr[offset]; @@ -1592,7 +1582,6 @@ READ8_MEMBER(dynax_state::gekisha_8000_r) WRITE8_MEMBER(dynax_state::gekisha_8000_w) { - if (!m_gekisha_rom_enable) { switch (offset + 0x8000) @@ -4817,7 +4806,6 @@ void mjelctrn_update_irq( running_machine &machine ) INTERRUPT_GEN_MEMBER(dynax_state::mjelctrn_vblank_interrupt) { - // This is a kludge to avoid losing blitter interrupts // there should be a vblank ack mechanism if (!m_blitter_irq) diff --git a/src/mame/drivers/ecoinf1.c b/src/mame/drivers/ecoinf1.c index 1d7af31c5a4..abc8016e3ef 100644 --- a/src/mame/drivers/ecoinf1.c +++ b/src/mame/drivers/ecoinf1.c @@ -352,7 +352,6 @@ ROM_END DRIVER_INIT_MEMBER(ecoinf1_state,ecoinf1) { - } // all roms might really be for the same game, just in different cabinet styles diff --git a/src/mame/drivers/ecoinf2.c b/src/mame/drivers/ecoinf2.c index 4ffdcd72fe0..4b5f9f3689e 100644 --- a/src/mame/drivers/ecoinf2.c +++ b/src/mame/drivers/ecoinf2.c @@ -493,7 +493,6 @@ ROM_START( ec_sumnc ) ROM_END DRIVER_INIT_MEMBER(ecoinf2_state,ecoinf2) { - } // OXO wh type (Phoenix?) (watchdog on port 5c?) diff --git a/src/mame/drivers/ecoinf3.c b/src/mame/drivers/ecoinf3.c index 6e5a5db09f0..4840bff12a3 100644 --- a/src/mame/drivers/ecoinf3.c +++ b/src/mame/drivers/ecoinf3.c @@ -398,7 +398,6 @@ void ecoinf3_state::update_display() // is the 2 digit bank display part of this, or multiplexed elsewhere WRITE8_MEMBER(ecoinf3_state::ppi8255_intf_e_write_a_alpha_display) { - if ((data>=0x20) && (data<0x5b)) logerror("%04x - ppi8255_intf_e_write_a %02x (alpha) '%c'\n", machine().device("maincpu")->safe_pcbase(), data, data); else logerror("%04x - ppi8255_intf_e_write_a %02x (alpha)\n", machine().device("maincpu")->safe_pcbase(), data); @@ -852,7 +851,6 @@ ROM_END DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3) { - } DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3_swap) diff --git a/src/mame/drivers/ecoinfr.c b/src/mame/drivers/ecoinfr.c index e6da1bb9cd2..80c41020144 100644 --- a/src/mame/drivers/ecoinfr.c +++ b/src/mame/drivers/ecoinfr.c @@ -117,7 +117,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(ecoinfr_state::ecoinfr_irq_timer) { - irq_toggle^=1; //printf("blah %d\n", irq_toggle); @@ -197,27 +196,22 @@ WRITE8_MEMBER(ecoinfr_state::ec_port02_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port03_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port04_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port05_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port06_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port07_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port08_out_bank_strobe_w) @@ -265,7 +259,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port08_out_bank_strobe_w) // is developed WRITE8_MEMBER(ecoinfr_state::ec_port09_out_reelen_w) { - int old_port09_value = port09_value; port09_value = data; @@ -281,13 +274,11 @@ WRITE8_MEMBER(ecoinfr_state::ec_port09_out_reelen_w) WRITE8_MEMBER(ecoinfr_state::ec_port0a_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port0b_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port0c_out_cred_strobe_w) @@ -336,7 +327,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0d_out_cred_data_w) WRITE8_MEMBER(ecoinfr_state::ec_port0e_out_w) { - } WRITE8_MEMBER(ecoinfr_state::ec_port0f_out_bank_segdata_w) @@ -350,7 +340,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0f_out_bank_segdata_w) WRITE8_MEMBER(ecoinfr_state::ec_port10_out_w) { - int old_port10_value = port10_value; port10_value = data; @@ -366,7 +355,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port10_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port11_out_w) { - int old_port11_value = port11_value; port11_value = data; @@ -382,7 +370,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port11_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port12_out_w) { - int old_port12_value = port12_value; port12_value = data; @@ -398,7 +385,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port12_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port13_out_w) { - int old_port13_value = port13_value; port13_value = data; @@ -414,7 +400,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port13_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port14_out_w) { - int old_port14_value = port14_value; port14_value = data; @@ -430,7 +415,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port14_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port15_out_w) { - int old_port15_value = port15_value; port15_value = data; @@ -449,7 +433,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port15_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port16_out_w) { - int old_port16_value = port16_value; port16_value = data; @@ -465,7 +448,6 @@ WRITE8_MEMBER(ecoinfr_state::ec_port16_out_w) WRITE8_MEMBER(ecoinfr_state::ec_port17_out_w) { - int old_port17_value = port17_value; port17_value = data; @@ -752,7 +734,6 @@ INPUT_PORTS_END void ecoinfr_state::machine_reset() { - // port00_value = 0x00; // port01_value = 0x00; // port02_value = 0x00; @@ -844,16 +825,14 @@ MACHINE_CONFIG_END ROM_LOAD( "bxpal", 0x0000, 0x000c80, CRC(e30cd1ff) SHA1(4a1ee1703a677143412aa367cfe7d7d346812d87) ) \ ROM_REGION( 0x200000, "sndz80", 0 ) \ /* apparently all games using these PCBs had the same sound rom.. */ \ - ROM_LOAD( "barxsnd.bin", 0x0000, 0x001000, CRC(7d37fda1) SHA1(fb906615067887d9daecdbc741cfa4ac710c4627) ) \ - + ROM_LOAD( "barxsnd.bin", 0x0000, 0x001000, CRC(7d37fda1) SHA1(fb906615067887d9daecdbc741cfa4ac710c4627) ) #define EC_BARX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_BARX_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) /* 32Kb With Header / Space for Header */ @@ -975,16 +954,14 @@ EC_BARX_SET( 199?, ec_bx180a, ec_bx180, "bxc1&6c.rom", 0x0000, 0x008000, CR #define EC_BIG7_OTHERS \ ROM_REGION( 0x200000, "sndz80", 0 ) \ - ROM_LOAD( "big7snd", 0x0000, 0x002000, CRC(b530d91f) SHA1(f4e70e05d11e92a82f4bf8d78859b2a94fa5f22b) ) \ - + ROM_LOAD( "big7snd", 0x0000, 0x002000, CRC(b530d91f) SHA1(f4e70e05d11e92a82f4bf8d78859b2a94fa5f22b) ) #define EC_BIG7_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_BIG7_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) // This is almost certainly a mix of 'Big7' and 'Super Big7' ROMs /* All have 'BIG7' and type info in header */ EC_BIG7_SET( 199?, ec_big7, 0, "big7.bin", 0x0000, 0x008000, CRC(12a08de2) SHA1(cce3526d3b47567d240739111ed4b7e2ba994de6), "Electrocoin","Big 7 / Super Big 7 (Electrocoin) (set 1)" ) @@ -1064,16 +1041,14 @@ EC_BIG7_SET( 199?, ec_big7__ay, ec_big7, "bigcon8t.hex", 0x0000, #define EC_SBARX_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_SBARX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_SBARX_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) /* Identified as 'SBARX2' header like BIG7 */ EC_SBARX_SET( 199?, ec_sbarx, 0, "iss3001.rom", 0x0000, 0x008000, CRC(01390318) SHA1(e01a4160f774e376b5527ddee084a0be3eef865e), "Electrocoin","Super Bar X (Electrocoin) (set 1)" ) @@ -1163,8 +1138,7 @@ EC_SBARX_SET( 199?, ec_sbarx__a4, ec_sbarx, "sbx8elac", ROM_LOAD( name, offset, length, hash ) \ EC_SBARX_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfrbr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfrbr ,ROT0,company,title,GAME_FLAGS ) /* No Header - very similar to Brunel sets, but no device at 0xa000 */ // spin the reels a lot more than anything else EC_SBARXBR_SET( 1991, ec_sbxbr, 0, "sbx5nc.10", 0x0000, 0x008000, CRC(beb7254a) SHA1(137e91e0b92d970d09d165a42b890a5d31d795d9), "Brunel Research","Super Bar X (Brunel Research) (set 1)" ) @@ -1182,16 +1156,14 @@ EC_SBARXBR_SET( 1991, ec_sbxbrh, ec_sbxbr, "super bar x 8 1-0.bin", #define EC_MAG7S_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_MAG7S_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_MAG7S_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) @@ -1269,16 +1241,14 @@ EC_MAG7S_SET( 199?, ec_mag7s__a0, ec_mag7s, "majic", 0x0000, 0x008000, CRC #define EC_REDBR_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_REDBR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_REDBR_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) // These are '2001 REDBAR' (older header type with 0 at end) EC_REDBR_SET( 199?, ec_redbr, 0, "issa101", 0x0000, 0x008000, CRC(05bba52d) SHA1(fe1f80a6621564f8ea0fd741618ebd80a78a0055), "Electrocoin","Red Bar (Electrocoin) (set 1)" ) EC_REDBR_SET( 199?, ec_redbr__a, ec_redbr, "issa102", 0x0000, 0x008000, CRC(9aebf74c) SHA1(4da5d9240a2dcfdaa96a8a784ea5745c90108f9e), "Electrocoin","Red Bar (Electrocoin) (set 2)" ) @@ -1390,16 +1360,14 @@ EC_REDBR_SET( 199?, ec_redbr__b1, ec_redbr, "sbig78t", 0x00 #define EC_BXD7S_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_BXD7S_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_BXD7S_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) // These are '2006 COOL7' EC_BXD7S_SET( 199?, ec_bxd7s, 0, "issc193.dat", 0x0000, 0x008000, CRC(2f3fb9e2) SHA1(426f7436c8a22f1d8a05a5ccef6b6b5551441028), "Electrocoin","Bar X Diamond 7s (2006 COOL7) (Electrocoin) (set 1)" ) // P-2S K--- @@ -1414,16 +1382,14 @@ EC_BXD7S_SET( 199?, ec_bxd7s__d, ec_bxd7s, "issc337", 0x0000, 0x008000 #define EC_CASBX_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_CASBX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_CASBX_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) /* (C)1993-97/2002-03 ELECTROCOIN */ @@ -1442,16 +1408,14 @@ EC_CASBX_SET( 2005, ec_bx125a, ec_bx125, "x125n34.bin", 0x0000, 0x010000, CR #define EC_SPBDX_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_SPBDX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_SPBDX_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) /* No header (space for one, but 0x00 fill) - Electrocoin 1993 copyright near end */ EC_SPBDX_SET( 199?, ec_spbdx, 0, "iss132.rom", 0x0000, 0x008000, CRC(fd2ea535) SHA1(6deda1825bfce9481bf85a500e031242a2c9cf8c), "Electrocoin","Super Bar X Deluxe (Electrocoin) (set 1)" ) // ELCNSBRX - Sat Jun 22 13:28:41 1996 @@ -1463,16 +1427,14 @@ EC_SPBDX_SET( 199?, ec_spbdx__d, ec_spbdx, "300615", 0x0000, 0x008000 #define EC_UNK5_OTHERS \ ROM_REGION( 0x200000, "sndz80", ROMREGION_ERASE00 ) \ - /* probably the same sound rom */ \ - + /* probably the same sound rom */ #define EC_UNK5_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ EC_UNK5_OTHERS \ ROM_END \ - GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,ecoinfr ,ecoinfr_barx , ecoinfr_state,ecoinfr ,ROT0,company,title,GAME_FLAGS ) // No Header info (all 0x00) // (C)1993/97 ELECTROCOIN @@ -1715,7 +1677,6 @@ ROM_END DRIVER_INIT_MEMBER(ecoinfr_state,ecoinfr) { - } DRIVER_INIT_MEMBER(ecoinfr_state,ecoinfrmab) @@ -1726,7 +1687,6 @@ DRIVER_INIT_MEMBER(ecoinfr_state,ecoinfrmab) // for the Brunel Research sets DRIVER_INIT_MEMBER(ecoinfr_state,ecoinfrbr) { - } // 3rd party sets with MAB scrambling, game names might be incorrect, should be the same basic hardware as these tho. diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 8a0edd59a83..2492f71d508 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -174,7 +174,6 @@ WRITE8_MEMBER(egghunt_state::egghunt_atram_w) void egghunt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(egghunt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); save_item(NAME(m_bgram)); @@ -391,7 +390,6 @@ GFXDECODE_END void egghunt_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_gfx_banking)); diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 1bf208e35a4..164d11eb4be 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -80,7 +80,6 @@ READ8_MEMBER(embargo_state::input_port_bit_r) READ8_MEMBER(embargo_state::dial_r) { - UINT8 lo = 0; UINT8 hi = 0; @@ -230,7 +229,6 @@ INPUT_PORTS_END void embargo_state::machine_start() { - /* register for state saving */ save_item(NAME(m_dial_enable_1)); save_item(NAME(m_dial_enable_2)); @@ -240,7 +238,6 @@ void embargo_state::machine_start() void embargo_state::machine_reset() { - m_dial_enable_1 = 0; m_dial_enable_2 = 0; m_input_select = 0; diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 343d54bf051..a88abc02eed 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -216,7 +216,6 @@ READ8_MEMBER( eolith_state::qs1000_p1_r ) WRITE8_MEMBER( eolith_state::qs1000_p1_w ) { - } @@ -1477,7 +1476,6 @@ MACHINE_RESET_MEMBER(eolith_state,eolith) DRIVER_INIT_MEMBER(eolith_state,eolith) { - init_eolith_speedup(machine()); // Sound CPU -> QS1000 CPU serial link diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c index 160ed2b7e86..912b8bbae04 100644 --- a/src/mame/drivers/eolithsp.c +++ b/src/mame/drivers/eolithsp.c @@ -108,7 +108,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(eolith_state::eolith_speedup) CUSTOM_INPUT_MEMBER(eolith_state::eolith_speedup_getvblank) { - // printf("%s:eolith speedup_read data %02x\n",machine().describe_context(), eolith_vblank); diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 960e1937743..9c8bd24f436 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -36,7 +36,6 @@ WRITE8_MEMBER(epos_state::dealer_decrypt_rom) { - if (offset & 0x04) m_counter = (m_counter + 1) & 0x03; else @@ -367,14 +366,12 @@ INPUT_PORTS_END MACHINE_START_MEMBER(epos_state,epos) { - save_item(NAME(m_palette)); save_item(NAME(m_counter)); } void epos_state::machine_reset() { - m_palette = 0; m_counter = 0; } diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c index 8e524be3d52..33399f57370 100644 --- a/src/mame/drivers/eprom.c +++ b/src/mame/drivers/eprom.c @@ -94,7 +94,6 @@ READ16_MEMBER(eprom_state::adc_r) WRITE16_MEMBER(eprom_state::eprom_latch_w) { - if (ACCESSING_BITS_0_7 && (machine().device("extra") != NULL)) { /* bit 0: reset extra CPU */ @@ -704,7 +703,6 @@ ROM_END DRIVER_INIT_MEMBER(eprom_state,eprom) { - atarijsa_init(machine(), "260010", 0x0002); /* install CPU synchronization handlers */ diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 66f647750dd..8a3fe6dc2dd 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -424,7 +424,6 @@ static SOUND_START(equites) WRITE8_MEMBER(equites_state::equites_c0f8_w) { - switch (offset) { case 0: // c0f8: NMI ack (written by NMI handler) @@ -599,7 +598,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(equites_state::splndrbt_scanline) WRITE8_MEMBER(equites_state::equites_8155_w) { - // FIXME proper 8155 emulation must be implemented switch( offset ) { @@ -1188,7 +1186,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(equites_state,equites) { - m_mcu = machine().device("mcu"); m_audio_cpu = machine().device("audiocpu"); m_msm = machine().device("msm"); @@ -1219,7 +1216,6 @@ MACHINE_START_MEMBER(equites_state,equites) MACHINE_RESET_MEMBER(equites_state,equites) { - flip_screen_set(0); m_fg_char_bank = 0; diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 7b85b1d709c..4c6a2f094f8 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -128,8 +128,7 @@ WRITE16_MEMBER(esd16_state::esd_eeprom_w) AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITE(esd16_tilemap0_color_w) \ AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITENOP /* Unknown */ \ AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITE(esd16_sound_command_w) \ - AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITENOP /* n/c */ \ - + AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITENOP /* n/c */ #define ESD16_IO_AREA_EEPROM( _BASE ) \ AM_RANGE(_BASE + 0x0, _BASE + 0x1) AM_WRITENOP /* Irq Ack */ \ AM_RANGE(_BASE + 0x2, _BASE + 0x3) AM_READ_PORT("P1_P2") \ @@ -138,26 +137,21 @@ WRITE16_MEMBER(esd16_state::esd_eeprom_w) AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITE(esd16_tilemap0_color_w) \ AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITENOP /* Unknown */ \ AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITE(esd16_sound_command_w) \ - AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITE(esd_eeprom_w) \ - + AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITE(esd_eeprom_w) #define ESD16_VID_ATTR_AREA( _BASE ) \ AM_RANGE(_BASE + 0x0, _BASE + 0x3) AM_WRITEONLY AM_SHARE("scroll_0") \ AM_RANGE(_BASE + 0x4, _BASE + 0x7) AM_WRITEONLY AM_SHARE("scroll_1") \ AM_RANGE(_BASE + 0x8, _BASE + 0x9) AM_WRITEONLY AM_SHARE("platform_x") \ AM_RANGE(_BASE + 0xa, _BASE + 0xb) AM_WRITEONLY AM_SHARE("platform_y") \ AM_RANGE(_BASE + 0xc, _BASE + 0xd) AM_WRITENOP \ - AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITEONLY AM_SHARE("head_layersize") \ - + AM_RANGE(_BASE + 0xe, _BASE + 0xf) AM_WRITEONLY AM_SHARE("head_layersize") #define ESD16_PALETTE_AREA( _BASE ) \ - AM_RANGE(_BASE + 0x000, _BASE + 0xfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") \ - + AM_RANGE(_BASE + 0x000, _BASE + 0xfff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_word_w) AM_SHARE("paletteram") #define ESD16_SPRITE_AREA( _BASE ) \ - AM_RANGE(_BASE + 0x000, _BASE + 0x7ff) AM_WRITEONLY AM_SHARE("spriteram") AM_MIRROR(0x000800) \ - + AM_RANGE(_BASE + 0x000, _BASE + 0x7ff) AM_WRITEONLY AM_SHARE("spriteram") AM_MIRROR(0x000800) #define ESD16_VRAM_AREA( _BASE ) \ AM_RANGE(_BASE + 0x00000, _BASE + 0x03fff) AM_WRITE(esd16_vram_0_w) AM_SHARE("vram_0") AM_MIRROR(0x4000) \ - AM_RANGE(_BASE + 0x20000, _BASE + 0x23fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1") AM_MIRROR(0x4000) \ - + AM_RANGE(_BASE + 0x20000, _BASE + 0x23fff) AM_WRITE(esd16_vram_1_w) AM_SHARE("vram_1") AM_MIRROR(0x4000) /*** Memory Maps ***/ static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16, esd16_state ) @@ -252,7 +246,6 @@ ADDRESS_MAP_END READ8_MEMBER(esd16_state::esd16_sound_command_r) { - /* Clear IRQ only after reading the command, or some get lost */ m_audio_cpu->execute().set_input_line(0, CLEAR_LINE); return soundlatch_byte_r(space, 0); @@ -599,7 +592,6 @@ void esd16_state::machine_start() void esd16_state::machine_reset() { - m_tilemap0_color = 0; } diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c index e22758ba783..d8ee1db9344 100644 --- a/src/mame/drivers/espial.c +++ b/src/mame/drivers/espial.c @@ -46,7 +46,6 @@ Stephh's notes (based on the games Z80 code and some tests) : void espial_state::machine_reset() { - m_flipscreen = 0; m_main_nmi_enabled = FALSE; @@ -55,7 +54,6 @@ void espial_state::machine_reset() void espial_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -89,7 +87,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(espial_state::espial_scanline) INTERRUPT_GEN_MEMBER(espial_state::espial_sound_nmi_gen) { - if (m_sound_nmi_enabled) nmi_line_pulse(device); } diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c index a3e5e438f70..59993d65a3c 100644 --- a/src/mame/drivers/exedexes.c +++ b/src/mame/drivers/exedexes.c @@ -207,7 +207,6 @@ static const sn76496_config psg_intf = void exedexes_state::machine_start() { - save_item(NAME(m_chon)); save_item(NAME(m_objon)); save_item(NAME(m_sc1on)); @@ -216,7 +215,6 @@ void exedexes_state::machine_start() void exedexes_state::machine_reset() { - m_chon = 0; m_objon = 0; m_sc1on = 0; diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 80a7fa97f1c..47c3f4602ee 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -379,7 +379,6 @@ static const ay8910_interface ay8910_config = void exerion_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_porta)); diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index f955c912879..86c9cc32c49 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -254,7 +254,6 @@ UINT32 expro02_state::screen_update_galsnew(screen_device &screen, bitmap_ind16 void expro02_state::video_start() { - } @@ -417,7 +416,6 @@ WRITE16_MEMBER(expro02_state::galsnew_6295_bankswitch_w) WRITE16_MEMBER(expro02_state::galsnew_paletteram_w) { - data = COMBINE_DATA(&m_generic_paletteram_16[offset]); palette_set_color_rgb(machine(),offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1)); } diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index 42cf0e11e2f..58091a2205d 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -447,7 +447,6 @@ static const ym3526_interface ym3526_config = #if 0 INTERRUPT_GEN_MEMBER(exprraid_state::exprraid_interrupt) { - if ((~ioport("IN2")->read()) & 0xc0) { if (m_coin == 0) @@ -468,7 +467,6 @@ INTERRUPT_GEN_MEMBER(exprraid_state::exprraid_interrupt) void exprraid_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_slave = machine().device("slave"); @@ -477,7 +475,6 @@ void exprraid_state::machine_start() void exprraid_state::machine_reset() { - m_bg_index[0] = 0; m_bg_index[1] = 0; m_bg_index[2] = 0; diff --git a/src/mame/drivers/extrema.c b/src/mame/drivers/extrema.c index 699fe6a6022..3d01e1496b0 100644 --- a/src/mame/drivers/extrema.c +++ b/src/mame/drivers/extrema.c @@ -63,8 +63,7 @@ ROM_END #define MISSING_DISK \ DISK_REGION( "ide" ) \ - DISK_IMAGE( "extrema_hdd", 0, NO_DUMP ) \ - + DISK_IMAGE( "extrema_hdd", 0, NO_DUMP ) ROM_START( adults ) ROM_REGION( 0x100000, "maincpu", 0 ) diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 93f60a0a648..a1ea11649fd 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -67,7 +67,6 @@ WRITE8_MEMBER(f1gp_state::f1gp_sh_bankswitch_w) WRITE16_MEMBER(f1gp_state::sound_command_w) { - if (ACCESSING_BITS_0_7) { m_pending_command = 1; @@ -415,7 +414,6 @@ static const k053936_interface f1gp2_k053936_intf = MACHINE_START_MEMBER(f1gp_state,f1gpb) { - save_item(NAME(m_pending_command)); save_item(NAME(m_roz_bank)); save_item(NAME(m_flipscreen)); @@ -437,7 +435,6 @@ MACHINE_START_MEMBER(f1gp_state,f1gp) MACHINE_RESET_MEMBER(f1gp_state,f1gp) { - m_pending_command = 0; m_roz_bank = 0; m_flipscreen = 0; diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c index 844d5acd6c7..dd787fd7497 100644 --- a/src/mame/drivers/famibox.c +++ b/src/mame/drivers/famibox.c @@ -286,7 +286,6 @@ static void famicombox_reset(running_machine &machine) TIMER_CALLBACK_MEMBER(famibox_state::famicombox_attract_timer_callback) { - m_attract_timer->adjust(attotime::never, 0, attotime::never); if ( BIT(m_exception_mask,1) ) { @@ -297,7 +296,6 @@ TIMER_CALLBACK_MEMBER(famibox_state::famicombox_attract_timer_callback) TIMER_CALLBACK_MEMBER(famibox_state::famicombox_gameplay_timer_callback) { - if (m_coins > 0) m_coins--; @@ -409,7 +407,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(famibox_state::famibox_keyswitch_changed) { - if ( BIT(m_exception_mask, 3) ) { m_exception_cause &= ~0x08; @@ -419,7 +416,6 @@ INPUT_CHANGED_MEMBER(famibox_state::famibox_keyswitch_changed) INPUT_CHANGED_MEMBER(famibox_state::coin_inserted) { - if ( newval ) { m_coins++; diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index b3058524f10..1e32332f2ad 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -818,7 +818,6 @@ GFXDECODE_END MACHINE_START_MEMBER(fantland_state,fantland) { - m_audio_cpu = machine().device("audiocpu"); save_item(NAME(m_nmi_enable)); @@ -947,7 +946,6 @@ static const msm5205_interface msm5205_config_3 = MACHINE_START_MEMBER(fantland_state,borntofi) { - MACHINE_START_CALL_MEMBER(fantland); m_msm1 = machine().device("msm1"); diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index 07363aafb22..a94f918689a 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -53,7 +53,6 @@ READ8_MEMBER(fastfred_state::fastfred_custom_io_r) READ8_MEMBER(fastfred_state::flyboy_custom1_io_r) { - switch (space.device().safe_pc()) { case 0x049d: return 0xad; /* compare */ @@ -81,7 +80,6 @@ READ8_MEMBER(fastfred_state::flyboy_custom1_io_r) READ8_MEMBER(fastfred_state::flyboy_custom2_io_r) { - switch (space.device().safe_pc()) { case 0x0395: return 0xf7; /* $C900 compare */ @@ -164,13 +162,11 @@ READ8_MEMBER(fastfred_state::imago_sprites_offset_r) WRITE8_MEMBER(fastfred_state::nmi_mask_w) { - m_nmi_mask = data & 1; } WRITE8_MEMBER(fastfred_state::sound_nmi_mask_w) { - m_sound_nmi_mask = data & 1; } @@ -628,14 +624,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(fastfred_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(fastfred_state::sound_timer_irq) { - if(m_sound_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index ce2075c3f27..3ca4ab3313d 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -38,7 +38,6 @@ WRITE8_MEMBER(fastlane_state::k007121_registers_w) WRITE8_MEMBER(fastlane_state::fastlane_bankswitch_w) { - /* bits 0 & 1 coin counters */ coin_counter_w(machine(), 0,data & 0x01); coin_counter_w(machine(), 1,data & 0x02); diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 351eb232982..2c6ea345d1c 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -36,7 +36,6 @@ inputs + notes by stephh INPUT_CHANGED_MEMBER(fcombat_state::coin_inserted) { - /* coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -105,7 +104,6 @@ READ8_MEMBER(fcombat_state::e300_r) WRITE8_MEMBER(fcombat_state::ee00_w) { - } static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, fcombat_state ) @@ -259,7 +257,6 @@ GFXDECODE_END void fcombat_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_cocktail_flip)); @@ -274,7 +271,6 @@ void fcombat_state::machine_start() void fcombat_state::machine_reset() { - m_cocktail_flip = 0; m_char_palette = 0; m_sprite_palette = 0; diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 4fd554c153e..4195b99ecb6 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -87,7 +87,6 @@ public: void feversoc_state::video_start() { - } UINT32 feversoc_state::screen_update_feversoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c index e87868a87e6..8547ac1f53b 100644 --- a/src/mame/drivers/fgoal.c +++ b/src/mame/drivers/fgoal.c @@ -134,14 +134,12 @@ READ8_MEMBER(fgoal_state::fgoal_row_r) WRITE8_MEMBER(fgoal_state::fgoal_row_w) { - m_row = data; mb14241_shift_data_w(m_mb14241, space, 0, 0); } WRITE8_MEMBER(fgoal_state::fgoal_col_w) { - m_col = data; mb14241_shift_count_w(m_mb14241, space, 0, data); } @@ -329,7 +327,6 @@ GFXDECODE_END void fgoal_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_mb14241 = machine().device("mb14241"); @@ -344,7 +341,6 @@ void fgoal_state::machine_start() void fgoal_state::machine_reset() { - machine().scheduler().timer_set(machine().primary_screen->time_until_pos(0), timer_expired_delegate(FUNC(fgoal_state::interrupt_callback),this)); m_xpos = 0; diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c index ecdceb337ee..eb33700d0df 100644 --- a/src/mame/drivers/finalizr.c +++ b/src/mame/drivers/finalizr.c @@ -54,7 +54,6 @@ WRITE8_MEMBER(finalizr_state::finalizr_i8039_irq_w) WRITE8_MEMBER(finalizr_state::i8039_irqen_w) { - /* bit 0x80 goes active low, indicating that the external IRQ being serviced is complete bit 0x40 goes active high to enable the DAC ? @@ -66,7 +65,6 @@ WRITE8_MEMBER(finalizr_state::i8039_irqen_w) READ8_MEMBER(finalizr_state::i8039_T1_r) { - /* I suspect the clock-out from the I8039 T0 line should be connected here (See the i8039_T0_w handler below). The frequency of this clock cannot be greater than I8039 CLKIN / 45 @@ -253,7 +251,6 @@ static const sn76496_config psg_intf = void finalizr_state::machine_start() { - m_audio_cpu = machine().device("audiocpu"); save_item(NAME(m_spriterambank)); @@ -265,7 +262,6 @@ void finalizr_state::machine_start() void finalizr_state::machine_reset() { - m_spriterambank = 0; m_charbank = 0; m_T1_line = 0; diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 6bfbe773d41..5c4ce5995e2 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1190,7 +1190,6 @@ static void atapi_command_reg_w(running_machine &machine, int reg, UINT16 data) //if (state->m_atapi_drivesel==1) logerror("!!!ATAPI COMMAND %x\n", state->m_atapi_data[0]&0xff); switch (state->m_atapi_data[0]&0xff) { - case 0x55: // MODE SELECT state->m_atapi_cdata_wait = state->m_atapi_data[4]/2; state->m_atapi_data_ptr = 0; diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index 739079f5008..12a1d9d5f79 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -407,7 +407,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(firetrap_state::coin_inserted) { - /* coin insertion causes an IRQ */ if(newval) { @@ -583,7 +582,6 @@ static const msm5205_interface msm5205_config = INTERRUPT_GEN_MEMBER(firetrap_state::firetrap_irq) { - if (m_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index e672f010933..e474b988dab 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -51,7 +51,6 @@ INPUT_CHANGED_MEMBER(firetrk_state::gear_changed) INTERRUPT_GEN_MEMBER(firetrk_state::firetrk_interrupt) { - /* NMI interrupts are disabled during service mode in firetrk and montecar */ if (!m_in_service_mode) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index 4cf8f29efe2..87ceac56cf3 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -721,13 +721,11 @@ GFXDECODE_END void fitfight_state::machine_start() { - save_item(NAME(m_fof_700000_data)); } void fitfight_state::machine_reset() { - m_fof_700000_data = 0; } diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 579409ffe2a..20090eb047f 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -22,7 +22,6 @@ INTERRUPT_GEN_MEMBER(flkatck_state::flkatck_interrupt) { - if (m_irq_enabled) device.execute().set_input_line(HD6309_IRQ_LINE, HOLD_LINE); } @@ -61,7 +60,6 @@ READ8_MEMBER(flkatck_state::flkatck_ls138_r) WRITE8_MEMBER(flkatck_state::flkatck_ls138_w) { - switch ((offset & 0x1c) >> 2) { case 0x04: /* bankswitch */ @@ -207,7 +205,6 @@ void flkatck_state::machine_start() void flkatck_state::machine_reset() { - k007232_set_bank(machine().device("konami"), 0, 1); m_irq_enabled = 0; diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 46db32e9f6d..a54959f6f53 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -428,7 +428,6 @@ WRITE8_MEMBER(flstory_state::sound_control_2_w) WRITE8_MEMBER(flstory_state::sound_control_3_w)/* unknown */ { - m_snd_ctrl3 = data & 0xff; // popmessage("SND3 0=%02x 1=%02x 2=%02x 3=%02x", m_snd_ctrl0, m_snd_ctrl1, m_snd_ctrl2, m_snd_ctrl3); } @@ -1003,7 +1002,6 @@ static const msm5232_interface msm5232_config = void flstory_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -1042,7 +1040,6 @@ void flstory_state::machine_start() MACHINE_RESET_MEMBER(flstory_state,flstory) { - MACHINE_RESET_CALL_MEMBER(ta7630); /* video */ diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index f53f1d50836..9360620ce4a 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -374,7 +374,6 @@ void flyball_state::palette_init() void flyball_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_pitcher_vert)); diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c index 1b668942bff..3c9d505f7db 100644 --- a/src/mame/drivers/forte2.c +++ b/src/mame/drivers/forte2.c @@ -116,7 +116,6 @@ void forte2_state::machine_reset() void forte2_state::machine_start() { - /* register for save states */ state_save_register_global(machine(), m_input_mask); } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index b3eb93477d1..e9d05b617ed 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -39,7 +39,6 @@ INTERRUPT_GEN_MEMBER(fromanc2_state::fromanc2_interrupt) WRITE16_MEMBER(fromanc2_state::fromanc2_sndcmd_w) { - soundlatch_byte_w(space, offset, (data >> 8) & 0xff); // 1P (LEFT) soundlatch2_byte_w(space, offset, data & 0xff); // 2P (RIGHT) @@ -503,7 +502,6 @@ static const ym2610_interface ym2610_config = MACHINE_START_MEMBER(fromanc2_state,fromanc4) { - m_audiocpu = machine().device("audiocpu"); m_subcpu = machine().device("sub"); m_eeprom = machine().device("eeprom"); @@ -521,7 +519,6 @@ MACHINE_START_MEMBER(fromanc2_state,fromanc4) MACHINE_START_MEMBER(fromanc2_state,fromanc2) { - m_bankedram = auto_alloc_array(machine(), UINT8, 0x4000 * 3); membank("bank1")->configure_entries(0, 4, memregion("sub")->base(), 0x4000); @@ -537,7 +534,6 @@ MACHINE_START_MEMBER(fromanc2_state,fromanc2) void fromanc2_state::machine_reset() { - m_portselect = 0; m_datalatch1 = 0; m_datalatch_2h = 0; diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 18764977709..416acf6fcb7 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -75,7 +75,6 @@ WRITE8_MEMBER(fromance_state::fromance_commanddata_w) READ8_MEMBER(fromance_state::fromance_busycheck_main_r) { - /* set a timer to force synchronization after the read */ machine().scheduler().synchronize(); @@ -88,7 +87,6 @@ READ8_MEMBER(fromance_state::fromance_busycheck_main_r) READ8_MEMBER(fromance_state::fromance_busycheck_sub_r) { - if (m_directionflag) return 0xff; // standby else diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c index fdb7c085492..ee92a587178 100644 --- a/src/mame/drivers/funkball.c +++ b/src/mame/drivers/funkball.c @@ -169,7 +169,6 @@ public: void funkball_state::video_start() { - } UINT32 funkball_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) @@ -521,7 +520,6 @@ WRITE8_MEMBER( funkball_state::flash_data_w ) READ32_MEMBER(funkball_state::biu_ctrl_r) { - if (offset == 0) { return 0xffffff; @@ -531,7 +529,6 @@ READ32_MEMBER(funkball_state::biu_ctrl_r) WRITE32_MEMBER(funkball_state::biu_ctrl_w) { - //mame_printf_debug("biu_ctrl_w %08X, %08X, %08X\n", data, offset, mem_mask); COMBINE_DATA(m_biu_ctrl_reg + offset); @@ -552,7 +549,6 @@ WRITE32_MEMBER(funkball_state::biu_ctrl_w) WRITE8_MEMBER(funkball_state::bios_ram_w) { - if(m_biu_ctrl_reg[0x0c/4] & (2 << ((offset & 0x4000)>>14)*4)) // memory is write-able { m_bios_ram[offset] = data; diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c index 163a1a0bff5..872db9221bd 100644 --- a/src/mame/drivers/funkybee.c +++ b/src/mame/drivers/funkybee.c @@ -280,13 +280,11 @@ static const ay8910_interface ay8910_config = void funkybee_state::machine_start() { - save_item(NAME(m_gfx_bank)); } void funkybee_state::machine_reset() { - m_gfx_bank = 0; } diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index dfe7cce354d..7cab9934c7a 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -288,7 +288,6 @@ static const deco16ic_interface funkyjet_deco16ic_tilegen1_intf = void funkyjet_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index db96931dd28..1b1ebfbd3a2 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -220,7 +220,6 @@ WRITE32_MEMBER(fuuki32_state::snd_020_w) WRITE32_MEMBER(fuuki32_state::fuuki32_vregs_w) { - if (m_vregs[offset] != data) { COMBINE_DATA(&m_vregs[offset]); diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 5de109267f4..48e9da22d7f 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -33,7 +33,6 @@ Year Game PCB NOTES WRITE16_MEMBER(gaelco_state::bigkarnk_sound_command_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -73,7 +72,6 @@ WRITE16_MEMBER(gaelco_state::OKIM6295_bankswitch_w) WRITE16_MEMBER(gaelco_state::gaelco_vram_encrypted_w) { - // mame_printf_debug("gaelco_vram_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0f, 0x4228); COMBINE_DATA(&m_videoram[offset]); @@ -84,7 +82,6 @@ WRITE16_MEMBER(gaelco_state::gaelco_vram_encrypted_w) WRITE16_MEMBER(gaelco_state::gaelco_encrypted_w) { - // mame_printf_debug("gaelco_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0f, 0x4228); COMBINE_DATA(&m_screen[offset]); @@ -94,7 +91,6 @@ WRITE16_MEMBER(gaelco_state::gaelco_encrypted_w) WRITE16_MEMBER(gaelco_state::thoop_vram_encrypted_w) { - // mame_printf_debug("gaelco_vram_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0e, 0x4228); COMBINE_DATA(&m_videoram[offset]); @@ -104,7 +100,6 @@ WRITE16_MEMBER(gaelco_state::thoop_vram_encrypted_w) WRITE16_MEMBER(gaelco_state::thoop_encrypted_w) { - // mame_printf_debug("gaelco_encrypted_w!!\n"); data = gaelco_decrypt(space, offset, data, 0x0e, 0x4228); COMBINE_DATA(&m_screen[offset]); @@ -497,7 +492,6 @@ GFXDECODEINFO(0x100000,64) void gaelco_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index bd609d6c633..b47f02b7be6 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -138,7 +138,6 @@ Notes: WRITE16_MEMBER(gaiden_state::gaiden_sound_command_w) { - if (ACCESSING_BITS_0_7) soundlatch_byte_w(space, 0, data & 0xff); /* Ninja Gaiden */ if (ACCESSING_BITS_8_15) @@ -148,7 +147,6 @@ WRITE16_MEMBER(gaiden_state::gaiden_sound_command_w) WRITE16_MEMBER(gaiden_state::drgnbowl_sound_command_w) { - if (ACCESSING_BITS_8_15) { soundlatch_byte_w(space, 0, data >> 8); @@ -164,7 +162,6 @@ WRITE16_MEMBER(gaiden_state::drgnbowl_sound_command_w) WRITE16_MEMBER(gaiden_state::wildfang_protection_w) { - if (ACCESSING_BITS_8_15) { static const int jumppoints[] = @@ -291,7 +288,6 @@ static const int jumppoints_other[0x100] = MACHINE_RESET_MEMBER(gaiden_state,raiga) { - m_prot = 0; m_jumpcode = 0; @@ -330,7 +326,6 @@ MACHINE_START_MEMBER(gaiden_state,raiga) WRITE16_MEMBER(gaiden_state::raiga_protection_w) { - if (ACCESSING_BITS_8_15) { data >>= 8; @@ -1538,7 +1533,6 @@ static void descramble_drgnbowl_gfx(running_machine &machine) memcpy(buffer,ROM,size); for( i = 0; i < size; i++ ) { - ROM[i] = buffer[BITSWAP24(i,23,22,21,20, 19,18,16,17, 15,14,13, 4, diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 7a0f07a3e2c..f78da2faad9 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -735,7 +735,6 @@ WRITE8_MEMBER(bosco_state::bosco_flip_screen_w) WRITE8_MEMBER(galaga_state::bosco_latch_w) { - switch (offset) { case 0x00: /* IRQ1 */ @@ -874,7 +873,6 @@ TIMER_CALLBACK_MEMBER(galaga_state::cpu3_interrupt_callback) MACHINE_START_MEMBER(galaga_state,galaga) { - /* create the interrupt timer */ m_cpu3_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(galaga_state::cpu3_interrupt_callback),this)); m_custom_mod = 0; @@ -897,7 +895,6 @@ static void bosco_latch_reset(running_machine &machine) MACHINE_RESET_MEMBER(galaga_state,galaga) { - /* Reset all latches */ bosco_latch_reset(machine()); @@ -1637,14 +1634,12 @@ static const samples_interface battles_samples_interface = INTERRUPT_GEN_MEMBER(galaga_state::main_vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(galaga_state::sub_vblank_irq) { - if(m_sub_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index f58c0cf58e6..d0183686fd5 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -98,7 +98,6 @@ CUSTOM_INPUT_MEMBER(galastrm_state::coin_word_r) WRITE32_MEMBER(galastrm_state::galastrm_input_w) { - #if 0 { char t[64]; diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index eda5d244dc8..947272fcc72 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -164,7 +164,6 @@ WRITE16_MEMBER(galaxi_state::galaxi_fg_w) void galaxi_state::video_start() { - m_bg1_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); m_bg2_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); m_bg3_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galaxi_state::get_bg3_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 0x20, 0x10); @@ -234,7 +233,6 @@ WRITE16_MEMBER(galaxi_state::galaxi_500002_w) WRITE16_MEMBER(galaxi_state::galaxi_500004_w) { - if (ACCESSING_BITS_0_7) { /* @@ -385,7 +383,6 @@ GFXDECODE_END void galaxi_state::machine_start() { - save_item(NAME(m_hopper)); save_item(NAME(m_ticket)); save_item(NAME(m_out)); @@ -393,7 +390,6 @@ void galaxi_state::machine_start() void galaxi_state::machine_reset() { - m_hopper = 0; m_ticket = 0; m_out[0] = 0; diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 26eda81aed5..e21935e9218 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -841,7 +841,6 @@ static void monsterz_set_latch(running_machine &machine) WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w) { - // d7 high: set latch + advance address high bits (and reset low bits?) if (data & 0x80) { @@ -852,7 +851,6 @@ WRITE8_MEMBER(galaxian_state::monsterz_porta_1_w) WRITE8_MEMBER(galaxian_state::monsterz_portb_1_w) { - // d3 high: set latch + advance address low bits if (data & 0x08) { @@ -2932,7 +2930,6 @@ void galaxian_state::tenspot_set_game_bank(running_machine& machine, int bank, i if (from_game) { - for (x=0;x<0x200;x++) { machine.gfx[0]->mark_dirty(x); @@ -3218,7 +3215,6 @@ DRIVER_INIT_MEMBER(galaxian_state,mshuttlj) DRIVER_INIT_MEMBER(galaxian_state,fantastc) { - /* video extensions */ common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, NULL, upper_extend_sprite_info); diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c index 2146b843648..91b595d2adb 100644 --- a/src/mame/drivers/galgame.c +++ b/src/mame/drivers/galgame.c @@ -59,7 +59,6 @@ public: READ16_MEMBER(galaxygame_state::ke_r) { - UINT16 ret; switch( offset ) @@ -86,7 +85,6 @@ READ16_MEMBER(galaxygame_state::ke_r) WRITE16_MEMBER(galaxygame_state::ke_w) { - switch( offset ) { case 0: // DIV diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index dedabc8a8a8..36e81b4ec9b 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -91,7 +91,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(galivan_state::blit_trigger_w) { - nb_1414m4_exec(space,(m_videoram[0] << 8) | (m_videoram[1] & 0xff),m_videoram,m_scrollx,m_scrolly,m_tx_tilemap); } @@ -377,7 +376,6 @@ GFXDECODE_END MACHINE_START_MEMBER(galivan_state,galivan) { - /* configure ROM banking */ UINT8 *rombase = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 2, &rombase[0x10000], 0x2000); @@ -393,7 +391,6 @@ MACHINE_START_MEMBER(galivan_state,galivan) MACHINE_START_MEMBER(galivan_state,ninjemak) { - /* configure ROM banking */ UINT8 *rombase = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &rombase[0x10000], 0x2000); @@ -408,7 +405,6 @@ MACHINE_START_MEMBER(galivan_state,ninjemak) MACHINE_RESET_MEMBER(galivan_state,galivan) { - machine().device("maincpu")->reset(); // m_layers = 0x60; @@ -421,7 +417,6 @@ MACHINE_RESET_MEMBER(galivan_state,galivan) MACHINE_RESET_MEMBER(galivan_state,ninjemak) { - machine().device("maincpu")->reset(); m_scrollx = 0; @@ -1048,7 +1043,6 @@ WRITE8_MEMBER(galivan_state::youmab_81_w) /* scrolling is tied to a serial port, reads from 0xe43d-0xe43e-0xe43f-0xe440 */ WRITE8_MEMBER(galivan_state::youmab_84_w) { - m_shift_val &= ~((0x80 >> 7) << m_shift_scroll); m_shift_val |= (((data & 0x80) >> 7) << m_shift_scroll); @@ -1061,7 +1055,6 @@ WRITE8_MEMBER(galivan_state::youmab_84_w) WRITE8_MEMBER(galivan_state::youmab_86_w) { - /* latch values */ { m_scrolly = (m_shift_val & 0x0003ff); diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 537f40fc300..d3f043421df 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -433,7 +433,6 @@ INPUT_PORTS_END WRITE16_MEMBER(galpani3_state::galpani3_suprnova_sprite32_w) { - COMBINE_DATA(&m_spriteram[offset]); offset>>=1; m_spriteram32[offset]=(m_spriteram[offset*2+1]<<16) | (m_spriteram[offset*2]); @@ -441,7 +440,6 @@ WRITE16_MEMBER(galpani3_state::galpani3_suprnova_sprite32_w) WRITE16_MEMBER(galpani3_state::galpani3_suprnova_sprite32regs_w) { - COMBINE_DATA(&m_sprregs[offset]); offset>>=1; m_spc_regs[offset]=(m_sprregs[offset*2+1]<<16) | (m_sprregs[offset*2]); @@ -449,7 +447,6 @@ WRITE16_MEMBER(galpani3_state::galpani3_suprnova_sprite32regs_w) WRITE16_MEMBER(galpani3_state::galpani3_priority_buffer_scrollx_w) { - m_priority_buffer_scrollx = data; } diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index a73f4967367..57cef1de53a 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -45,7 +45,6 @@ Manuals for both games define the controls as 4 push buttons: WRITE16_MEMBER(galspnbl_state::soundcommand_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space,offset,data & 0xff); @@ -220,7 +219,6 @@ static const ym3812_interface ym3812_config = void galspnbl_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c index 7c6f3980095..4b070959fde 100644 --- a/src/mame/drivers/gameplan.c +++ b/src/mame/drivers/gameplan.c @@ -91,7 +91,6 @@ TODO: WRITE8_MEMBER(gameplan_state::io_select_w) { - switch (data) { case 0x01: m_current_port = 0; break; @@ -137,7 +136,6 @@ static const via6522_interface via_1_interface = WRITE8_MEMBER(gameplan_state::audio_reset_w) { - m_audiocpu->set_input_line(INPUT_LINE_RESET, data ? CLEAR_LINE : ASSERT_LINE); if (data == 0) @@ -975,7 +973,6 @@ static const ay8910_interface ay8910_config = MACHINE_START_MEMBER(gameplan_state,gameplan) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_riot = machine().device("riot"); diff --git a/src/mame/drivers/gamtor.c b/src/mame/drivers/gamtor.c index 0ee2a2fcb4d..36ae8753e46 100644 --- a/src/mame/drivers/gamtor.c +++ b/src/mame/drivers/gamtor.c @@ -39,7 +39,6 @@ public: WRITE32_MEMBER(gaminator_state::gamtor_unk_w) { - } diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 596c36a544a..1e89a8b3983 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -252,7 +252,6 @@ TIMER_CALLBACK_MEMBER(gaplus_state::namcoio_run) INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_main_irq) { - device_t *io58xx = machine().device("58xx"); device_t *io56xx = machine().device("56xx"); @@ -268,14 +267,12 @@ INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_main_irq) INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_sub_irq) { - if(m_sub_irq_mask) machine().device("sub")->execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(gaplus_state::gaplus_vblank_sub2_irq) { - if(m_sub2_irq_mask) machine().device("sub2")->execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c index c7afdb58b8e..1dc48f47d79 100644 --- a/src/mame/drivers/gatron.c +++ b/src/mame/drivers/gatron.c @@ -406,7 +406,6 @@ INPUT_PORTS_END static const gfx_layout charlayout = { - 8, 16, RGN_FRAC(1,3), /* 256 tiles */ 3, diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 886fb667b19..057c845f0be 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -126,7 +126,6 @@ WRITE8_MEMBER(gberet_state::mrgoemon_coin_counter_w) WRITE8_MEMBER(gberet_state::gberet_flipscreen_w) { - /* bits 0/1/2 = interrupt enable */ UINT8 ack_mask = ~data & m_interrupt_mask; // 1->0 @@ -403,7 +402,6 @@ static const sn76496_config psg_intf = MACHINE_START_MEMBER(gberet_state,gberet) { - save_item(NAME(m_interrupt_mask)); save_item(NAME(m_interrupt_ticks)); save_item(NAME(m_spritebank)); @@ -411,7 +409,6 @@ MACHINE_START_MEMBER(gberet_state,gberet) MACHINE_RESET_MEMBER(gberet_state,gberet) { - m_interrupt_mask = 0; m_interrupt_ticks = 0; m_spritebank = 0; diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index 48e45dbe9b5..93375694046 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -21,14 +21,12 @@ static KONAMI_SETLINES_CALLBACK( gbusters_banking ); INTERRUPT_GEN_MEMBER(gbusters_state::gbusters_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } READ8_MEMBER(gbusters_state::bankedram_r) { - if (m_palette_selected) return m_generic_paletteram_8[offset]; else @@ -37,7 +35,6 @@ READ8_MEMBER(gbusters_state::bankedram_r) WRITE8_MEMBER(gbusters_state::bankedram_w) { - if (m_palette_selected) paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data); else @@ -46,7 +43,6 @@ WRITE8_MEMBER(gbusters_state::bankedram_w) WRITE8_MEMBER(gbusters_state::gbusters_1f98_w) { - /* bit 0 = enable char ROM reading through the video RAM */ k052109_set_rmrd_line(m_k052109, (data & 0x01) ? ASSERT_LINE : CLEAR_LINE); @@ -62,7 +58,6 @@ WRITE8_MEMBER(gbusters_state::gbusters_1f98_w) WRITE8_MEMBER(gbusters_state::gbusters_coin_counter_w) { - /* bit 0 select palette RAM or work RAM at 5800-5fff */ m_palette_selected = ~data & 0x01; @@ -122,7 +117,6 @@ WRITE8_MEMBER(gbusters_state::gbusters_snd_bankswitch_w) /* special handlers to combine 052109 & 051960 */ READ8_MEMBER(gbusters_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -138,7 +132,6 @@ READ8_MEMBER(gbusters_state::k052109_051960_r) WRITE8_MEMBER(gbusters_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index d3be028a1c7..239b6f131f9 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -79,7 +79,6 @@ INTERRUPT_GEN_MEMBER(gcpinbal_state::gcpinbal_interrupt) READ16_MEMBER(gcpinbal_state::ioc_r) { - /* 20 (only once), 76, a0 are read in log */ switch (offset) @@ -395,7 +394,6 @@ static const msm5205_interface msm6585_config = void gcpinbal_state::machine_start() { - save_item(NAME(m_scrollx)); save_item(NAME(m_scrolly)); save_item(NAME(m_bg0_gfxset)); diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 56230d47ac5..22987bd1d56 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -1108,7 +1108,6 @@ static I8255A_INTERFACE( findout_ppi8255_1_intf ) INTERRUPT_GEN_MEMBER(gei_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c index 164246d98c3..69f2db81519 100644 --- a/src/mame/drivers/ggconnie.c +++ b/src/mame/drivers/ggconnie.c @@ -166,7 +166,6 @@ READ8_MEMBER(ggconnie_state::rtc_r) WRITE8_MEMBER(ggconnie_state::rtc_w) { - } /* TODO: banking not understood (is the ROM dumped correctly btw?) */ diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index ae8b7ce306a..e06f13b7290 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -65,7 +65,6 @@ READ16_MEMBER(gijoe_state::control2_r) WRITE16_MEMBER(gijoe_state::control2_w) { - if (ACCESSING_BITS_0_7) { /* bit 0 is data */ @@ -110,14 +109,12 @@ static void gijoe_objdma( running_machine &machine ) TIMER_CALLBACK_MEMBER(gijoe_state::dmaend_callback) { - if (m_cur_control2 & 0x0020) m_maincpu->set_input_line(6, HOLD_LINE); } INTERRUPT_GEN_MEMBER(gijoe_state::gijoe_interrupt) { - // global interrupt masking (*this game only) if (!k056832_is_irq_enabled(m_k056832, 0)) return; @@ -271,7 +268,6 @@ static const k053247_interface gijoe_k053247_intf = void gijoe_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_k054539 = machine().device("k054539"); diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index b4dffe956b3..dffdacd6c4f 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -228,7 +228,6 @@ GFXDECODE_END void ginganin_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_layers_ctrl)); @@ -237,7 +236,6 @@ void ginganin_state::machine_start() void ginganin_state::machine_reset() { - m_layers_ctrl = 0; m_flipscreen = 0; } diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index 8d4cf02bc2b..65c07c97db8 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -20,7 +20,6 @@ WRITE16_MEMBER(glass_state::clr_int_w) INTERRUPT_GEN_MEMBER(glass_state::glass_interrupt) { - if (m_cause_interrupt) { device.execute().set_input_line(6, HOLD_LINE); @@ -171,7 +170,6 @@ INPUT_PORTS_END void glass_state::machine_start() { - save_item(NAME(m_cause_interrupt)); save_item(NAME(m_current_bit)); save_item(NAME(m_current_command)); diff --git a/src/mame/drivers/globalfr.c b/src/mame/drivers/globalfr.c index 713c526310c..0b7d3246ca7 100644 --- a/src/mame/drivers/globalfr.c +++ b/src/mame/drivers/globalfr.c @@ -41,7 +41,6 @@ public: WRITE16_MEMBER(globalfr_state::vfd_w) { - // if(!(data & 0x20)) need to find reset { int clock = (data & 0x40) != 0; @@ -87,8 +86,7 @@ MACHINE_CONFIG_END #define GL_SNBEV_SOUND \ ROM_REGION( 0x200000, "snd", 0 ) \ ROM_LOAD( "3pbv0-8t.u1", 0x000000, 0x100000, CRC(330d891f) SHA1(3bf0f4a107289a079371cd3a9dcce6dd9b304dfe) ) \ - ROM_LOAD( "3pbv0-8t.u2", 0x100000, 0x100000, CRC(b4a0d108) SHA1(cb63bf3cb399c91015b70ef0ebd95e2bdc405b27) ) \ - + ROM_LOAD( "3pbv0-8t.u2", 0x100000, 0x100000, CRC(b4a0d108) SHA1(cb63bf3cb399c91015b70ef0ebd95e2bdc405b27) ) ROM_START( gl_snbev ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD( "3pbv1-3n.g0", 0x000000, 0x020000, CRC(591eccbe) SHA1(aa5d38af8f8cbb4b2b0439dba29537feac9ddd29) ) diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 400f390eba0..4b1280c45b7 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -302,7 +302,6 @@ GFXDECODE_END void gng_state::machine_start() { - UINT8 *rombase = memregion("maincpu")->base(); membank("bank1")->configure_entries(0, 4, &rombase[0x10000], 0x2000); membank("bank1")->configure_entry(4, &rombase[0x4000]); @@ -313,7 +312,6 @@ void gng_state::machine_start() void gng_state::machine_reset() { - m_scrollx[0] = 0; m_scrollx[1] = 0; m_scrolly[0] = 0; diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 34e23290ce7..69e76c5064a 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -304,7 +304,6 @@ void goal92_state::machine_start() void goal92_state::machine_reset() { - m_fg_bank = 0; m_msm5205next = 0; m_adpcm_toggle = 0; diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index e8ac0d6e911..f90d8eb9692 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -25,7 +25,6 @@ Notes: WRITE8_MEMBER(goindol_state::goindol_bankswitch_w) { - membank("bank1")->set_entry(data & 0x03); if (m_char_bank != ((data & 0x10) >> 4)) @@ -41,7 +40,6 @@ WRITE8_MEMBER(goindol_state::goindol_bankswitch_w) READ8_MEMBER(goindol_state::prot_f422_r) { - /* bit 7 = vblank? */ m_prot_toggle ^= 0x80; @@ -51,7 +49,6 @@ READ8_MEMBER(goindol_state::prot_f422_r) WRITE8_MEMBER(goindol_state::prot_fc44_w) { - logerror("%04x: prot_fc44_w(%02x)\n", space.device().safe_pc(), data); m_ram[0x0419] = 0x5b; m_ram[0x041a] = 0x3f; @@ -60,21 +57,18 @@ WRITE8_MEMBER(goindol_state::prot_fc44_w) WRITE8_MEMBER(goindol_state::prot_fd99_w) { - logerror("%04x: prot_fd99_w(%02x)\n", space.device().safe_pc(), data); m_ram[0x0421] = 0x3f; } WRITE8_MEMBER(goindol_state::prot_fc66_w) { - logerror("%04x: prot_fc66_w(%02x)\n", space.device().safe_pc(), data); m_ram[0x0423] = 0x06; } WRITE8_MEMBER(goindol_state::prot_fcb0_w) { - logerror("%04x: prot_fcb0_w(%02x)\n", space.device().safe_pc(), data); m_ram[0x0425] = 0x06; } @@ -229,7 +223,6 @@ void goindol_state::machine_start() void goindol_state::machine_reset() { - m_char_bank = 0; m_prot_toggle = 0; } diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c index 3816360e29e..4e5ab7d8bcd 100644 --- a/src/mame/drivers/goldngam.c +++ b/src/mame/drivers/goldngam.c @@ -258,12 +258,10 @@ public: void goldngam_state::video_start() { - } UINT32 goldngam_state::screen_update_goldngam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int x, y; // ERROR: This cast is NOT endian-safe without the use of BYTE/WORD/DWORD_XOR_* macros! @@ -285,7 +283,6 @@ UINT32 goldngam_state::screen_update_goldngam(screen_device &screen, bitmap_ind1 void goldngam_state::palette_init() { - } diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 294655be709..4a53ce6eb21 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -9420,7 +9420,6 @@ DRIVER_INIT_MEMBER(goldnpkr_state,royale) DRIVER_INIT_MEMBER(goldnpkr_state,flcnw) { - /* Attempt to decrypt the MCU program (we're sooo close!) */ UINT8 *ROM = machine().root_device().memregion("mcu")->base(); diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index f76a7618326..d37cd8ae943 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -123,7 +123,6 @@ WRITE8_MEMBER(goldstar_state::protection_w) { - if (data == 0x2a) m_dataoffset = 0; } @@ -5917,7 +5916,6 @@ WRITE8_MEMBER(goldstar_state::system_outputb_w) WRITE8_MEMBER(goldstar_state::system_outputc_w) { - m_lucky8_nmi_enable = data & 8; m_unkch_vidreg = data & 2; //popmessage("system_outputc_w %02x",data); @@ -6221,7 +6219,6 @@ PALETTE_INIT_MEMBER(goldstar_state,lucky8) proms = machine().root_device().memregion("proms")->base(); for (i = 0; i < 0x100; i++) { - data = proms[0x000 + i] | (proms[0x100 + i] << 4); palette_set_color_rgb(machine(), i, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6)); @@ -6473,7 +6470,6 @@ MACHINE_CONFIG_END INTERRUPT_GEN_MEMBER(goldstar_state::lucky8_irq) { - if(m_lucky8_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c index cb8284fdd99..35838b471ba 100644 --- a/src/mame/drivers/gotcha.c +++ b/src/mame/drivers/gotcha.c @@ -240,7 +240,6 @@ GFXDECODE_END void gotcha_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_banksel)); diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index 01f24c68292..03ddd129644 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -176,7 +176,6 @@ static const samples_interface gotya_samples_interface = void gotya_state::machine_start() { - m_samples = machine().device("samples"); save_item(NAME(m_scroll_bit_8)); @@ -185,7 +184,6 @@ void gotya_state::machine_start() void gotya_state::machine_reset() { - m_scroll_bit_8 = 0; m_theme_playing = 0; } diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 00ed9bf0f6e..be8f2a9a56a 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -34,7 +34,6 @@ READ16_MEMBER(gradius3_state::k052109_halfword_r) WRITE16_MEMBER(gradius3_state::k052109_halfword_w) { - if (ACCESSING_BITS_0_7) k052109_w(m_k052109, space, offset, data & 0xff); @@ -51,7 +50,6 @@ READ16_MEMBER(gradius3_state::k051937_halfword_r) WRITE16_MEMBER(gradius3_state::k051937_halfword_w) { - if (ACCESSING_BITS_0_7) k051937_w(m_k051960, space, offset, data & 0xff); } @@ -69,7 +67,6 @@ WRITE16_MEMBER(gradius3_state::k051960_halfword_w) WRITE16_MEMBER(gradius3_state::cpuA_ctrl_w) { - if (ACCESSING_BITS_8_15) { data >>= 8; @@ -94,7 +91,6 @@ WRITE16_MEMBER(gradius3_state::cpuA_ctrl_w) WRITE16_MEMBER(gradius3_state::cpuB_irqenable_w) { - if (ACCESSING_BITS_8_15) m_irqBmask = (data >> 8) & 0x07; } @@ -119,7 +115,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(gradius3_state::gradius3_sub_scanline) WRITE16_MEMBER(gradius3_state::cpuB_irqtrigger_w) { - if (m_irqBmask & 4) { logerror("%04x trigger cpu B irq 4 %02x\n",space.device().safe_pc(),data); @@ -286,7 +281,6 @@ static const k051960_interface gradius3_k051960_intf = void gradius3_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_subcpu = machine().device("sub"); @@ -301,7 +295,6 @@ void gradius3_state::machine_start() void gradius3_state::machine_reset() { - /* start with cpu B halted */ machine().device("sub")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_irqAen = 0; diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index 48d7f8524aa..642bcc6b963 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -92,7 +92,6 @@ void grchamp_state::machine_reset() INTERRUPT_GEN_MEMBER(grchamp_state::grchamp_cpu0_interrupt) { - if (m_cpu0_out[0] & 0x01) device.execute().set_input_line(0, ASSERT_LINE); } @@ -100,7 +99,6 @@ INTERRUPT_GEN_MEMBER(grchamp_state::grchamp_cpu0_interrupt) INTERRUPT_GEN_MEMBER(grchamp_state::grchamp_cpu1_interrupt) { - if (m_cpu1_out[4] & 0x01) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 374ddaf8618..55bfbafe083 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -535,7 +535,6 @@ UINT32 gstream_state::screen_update_gstream(screen_device &screen, bitmap_ind16 void gstream_state::machine_start() { - save_item(NAME(m_tmap1_scrollx)); save_item(NAME(m_tmap2_scrollx)); save_item(NAME(m_tmap3_scrollx)); @@ -548,7 +547,6 @@ void gstream_state::machine_start() void gstream_state::machine_reset() { - m_tmap1_scrollx = 0; m_tmap2_scrollx = 0; m_tmap3_scrollx = 0; diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index 9a8f67af9b8..bfcccea8c97 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -249,7 +249,6 @@ MACHINE_RESET_MEMBER(gsword_state,josvolly) INTERRUPT_GEN_MEMBER(gsword_state::gsword_snd_interrupt) { - if(m_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 7fcdd6cc0c0..a087994c16c 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -373,7 +373,6 @@ void gundealr_state::machine_start() void gundealr_state::machine_reset() { - m_flipscreen = 0; m_scroll[0] = 0; m_scroll[1] = 0; diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index e011a38c870..ffe75b08835 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -285,7 +285,6 @@ void gunsmoke_state::machine_start() void gunsmoke_state::machine_reset() { - m_chon = 0; m_objon = 0; m_bgon = 0; diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index ba01d0adf61..3e1f4b9d83c 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -491,21 +491,18 @@ DISCRETE_SOUND_END void gyruss_state::machine_start() { - save_item(NAME(m_master_nmi_mask)); save_item(NAME(m_slave_irq_mask)); } INTERRUPT_GEN_MEMBER(gyruss_state::master_vblank_irq) { - if (m_master_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(gyruss_state::slave_vblank_irq) { - if (m_slave_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 4dbd06297b1..d6daf21f8a2 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1265,7 +1265,6 @@ void halleys_state::video_start() static void copy_scroll_op(bitmap_ind16 &bitmap, UINT16 *source, int sx, int sy) { - //-------------------------------------------------------------------------- #define OPCOPY_COMMON { \ @@ -1303,7 +1302,6 @@ static void copy_scroll_op(bitmap_ind16 &bitmap, UINT16 *source, int sx, int sy) static void copy_scroll_xp(bitmap_ind16 &bitmap, UINT16 *source, int sx, int sy) { - //-------------------------------------------------------------------------- #define XCOPY_COMMON \ @@ -1618,7 +1616,6 @@ WRITE8_MEMBER(halleys_state::sndnmi_msk_w) WRITE8_MEMBER(halleys_state::soundcommand_w) { - m_io_ram[0x8a] = data; soundlatch_byte_w(space,offset,data); machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c index 9950dd4c582..1cc43ebbdcc 100644 --- a/src/mame/drivers/hanaawas.c +++ b/src/mame/drivers/hanaawas.c @@ -184,13 +184,11 @@ static const ay8910_interface ay8910_config = void hanaawas_state::machine_start() { - save_item(NAME(m_mux)); } void hanaawas_state::machine_reset() { - m_mux = 0; } diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 6186fb59c4b..b819b46953f 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -196,7 +196,6 @@ void hcastle_state::machine_start() void hcastle_state::machine_reset() { - m_pf2_bankbase = 0; m_pf1_bankbase = 0; m_gfx_bank = 0; diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 9f9e46e4292..70464cdbba3 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -135,7 +135,6 @@ public: VIDEO_START_MEMBER(highvdeo_state,tourvisn) { - } UINT32 highvdeo_state::screen_update_tourvisn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index 96f46aa997a..1f45bca447d 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -399,7 +399,6 @@ public: void hikaru_state::video_start() { - } UINT32 hikaru_state::screen_update_hikaru(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) @@ -524,8 +523,7 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 1, "bios1", "epr23400" ) \ ROM_LOAD16_WORD_SWAP_BIOS( 1, "epr-23400.ic94", 0x000000, 0x200000, CRC(3d557104) SHA1(d39879f5a1acbd54ad8ee4fbd412f870c9ff4aa5) ) \ ROM_SYSTEM_BIOS( 2, "bios2", "epr21904" ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 1, "epr-21904.ic94", 0x000000, 0x200000, CRC(d96298b6) SHA1(d10d837bc7d68eb7125c34beffe21a91305627b0) ) \ - + ROM_LOAD16_WORD_SWAP_BIOS( 1, "epr-21904.ic94", 0x000000, 0x200000, CRC(d96298b6) SHA1(d10d837bc7d68eb7125c34beffe21a91305627b0) ) // bios 0 is SAMURAI boot rom 0.96 / 2000/8/10 // bios 1 is SAMURAI boot rom 0.92 / 1999/7/2 // bios 2 is SAMURAI boot rom 0.84 / 1999/7/22 diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index 764cd39adf5..b86eaf9ea61 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -280,7 +280,6 @@ void himesiki_state::machine_start() void himesiki_state::machine_reset() { - m_scrollx[0] = 0; m_scrollx[1] = 0; m_flipscreen = 0; diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index d3f14a5ff44..870738d07ca 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -32,7 +32,6 @@ TILE_GET_INFO_MEMBER(hitme_state::get_hitme_tile_info) { - /* the code is the low 6 bits */ UINT8 code = m_videoram[tile_index] & 0x3f; SET_TILE_INFO_MEMBER(0, code, 0, 0); @@ -41,7 +40,6 @@ TILE_GET_INFO_MEMBER(hitme_state::get_hitme_tile_info) WRITE8_MEMBER(hitme_state::hitme_vidram_w) { - /* mark this tile dirty */ m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); @@ -308,7 +306,6 @@ void hitme_state::machine_start() void hitme_state::machine_reset() { - m_timeout_time = attotime::zero; } diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index 1894f22a733..f9696a7a639 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -532,7 +532,6 @@ static const msm5205_interface msm5205_config = void hnayayoi_state::machine_start() { - save_item(NAME(m_palbank)); save_item(NAME(m_blit_layer)); save_item(NAME(m_blit_dest)); @@ -542,7 +541,6 @@ void hnayayoi_state::machine_start() void hnayayoi_state::machine_reset() { - /* start with the MSM5205 reset */ msm5205_reset_w(machine().device("msm"), 1); diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 35962b6f496..2e79f46e974 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -475,21 +475,18 @@ READ32_MEMBER(hng64_state::hng64_random_read) READ32_MEMBER(hng64_state::hng64_com_r) { - logerror("com read (PC=%08x): %08x %08x = %08x\n", space.device().safe_pc(), (offset*4)+0xc0000000, mem_mask, m_com_ram[offset]); return m_com_ram[offset]; } WRITE32_MEMBER(hng64_state::hng64_com_w) { - logerror("com write (PC=%08x): %08x %08x = %08x\n", space.device().safe_pc(), (offset*4)+0xc0000000, mem_mask, data); COMBINE_DATA(&m_com_ram[offset]); } WRITE32_MEMBER(hng64_state::hng64_com_share_w) { - logerror("commw (PC=%08x): %08x %08x %08x\n", space.device().safe_pc(), data, (offset*4)+0xc0001000, mem_mask); if (offset == 0x0) COMBINE_DATA(&m_com_shared_a); @@ -635,7 +632,6 @@ WRITE32_MEMBER(hng64_state::hng64_sysregs_w) /* Fatal Fury Wild Ambition / Buriki One */ READ32_MEMBER(hng64_state::fight_io_r) { - switch (offset*4) { case 0x000: return 0x00000400; @@ -650,7 +646,6 @@ READ32_MEMBER(hng64_state::fight_io_r) /* Samurai Shodown 64 / Samurai Shodown 64 2 */ READ32_MEMBER(hng64_state::samsho_io_r) { - switch (offset*4) { case 0x000: @@ -680,7 +675,6 @@ READ32_MEMBER(hng64_state::samsho_io_r) /* FIXME: trigger input doesn't work? */ READ32_MEMBER(hng64_state::shoot_io_r) { - switch (offset*4) { case 0x000: @@ -750,7 +744,6 @@ READ32_MEMBER(hng64_state::racing_io_r) READ32_MEMBER(hng64_state::hng64_dualport_r) { - //printf("dualport R %08x %08x (PC=%08x)\n", offset*4, hng64_dualport[offset], space.device().safe_pc()); /* @@ -788,7 +781,6 @@ Beast Busters 2 outputs (all at offset == 0x1c): WRITE32_MEMBER(hng64_state::hng64_dualport_w) { - //printf("dualport WRITE %08x %08x (PC=%08x)\n", offset*4, hng64_dualport[offset], space.device().safe_pc()); COMBINE_DATA (&m_dualport[offset]); } @@ -802,7 +794,6 @@ WRITE32_MEMBER(hng64_state::hng64_dualport_w) // 30140000-3015ffff is ZBuffer A READ32_MEMBER(hng64_state::hng64_3d_1_r) { - return m_3d_1[offset]; } @@ -815,13 +806,11 @@ WRITE32_MEMBER(hng64_state::hng64_3d_1_w) READ32_MEMBER(hng64_state::hng64_3d_2_r) { - return m_3d_2[offset]; } WRITE32_MEMBER(hng64_state::hng64_3d_2_w) { - COMBINE_DATA (&m_3d_1[offset]); COMBINE_DATA (&m_3d_2[offset]); } @@ -925,7 +914,6 @@ WRITE32_MEMBER(hng64_state::tcram_w) READ32_MEMBER(hng64_state::tcram_r) { - //printf("Q1 R : %.8x %.8x\n", offset, hng64_tcram[offset]); if(offset == 0x12) return ioport("VBLANK")->read(); @@ -937,7 +925,6 @@ READ32_MEMBER(hng64_state::tcram_r) unknown purpose (vblank? related to the display list?). */ READ32_MEMBER(hng64_state::unk_vreg_r) { - return ++m_unk_vreg_toggle; } @@ -1292,7 +1279,6 @@ WRITE8_MEMBER(hng64_state::hng64_comm_memory_w) /* KL5C80 I/O handlers */ WRITE8_MEMBER(hng64_state::hng64_comm_io_mmu) { - m_com_mmu_mem[offset] = data; /* Debugging - you can't change A4 - the hardware doesn't let you */ @@ -1646,7 +1632,6 @@ static void hng64_patch_bios_region(running_machine& machine, int region) DRIVER_INIT_MEMBER(hng64_state,hng64) { - // region hacking, english error messages are more useful to us, but no english bios is dumped... #ifdef HACK_REGION // versions according to fatal fury test mode @@ -1669,14 +1654,12 @@ DRIVER_INIT_MEMBER(hng64_state,hng64) DRIVER_INIT_MEMBER(hng64_state,hng64_fght) { - m_no_machine_error_code = 0x01000000; DRIVER_INIT_CALL(hng64); } DRIVER_INIT_MEMBER(hng64_state,fatfurwa) { - /* FILE* fp = fopen("/tmp/test.bin", "wb"); fwrite(memregion("verts")->base(), 1, 0x0c00000*2, fp); fclose(fp); */ DRIVER_INIT_CALL(hng64_fght); m_mcu_type = FIGHT_MCU; @@ -1684,14 +1667,12 @@ DRIVER_INIT_MEMBER(hng64_state,fatfurwa) DRIVER_INIT_MEMBER(hng64_state,ss64) { - DRIVER_INIT_CALL(hng64_fght); m_mcu_type = SAMSHO_MCU; } DRIVER_INIT_MEMBER(hng64_state,hng64_race) { - m_no_machine_error_code = 0x02000000; m_mcu_type = RACING_MCU; DRIVER_INIT_CALL(hng64); @@ -1699,7 +1680,6 @@ DRIVER_INIT_MEMBER(hng64_state,hng64_race) DRIVER_INIT_MEMBER(hng64_state,hng64_shoot) { - m_mcu_type = SHOOT_MCU; m_no_machine_error_code = 0x03000000; DRIVER_INIT_CALL(hng64); @@ -1773,7 +1753,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(hng64_state::hng64_irq) void hng64_state::machine_start() { - /* set the fastest DRC options */ mips3drc_set_options(machine().device("maincpu"), MIPS3DRC_FASTEST_OPTIONS + MIPS3DRC_STRICT_VERIFY); diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index b85d0861c7d..e372e16cec5 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -340,7 +340,6 @@ WRITE8_MEMBER(homedata_state::reikaids_upd7807_porta_w) WRITE8_MEMBER(homedata_state::reikaids_upd7807_portc_w) { - /* port C layout: 7 coin counter 6 to main CPU (data) @@ -1141,7 +1140,6 @@ static const sn76496_config psg_intf = MACHINE_START_MEMBER(homedata_state,homedata) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_ym = machine().device("ymsnd"); @@ -1194,7 +1192,6 @@ MACHINE_START_MEMBER(homedata_state,pteacher) MACHINE_RESET_MEMBER(homedata_state,homedata) { - m_visible_page = 0; m_flipscreen = 0; m_blitter_bank = 0; @@ -2039,7 +2036,6 @@ DRIVER_INIT_MEMBER(homedata_state,battlcry) DRIVER_INIT_MEMBER(homedata_state,mirderby) { - } diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c index 4160ff03a55..4dea609d271 100644 --- a/src/mame/drivers/hotstuff.c +++ b/src/mame/drivers/hotstuff.c @@ -102,7 +102,6 @@ WRITE8_MEMBER(hotstuff_state::ioboard_data_w) WRITE8_MEMBER(hotstuff_state::ioboard_reg_w) { - m_ioboard.index = data; printf("REG %02x\n",data); } diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index 28daa31f080..e441634e256 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -117,7 +117,6 @@ ROM_END DRIVER_INIT_MEMBER(md_cons_state,hshavoc) { - int x; UINT16 *src = (UINT16 *)machine().root_device().memregion("maincpu")->base(); diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 15de2bfccf0..d1407f5159f 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -140,7 +140,6 @@ public: void hvyunit_state::machine_start() { - m_master_cpu = machine().device("master"); m_slave_cpu = machine().device("slave"); m_sound_cpu = machine().device("soundcpu"); @@ -152,7 +151,6 @@ void hvyunit_state::machine_start() void hvyunit_state::machine_reset() { - m_mermaid_int0_l = 1; m_mermaid_to_z80_full = 0; m_z80_to_mermaid_full = 0; @@ -167,7 +165,6 @@ void hvyunit_state::machine_reset() TILE_GET_INFO_MEMBER(hvyunit_state::get_bg_tile_info) { - int attr = m_colorram[tile_index]; int code = m_videoram[tile_index] + ((attr & 0x0f) << 8); int color = (attr >> 4); @@ -225,7 +222,6 @@ WRITE8_MEMBER(hvyunit_state::master_bankswitch_w) WRITE8_MEMBER(hvyunit_state::mermaid_data_w) { - m_data_to_mermaid = data; m_z80_to_mermaid_full = 1; m_mermaid_int0_l = 0; @@ -234,14 +230,12 @@ WRITE8_MEMBER(hvyunit_state::mermaid_data_w) READ8_MEMBER(hvyunit_state::mermaid_data_r) { - m_mermaid_to_z80_full = 0; return m_data_to_z80; } READ8_MEMBER(hvyunit_state::mermaid_status_r) { - return (!m_mermaid_to_z80_full << 2) | (m_z80_to_mermaid_full << 3); } @@ -254,28 +248,24 @@ READ8_MEMBER(hvyunit_state::mermaid_status_r) WRITE8_MEMBER(hvyunit_state::trigger_nmi_on_sound_cpu2) { - soundlatch_byte_w(space, 0, data); m_sound_cpu->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } WRITE8_MEMBER(hvyunit_state::hu_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(hvyunit_state::hu_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(hvyunit_state::slave_bankswitch_w) { - unsigned char *ROM = memregion("slave")->base(); int bank = (data & 0x03); m_port0_data = data; @@ -331,7 +321,6 @@ READ8_MEMBER(hvyunit_state::mermaid_p0_r) WRITE8_MEMBER(hvyunit_state::mermaid_p0_w) { - if (!BIT(m_mermaid_p[0], 1) && BIT(data, 1)) { m_mermaid_to_z80_full = 1; @@ -346,7 +335,6 @@ WRITE8_MEMBER(hvyunit_state::mermaid_p0_w) READ8_MEMBER(hvyunit_state::mermaid_p1_r) { - if (BIT(m_mermaid_p[0], 0) == 0) return m_data_to_mermaid; else @@ -355,7 +343,6 @@ READ8_MEMBER(hvyunit_state::mermaid_p1_r) WRITE8_MEMBER(hvyunit_state::mermaid_p1_w) { - if (data == 0xff) { m_mermaid_int0_l = 1; @@ -367,7 +354,6 @@ WRITE8_MEMBER(hvyunit_state::mermaid_p1_w) READ8_MEMBER(hvyunit_state::mermaid_p2_r) { - switch ((m_mermaid_p[0] >> 2) & 3) { case 0: return ioport("IN1")->read(); @@ -379,13 +365,11 @@ READ8_MEMBER(hvyunit_state::mermaid_p2_r) WRITE8_MEMBER(hvyunit_state::mermaid_p2_w) { - m_mermaid_p[2] = data; } READ8_MEMBER(hvyunit_state::mermaid_p3_r) { - UINT8 dsw = 0; UINT8 dsw1 = ioport("DSW1")->read(); UINT8 dsw2 = ioport("DSW2")->read(); @@ -403,7 +387,6 @@ READ8_MEMBER(hvyunit_state::mermaid_p3_r) WRITE8_MEMBER(hvyunit_state::mermaid_p3_w) { - m_mermaid_p[3] = data; m_slave_cpu->execute().set_input_line(INPUT_LINE_RESET, data & 2 ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index 836fa8d4861..9c216f194e5 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -28,7 +28,6 @@ WRITE8_MEMBER(hyperspt_state::hyperspt_coin_counter_w) WRITE8_MEMBER(hyperspt_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -274,7 +273,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(hyperspt_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index f201205e716..53d8802066c 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -97,7 +97,6 @@ WRITE16_MEMBER(hyprduel_state::hyprduel_irq_cause_w) WRITE16_MEMBER(hyprduel_state::hyprduel_subcpu_control_w) { - switch (data) { case 0x0d: @@ -618,7 +617,6 @@ GFXDECODE_END void hyprduel_state::machine_reset() { - /* start with cpu2 halted */ machine().device("sub")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_subcpu_resetline = 1; @@ -631,7 +629,6 @@ void hyprduel_state::machine_reset() MACHINE_START_MEMBER(hyprduel_state,hyprduel) { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); @@ -643,7 +640,6 @@ MACHINE_START_MEMBER(hyprduel_state,hyprduel) MACHINE_START_MEMBER(hyprduel_state,magerror) { - MACHINE_START_CALL_MEMBER(hyprduel); m_magerror_irq_timer->adjust(attotime::zero, 0, attotime::from_hz(968)); /* tempo? */ } @@ -780,7 +776,6 @@ ROM_END DRIVER_INIT_MEMBER(hyprduel_state,hyprduel) { - m_int_num = 0x02; /* cpu synchronization (severe timings) */ @@ -792,7 +787,6 @@ DRIVER_INIT_MEMBER(hyprduel_state,hyprduel) DRIVER_INIT_MEMBER(hyprduel_state,magerror) { - m_int_num = 0x01; m_magerror_irq_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(hyprduel_state::magerror_irq_callback),this)); } diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c index 617d617fb32..fd76b94aaf4 100644 --- a/src/mame/drivers/icecold.c +++ b/src/mame/drivers/icecold.c @@ -296,7 +296,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_sint_timer) TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer) { - // /MOTENBL is set high during reset for disable the motors control if (m_motenbl == 0) { diff --git a/src/mame/drivers/ichiban.c b/src/mame/drivers/ichiban.c index ad57b61df70..a1977d8fcae 100644 --- a/src/mame/drivers/ichiban.c +++ b/src/mame/drivers/ichiban.c @@ -65,7 +65,6 @@ public: void ichibanjyan_state::video_start() { - } UINT32 ichibanjyan_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index a7dc2ea3a27..aeab99297c6 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -71,7 +71,6 @@ Notes: struct blitter_t { - UINT16 x, y, w, h, gfx_lo, gfx_hi, depth, @@ -1377,7 +1376,6 @@ WRITE16_MEMBER(igs011_state::drgnwrld_igs003_w) switch(m_igs003_reg[0]) { - case 0x00: if (ACCESSING_BITS_0_7) coin_counter_w(machine(), 0,data & 2); diff --git a/src/mame/drivers/igspc.c b/src/mame/drivers/igspc.c index 51c7957a4ad..4756665594e 100644 --- a/src/mame/drivers/igspc.c +++ b/src/mame/drivers/igspc.c @@ -109,7 +109,6 @@ ROM_END DRIVER_INIT_MEMBER(speeddrv_state,speeddrv) { - } GAME( 2004, speeddrv, 0, speeddrv, speeddrv, speeddrv_state, speeddrv, ROT0, "IGS", "Speed Driver", GAME_IS_SKELETON ) diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c index b0f7b20cb40..fa9f0539893 100644 --- a/src/mame/drivers/ikki.c +++ b/src/mame/drivers/ikki.c @@ -26,7 +26,6 @@ TODO: READ8_MEMBER(ikki_state::ikki_e000_r) { - /* bit1: interrupt type?, bit0: CPU2 busack? */ return (m_irq_source << 1); @@ -227,7 +226,6 @@ static const sn76496_config psg_intf = void ikki_state::machine_start() { - save_item(NAME(m_flipscreen)); save_item(NAME(m_punch_through_pen)); save_item(NAME(m_irq_source)); @@ -235,7 +233,6 @@ void ikki_state::machine_start() void ikki_state::machine_reset() { - m_flipscreen = 0; } diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index ce48984ea47..eeb8b5a19e6 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -204,7 +204,6 @@ static void initialize_colors( running_machine &machine ) void imolagp_state::video_start() { - memset(m_videoram, 0, sizeof(m_videoram)); save_item(NAME(m_videoram)); @@ -498,7 +497,6 @@ static TIMER_DEVICE_CALLBACK ( imolagp_nmi_cb ) INTERRUPT_GEN_MEMBER(imolagp_state::vblank_irq) { - #ifdef HLE_COM memcpy(&m_slave_workram[0x80], m_mComData, m_mComCount); m_mComCount = 0; @@ -520,7 +518,6 @@ static I8255A_INTERFACE( ppi8255_intf ) void imolagp_state::machine_start() { - m_slavecpu = machine().device("slave"); save_item(NAME(m_control)); @@ -538,7 +535,6 @@ void imolagp_state::machine_start() void imolagp_state::machine_reset() { - m_control = 0; m_scroll = 0; m_steerlatch = 0; diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 093c97dc5dd..26a6c03a139 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -359,7 +359,6 @@ void inufuku_state::machine_start() void inufuku_state::machine_reset() { - m_pending_command = 1; m_bg_scrollx = 0; m_bg_scrolly = 0; diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index 36e3a467649..b2b3c3ddc30 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -38,7 +38,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ironhors_state::ironhors_irq) WRITE8_MEMBER(ironhors_state::ironhors_sh_irqtrigger_w) { - m_soundcpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } @@ -357,7 +356,6 @@ static const ym2203_interface ym2203_config = void ironhors_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_soundcpu = machine().device("soundcpu"); @@ -368,7 +366,6 @@ void ironhors_state::machine_start() void ironhors_state::machine_reset() { - m_palettebank = 0; m_charbank = 0; m_spriterambank = 0; @@ -433,7 +430,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ironhors_state::farwest_irq) READ8_MEMBER(ironhors_state::farwest_soundlatch_r) { - return soundlatch_byte_r(m_soundcpu->space(AS_PROGRAM), 0); } diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 56925e926a2..bc6312c481c 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -136,7 +136,6 @@ WRITE8_MEMBER(jackal_state::jackal_zram_w) WRITE8_MEMBER(jackal_state::jackal_voram_w) { - if ((offset & 0xf800) == 0) jackal_mark_tile_dirty(machine(), offset & 0x3ff); @@ -309,7 +308,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(jackal_state::jackal_interrupt) { - if (m_irq_enable) { device.execute().set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index ef0cf89d4c1..93f9979c422 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -540,7 +540,6 @@ GFXDECODE_END DRIVER_INIT_MEMBER(jackie_state,jackie) { - int A; UINT8 *rom = machine().root_device().memregion("maincpu")->base(); diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 0d5508c8074..510744fd186 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -94,7 +94,6 @@ Notes: WRITE8_MEMBER(jailbrek_state::ctrl_w) { - m_nmi_enable = data & 0x01; m_irq_enable = data & 0x02; flip_screen_set(data & 0x08); @@ -102,14 +101,12 @@ WRITE8_MEMBER(jailbrek_state::ctrl_w) INTERRUPT_GEN_MEMBER(jailbrek_state::jb_interrupt) { - if (m_irq_enable) device.execute().set_input_line(0, HOLD_LINE); } INTERRUPT_GEN_MEMBER(jailbrek_state::jb_interrupt_nmi) { - if (m_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index ea071e918a5..cccb05598ae 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -143,7 +143,6 @@ void jangou_state::palette_init() void jangou_state::video_start() { - save_item(NAME(m_blit_buffer)); } @@ -255,7 +254,6 @@ WRITE8_MEMBER(jangou_state::blitter_process_w) /* What is the bit 5 (0x20) for?*/ WRITE8_MEMBER(jangou_state::blit_vregs_w) { - // printf("%02x %02x\n", offset, data); m_pen_data[offset] = data & 0xf; } @@ -331,7 +329,6 @@ WRITE8_MEMBER(jangou_state::cvsd_w) TIMER_CALLBACK_MEMBER(jangou_state::cvsd_bit_timer_callback) { - /* Data is shifted out at the MSB */ hc55516_digit_w(m_cvsd, (m_cvsd_shiftreg >> 7) & 1); m_cvsd_shiftreg <<= 1; @@ -377,7 +374,6 @@ READ8_MEMBER(jangou_state::master_com_r) WRITE8_MEMBER(jangou_state::master_com_w) { - m_nsc->execute().set_input_line(0, HOLD_LINE); m_nsc_latch = data; } @@ -920,7 +916,6 @@ static SOUND_START( jangou ) MACHINE_START_MEMBER(jangou_state,common) { - m_cpu_0 = machine().device("cpu0"); m_cpu_1 = machine().device("cpu1"); m_cvsd = machine().device("cvsd"); @@ -933,7 +928,6 @@ MACHINE_START_MEMBER(jangou_state,common) void jangou_state::machine_start() { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_cvsd_shiftreg)); @@ -942,7 +936,6 @@ void jangou_state::machine_start() MACHINE_START_MEMBER(jangou_state,jngolady) { - MACHINE_START_CALL_MEMBER(common); save_item(NAME(m_adpcm_byte)); @@ -966,7 +959,6 @@ MACHINE_RESET_MEMBER(jangou_state,common) void jangou_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER(common); m_cvsd_shiftreg = 0; @@ -975,7 +967,6 @@ void jangou_state::machine_reset() MACHINE_RESET_MEMBER(jangou_state,jngolady) { - MACHINE_RESET_CALL_MEMBER(common); m_adpcm_byte = 0; diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index bf8a38dbc27..8bdcbbbf325 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -142,7 +142,6 @@ public: void jantotsu_state::video_start() { - save_item(NAME(m_bitmap)); } @@ -192,7 +191,6 @@ WRITE8_MEMBER(jantotsu_state::jantotsu_bitmap_w) WRITE8_MEMBER(jantotsu_state::bankaddr_w) { - m_vram_bank = ((data & 0xc0) >> 6); m_display_on = (data & 2); @@ -490,7 +488,6 @@ static const sn76496_config psg_intf = void jantotsu_state::machine_start() { - save_item(NAME(m_vram_bank)); save_item(NAME(m_mux_data)); save_item(NAME(m_adpcm_pos)); @@ -501,7 +498,6 @@ void jantotsu_state::machine_start() void jantotsu_state::machine_reset() { - /*Load hard-wired background color.*/ m_col_bank = (ioport("DSW2")->read() & 0xc0) >> 3; diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 79d7e0594a2..5fc67f4efad 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -363,13 +363,11 @@ UINT32 jchan_state::screen_update_jchan(screen_device &screen, bitmap_ind16 &bit WRITE16_MEMBER(jchan_state::jchan_ctrl_w) { - m_irq_sub_enable = data & 0x8000; // hack / guess! } READ16_MEMBER(jchan_state::jchan_ctrl_r) { - switch(offset) { case 0/2: return ioport("P1")->read(); @@ -390,7 +388,6 @@ READ16_MEMBER(jchan_state::jchan_ctrl_r) /* communications - hacky! */ WRITE16_MEMBER(jchan_state::main2sub_cmd_w) { - COMBINE_DATA(&m_mainsub_shared_ram[0x03ffe/2]); machine().device("sub")->execute().set_input_line(4, HOLD_LINE); } @@ -398,7 +395,6 @@ WRITE16_MEMBER(jchan_state::main2sub_cmd_w) // is this called? WRITE16_MEMBER(jchan_state::sub2main_cmd_w) { - COMBINE_DATA(&m_mainsub_shared_ram[0x0000/2]); machine().device("maincpu")->execute().set_input_line(3, HOLD_LINE); } @@ -406,7 +402,6 @@ WRITE16_MEMBER(jchan_state::sub2main_cmd_w) /* ram convert for suprnova (requires 32-bit stuff) */ WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32_1_w) { - COMBINE_DATA(&m_spriteram_1[offset]); offset>>=1; m_sprite_ram32_1[offset]=(m_spriteram_1[offset*2+1]<<16) | (m_spriteram_1[offset*2]); @@ -414,7 +409,6 @@ WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32_1_w) WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32regs_1_w) { - COMBINE_DATA(&m_sprregs_1[offset]); offset>>=1; m_sprite_regs32_1[offset]=(m_sprregs_1[offset*2+1]<<16) | (m_sprregs_1[offset*2]); @@ -422,7 +416,6 @@ WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32regs_1_w) WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32_2_w) { - COMBINE_DATA(&m_spriteram_2[offset]); offset>>=1; m_sprite_ram32_2[offset]=(m_spriteram_2[offset*2+1]<<16) | (m_spriteram_2[offset*2]); @@ -430,7 +423,6 @@ WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32_2_w) WRITE16_MEMBER(jchan_state::jchan_suprnova_sprite32regs_2_w) { - COMBINE_DATA(&m_sprregs_2[offset]); offset>>=1; m_sprite_regs32_2[offset]=(m_sprregs_2[offset*2+1]<<16) | (m_sprregs_2[offset*2]); diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c index 9d722dc6143..fb2172311b2 100644 --- a/src/mame/drivers/jclub2.c +++ b/src/mame/drivers/jclub2.c @@ -718,12 +718,10 @@ MACHINE_CONFIG_END VIDEO_START_MEMBER(darkhors_state,jclub2) { - } UINT32 darkhors_state::screen_update_jclub2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // this isn't an st0020.. m_gdfs_st0020->st0020_draw_all(machine(), bitmap, cliprect); @@ -783,7 +781,6 @@ static const st0016_interface st0016_config = VIDEO_START_MEMBER(darkhors_state,jclub2o) { - } UINT32 darkhors_state::screen_update_jclub2o(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index 482002979ac..9c01612b6ac 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -154,7 +154,6 @@ WRITE8_MEMBER(jedi_state::main_irq_ack_w) void jedi_state::machine_start() { - /* set a timer to run the interrupts */ m_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(jedi_state::generate_interrupt),this)); m_interrupt_timer->adjust(machine().primary_screen->time_until_pos(32), 32); @@ -176,7 +175,6 @@ void jedi_state::machine_start() void jedi_state::machine_reset() { - /* init globals */ m_a2d_select = 0; m_nvram_enabled = 0; @@ -221,7 +219,6 @@ READ8_MEMBER(jedi_state::a2d_data_r) WRITE8_MEMBER(jedi_state::a2d_select_w) { - m_a2d_select = offset; } @@ -241,7 +238,6 @@ WRITE8_MEMBER(jedi_state::jedi_coin_counter_w) WRITE8_MEMBER(jedi_state::nvram_data_w) { - if (m_nvram_enabled) m_nvram[offset] = data; } @@ -249,7 +245,6 @@ WRITE8_MEMBER(jedi_state::nvram_data_w) WRITE8_MEMBER(jedi_state::nvram_enable_w) { - m_nvram_enabled = ~offset & 1; } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index d83e00b8138..f84110a4913 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -159,7 +159,6 @@ WRITE8_MEMBER(jollyjgr_state::jollyjgr_videoram_w) WRITE8_MEMBER(jollyjgr_state::jollyjgr_attrram_w) { - if (offset & 1) { /* color change */ @@ -178,7 +177,6 @@ WRITE8_MEMBER(jollyjgr_state::jollyjgr_attrram_w) WRITE8_MEMBER(jollyjgr_state::jollyjgr_misc_w) { - // they could be swapped, because it always set "data & 3" m_flip_x = data & 1; m_flip_y = data & 2; @@ -552,7 +550,6 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1 UINT32 jollyjgr_state::screen_update_fspider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // Draw bg and sprites screen_update_jollyjgr(screen, bitmap, cliprect); @@ -631,7 +628,6 @@ INTERRUPT_GEN_MEMBER(jollyjgr_state::jollyjgr_interrupt) void jollyjgr_state::machine_start() { - save_item(NAME(m_nmi_enable)); save_item(NAME(m_flip_x)); save_item(NAME(m_flip_y)); @@ -641,7 +637,6 @@ void jollyjgr_state::machine_start() void jollyjgr_state::machine_reset() { - m_nmi_enable = 0; m_flip_x = 0; m_flip_y = 0; diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 9994cfa26aa..990dd8c8274 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -70,7 +70,6 @@ public: void jongkyo_state::video_start() { - } UINT32 jongkyo_state::screen_update_jongkyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -474,7 +473,6 @@ static const ay8910_interface ay8910_config = void jongkyo_state::machine_start() { - save_item(NAME(m_videoram2)); save_item(NAME(m_rom_bank)); save_item(NAME(m_mux_data)); @@ -482,7 +480,6 @@ void jongkyo_state::machine_start() void jongkyo_state::machine_reset() { - m_rom_bank = 0; m_mux_data = 0; } diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 3cc2f5a312a..3777d222fea 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -905,7 +905,6 @@ MACHINE_CONFIG_END READ8_MEMBER(jpmimpct_state::hopper_b_r) { - int retval; // B0 = 100p Hopper Out Verif // B1 = Hopper High @@ -932,7 +931,6 @@ READ8_MEMBER(jpmimpct_state::hopper_b_r) READ8_MEMBER(jpmimpct_state::hopper_c_r) { - int retval; // C0-C2 = Alpha // C3 @@ -970,7 +968,6 @@ READ8_MEMBER(jpmimpct_state::hopper_c_r) WRITE8_MEMBER(jpmimpct_state::payen_a_w) { - m_motor[0] = (data & 0x01); m_payen = (data & 0x10); m_slidesout = (data & 0x10); diff --git a/src/mame/drivers/jpmimpctsw.c b/src/mame/drivers/jpmimpctsw.c index 1cd1ff17270..cee66060942 100644 --- a/src/mame/drivers/jpmimpctsw.c +++ b/src/mame/drivers/jpmimpctsw.c @@ -87,8 +87,7 @@ ROM_END #define j6arcade_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "arca-snd.bin", 0x000000, 0x080000, CRC(111c3c40) SHA1(9ce6da8101eb9c26c7ff5616ef24e7c119803777) ) \ - + ROM_LOAD( "arca-snd.bin", 0x000000, 0x080000, CRC(111c3c40) SHA1(9ce6da8101eb9c26c7ff5616ef24e7c119803777) ) ROM_START( j6arcade ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -177,8 +176,7 @@ ROM_END #define j6bnkrcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cbsnd.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) \ - + ROM_LOAD( "cbsnd.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) ROM_START( j6bnkrcl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "clba-6_1.bin", 0x000000, 0x020000, CRC(b0407200) SHA1(88792a7cc71be3830a0156fa10195bad3cc58066) ) @@ -210,8 +208,7 @@ ROM_END #define j6big50_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "1386.bin", 0x000000, 0x080000, CRC(72ddabc9) SHA1(c68b0896b4c25b591029231dff045b16eab61ac4) ) \ - + ROM_LOAD( "1386.bin", 0x000000, 0x080000, CRC(72ddabc9) SHA1(c68b0896b4c25b591029231dff045b16eab61ac4) ) ROM_START( j6big50 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -250,8 +247,7 @@ ROM_END #define j6bigbnk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "1109.bin", 0x000000, 0x080000, CRC(b4d7ac12) SHA1(ac194d15e9d4e5cdadddbf2dc3c9660b52f116c2) ) \ - + ROM_LOAD( "1109.bin", 0x000000, 0x080000, CRC(b4d7ac12) SHA1(ac194d15e9d4e5cdadddbf2dc3c9660b52f116c2) ) ROM_START( j6bigbnk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -384,8 +380,7 @@ ROM_END #define j6bigbuk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bb_snd.bin", 0x000000, 0x080000, CRC(d4d57f9f) SHA1(2ec38b62928d8c208880015b3a5e348e9b1c2079) ) \ - + ROM_LOAD( "bb_snd.bin", 0x000000, 0x080000, CRC(d4d57f9f) SHA1(2ec38b62928d8c208880015b3a5e348e9b1c2079) ) ROM_START( j6bigbuk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -478,8 +473,7 @@ ROM_END #define j6bigpct_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6bigpct ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "big11nsk.1", 0x000000, 0x020000, CRC(fabe2c0d) SHA1(522cd19e6e947afb485e6fd81e3589a97ec5ba0b) ) @@ -504,8 +498,7 @@ ROM_END #define j6bigtop_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "btcl-snd.bin", 0x000000, 0x080000, CRC(160d0317) SHA1(bb111b0a96fde85acd197ef9147eae2b7059da36) ) \ - + ROM_LOAD( "btcl-snd.bin", 0x000000, 0x080000, CRC(160d0317) SHA1(bb111b0a96fde85acd197ef9147eae2b7059da36) ) ROM_START( j6bigtop ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -538,8 +531,7 @@ ROM_END #define j6bigwhl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bigwheelsnd.bin", 0x000000, 0x080000, CRC(90a19aaa) SHA1(7b17e9fda01d4fb163e09107759a6bf473fc6dc0) ) \ - + ROM_LOAD( "bigwheelsnd.bin", 0x000000, 0x080000, CRC(90a19aaa) SHA1(7b17e9fda01d4fb163e09107759a6bf473fc6dc0) ) ROM_START( j6bigwhl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -586,8 +578,7 @@ ROM_END #define j6bnza_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "1064.bin", 0x000000, 0x080000, CRC(266edecb) SHA1(c985081bd2a4500889aae0dc7ecd7d8e4cbd1591) ) \ - + ROM_LOAD( "1064.bin", 0x000000, 0x080000, CRC(266edecb) SHA1(c985081bd2a4500889aae0dc7ecd7d8e4cbd1591) ) ROM_START( j6bnza ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -676,8 +667,7 @@ ROM_END #define j6brkout_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bksnd.bin", 0x000000, 0x080000, CRC(f72bd4f4) SHA1(ef8651fe7bb5f5340e41d35ca0669cba7d9c1372) ) \ - + ROM_LOAD( "bksnd.bin", 0x000000, 0x080000, CRC(f72bd4f4) SHA1(ef8651fe7bb5f5340e41d35ca0669cba7d9c1372) ) ROM_START( j6brkout ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -710,8 +700,7 @@ ROM_END #define j6cpclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cpalaceclubsnd", 0x000000, 0x080000, CRC(ef433c44) SHA1(049bdbbe8d88fb77dbfc9c2690e62982e7fe20ea) ) \ - + ROM_LOAD( "cpalaceclubsnd", 0x000000, 0x080000, CRC(ef433c44) SHA1(049bdbbe8d88fb77dbfc9c2690e62982e7fe20ea) ) ROM_START( j6cpclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -739,8 +728,7 @@ ROM_END #define j6camelt_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "camsound.bin", 0x000000, 0x080000, CRC(70d5a16f) SHA1(0e8ec67387274298637598bf1ab8c479aa108c54) ) \ - + ROM_LOAD( "camsound.bin", 0x000000, 0x080000, CRC(70d5a16f) SHA1(0e8ec67387274298637598bf1ab8c479aa108c54) ) ROM_START( j6camelt ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -789,8 +777,7 @@ ROM_END #define j6cshbox_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cbcsnd.bin", 0x000000, 0x080000, CRC(bf209b9b) SHA1(d2c079b05baeae80ed772509c3d9640e682addcd) ) \ - + ROM_LOAD( "cbcsnd.bin", 0x000000, 0x080000, CRC(bf209b9b) SHA1(d2c079b05baeae80ed772509c3d9640e682addcd) ) ROM_START( j6cshbox ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -826,8 +813,7 @@ ROM_END #define j6cshbst_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "as1.bin", 0x000000, 0x080000, CRC(96127e49) SHA1(58bec4a024eb557995c67ac81880ad3a9de84ac0) ) \ - + ROM_LOAD( "as1.bin", 0x000000, 0x080000, CRC(96127e49) SHA1(58bec4a024eb557995c67ac81880ad3a9de84ac0) ) ROM_START( j6cshbst ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -867,8 +853,7 @@ ROM_END #define j6cshcnt_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cd75snd.bin", 0x000000, 0x080000, CRC(352e28cd) SHA1(c98307f5eaf511c9d281151d1c07ffd83f24244c) ) \ - + ROM_LOAD( "cd75snd.bin", 0x000000, 0x080000, CRC(352e28cd) SHA1(c98307f5eaf511c9d281151d1c07ffd83f24244c) ) ROM_START( j6cshcnt ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -886,8 +871,7 @@ ROM_END #define j6cshrd_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cashraider8b11as1 24-9-98.bin", 0x000000, 0x080000, CRC(8d28ba3c) SHA1(5d403bdc4cfd6a3e14c1e9458dcda112ed1770c5) ) /* aka carasnd.bin */ \ - + ROM_LOAD( "cashraider8b11as1 24-9-98.bin", 0x000000, 0x080000, CRC(8d28ba3c) SHA1(5d403bdc4cfd6a3e14c1e9458dcda112ed1770c5) ) /* aka carasnd.bin */ ROM_START( j6cshrd ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -939,8 +923,7 @@ ROM_END #define j6cshvgs_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cvssnd.bin", 0x000000, 0x080000, CRC(f2f828f5) SHA1(3d141884ea68d3e440ac43eaec3e8133fa8ae776) ) \ - + ROM_LOAD( "cvssnd.bin", 0x000000, 0x080000, CRC(f2f828f5) SHA1(3d141884ea68d3e440ac43eaec3e8133fa8ae776) ) ROM_START( j6cshvgs ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1077,8 +1060,7 @@ ROM_END #define j6cas5_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cfl-snd.bin", 0x000000, 0x080000, CRC(0016ab04) SHA1(82d133f485b325b29db901f6254c80ca959abd3e) ) \ - + ROM_LOAD( "cfl-snd.bin", 0x000000, 0x080000, CRC(0016ab04) SHA1(82d133f485b325b29db901f6254c80ca959abd3e) ) ROM_START( j6cas5 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1177,8 +1159,7 @@ ROM_END #define j6cascz_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "1274.bin", 0x000000, 0x080000, CRC(90a19aaa) SHA1(7b17e9fda01d4fb163e09107759a6bf473fc6dc0) ) \ - ROM_LOAD( "crazycasinosnd.bin", 0x000000, 0x080000, CRC(d10b8005) SHA1(e499e4e119956c7831dcec8dc8a6e338423afafb) ) \ - + ROM_LOAD( "crazycasinosnd.bin", 0x000000, 0x080000, CRC(d10b8005) SHA1(e499e4e119956c7831dcec8dc8a6e338423afafb) ) // check hw for j6cascz sets @@ -1284,8 +1265,7 @@ ROM_END #define j6cccla_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6cccla ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1375,8 +1355,7 @@ ROM_END #define j6cascla_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6cascla ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1529,8 +1508,7 @@ ROM_END #define j6casclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "1274.bin", 0x000000, 0x080000, CRC(90a19aaa) SHA1(7b17e9fda01d4fb163e09107759a6bf473fc6dc0) ) \ - ROM_LOAD( "cccsnd.bin", 0x000000, 0x080000, CRC(facc0580) SHA1(4f0307a6439e5df97ee4e80f6300e7bf056f3dad) ) \ - + ROM_LOAD( "cccsnd.bin", 0x000000, 0x080000, CRC(facc0580) SHA1(4f0307a6439e5df97ee4e80f6300e7bf056f3dad) ) ROM_START( j6casclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1550,8 +1528,7 @@ ROM_END ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "clve-snd.bin", 0x000000, 0x020000, CRC(f77c12c7) SHA1(a2084be41949949aed787c1dccb64b969de81c86) ) /* looks like a bad dump, most missing */ \ ROM_LOAD( "cas_las_vegas_snd.bin", 0x000000, 0x080000, CRC(d49c212e) SHA1(e4ddd743bdb9404afb5d6c3d2ae4ea1d625c331d) ) \ - ROM_LOAD( "caslasvegas30-06-97-4133as1.bin", 0x000000, 0x080000, CRC(d49c212e) SHA1(e4ddd743bdb9404afb5d6c3d2ae4ea1d625c331d) ) \ - + ROM_LOAD( "caslasvegas30-06-97-4133as1.bin", 0x000000, 0x080000, CRC(d49c212e) SHA1(e4ddd743bdb9404afb5d6c3d2ae4ea1d625c331d) ) ROM_START( j6caslas ) @@ -1597,8 +1574,7 @@ ROM_END #define j6cluclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "clubcluedosnd.bin", 0x000000, 0x080000, CRC(80491c1b) SHA1(432ce61b26f77da10f5dc9230d8e3d4d988db4b4) ) \ - + ROM_LOAD( "clubcluedosnd.bin", 0x000000, 0x080000, CRC(80491c1b) SHA1(432ce61b26f77da10f5dc9230d8e3d4d988db4b4) ) ROM_START( j6cluclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1694,8 +1670,7 @@ ROM_END #define j6col_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "coli_snd.bin", 0x000000, 0x080000, CRC(0f75b32e) SHA1(29e9e04d9a1686dfdf6cbdcd3acca23d6e64a048) ) \ - + ROM_LOAD( "coli_snd.bin", 0x000000, 0x080000, CRC(0f75b32e) SHA1(29e9e04d9a1686dfdf6cbdcd3acca23d6e64a048) ) ROM_START( j6col ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1749,8 +1724,7 @@ ROM_END #define j6colcsh_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "coli-snd.bin", 0x000000, 0x080000, CRC(a194e5af) SHA1(649d6ecc4e15afd60c2f57d082a6d9846013c107) ) \ - + ROM_LOAD( "coli-snd.bin", 0x000000, 0x080000, CRC(a194e5af) SHA1(649d6ecc4e15afd60c2f57d082a6d9846013c107) ) ROM_START( j6colcsh ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "coli-6_1.bin", 0x000000, 0x020000, CRC(e560f327) SHA1(48c619dc65e023621a530419ef6363865ff59c2a) ) @@ -1790,8 +1764,7 @@ ROM_END #define j6colmon_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "colourofmoneysnd.bin", 0x000000, 0x080000, CRC(289d74c8) SHA1(04938d526e4a3079e9570fa946e5c6b9cc0ba311) ) \ - + ROM_LOAD( "colourofmoneysnd.bin", 0x000000, 0x080000, CRC(289d74c8) SHA1(04938d526e4a3079e9570fa946e5c6b9cc0ba311) ) ROM_START( j6colmon ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1873,8 +1846,7 @@ ROM_END #define j6coprob_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "crsound.bin", 0x000000, 0x080000, CRC(d39dd4f1) SHA1(9ce7870c00f9ccb797182af41a7d22e41624c8ce) ) \ - + ROM_LOAD( "crsound.bin", 0x000000, 0x080000, CRC(d39dd4f1) SHA1(9ce7870c00f9ccb797182af41a7d22e41624c8ce) ) ROM_START( j6coprob ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -1921,8 +1893,7 @@ ROM_END #define j6crack_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "crck_snd.hex", 0x000000, 0x080000, CRC(106bb6b5) SHA1(a2e109fd71575dcceec190efed0a9c81ec1f4048) ) \ - + ROM_LOAD( "crck_snd.hex", 0x000000, 0x080000, CRC(106bb6b5) SHA1(a2e109fd71575dcceec190efed0a9c81ec1f4048) ) ROM_START( j6crack ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2004,8 +1975,7 @@ ROM_END #define j6crzclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6crzclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2038,8 +2008,7 @@ ROM_END #define j6crsfir_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "crossfiresnd.bin", 0x000000, 0x080000, CRC(266edecb) SHA1(c985081bd2a4500889aae0dc7ecd7d8e4cbd1591) ) \ - + ROM_LOAD( "crossfiresnd.bin", 0x000000, 0x080000, CRC(266edecb) SHA1(c985081bd2a4500889aae0dc7ecd7d8e4cbd1591) ) ROM_START( j6crsfir ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2059,8 +2028,7 @@ ROM_END #define j6daygld_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ /* dgsnd.bin = popsnd.bin m_popeye Popeye (20p/8 GBP Token) */ \ - ROM_LOAD( "dgsnd2.b8", 0x000000, 0x080000, CRC(7e8c05ce) SHA1(616b0f94b94331f86d7b1fec11dd05cf9b0968cf) ) \ - + ROM_LOAD( "dgsnd2.b8", 0x000000, 0x080000, CRC(7e8c05ce) SHA1(616b0f94b94331f86d7b1fec11dd05cf9b0968cf) ) ROM_START( j6daygld ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "dg30cz04_1.b8", 0x000000, 0x020000, CRC(ff3aefc9) SHA1(80e5485f0f6e67dac3bfaa5b3ba947ff63f9b745) ) @@ -2106,8 +2074,7 @@ ROM_END #define j6dayml_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "daytona-sound_4m.epr", 0x000000, 0x080000, CRC(a74fa29c) SHA1(3db3322910717d4eda81b5df5988453fdebec7bf) ) \ - + ROM_LOAD( "daytona-sound_4m.epr", 0x000000, 0x080000, CRC(a74fa29c) SHA1(3db3322910717d4eda81b5df5988453fdebec7bf) ) ROM_START( j6dayml ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "dm30cz08_1.b8", 0x000000, 0x020000, CRC(488a9da7) SHA1(604a2a6f7f07a9506906abeea79066459f375e61) ) @@ -2132,8 +2099,7 @@ ROM_END #define j6dmnjkr_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "demonjocker-sound_4m.epr", 0x000000, 0x04a018, CRC(796e1b35) SHA1(e9c8e5a350823275c9ba9238781872ea359d5049) ) \ - + ROM_LOAD( "demonjocker-sound_4m.epr", 0x000000, 0x04a018, CRC(796e1b35) SHA1(e9c8e5a350823275c9ba9238781872ea359d5049) ) ROM_START( j6dmnjkr ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2197,8 +2163,7 @@ ROM_END #define j6dyfl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "doyoufeelluckysnd.bin", 0x000000, 0x080000, CRC(9148112e) SHA1(8976a03eb68b1f08c6260c095bddb8d8731539af) ) \ - + ROM_LOAD( "doyoufeelluckysnd.bin", 0x000000, 0x080000, CRC(9148112e) SHA1(8976a03eb68b1f08c6260c095bddb8d8731539af) ) ROM_START( j6dyfl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2292,8 +2257,7 @@ ROM_END #define j6euphor_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "euphoriasnd.bin", 0x000000, 0x080000, CRC(d3097d34) SHA1(3db500b5ee38dfa580336b4bac43b139a31d2638) ) \ - + ROM_LOAD( "euphoriasnd.bin", 0x000000, 0x080000, CRC(d3097d34) SHA1(3db500b5ee38dfa580336b4bac43b139a31d2638) ) ROM_START( j6euphor ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2346,8 +2310,7 @@ ROM_END #define j6fastfr_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cffsnd.bin", 0x000000, 0x080000, CRC(29355a37) SHA1(5810f0eafe58b5d03cd104381eb92f55b1e08baa) ) \ - + ROM_LOAD( "cffsnd.bin", 0x000000, 0x080000, CRC(29355a37) SHA1(5810f0eafe58b5d03cd104381eb92f55b1e08baa) ) ROM_START( j6fastfr ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2367,8 +2330,7 @@ ROM_END #define j6fasttk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6fasttk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "9331.bin", 0x000000, 0x020000, CRC(54dbf894) SHA1(a3ffff82883cc192108f44d36a7465d4afeaf114) ) @@ -2401,8 +2363,7 @@ ROM_END #define j6filth_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "1151.bin", 0x000000, 0x080000, CRC(c3a2bf9b) SHA1(31536613fd9dcce0878109d460344591570c4334) ) \ -/* ROM_LOAD( "frcl-snd.bin", 0x000000, 0x080000, CRC(c3a2bf9b) SHA1(31536613fd9dcce0878109d460344591570c4334) ) */ \ - +/* ROM_LOAD( "frcl-snd.bin", 0x000000, 0x080000, CRC(c3a2bf9b) SHA1(31536613fd9dcce0878109d460344591570c4334) ) */ ROM_START( j6filth ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2436,8 +2397,7 @@ ROM_END #define j6firbl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fireballsnd.bin", 0x000000, 0x080000, CRC(e47444c7) SHA1(535ae2abdf5f9a1931c8b2afccf9a63b0778e5e3) ) \ - + ROM_LOAD( "fireballsnd.bin", 0x000000, 0x080000, CRC(e47444c7) SHA1(535ae2abdf5f9a1931c8b2afccf9a63b0778e5e3) ) ROM_START( j6firbl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2477,8 +2437,7 @@ ROM_END #define j6fireck_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fccs1.bin", 0x000000, 0x080000, CRC(0421526d) SHA1(9dad850c208cb9f4a3a4c62e05a18217466d227e) ) \ - + ROM_LOAD( "fccs1.bin", 0x000000, 0x080000, CRC(0421526d) SHA1(9dad850c208cb9f4a3a4c62e05a18217466d227e) ) ROM_START( j6fireck ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "ficr-11.bin", 0x000000, 0x020000, CRC(655efa46) SHA1(f861bb97cd029353027379ab1a049218c3c987f5) ) @@ -2524,8 +2483,7 @@ ROM_END #define j6firclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "firecracker_club_sound.bin", 0x000000, 0x080000, CRC(0421526d) SHA1(9dad850c208cb9f4a3a4c62e05a18217466d227e) ) \ - + ROM_LOAD( "firecracker_club_sound.bin", 0x000000, 0x080000, CRC(0421526d) SHA1(9dad850c208cb9f4a3a4c62e05a18217466d227e) ) ROM_START( j6firclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "35ff", 0x000000, 0x020000, CRC(b0655026) SHA1(b0e556bbd1450035dd0a373eaf01a09d9cf90c60) ) // aka firecracker_club.p1 @@ -2557,8 +2515,7 @@ ROM_END #define j6fivalv_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fivealivesnd.bin", 0x000000, 0x080000, CRC(4e4e94d9) SHA1(b8d1f241c4257436fd0e552494d2c9af1c8661dd) ) \ - + ROM_LOAD( "fivealivesnd.bin", 0x000000, 0x080000, CRC(4e4e94d9) SHA1(b8d1f241c4257436fd0e552494d2c9af1c8661dd) ) ROM_START( j6fivalv ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2584,8 +2541,7 @@ ROM_END #define j6fiveln_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "c-snd.bin", 0x000000, 0x080000, CRC(0016ab04) SHA1(82d133f485b325b29db901f6254c80ca959abd3e) ) \ - + ROM_LOAD( "c-snd.bin", 0x000000, 0x080000, CRC(0016ab04) SHA1(82d133f485b325b29db901f6254c80ca959abd3e) ) ROM_START( j6fiveln ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "39.bin", 0x000000, 0x020000, CRC(f960d6dd) SHA1(d69f868201e1cd7ccceb155f6c219aa81791e3a3) ) @@ -2618,8 +2574,7 @@ ROM_END #define j6frc10_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "force10snd.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) /* aka fo10-snd.bin */ \ - + ROM_LOAD( "force10snd.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) /* aka fo10-snd.bin */ ROM_START( j6frc10 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2680,8 +2635,7 @@ ROM_END #define j6frtpot_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fruitpotssnd.bin", 0x000000, 0x080000, CRC(1aacc429) SHA1(7ee38a34087a05d06fbfff78b57bf794c4f25d0c) ) \ - + ROM_LOAD( "fruitpotssnd.bin", 0x000000, 0x080000, CRC(1aacc429) SHA1(7ee38a34087a05d06fbfff78b57bf794c4f25d0c) ) ROM_START( j6frtpot ) ROM_REGION( PRGSIZE_LARGE, "maincpu", 0 ) // not overdumps? legit larger game? @@ -2714,8 +2668,7 @@ ROM_END #define j6gforce_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "gfor-snd.bin", 0x000000, 0x080000, CRC(4b710c8a) SHA1(af93c795d4c46cb95d92c48ac60a48db7f6724ac) ) \ - + ROM_LOAD( "gfor-snd.bin", 0x000000, 0x080000, CRC(4b710c8a) SHA1(af93c795d4c46cb95d92c48ac60a48db7f6724ac) ) ROM_START( j6gforce ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2764,8 +2717,7 @@ ROM_END #define j6guab_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "guabs.hex", 0x000000, 0x080000, CRC(fc041c87) SHA1(bd2606e3a67e13ce937b8cb4d5fcda9fa13842a1) ) \ - + ROM_LOAD( "guabs.hex", 0x000000, 0x080000, CRC(fc041c87) SHA1(bd2606e3a67e13ce937b8cb4d5fcda9fa13842a1) ) ROM_START( j6guab ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2819,8 +2771,7 @@ ROM_END #define j6guabcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "guabs.hex", 0x000000, 0x080000, CRC(fc041c87) SHA1(bd2606e3a67e13ce937b8cb4d5fcda9fa13842a1) ) \ - + ROM_LOAD( "guabs.hex", 0x000000, 0x080000, CRC(fc041c87) SHA1(bd2606e3a67e13ce937b8cb4d5fcda9fa13842a1) ) ROM_START( j6guabcl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2838,8 +2789,7 @@ ROM_END #define j6gldclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "gladiatorsnd.bin", 0x000000, 0x080000, CRC(13bd21c7) SHA1(3e0e087fdf8566ca6803f8f9f75597e19433fd0b) ) \ - + ROM_LOAD( "gladiatorsnd.bin", 0x000000, 0x080000, CRC(13bd21c7) SHA1(3e0e087fdf8566ca6803f8f9f75597e19433fd0b) ) ROM_START( j6gldclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2865,8 +2815,7 @@ ROM_END #define j6gogold_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "gfgoldsnd.bin", 0x000000, 0x080000, CRC(1ccc9b9b) SHA1(d6c7d4285b569c8ed77f732d6e42e6b763d200d4) ) \ - + ROM_LOAD( "gfgoldsnd.bin", 0x000000, 0x080000, CRC(1ccc9b9b) SHA1(d6c7d4285b569c8ed77f732d6e42e6b763d200d4) ) ROM_START( j6gogold ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "20702.bin", 0x000000, 0x020000, CRC(c274df22) SHA1(f623bb8ba2afcc3ad7c58a4cf56ea8d8f9d1308a) ) @@ -2912,8 +2861,7 @@ ROM_END #define j6golddm_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "gdsnd.bin", 0x000000, 0x04a018, CRC(796e1b35) SHA1(e9c8e5a350823275c9ba9238781872ea359d5049) ) \ - + ROM_LOAD( "gdsnd.bin", 0x000000, 0x04a018, CRC(796e1b35) SHA1(e9c8e5a350823275c9ba9238781872ea359d5049) ) ROM_START( j6golddm ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -2931,8 +2879,7 @@ ROM_END #define j6goldgl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "goldengoalsnd.bin", 0x000000, 0x080000, CRC(3af9ccdb) SHA1(4a911a48816bc69743ba1ba18fdd913041636ae1) ) \ - + ROM_LOAD( "goldengoalsnd.bin", 0x000000, 0x080000, CRC(3af9ccdb) SHA1(4a911a48816bc69743ba1ba18fdd913041636ae1) ) ROM_START( j6goldgl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3029,8 +2976,7 @@ ROM_END #define j6hapyhr_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "happyhoursnd.bin", 0x000000, 0x080000, CRC(ef80bbfd) SHA1(66dc0bd35054a506dc75972ac59f9ca03d886e1b) ) \ - + ROM_LOAD( "happyhoursnd.bin", 0x000000, 0x080000, CRC(ef80bbfd) SHA1(66dc0bd35054a506dc75972ac59f9ca03d886e1b) ) ROM_START( j6hapyhr ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3066,8 +3012,7 @@ ROM_END #define j6impact_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "hiim-snd.bin", 0x000000, 0x080000, CRC(3f54a54c) SHA1(fb3b2561f10391f01ee97e4501e8492fcfe4fd2b) ) \ - + ROM_LOAD( "hiim-snd.bin", 0x000000, 0x080000, CRC(3f54a54c) SHA1(fb3b2561f10391f01ee97e4501e8492fcfe4fd2b) ) ROM_START( j6impact ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3099,8 +3044,7 @@ ROM_END #define j6hilosv_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "hi_lo_silver_snd.bin", 0x000000, 0x080000, CRC(fd88e3a6) SHA1(07c2fec617faea189ceddc46ec477fb09c0ec4a9) ) \ - + ROM_LOAD( "hi_lo_silver_snd.bin", 0x000000, 0x080000, CRC(fd88e3a6) SHA1(07c2fec617faea189ceddc46ec477fb09c0ec4a9) ) ROM_START( j6hilosv ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3148,8 +3092,7 @@ ROM_END #define j6hirol_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "hiro-snd.bin", 0x000000, 0x080000, CRC(5843c195) SHA1(0665e913e4c1a919aa5331cce7a467c841722388) ) \ - + ROM_LOAD( "hiro-snd.bin", 0x000000, 0x080000, CRC(5843c195) SHA1(0665e913e4c1a919aa5331cce7a467c841722388) ) ROM_START( j6hirol ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3188,8 +3131,7 @@ ROM_END #define j6hirlcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "hrcl-snd.bin", 0x000000, 0x080000, CRC(5843c195) SHA1(0665e913e4c1a919aa5331cce7a467c841722388) ) \ - + ROM_LOAD( "hrcl-snd.bin", 0x000000, 0x080000, CRC(5843c195) SHA1(0665e913e4c1a919aa5331cce7a467c841722388) ) ROM_START( j6hirlcl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "hrcl-3_1.bin", 0x000000, 0x020000, CRC(680182bf) SHA1(54e1b6db179934a29453ff5c5664fd00352377ea) ) @@ -3220,8 +3162,7 @@ ROM_END #define j6histk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "histakessnd.bin", 0x000000, 0x080000, CRC(7bffa191) SHA1(e3a4a4eef878fb093240a3e145cf405d266bec74) ) \ - + ROM_LOAD( "histakessnd.bin", 0x000000, 0x080000, CRC(7bffa191) SHA1(e3a4a4eef878fb093240a3e145cf405d266bec74) ) ROM_START( j6histk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3239,8 +3180,7 @@ ROM_END #define j6hiphop_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6hiphop ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3280,8 +3220,7 @@ ROM_END #define j6hotsht_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "hosh-snd.bin", 0x000000, 0x080000, CRC(f5bcfe63) SHA1(4983cb4c2d69730d7f1984d648c2801b46b4ab70) ) \ - + ROM_LOAD( "hosh-snd.bin", 0x000000, 0x080000, CRC(f5bcfe63) SHA1(4983cb4c2d69730d7f1984d648c2801b46b4ab70) ) ROM_START( j6hotsht ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3377,8 +3316,7 @@ ROM_END #define j6impuls_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "impu-snd.bin", 0x000000, 0x080000, CRC(0551d030) SHA1(7a8d012690bcea707710bf39c8069d7c074912ce) ) \ - + ROM_LOAD( "impu-snd.bin", 0x000000, 0x080000, CRC(0551d030) SHA1(7a8d012690bcea707710bf39c8069d7c074912ce) ) ROM_START( j6impuls ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3435,8 +3373,7 @@ ROM_END #define j6indy_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "6706.bin", 0x000000, 0x080000, CRC(674c5b21) SHA1(12e12e362ae8c99414cd474a34fa13acd8f6bcb3) ) \ - ROM_LOAD( "indisnd.bin", 0x0000, 0x080000, CRC(90ff139b) SHA1(9555553dc01055c311d4917e6ed7f5d3b6bf3b71) ) \ - + ROM_LOAD( "indisnd.bin", 0x0000, 0x080000, CRC(90ff139b) SHA1(9555553dc01055c311d4917e6ed7f5d3b6bf3b71) ) ROM_START( j6indy ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3538,8 +3475,7 @@ ROM_END #define j6showtm_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "itsshowtimesnd.bin", 0x000000, 0x080000, CRC(7a2264fa) SHA1(55d5a15ff8c6a76c5403856bb8e64cbfdafb7a55) ) \ - + ROM_LOAD( "itsshowtimesnd.bin", 0x000000, 0x080000, CRC(7a2264fa) SHA1(55d5a15ff8c6a76c5403856bb8e64cbfdafb7a55) ) ROM_START( j6showtm ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3636,8 +3572,7 @@ ROM_END #define j6jackjs_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "jackpotjusticesnd.bin", 0x000000, 0x080000, CRC(379e1a3d) SHA1(3b455a812284e716a831aadbaa592ee0ddab1a9d) ) \ - + ROM_LOAD( "jackpotjusticesnd.bin", 0x000000, 0x080000, CRC(379e1a3d) SHA1(3b455a812284e716a831aadbaa592ee0ddab1a9d) ) ROM_START( j6jackjs ) // not overdumps? legit larger game? ROM_REGION( PRGSIZE_LARGE, "maincpu", 0 ) ROM_LOAD16_BYTE( "60000150.evn", 0x000000, 0x080000, CRC(358d59c8) SHA1(9212565a1f9d50d26d4ccfff747824c42e878e52) ) @@ -3680,8 +3615,7 @@ ROM_END #define j6jkrpls_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6jkrpls ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "jp30cz04_1.b8", 0x000000, 0x020000, CRC(096baa03) SHA1(d9d3aa5616e253b49adda9254dbdaedb3e7ee72a) ) @@ -3728,8 +3662,7 @@ ROM_END #define j6jkpldx_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6jkpldx ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "jpd75cz03_1.b8", 0x000000, 0x020000, CRC(f48c26c5) SHA1(5a46a24a4575da3360eab54059ea994b7e8e4f8d) ) @@ -3778,8 +3711,7 @@ ROM_END #define j6kungfu_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "kufu-snd.bin", 0x000000, 0x080000, CRC(95360279) SHA1(f86c5ef3f7e790e3062ebda5150d2384ea341651) ) \ - + ROM_LOAD( "kufu-snd.bin", 0x000000, 0x080000, CRC(95360279) SHA1(f86c5ef3f7e790e3062ebda5150d2384ea341651) ) ROM_START( j6kungfu ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "kfu20p1", 0x000000, 0x020000, CRC(f8dc50fb) SHA1(8beca856ac604d568e162d26c83f1d2984eccd6d) ) @@ -3819,8 +3751,7 @@ ROM_END #define j6luckla_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6luckla ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3846,8 +3777,7 @@ ROM_END #define j6magcir_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "f098.bin", 0x000000, 0x080000, CRC(a4431105) SHA1(2dad84011ccf08be5b642884b2353718ebb4a6c7) ) \ - + ROM_LOAD( "f098.bin", 0x000000, 0x080000, CRC(a4431105) SHA1(2dad84011ccf08be5b642884b2353718ebb4a6c7) ) ROM_START( j6magcir ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "magic1.bin", 0x000000, 0x020000, CRC(c7a646dc) SHA1(c4c6e2ecccdccb66421a4c926b9cac5260f855e3) ) @@ -3885,8 +3815,7 @@ ROM_END #define j6mavrk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "1431.bin", 0x000000, 0x080000, CRC(2c95a586) SHA1(81f27d408f29bec0c79a7ac635e74a11cc93f2cc) ) \ - + ROM_LOAD( "1431.bin", 0x000000, 0x080000, CRC(2c95a586) SHA1(81f27d408f29bec0c79a7ac635e74a11cc93f2cc) ) ROM_START( j6mavrk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3925,8 +3854,7 @@ ROM_END #define j6maxod_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "maov-snd.bin", 0x000000, 0x080000, CRC(9b527476) SHA1(6a6333aea592a1a7331a79372bbd6a16ff35c252) ) \ - + ROM_LOAD( "maov-snd.bin", 0x000000, 0x080000, CRC(9b527476) SHA1(6a6333aea592a1a7331a79372bbd6a16ff35c252) ) ROM_START( j6maxod ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -3970,8 +3898,7 @@ ROM_END #define j6medal_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "medjob.bin", 0x000000, 0x080000, CRC(dd8296bf) SHA1(c9209abf4276d81897476420177d24e739f0441e) ) \ - + ROM_LOAD( "medjob.bin", 0x000000, 0x080000, CRC(dd8296bf) SHA1(c9209abf4276d81897476420177d24e739f0441e) ) ROM_START( j6medal ) // not overdumps? legit larger game? ROM_REGION( PRGSIZE_LARGE, "maincpu", 0 ) @@ -4011,8 +3938,7 @@ ROM_END #define j6megbck_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "mebu-snd.bin", 0x000000, 0x080000, CRC(20bce62c) SHA1(50c5959eb5a5f8436a08f9a6a096b18cbf49970e) ) \ - + ROM_LOAD( "mebu-snd.bin", 0x000000, 0x080000, CRC(20bce62c) SHA1(50c5959eb5a5f8436a08f9a6a096b18cbf49970e) ) ROM_START( j6megbck ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "mebu-4_1.bin", 0x000000, 0x020000, CRC(85080234) SHA1(9a65e7adbf4f5f4832f7daebc2ff9abd430b74a2) ) @@ -4066,8 +3992,7 @@ ROM_END #define j6montlk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ /* ROM_LOAD( "1109.bin", 0x000000, 0x080000, CRC(b4d7ac12) SHA1(ac194d15e9d4e5cdadddbf2dc3c9660b52f116c2) ) */ \ - ROM_LOAD( "mtsnd.bin", 0x000000, 0x080000, CRC(b4d7ac12) SHA1(ac194d15e9d4e5cdadddbf2dc3c9660b52f116c2) ) \ - + ROM_LOAD( "mtsnd.bin", 0x000000, 0x080000, CRC(b4d7ac12) SHA1(ac194d15e9d4e5cdadddbf2dc3c9660b52f116c2) ) ROM_START( j6montlk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4135,8 +4060,7 @@ ROM_END #define j6mono60_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "monop60.snd", 0x000000, 0x080000, CRC(c79af6d0) SHA1(518a7b16978a843bdb83938279b11f446503361e) ) /* aka mon60_snd.bin */ \ - + ROM_LOAD( "monop60.snd", 0x000000, 0x080000, CRC(c79af6d0) SHA1(518a7b16978a843bdb83938279b11f446503361e) ) /* aka mon60_snd.bin */ ROM_START( j6mono60 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4233,8 +4157,7 @@ ROM_END #define j6monobn_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6monobn ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4262,8 +4185,7 @@ ROM_END #define j6outlaw_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "outlawsnd.bin", 0x000000, 0x080000, CRC(9b9f21dc) SHA1(aca23a525f1288f49a18a74eb36ac3a67efa7e20) ) \ - + ROM_LOAD( "outlawsnd.bin", 0x000000, 0x080000, CRC(9b9f21dc) SHA1(aca23a525f1288f49a18a74eb36ac3a67efa7e20) ) ROM_START( j6outlaw ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "7547.bin", 0x000000, 0x020000, CRC(7a4efbf1) SHA1(5e184e172a129aad6ad34409f63de25916414146) ) @@ -4287,8 +4209,7 @@ ROM_END #define j6oxo_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "oxo_bingo_snd.bin", 0x000000, 0x080000, CRC(008a2d6a) SHA1(a89114154489142556b373ab24cd32fadf5856b3) ) \ - + ROM_LOAD( "oxo_bingo_snd.bin", 0x000000, 0x080000, CRC(008a2d6a) SHA1(a89114154489142556b373ab24cd32fadf5856b3) ) ROM_START( j6oxo ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "7613.bin", 0x000000, 0x020000, CRC(0621762a) SHA1(ec09cfed79158b09093a162785b6bdd1916ce50c) ) @@ -4334,8 +4255,7 @@ ROM_END #define j6oxobin_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "oxo_bingo_snd.bin", 0x000000, 0x080000, CRC(008a2d6a) SHA1(a89114154489142556b373ab24cd32fadf5856b3) ) \ - + ROM_LOAD( "oxo_bingo_snd.bin", 0x000000, 0x080000, CRC(008a2d6a) SHA1(a89114154489142556b373ab24cd32fadf5856b3) ) ROM_START( j6oxobin ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4400,8 +4320,7 @@ ROM_END #define j6papa_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "papasnd.bin", 0x000000, 0x080000, CRC(c2de3abc) SHA1(2885817e7d6b11c0a2b35507b5654902257db32c) ) \ - + ROM_LOAD( "papasnd.bin", 0x000000, 0x080000, CRC(c2de3abc) SHA1(2885817e7d6b11c0a2b35507b5654902257db32c) ) ROM_START( j6papa ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4455,8 +4374,7 @@ ROM_END #define j6phxgld_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pgsnd2.b8", 0x000000, 0x080000, CRC(c63cf006) SHA1(f204da5e744dd2ade662ac8d9f7d1896513cb38a) ) \ - + ROM_LOAD( "pgsnd2.b8", 0x000000, 0x080000, CRC(c63cf006) SHA1(f204da5e744dd2ade662ac8d9f7d1896513cb38a) ) ROM_START( j6phxgld ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "pg30cz05_1.b8", 0x000000, 0x020000, CRC(9eb4716a) SHA1(459db543d20e5ddd03d0be917d8d4e153cb97183) ) @@ -4526,8 +4444,7 @@ ROM_END #define j6pnxmil_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "phmill7_snd2", 0x000000, 0x014008, CRC(12086987) SHA1(ca6d74b844a0c042d66940f5d39fdef9d5591651) ) /* bad? */ \ - ROM_LOAD( "phmill7_snd.bin", 0x000000, 0x080000, CRC(e7332f6d) SHA1(c2457be9a7a37184bacd4199a5c347896ecfeb1c) ) \ - + ROM_LOAD( "phmill7_snd.bin", 0x000000, 0x080000, CRC(e7332f6d) SHA1(c2457be9a7a37184bacd4199a5c347896ecfeb1c) ) ROM_START( j6pnxmil ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4560,8 +4477,7 @@ ROM_END #define j6pinwzd_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "pbwzsnd.bin", 0x000000, 0x020000, CRC(ee9df577) SHA1(bdc6ecba5b7ad9c7b012342c7710266ec6eeb0ab) ) \ - ROM_LOAD( "piwi-snd.bin", 0x000000, 0x080000, CRC(ba98eecc) SHA1(39edb9524c23a78f89077215bef8f43a47605b47) ) \ - + ROM_LOAD( "piwi-snd.bin", 0x000000, 0x080000, CRC(ba98eecc) SHA1(39edb9524c23a78f89077215bef8f43a47605b47) ) ROM_START( j6pinwzd ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4634,8 +4550,7 @@ ROM_END #define j6pirgld_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pirat6_snd.bin", 0x000000, 0x080000, CRC(5c60a3f8) SHA1(9d83aca9e5ecd230f6ca98f033f5274dbefe9feb) ) \ - + ROM_LOAD( "pirat6_snd.bin", 0x000000, 0x080000, CRC(5c60a3f8) SHA1(9d83aca9e5ecd230f6ca98f033f5274dbefe9feb) ) ROM_START( j6pirgld ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "pirat_113001.b8", 0x000000, 0x020000, CRC(58c488b8) SHA1(bd2cf3f604a1fd075d2077c8e38d75c0c3325cb8) ) @@ -4652,8 +4567,7 @@ ROM_END #define j6popoli_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "popoli_snd.bin", 0x000000, 0x080000, CRC(e982a788) SHA1(3c6aed29892011c3d7d076ea9bef5882f7ded055) ) \ - + ROM_LOAD( "popoli_snd.bin", 0x000000, 0x080000, CRC(e982a788) SHA1(3c6aed29892011c3d7d076ea9bef5882f7ded055) ) ROM_START( j6popoli ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "7604.bin", 0x000000, 0x020000, CRC(7b44b69e) SHA1(8bbc3caa889d539646198c9b7f54cd31ab715c6d) ) @@ -4670,8 +4584,7 @@ ROM_END #define j6pog_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pog10snd.bin", 0x000000, 0x080000, CRC(00f6d1f6) SHA1(66581a6391e9ddc931cb102b00f38720ab125f5c) ) \ - + ROM_LOAD( "pog10snd.bin", 0x000000, 0x080000, CRC(00f6d1f6) SHA1(66581a6391e9ddc931cb102b00f38720ab125f5c) ) ROM_START( j6pog ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4719,8 +4632,7 @@ ROM_END #define j6pogcls_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6pogcls ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "clpg-31.bin", 0x000000, 0x020000, CRC(07102281) SHA1(a7760c78f4848d7eec175027485d19d38307ccf9) ) @@ -4745,8 +4657,7 @@ ROM_END #define j6pwrlin_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6pwrlin ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4764,8 +4675,7 @@ ROM_END #define j6pwrspn_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "posp-snd.bin", 0x000000, 0x080000, CRC(861a0d14) SHA1(ea5eef793ad682dbf660ed7e77f93a7b900c97cc) ) \ - + ROM_LOAD( "posp-snd.bin", 0x000000, 0x080000, CRC(861a0d14) SHA1(ea5eef793ad682dbf660ed7e77f93a7b900c97cc) ) ROM_START( j6pwrspn ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "posp-5s1.bin", 0x000000, 0x020000, CRC(4184881b) SHA1(fb4dfb2e5b5c2cebd15b908a38014b56bb311eef) ) @@ -4810,8 +4720,7 @@ ROM_END #define j6quantm_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "qule-snd.bin", 0x000000, 0x080000, CRC(eb8c692d) SHA1(384b73573d64d67547d1c04f279bda6c02f78450) ) \ - + ROM_LOAD( "qule-snd.bin", 0x000000, 0x080000, CRC(eb8c692d) SHA1(384b73573d64d67547d1c04f279bda6c02f78450) ) ROM_START( j6quantm ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "20717.bin", 0x000000, 0x020000, CRC(31435fe1) SHA1(d42fe30367ded93562d4e1739307a47423f4dd51) ) @@ -4863,8 +4772,7 @@ ROM_END #define j6ra_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "realsnd.bin", 0x000000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) \ - + ROM_LOAD( "realsnd.bin", 0x000000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) ROM_START( j6ra ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4903,8 +4811,7 @@ ROM_END #define j6raclb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "realsnd.bin", 0x000000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) \ - + ROM_LOAD( "realsnd.bin", 0x000000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) ROM_START( j6raclb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -4944,8 +4851,7 @@ ROM_END #define j6redarw_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rear-snd.bin", 0x000000, 0x080000, CRC(7e8c05ce) SHA1(616b0f94b94331f86d7b1fec11dd05cf9b0968cf) ) \ - + ROM_LOAD( "rear-snd.bin", 0x000000, 0x080000, CRC(7e8c05ce) SHA1(616b0f94b94331f86d7b1fec11dd05cf9b0968cf) ) ROM_START( j6redarw ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5035,8 +4941,7 @@ ROM_END #define j6rh6_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6rh6 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5083,8 +4988,7 @@ ROM_END #define j6rhchil_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rhcssnd.bin", 0x000000, 0x080000, CRC(60b336b1) SHA1(53d04bec9cbba4a0e89d34329ed41f89945e283b) ) \ - + ROM_LOAD( "rhcssnd.bin", 0x000000, 0x080000, CRC(60b336b1) SHA1(53d04bec9cbba4a0e89d34329ed41f89945e283b) ) ROM_START( j6rhchil ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "rhcst.p1", 0x000000, 0x020000, CRC(334fdbcc) SHA1(194c226e1c41eb326841cf022e8a1b28088a7073) ) @@ -5123,8 +5027,7 @@ ROM_END #define j6rh6cl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rh6s1.bin", 0x000000, 0x080000, CRC(86b4c970) SHA1(0ce214ee406b1c325693b2b615498bdb2c3a16eb) ) \ - + ROM_LOAD( "rh6s1.bin", 0x000000, 0x080000, CRC(86b4c970) SHA1(0ce214ee406b1c325693b2b615498bdb2c3a16eb) ) ROM_START( j6rh6cl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5164,8 +5067,7 @@ ROM_END #define j6reelmn_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "1360.bin", 0x000000, 0x080000, CRC(3a1a5f09) SHA1(807cf2cf7a4738c1904990b281f7d4c9a86c78e7) ) \ - + ROM_LOAD( "1360.bin", 0x000000, 0x080000, CRC(3a1a5f09) SHA1(807cf2cf7a4738c1904990b281f7d4c9a86c78e7) ) ROM_START( j6reelmn ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "9485.bin", 0x000000, 0x020000, CRC(1a729666) SHA1(d4389ff5a16b994ca1480fe0ff097c7601b2ef6b) ) @@ -5214,8 +5116,7 @@ ROM_END #define j6reelth_alt_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "reel-snd.bin", 0x000000, 0x080000, CRC(3178ddb0) SHA1(60be12e6198bd8b7cf021b54c3cd858ff5bac127) ) \ - + ROM_LOAD( "reel-snd.bin", 0x000000, 0x080000, CRC(3178ddb0) SHA1(60be12e6198bd8b7cf021b54c3cd858ff5bac127) ) ROM_START( j6reeltha ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "reel-31.bin", 0x000000, 0x020000, CRC(3e8020f8) SHA1(479f9e157eba570d0fa670f0f9ea7dbd3d94ca1f) ) @@ -5244,8 +5145,7 @@ ROM_END #define j6rico_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ricochet_snd.bin", 0x000000, 0x080000, CRC(b24522fe) SHA1(1546edee6cf483abdbc761c715dcbc696209d429) ) \ - + ROM_LOAD( "ricochet_snd.bin", 0x000000, 0x080000, CRC(b24522fe) SHA1(1546edee6cf483abdbc761c715dcbc696209d429) ) ROM_START( j6rico ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5292,8 +5192,7 @@ ROM_END #define j6robin_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "robin_snd.bin", 0x000000, 0x080000, CRC(bbddccf9) SHA1(33f3d14d4898f9ba4ba2c2a88621cf3e2c828a8f) ) \ - + ROM_LOAD( "robin_snd.bin", 0x000000, 0x080000, CRC(bbddccf9) SHA1(33f3d14d4898f9ba4ba2c2a88621cf3e2c828a8f) ) ROM_START( j6robin ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "9425.bin", 0x000000, 0x020000, CRC(0b9f9c83) SHA1(2004b7fc3a0fd8ba424d0e293cd53b57a653f6e3) ) @@ -5326,8 +5225,7 @@ ROM_END ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) /* which is correct? or are these for regular/classic/club? */ \ ROM_LOAD( "rocosnd.bin", 0x000000, 0x080000, CRC(60236e81) SHA1(9546c92d8a42d911e5b462c598a0b42987c0ba03) ) \ ROM_LOAD( "rcstrsnd.bin", 0x000000, 0x080000, CRC(b0753c1d) SHA1(b111ca10c01ee2089cbc613ad91235d429272ab8) ) \ - ROM_LOAD( "rcoastersoundalt.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) /* very different */ \ - + ROM_LOAD( "rcoastersoundalt.bin", 0x000000, 0x080000, CRC(e7e587c9) SHA1(fde7a7761253dc4133340b766d220873731c11c7) ) /* very different */ ROM_START( j6roller ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5450,8 +5348,7 @@ ROM_END #define j6rccls_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6rccls ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "clrc-41.bin", 0x000000, 0x020000, CRC(6f312407) SHA1(c077276d18f50340989a20fe208ac84801895dc1) ) @@ -5476,8 +5373,7 @@ ROM_END #define j6royfls_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rofl-so.bin", 0x000000, 0x080000, CRC(c86bce52) SHA1(ba9b3f73e7418710737d3ace25ee2747d5685d8e) ) /* aka rflushc.as1 */ \ - + ROM_LOAD( "rofl-so.bin", 0x000000, 0x080000, CRC(c86bce52) SHA1(ba9b3f73e7418710737d3ace25ee2747d5685d8e) ) /* aka rflushc.as1 */ ROM_START( j6royfls ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5523,8 +5419,7 @@ ROM_END #define j6samur_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6samur ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5564,8 +5459,7 @@ ROM_END #define j6sidewd_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "sidewindersnd.bin", 0x000000, 0x080000, CRC(6e49b83b) SHA1(cba9ce8cc5dbaa0b498b2314165d4cc64c0a3881) ) \ - + ROM_LOAD( "sidewindersnd.bin", 0x000000, 0x080000, CRC(6e49b83b) SHA1(cba9ce8cc5dbaa0b498b2314165d4cc64c0a3881) ) ROM_START( j6sidewd ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "siw-11s1.bin", 0x000000, 0x020000, CRC(d24e9e75) SHA1(22d21eb5bfe92fc61e1667345aafe7b3214c9218) ) @@ -5611,8 +5505,7 @@ ROM_END #define j6snakes_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "snla-snd.bin", 0x000000, 0x080000, CRC(7902d8ef) SHA1(222b0a18902619c9b4b29fa2485cb4e143c21bab) ) \ - + ROM_LOAD( "snla-snd.bin", 0x000000, 0x080000, CRC(7902d8ef) SHA1(222b0a18902619c9b4b29fa2485cb4e143c21bab) ) ROM_START( j6snakes ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "20351.bin", 0x000000, 0x020000, CRC(7f9685fd) SHA1(b55c39ebbabd59a4c9aeea0f4337b8a629bad664) ) // aka snla.p1 @@ -5672,8 +5565,7 @@ ROM_END #define j6sonic_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "son_snd.bin", 0x000000, 0x080000, CRC(5cd8cf21) SHA1(82f875a59d678ef548173ee2c202e3963bc13116) ) \ - + ROM_LOAD( "son_snd.bin", 0x000000, 0x080000, CRC(5cd8cf21) SHA1(82f875a59d678ef548173ee2c202e3963bc13116) ) ROM_START( j6sonic ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "9440.bin", 0x000000, 0x020000, CRC(384f931e) SHA1(12bddb3dc2c1bc6c51c5ef4002673c6f45fa335c) ) @@ -5752,8 +5644,7 @@ ROM_END #define j6stards_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "star-snd.bin", 0x000000, 0x080000, CRC(d2dcd6cc) SHA1(f5a290befd41014b6aabae9fdb601d5a9766f1ba) ) \ - + ROM_LOAD( "star-snd.bin", 0x000000, 0x080000, CRC(d2dcd6cc) SHA1(f5a290befd41014b6aabae9fdb601d5a9766f1ba) ) ROM_START( j6stards ) @@ -5787,8 +5678,7 @@ ROM_END #define j6start_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6start ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -5807,8 +5697,7 @@ ROM_END #define j6strk10_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6strk10 ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "20178.bin", 0x000000, 0x020000, CRC(35135814) SHA1(250c0835611be4eaabab4c59288d9fdeafdc6ca5) ) @@ -5896,8 +5785,7 @@ ROM_END #define j6supbrk_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "subr-snd.bin", 0x000000, 0x080000, CRC(d2439c80) SHA1(8c80927e0d0c139293bd588fad15941bfb54674d) ) \ - + ROM_LOAD( "subr-snd.bin", 0x000000, 0x080000, CRC(d2439c80) SHA1(8c80927e0d0c139293bd588fad15941bfb54674d) ) ROM_START( j6supbrk ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "subr-2_1.bin", 0x000000, 0x020000, CRC(85222c75) SHA1(1fbed0f474a7ccfb523270b913a8adb41c8be388) ) @@ -5998,8 +5886,7 @@ ROM_END #define j6roof_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6roof ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6018,8 +5905,7 @@ ROM_END #define j6tbirds_sound \ ROM_REGION( 0x80000, "upd", 0 ) \ - ROM_LOAD( "tbcl-snd.bin", 0x000000, 0x80000, CRC(1cc197be) SHA1(2247aa1a0e6aab7389b3222f373890f54e907361) ) \ - + ROM_LOAD( "tbcl-snd.bin", 0x000000, 0x80000, CRC(1cc197be) SHA1(2247aa1a0e6aab7389b3222f373890f54e907361) ) ROM_START( j6tbirds ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "thbi-2_1.bin", 0x000000, 0x020000, CRC(a1ca874a) SHA1(0a12f387a9a3e261c1017922b8d6a652c696855a) ) @@ -6160,8 +6046,7 @@ ROM_END #define j6tbrdcl_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "tbcl-snd.bin", 0x000000, 0x80000, CRC(1cc197be) SHA1(2247aa1a0e6aab7389b3222f373890f54e907361) ) \ - + ROM_LOAD( "tbcl-snd.bin", 0x000000, 0x80000, CRC(1cc197be) SHA1(2247aa1a0e6aab7389b3222f373890f54e907361) ) ROM_START( j6tbrdcl ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6257,8 +6142,7 @@ ROM_END #define j6tomb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "tr_snd.bin", 0x000000, 0x080000, CRC(6cd91050) SHA1(6818e59fc52b9776ee40bf7f2a8fca2f74343335) ) \ - + ROM_LOAD( "tr_snd.bin", 0x000000, 0x080000, CRC(6cd91050) SHA1(6818e59fc52b9776ee40bf7f2a8fca2f74343335) ) ROM_START( j6tomb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "tora-41.bin", 0x000000, 0x020000, CRC(80956d40) SHA1(0864e5fa7bb41dca2128566ccd80c1208dea0157) ) @@ -6340,8 +6224,7 @@ ROM_END #define j6twst_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "twistersnd.bin", 0x000000, 0x080000, CRC(421a7a81) SHA1(d47caeb209eb6cfc47f82162b03563b25bbdf017) ) \ - + ROM_LOAD( "twistersnd.bin", 0x000000, 0x080000, CRC(421a7a81) SHA1(d47caeb209eb6cfc47f82162b03563b25bbdf017) ) ROM_START( j6twst ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6433,8 +6316,7 @@ ROM_END #define j6untch_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6untch ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6455,8 +6337,7 @@ ROM_END #define j6pompay_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "uppo-so1.bin", 0x000000, 0x080000, CRC(60e370f8) SHA1(6b528f64ee5d00491655169bc108a7a6d383eaa5) ) \ - + ROM_LOAD( "uppo-so1.bin", 0x000000, 0x080000, CRC(60e370f8) SHA1(6b528f64ee5d00491655169bc108a7a6d383eaa5) ) ROM_START( j6pompay ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "20270.bin", 0x000000, 0x020000, CRC(c214a067) SHA1(9e4d26727b32051b188c361b8ad8922cbd7a10b2) ) @@ -6500,8 +6381,7 @@ ROM_END #define j6vivark_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "vrve-snd.bin", 0x000000, 0x080000, CRC(40374f0b) SHA1(607eac4d3caee022e61531655ded137644602939) ) \ - + ROM_LOAD( "vrve-snd.bin", 0x000000, 0x080000, CRC(40374f0b) SHA1(607eac4d3caee022e61531655ded137644602939) ) ROM_START( j6vivark ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "vrve-2_1.bin", 0x000000, 0x020000, CRC(fea54f1c) SHA1(d5fcaa6417f0961bf370c90a468b5d59a17b62ba) ) @@ -6588,8 +6468,7 @@ ROM_END #define j6vivrkc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "vrcl-snds.bin", 0x000000, 0x080000, CRC(c4267ccf) SHA1(f299b63f762b420eaa5ddb024f357d7abb9fc21e) ) \ - + ROM_LOAD( "vrcl-snds.bin", 0x000000, 0x080000, CRC(c4267ccf) SHA1(f299b63f762b420eaa5ddb024f357d7abb9fc21e) ) ROM_START( j6vivrkc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "vrcl-d_1s.bin", 0x000000, 0x020000, CRC(ba6a1f04) SHA1(4fbb326386d4d5dfc16e64b824b042932e0497ee) ) @@ -6614,8 +6493,7 @@ ROM_END #define j6wldkng_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "wiki-snds.bin", 0x000000, 0x080000, CRC(2ba0529c) SHA1(c4b4b80fcbb867650649a42a4abe7675eea8f848) ) \ - + ROM_LOAD( "wiki-snds.bin", 0x000000, 0x080000, CRC(2ba0529c) SHA1(c4b4b80fcbb867650649a42a4abe7675eea8f848) ) ROM_START( j6wldkng ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6635,8 +6513,7 @@ ROM_END #define j6wthing_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "wildsnd.bin", 0x000000, 0x080000, CRC(a2c08185) SHA1(9ee589df284f1b803ca015fff599d229358530d4) ) \ - + ROM_LOAD( "wildsnd.bin", 0x000000, 0x080000, CRC(a2c08185) SHA1(9ee589df284f1b803ca015fff599d229358530d4) ) ROM_START( j6wthing ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6662,8 +6539,7 @@ ROM_END #define j6wildw_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "wwe10snd.bin", 0x000000, 0x080000, CRC(00c8c428) SHA1(2e10b10093acd4c2f7051aff28a8ae976bb1425b) ) \ - + ROM_LOAD( "wwe10snd.bin", 0x000000, 0x080000, CRC(00c8c428) SHA1(2e10b10093acd4c2f7051aff28a8ae976bb1425b) ) ROM_START( j6wildw ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "9379.bin", 0x000000, 0x020000, CRC(533dcf84) SHA1(b1b973fc4dc0601da7587d9079e24319ecca5f1b) ) @@ -6723,8 +6599,7 @@ ROM_END #define j6wizard_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "woosnd.bin", 0x000000, 0x080000, CRC(f72bd4f4) SHA1(ef8651fe7bb5f5340e41d35ca0669cba7d9c1372) ) \ - + ROM_LOAD( "woosnd.bin", 0x000000, 0x080000, CRC(f72bd4f4) SHA1(ef8651fe7bb5f5340e41d35ca0669cba7d9c1372) ) ROM_START( j6wizard ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6771,8 +6646,7 @@ ROM_END #define j6knight_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "yourluckynightsnd.bin", 0x000000, 0x080000, CRC(53c20160) SHA1(6295797d384fd00b4d982c924a4cfbaa079e93a1) ) \ - + ROM_LOAD( "yourluckynightsnd.bin", 0x000000, 0x080000, CRC(53c20160) SHA1(6295797d384fd00b4d982c924a4cfbaa079e93a1) ) ROM_START( j6knight ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "yourluckynight.p1", 0x000000, 0x020000, CRC(fbf7d7d9) SHA1(885a8a5acd06bafe7df01d9e36c5315f9a7f518c) ) @@ -6841,8 +6715,7 @@ ROM_END #define j6hikar_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6hikar ) @@ -6880,8 +6753,7 @@ ROM_END // correct rom might be in the j6roller sets #define j6rcclub_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6rcclub ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6907,8 +6779,7 @@ ROM_END #define j6slvgst_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6slvgst ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6968,8 +6839,7 @@ ROM_END #define j6footy_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ffsnd.bin", 0x000000, 0x080000, CRC(99b8f4bd) SHA1(afc8e24db67f841a570b4cdd780a759a8fa13055) ) \ - + ROM_LOAD( "ffsnd.bin", 0x000000, 0x080000, CRC(99b8f4bd) SHA1(afc8e24db67f841a570b4cdd780a759a8fa13055) ) // note: rom2 gets replaced between sets instead of rom1 (it's by Empire, not JPM) ROM_START( j6footy ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -6999,8 +6869,7 @@ ROM_END #define j6bmc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bigmoneysnd.bin", 0x0000, 0x080000, CRC(dd0a88c6) SHA1(22206fcba097a4f7dc6ae84d496d149a4206e0f0) ) \ - + ROM_LOAD( "bigmoneysnd.bin", 0x0000, 0x080000, CRC(dd0a88c6) SHA1(22206fcba097a4f7dc6ae84d496d149a4206e0f0) ) ROM_START( j6bmc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "bimo-91.bin", 0x00000, 0x020000, CRC(691a15b8) SHA1(d48d80ed59b7d20a4910a5b0554e64f8fe324bef) ) @@ -7018,8 +6887,7 @@ ROM_END #define j6bno_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bignightoutsnd.bin", 0x0000, 0x080000, CRC(e4da3e2e) SHA1(9751dfa7f9ca11b7073742b0ba2bf90fb483452b) ) /* aka bignite.as1 */ \ - + ROM_LOAD( "bignightoutsnd.bin", 0x0000, 0x080000, CRC(e4da3e2e) SHA1(9751dfa7f9ca11b7073742b0ba2bf90fb483452b) ) /* aka bignite.as1 */ ROM_START( j6bno ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "bignightout.p1", 0x00000, 0x020000, CRC(d9a9858f) SHA1(103a31682eb28f0585e948ad8f59887ad2976f40) ) @@ -7050,8 +6918,7 @@ ROM_END #define j6btbw_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "borntobewildsnd.bin", 0x0000, 0x080000, CRC(2c590926) SHA1(d5f56624d1f8f9692004937f98cadde78c2606bc) ) \ - + ROM_LOAD( "borntobewildsnd.bin", 0x0000, 0x080000, CRC(2c590926) SHA1(d5f56624d1f8f9692004937f98cadde78c2606bc) ) ROM_START( j6btbw ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7093,8 +6960,7 @@ ROM_END #define j6cpal_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ ROM_LOAD( "cpalace22-06-98 68d0a91.bin", 0x0000, 0x080000, CRC(56d581e0) SHA1(d22796ec6d96f4d4ea10dfdb925ceaff032fe7d0) ) \ - ROM_LOAD( "capa-snd.bin", 0x0000, 0x080000, CRC(56d581e0) SHA1(d22796ec6d96f4d4ea10dfdb925ceaff032fe7d0) ) \ - + ROM_LOAD( "capa-snd.bin", 0x0000, 0x080000, CRC(56d581e0) SHA1(d22796ec6d96f4d4ea10dfdb925ceaff032fe7d0) ) ROM_START( j6cpal ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7165,8 +7031,7 @@ ROM_END #define j6ccc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6ccc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "ccb1.bin", 0x00000, 0x020000, CRC(38a9b16e) SHA1(2ee0e1c67064e537b4459a69dc9ebf8be89f9051) ) @@ -7198,8 +7063,7 @@ ROM_END #define j6colic_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6colic ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7240,8 +7104,7 @@ ROM_END #define j6crakr_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6crakr ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "crac-11.bin", 0x00000, 0x020000, CRC(facb09cd) SHA1(3f70f3616a2201d25d3712012b4c56cfa09c1411) ) @@ -7267,8 +7130,7 @@ ROM_END #define j6ewndg_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6ewndg ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7294,8 +7156,7 @@ ROM_END #define j6easy_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "easymoneysnd.bin", 0x0000, 0x080000, CRC(aee5bc30) SHA1(071038e7fc7767b7b11c9b97b41e079fbbe11291) ) \ - + ROM_LOAD( "easymoneysnd.bin", 0x0000, 0x080000, CRC(aee5bc30) SHA1(071038e7fc7767b7b11c9b97b41e079fbbe11291) ) ROM_START( j6easy ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7328,8 +7189,7 @@ ROM_END #define j6ffc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6ffc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7375,8 +7235,7 @@ ROM_END #define j6grc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6grc ) @@ -7396,8 +7255,7 @@ ROM_END #define j6hdc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "club-hotdogssnd.bin", 0x0000, 0x080000, CRC(2bd7871f) SHA1(dc129f64f7186c02f4283229b579275ecb3a1165) ) \ - + ROM_LOAD( "club-hotdogssnd.bin", 0x0000, 0x080000, CRC(2bd7871f) SHA1(dc129f64f7186c02f4283229b579275ecb3a1165) ) ROM_START( j6hdc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7470,8 +7328,7 @@ ROM_END #define j6kapang_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6kapang ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "kapa-41.bin", 0x00000, 0x020000, CRC(34509f12) SHA1(b7de8c6004b9638365dceed79d9a829587c45ab4) ) @@ -7489,8 +7346,7 @@ ROM_END #define j6kfc_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "kungfuclubsound.bin", 0x0000, 0x080000, CRC(659dfb1a) SHA1(0094cdee97c82a05358e8fcc6157f761c51c3655) ) \ - + ROM_LOAD( "kungfuclubsound.bin", 0x0000, 0x080000, CRC(659dfb1a) SHA1(0094cdee97c82a05358e8fcc6157f761c51c3655) ) ROM_START( j6kfc ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "kfcl-e1.bin", 0x00000, 0x020000, CRC(f16857a0) SHA1(5cff87bf3857593c7d032315b7555e16c3849d08) ) @@ -7516,8 +7372,7 @@ ROM_END #define j6lucklo_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6lucklo ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7536,8 +7391,7 @@ ROM_END #define j6monst_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bad1snd.bin", 0x0000, 0x080000, CRC(1b61dcf9) SHA1(3ba4c8d9b77c86fbb931af0c0d9808ac68d0aa25) ) \ - + ROM_LOAD( "bad1snd.bin", 0x0000, 0x080000, CRC(1b61dcf9) SHA1(3ba4c8d9b77c86fbb931af0c0d9808ac68d0aa25) ) ROM_START( j6monst ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "monster.p1", 0x00000, 0x020000, CRC(979ba29d) SHA1(44258fc5c41794c84d0b034cc5bc789d2365f641) ) @@ -7595,8 +7449,7 @@ ROM_END #define j6potg_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6potg ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7623,8 +7476,7 @@ ROM_END #define j6ramese_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ramesesrichessnd.bin", 0x0000, 0x080000, CRC(0173169e) SHA1(ccba7f6d41193f556af8ef6c827b482277ee0ee2) ) \ - + ROM_LOAD( "ramesesrichessnd.bin", 0x0000, 0x080000, CRC(0173169e) SHA1(ccba7f6d41193f556af8ef6c827b482277ee0ee2) ) ROM_START( j6ramese ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "rari-b1.bin", 0x00000, 0x020000, CRC(a9d6f938) SHA1(ab0f9fb178708ff8660f37495f1c2579c9370b27) ) @@ -7678,8 +7530,7 @@ ROM_END #define j6r2rum_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rtrsnd.bin", 0x0000, 0x080000, CRC(ba72e377) SHA1(99e123eebb8e7ceb2fb36fd17f1c23d3ce04d2d6) ) \ - + ROM_LOAD( "rtrsnd.bin", 0x0000, 0x080000, CRC(ba72e377) SHA1(99e123eebb8e7ceb2fb36fd17f1c23d3ce04d2d6) ) ROM_START( j6r2rum ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7727,8 +7578,7 @@ ROM_END #define j6redal_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6redal ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "real-c1.bin", 0x00000, 0x020000, CRC(eabec7ae) SHA1(5722dc489b3cf5ff90d9688d52fd8489d80b9c96) ) @@ -7746,8 +7596,7 @@ ROM_END #define j6reelb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6reelb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "fg81.bin", 0x00000, 0x020000, CRC(570cd8b3) SHA1(91563b30d2ff229a000dfb3299a9cf343517fc72) ) @@ -7766,8 +7615,7 @@ ROM_END #define j6slagn_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "snlsasnd.bin", 0x0000, 0x080000, CRC(288e4ce1) SHA1(6690eccb1af94731af160d73b4d8903a98fa27bb) ) \ - + ROM_LOAD( "snlsasnd.bin", 0x0000, 0x080000, CRC(288e4ce1) SHA1(6690eccb1af94731af160d73b4d8903a98fa27bb) ) ROM_START( j6slagn ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "s&l31.b8", 0x00000, 0x020000, CRC(e8cadadb) SHA1(e7edfa79e1648658e200ddbbb1d280641e03b93e) ) @@ -7839,8 +7687,7 @@ ROM_END #define j6thril_sound \ ROM_LOAD( "thlr-snd.bin", 0x0000, 0x020000, CRC(03771692) SHA1(2f42859d09e4354689887f1e40f9fce1eb858e3e) ) /* probably bad */ \ - ROM_LOAD( "thrillersnd.bin", 0x0000, 0x080000, CRC(c93bc625) SHA1(ecceddd90a721c39ef3da8cef442c0d78dacaed2) ) \ - + ROM_LOAD( "thrillersnd.bin", 0x0000, 0x080000, CRC(c93bc625) SHA1(ecceddd90a721c39ef3da8cef442c0d78dacaed2) ) ROM_START( j6thril ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "fpe1.bin", 0x00000, 0x020000, CRC(d2e60e6f) SHA1(525022907858021a2a274a870336de6b414c0b05) ) @@ -7857,8 +7704,7 @@ ROM_END #define j6tqust_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - ROM_LOAD( "tresquestsnd.bin", 0x0000, 0x080000, CRC(c7254d62) SHA1(9b97c7d1a844cd39c3dcfd984e1908ece47db00e) ) \ - + ROM_LOAD( "tresquestsnd.bin", 0x0000, 0x080000, CRC(c7254d62) SHA1(9b97c7d1a844cd39c3dcfd984e1908ece47db00e) ) ROM_START( j6tqust ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) ROM_LOAD16_BYTE( "tq21.b8", 0x00000, 0x020000, CRC(b114c904) SHA1(bf4d2f13525aa9b91bd5985eb62e022751bba596) ) @@ -7901,8 +7747,7 @@ ROM_END #define j6h5clb_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6h5clb ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) @@ -7920,8 +7765,7 @@ ROM_END #define j6milln_sound \ ROM_REGION( 0x80000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( j6milln ) ROM_REGION( PRGSIZE_REGULAR, "maincpu", 0 ) diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index 081ca082b1a..6afe79b6b00 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -315,8 +315,7 @@ READ16_MEMBER(jpmsys5_state::jpm_upd7759_r) AM_RANGE(0x04608e, 0x04608f) AM_DEVREADWRITE8("acia6850_2", acia6850_device, data_read, data_write, 0xff) \ AM_RANGE(0x0460c0, 0x0460c1) AM_WRITENOP \ AM_RANGE(0x048000, 0x04801f) AM_READWRITE(coins_r, coins_w) \ - AM_RANGE(0x04c000, 0x04c0ff) AM_READ(mux_r) AM_WRITE(mux_w) \ - + AM_RANGE(0x04c000, 0x04c0ff) AM_READ(mux_r) AM_WRITE(mux_w) static ADDRESS_MAP_START( 68000_awp_map, AS_PROGRAM, 16, jpmsys5_state ) JPM_SYS5_COMMON_MAP diff --git a/src/mame/drivers/jpmsys5sw.c b/src/mame/drivers/jpmsys5sw.c index 75dc7748a8c..98fe9cd1d80 100644 --- a/src/mame/drivers/jpmsys5sw.c +++ b/src/mame/drivers/jpmsys5sw.c @@ -127,8 +127,7 @@ ROM_END // this came from the 'Crystal' Club set, but was also in the 'Crystal' normal set (which looks more like a club set).. Maybe it's just the club sound rom. #define J5AR80CL_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "atwcsnd.bin", 0x0000, 0x040000, CRC(c637b1ce) SHA1(e68a3f390f3671af693f080f20119d54118e10f0) ) \ - + ROM_LOAD( "atwcsnd.bin", 0x0000, 0x040000, CRC(c637b1ce) SHA1(e68a3f390f3671af693f080f20119d54118e10f0) ) ROM_START( j5ar80cl ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -165,8 +164,7 @@ ROM_END #define J5AR80_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "5652.bin", 0x00000, 0x040000, CRC(d0876512) SHA1(1bda1d640ca5ee6831d7a4ae948e3dce277e8a3e) ) \ - + ROM_LOAD( "5652.bin", 0x00000, 0x040000, CRC(d0876512) SHA1(1bda1d640ca5ee6831d7a4ae948e3dce277e8a3e) ) // ROM_LOAD( "atw80snd.bin", 0x00000, 0x020000, CRC(b002e11c) SHA1(f7133f4bb8c31feaad0a7b9ee88749f9b7877575) ) // this is just the first half of 5652/atworldsound.bin ROM_START( j5ar80 ) @@ -230,8 +228,7 @@ ROM_END #define J5CIR_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "circ_snd.bin", 0x00000, 0x080000, CRC(a4402d73) SHA1(e1760462734b8529f9ba374c36f9e0f2aa66264f) ) \ - + ROM_LOAD( "circ_snd.bin", 0x00000, 0x080000, CRC(a4402d73) SHA1(e1760462734b8529f9ba374c36f9e0f2aa66264f) ) ROM_START( j5cir ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "circus_10_quid_p1.bin", 0x00000, 0x10000, CRC(9ac0cc40) SHA1(2c45386d880df6ce3f40c5f74836f91541eb7f71) ) @@ -335,8 +332,7 @@ ROM_END // hopefully this is the right sound rom, because there was an Impact HW set in here too #define J5FAIRGD_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "cfg_snd", 0x00000, 0x080000, CRC(57ea2159) SHA1(79eb864333ecdfaacae51797327afe5cc8a815eb) ) \ - + ROM_LOAD( "cfg_snd", 0x00000, 0x080000, CRC(57ea2159) SHA1(79eb864333ecdfaacae51797327afe5cc8a815eb) ) ROM_START( j5fairgd ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "6474.bin", 0x00000, 0x10000, CRC(e02bea2d) SHA1(b93f44b04f64ffd19952447889f21ec4e43eef0f) ) // 0x81 = FF @@ -381,8 +377,7 @@ ROM_END #define J5FAIR_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "fairsound.bin", 0x0000, 0x040000, CRC(2992a89a) SHA1(74b972a234c96217c8ebd0e724e97dbb5afe6fc1) )\ - + ROM_LOAD( "fairsound.bin", 0x0000, 0x040000, CRC(2992a89a) SHA1(74b972a234c96217c8ebd0e724e97dbb5afe6fc1) ) ROM_START( j5fair ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "6248.bin", 0x00000, 0x10000, CRC(96b3fbc9) SHA1(4203a70ba444caba4496ced4168f271a7e405568) ) @@ -555,8 +550,7 @@ ROM_END #define J5JOKGLD_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ ROM_LOAD( "jg_snd.bin", 0x00000, 0x080000, CRC(bab05fea) SHA1(66e03ac598f6683b6634a2fce194dc058ddc8ef4) ) \ - ROM_LOAD( "jgsnd.bin", 0x00000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) \ - + ROM_LOAD( "jgsnd.bin", 0x00000, 0x080000, CRC(8bc92c90) SHA1(bcbbe270ce42d5960ac37a2324e3fb37ff513147) ) // Also with these roms: German Impact HW set? // ROM_LOAD16_BYTE( "jg.p1", 0x00000, 0x10000, CRC(e5658ca2) SHA1(2d188899a4aa8124b7c492379331b8713913c69e) ) // ROM_LOAD16_BYTE( "jg.p2", 0x00001, 0x10000, CRC(efa0c84b) SHA1(ef511378904823ae66b7812eff13d9cef5fa621b) ) @@ -781,8 +775,7 @@ ROM_END #define J5HOTDOG_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD16_BYTE( "hot_dogs_snd.bin", 0x00000, 0x040000, CRC(cd7eae1c) SHA1(48b6344491bf0f40e02fbdec5a26f546f2b8d7bb) ) \ - + ROM_LOAD16_BYTE( "hot_dogs_snd.bin", 0x00000, 0x040000, CRC(cd7eae1c) SHA1(48b6344491bf0f40e02fbdec5a26f546f2b8d7bb) ) ROM_START( j5hotdog ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -900,8 +893,7 @@ ROM_END #define J5POPTH_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "poptreashuntsound.bin", 0x00000, 0x080000, CRC(c7c3c012) SHA1(b6d4bab77ccc4499906db655326be10d346f8e6f) ) \ - + ROM_LOAD( "poptreashuntsound.bin", 0x00000, 0x080000, CRC(c7c3c012) SHA1(b6d4bab77ccc4499906db655326be10d346f8e6f) ) ROM_START( j5popth ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -980,8 +972,7 @@ ROM_END #define J5SLVREE_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "gstr_032003.bin", 0x00000, 0x080000, CRC(352e28cd) SHA1(c98307f5eaf511c9d281151d1c07ffd83f24244c) ) \ - + ROM_LOAD( "gstr_032003.bin", 0x00000, 0x080000, CRC(352e28cd) SHA1(c98307f5eaf511c9d281151d1c07ffd83f24244c) ) ROM_START( j5slvree ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "gstr_032001.bin", 0x00000, 0x10000, CRC(e84d6437) SHA1(565b625ddb0693cd59ca1b1e07cd25ff1cb5c8f6) ) // 0x81 = FD @@ -999,8 +990,7 @@ ROM_END #define J5SLVSTR_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "sssound.bin", 0x00000, 0x080000, CRC(d4d57f9f) SHA1(2ec38b62928d8c208880015b3a5e348e9b1c2079) ) \ - + ROM_LOAD( "sssound.bin", 0x00000, 0x080000, CRC(d4d57f9f) SHA1(2ec38b62928d8c208880015b3a5e348e9b1c2079) ) ROM_START( j5slvstr ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "ss30cz_02_1.b8", 0x00000, 0x10000, CRC(ea4efe3e) SHA1(3e41d5f614b386ae9d216d83d0fad080d475948d) ) // 0x81 = FF @@ -1059,8 +1049,7 @@ ROM_END #define J5POPEYE_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "popsnd.bin", 0x00000, 0x80000, CRC(67378dbc) SHA1(83f87e35bb2c73a788c0ed778b33f3710eb95406) ) \ - + ROM_LOAD( "popsnd.bin", 0x00000, 0x80000, CRC(67378dbc) SHA1(83f87e35bb2c73a788c0ed778b33f3710eb95406) ) ROM_START( j5popeye ) // also found in the set marked 'Super Popeye' ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "7531.bin", 0x00000, 0x10000, CRC(a8d5394c) SHA1(5be0cd8bc4cdb230a839f83e1297bc57dde20d94) ) // 0x81 = FF @@ -1230,8 +1219,7 @@ ROM_END #define J5HAGAR_SOUND \ ROM_REGION( 0x80000, "upd7759", 0 ) \ - ROM_LOAD( "6186.bin", 0x0000, 0x080000, CRC(3bdb52c8) SHA1(0b83890609fad4f2641844d9bd5504996ad2cc10) ) \ - + ROM_LOAD( "6186.bin", 0x0000, 0x080000, CRC(3bdb52c8) SHA1(0b83890609fad4f2641844d9bd5504996ad2cc10) ) ROM_START( j5hagar ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "hagar_6_a.bin", 0x00000, 0x10000, CRC(f461d173) SHA1(1b991cef0e1480cf1ee390f9d1da521660263501) ) // 0x81 = FF diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 3987e0d8a30..9a31d920382 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -125,8 +125,6 @@ WRITE8_MEMBER(jrpacman_state::jrpacman_interrupt_vector_w) WRITE8_MEMBER(jrpacman_state::irq_mask_w) { - - m_irq_mask = data & 1; } @@ -283,7 +281,6 @@ static const namco_interface namco_config = INTERRUPT_GEN_MEMBER(jrpacman_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index d88f1e2b855..d20238e6f52 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -145,7 +145,6 @@ UINT32 jubilee_state::screen_update_jubileep(screen_device &screen, bitmap_ind16 void jubilee_state::palette_init() { - } diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 7eee0a79fc3..3a69dbdc4f5 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -142,7 +142,6 @@ public: WRITE8_MEMBER(junofrst_state::junofrst_blitter_w) { - m_blitterdata[offset] = data; /* blitter is triggered by $8073 */ @@ -238,8 +237,6 @@ WRITE8_MEMBER(junofrst_state::junofrst_portB_w) WRITE8_MEMBER(junofrst_state::junofrst_sh_irqtrigger_w) { - - if (m_last_irq == 0 && data == 1) { /* setting bit 0 low then high triggers IRQ on the sound CPU */ @@ -252,15 +249,12 @@ WRITE8_MEMBER(junofrst_state::junofrst_sh_irqtrigger_w) WRITE8_MEMBER(junofrst_state::junofrst_i8039_irq_w) { - m_i8039->execute().set_input_line(0, ASSERT_LINE); } WRITE8_MEMBER(junofrst_state::i8039_irqen_and_status_w) { - - if ((data & 0x80) == 0) m_i8039->execute().set_input_line(0, CLEAR_LINE); m_i8039_status = (data & 0x70) >> 4; @@ -269,7 +263,6 @@ WRITE8_MEMBER(junofrst_state::i8039_irqen_and_status_w) WRITE8_MEMBER(junofrst_state::flip_screen_w) { - tutankhm_flip_screen_x_w(space, 0, data); tutankhm_flip_screen_y_w(space, 0, data); } @@ -282,8 +275,6 @@ WRITE8_MEMBER(junofrst_state::junofrst_coin_counter_w) WRITE8_MEMBER(junofrst_state::junofrst_irq_enable_w) { - - m_irq_enable = data & 1; if (!m_irq_enable) m_maincpu->set_input_line(0, CLEAR_LINE); @@ -389,7 +380,6 @@ static const ay8910_interface ay8910_config = MACHINE_START_MEMBER(junofrst_state,junofrst) { - m_maincpu = machine().device("maincpu"); m_i8039 = machine().device("mcu"); m_soundcpu = machine().device("audiocpu"); @@ -408,7 +398,6 @@ MACHINE_START_MEMBER(junofrst_state,junofrst) MACHINE_RESET_MEMBER(junofrst_state,junofrst) { - m_i8039_status = 0; m_last_irq = 0; m_flip_x = 0; @@ -421,7 +410,6 @@ MACHINE_RESET_MEMBER(junofrst_state,junofrst) INTERRUPT_GEN_MEMBER(junofrst_state::junofrst_30hz_irq) { - /* flip flops cause the interrupt to be signalled every other frame */ m_irq_toggle ^= 1; if (m_irq_toggle && m_irq_enable) diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index aca1bc27f11..9c0a6fc72aa 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -188,7 +188,6 @@ MACHINE_START_MEMBER(kangaroo_state,kangaroo_mcu) void kangaroo_state::machine_reset() { - /* I think there is a bug in the startup checks of the game. At the very */ /* beginning, during the RAM check, it goes one byte too far, and ends up */ /* trying to write, and re-read, location dfff. To the best of my knowledge, */ diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 46fccfbe26b..92dc914d585 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -330,7 +330,6 @@ static void chelnov_i8751_w( running_machine &machine, int data ) WRITE16_MEMBER(karnov_state::karnov_control_w) { - /* Mnemonics filled in from the schematics, brackets are my comments */ switch (offset << 1) { @@ -403,7 +402,6 @@ WRITE16_MEMBER(karnov_state::karnov_control_w) READ16_MEMBER(karnov_state::karnov_control_r) { - switch (offset << 1) { case 0: @@ -766,7 +764,6 @@ static const ym3526_interface ym3526_config = void karnov_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -784,7 +781,6 @@ void karnov_state::machine_start() void karnov_state::machine_reset() { - memset(m_ram, 0, 0x4000 / 2); /* Chelnov likes ram clear on reset.. */ m_i8751_return = 0; diff --git a/src/mame/drivers/kas89.c b/src/mame/drivers/kas89.c index fa2d0ddee6b..fcdf6e264c0 100644 --- a/src/mame/drivers/kas89.c +++ b/src/mame/drivers/kas89.c @@ -1,7 +1,6 @@ /************************************************************************************* - /\/\<< Kasino '89 >>/\/\ - + /\/\<< Kasino '89 >>/\/ 6-players electronic roulette. Video field + phisical LEDs roulette. @@ -268,7 +267,6 @@ void kas89_state::machine_start() void kas89_state::machine_reset() { - m_main_nmi_enable = 0; } diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index a42731fa881..5dd2ab24b41 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -150,7 +150,6 @@ READ8_MEMBER(kchamp_state::sound_reset_r) WRITE8_MEMBER(kchamp_state::kc_sound_control_w) { - if (offset == 0) m_sound_nmi_enable = ((data >> 7) & 1); // else @@ -383,7 +382,6 @@ INTERRUPT_GEN_MEMBER(kchamp_state::sound_int) MACHINE_START_MEMBER(kchamp_state,kchamp) { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_nmi_enable)); @@ -392,7 +390,6 @@ MACHINE_START_MEMBER(kchamp_state,kchamp) MACHINE_START_MEMBER(kchamp_state,kchampvs) { - MACHINE_START_CALL_MEMBER(kchamp); save_item(NAME(m_msm_data)); @@ -402,7 +399,6 @@ MACHINE_START_MEMBER(kchamp_state,kchampvs) void kchamp_state::machine_reset() { - m_nmi_enable = 0; m_sound_nmi_enable = 0; } diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 43b80ed7aca..bf4c4838693 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -295,7 +295,6 @@ WRITE16_MEMBER(kickgoal_state::actionhw_snd_w) INTERRUPT_GEN_MEMBER(kickgoal_state::kickgoal_interrupt) { - if ((m_adpcm->read_status() & 0x08) == 0) { switch(m_melody_loop) @@ -619,7 +618,6 @@ GFXDECODE_END void kickgoal_state::machine_start() { - save_item(NAME(m_snd_sam)); save_item(NAME(m_melody_loop)); save_item(NAME(m_snd_new)); @@ -630,7 +628,6 @@ void kickgoal_state::machine_start() void kickgoal_state::machine_reset() { - m_melody_loop = 0; m_snd_new = 0; m_snd_sam[0] = 0; diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 868ae86795b..376c6895e22 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -444,14 +444,12 @@ static const ay8910_interface ay8910_config = INTERRUPT_GEN_MEMBER(kingofb_state::kingofb_interrupt) { - if (m_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } void kingofb_state::machine_start() { - m_video_cpu = machine().device("video"); m_sprite_cpu = machine().device("sprite"); m_audio_cpu = machine().device("audiocpu"); @@ -462,7 +460,6 @@ void kingofb_state::machine_start() void kingofb_state::machine_reset() { - m_nmi_enable = 0; m_palette_bank = 0; } diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c index 6708fedcc8a..0ce9a0eb6ee 100644 --- a/src/mame/drivers/kncljoe.c +++ b/src/mame/drivers/kncljoe.c @@ -35,7 +35,6 @@ Updates: WRITE8_MEMBER(kncljoe_state::sound_cmd_w) { - if ((data & 0x80) == 0) soundlatch_byte_w(space, 0, data & 0x7f); else @@ -264,7 +263,6 @@ INTERRUPT_GEN_MEMBER(kncljoe_state::sound_nmi) void kncljoe_state::machine_start() { - m_soundcpu = machine().device("soundcpu"); save_item(NAME(m_port1)); @@ -276,7 +274,6 @@ void kncljoe_state::machine_start() void kncljoe_state::machine_reset() { - m_port1 = 0; m_port2 = 0; m_tile_bank = 0; diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index bc72a5ca2d1..12df0b6f4c7 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -163,7 +163,6 @@ WRITE8_MEMBER(koikoi_state::vram_w) READ8_MEMBER(koikoi_state::input_r) { - if (m_inputcnt < 0) return 0; @@ -340,7 +339,6 @@ static const ay8910_interface ay8910_config = void koikoi_state::machine_start() { - save_item(NAME(m_inputcnt)); save_item(NAME(m_inputval)); save_item(NAME(m_inputlen)); diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 316e3cd558f..98925d24e40 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -462,7 +462,6 @@ WRITE32_MEMBER(konamigv_state::flash_w) READ32_MEMBER(konamigv_state::trackball_r) { - if( offset == 0 && mem_mask == 0x0000ffff ) { int axis; @@ -488,7 +487,6 @@ READ32_MEMBER(konamigv_state::unknown_r) DRIVER_INIT_MEMBER(konamigv_state,simpbowl) { - m_flash8[0] = machine().device("flash0"); m_flash8[1] = machine().device("flash1"); m_flash8[2] = machine().device("flash2"); @@ -523,7 +521,6 @@ INPUT_PORTS_END READ32_MEMBER(konamigv_state::btcflash_r) { - if (mem_mask == 0x0000ffff) { return m_flash16[0]->read(offset*2); @@ -538,7 +535,6 @@ READ32_MEMBER(konamigv_state::btcflash_r) WRITE32_MEMBER(konamigv_state::btcflash_w) { - if (mem_mask == 0x0000ffff) { m_flash16[0]->write(offset*2, data&0xffff); @@ -551,7 +547,6 @@ WRITE32_MEMBER(konamigv_state::btcflash_w) READ32_MEMBER(konamigv_state::btc_trackball_r) { - // mame_printf_debug( "r %08x %08x %08x\n", space.device().safe_pc(), offset, mem_mask ); if( offset == 1 && mem_mask == 0xffff0000 ) @@ -580,7 +575,6 @@ WRITE32_MEMBER(konamigv_state::btc_trackball_w) DRIVER_INIT_MEMBER(konamigv_state,btchamp) { - m_flash16[0] = machine().device("flash"); machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f680080, 0x1f68008f, read32_delegate(FUNC(konamigv_state::btc_trackball_r),this), write32_delegate(FUNC(konamigv_state::btc_trackball_w),this)); @@ -660,7 +654,6 @@ WRITE32_MEMBER(konamigv_state::kdeadeye_0_w) DRIVER_INIT_MEMBER(konamigv_state,kdeadeye) { - m_flash16[0] = machine().device("flash"); machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f680080, 0x1f680083, "GUNX1" ); diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 35bcfaf8eda..3aa2060c10f 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1037,7 +1037,6 @@ WRITE32_MEMBER(konamigx_state::type4_prot_w) { if (last_prot_op != -1) { - // mame_printf_debug("type 4 prot command: %x\n", last_prot_op); /* known commands: diff --git a/src/mame/drivers/kontest.c b/src/mame/drivers/kontest.c index 38937679133..c9fbfe64d48 100644 --- a/src/mame/drivers/kontest.c +++ b/src/mame/drivers/kontest.c @@ -91,7 +91,6 @@ void kontest_state::palette_init() void kontest_state::video_start() { - } UINT32 kontest_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c index d41acf4552a..204f43b999b 100644 --- a/src/mame/drivers/kopunch.c +++ b/src/mame/drivers/kopunch.c @@ -70,7 +70,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(kopunch_state::left_coin_inserted) { - /* left coin insertion causes a rst6.5 (vector 0x34) */ if (newval) m_maincpu->set_input_line(I8085_RST65_LINE, HOLD_LINE); @@ -78,7 +77,6 @@ INPUT_CHANGED_MEMBER(kopunch_state::left_coin_inserted) INPUT_CHANGED_MEMBER(kopunch_state::right_coin_inserted) { - /* right coin insertion causes a rst5.5 (vector 0x2c) */ if (newval) m_maincpu->set_input_line(I8085_RST55_LINE, HOLD_LINE); @@ -171,7 +169,6 @@ GFXDECODE_END void kopunch_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_gfxbank)); @@ -179,7 +176,6 @@ void kopunch_state::machine_start() void kopunch_state::machine_reset() { - m_gfxbank = 0; } diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 8540e12bab8..ffabbf8ce03 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -260,7 +260,6 @@ void ksayakyu_state::machine_start() void ksayakyu_state::machine_reset() { - m_sound_status = 0xff; m_video_ctrl = 0; m_flipscreen = 0; diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 18cbb3aa764..cc1cd41cd16 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -705,7 +705,6 @@ READ32_MEMBER(ksys573_state::jamma_r) READ32_MEMBER(ksys573_state::control_r) { - verboselog( machine(), 2, "control_r( %08x, %08x ) %08x\n", offset, mem_mask, m_control ); return m_control; @@ -1291,7 +1290,6 @@ WRITE32_MEMBER(ksys573_state::security_w) READ32_MEMBER(ksys573_state::security_r) { - UINT32 data = m_n_security_control; verboselog( machine(), 2, "security_r( %08x, %08x ) %08x\n", offset, mem_mask, data ); return data; @@ -1768,7 +1766,6 @@ static void gn845pwbb_clk_w( running_machine &machine, int offset, int data ) CUSTOM_INPUT_MEMBER(ksys573_state::gn845pwbb_read) { - return ioport("STAGE")->read() & m_stage_mask; } @@ -1861,7 +1858,6 @@ static void gn845pwbb_output_callback( running_machine &machine, int offset, int DRIVER_INIT_MEMBER(ksys573_state,ddr) { - DRIVER_INIT_CALL(konami573); m_stage_mask = 0xffffffff; @@ -2606,7 +2602,6 @@ static void salarymc_lamp_callback( running_machine &machine, int data ) DRIVER_INIT_MEMBER(ksys573_state,salarymc) { - DRIVER_INIT_CALL(konami573); m_security_callback = salarymc_lamp_callback; @@ -2648,7 +2643,6 @@ static void hyperbbc_lamp_callback( running_machine &machine, int data ) DRIVER_INIT_MEMBER(ksys573_state,hyperbbc) { - DRIVER_INIT_CALL(konami573); m_security_callback = hyperbbc_lamp_callback; @@ -2985,7 +2979,6 @@ WRITE32_MEMBER(ksys573_state::gunmania_w) CUSTOM_INPUT_MEMBER(ksys573_state::gunmania_tank_shutter_sensor) { - if( m_tank_shutter_position == 0 ) { return 1; @@ -2996,7 +2989,6 @@ CUSTOM_INPUT_MEMBER(ksys573_state::gunmania_tank_shutter_sensor) CUSTOM_INPUT_MEMBER(ksys573_state::gunmania_cable_holder_sensor) { - return m_cable_holder_release; } diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index c6abbe03d03..dd50fca56dc 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -102,7 +102,6 @@ INTERRUPT_GEN_MEMBER(kungfur_state::kungfur_irq) WRITE8_MEMBER(kungfur_state::kungfur_output_w) { - // d0-d2: output led7seg static const int lut_digits[24] = { @@ -154,7 +153,6 @@ WRITE8_MEMBER(kungfur_state::kungfur_latch3_w) WRITE8_MEMBER(kungfur_state::kungfur_control_w) { - // d0-d3: N/C // d4: irq ack if (~data & 0x10) @@ -298,7 +296,6 @@ static const msm5205_interface msm5205_config_2 = void kungfur_state::machine_start() { - save_item(NAME(m_control)); save_item(NAME(m_latch)); diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index 514b60db367..e807ec33204 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -495,7 +495,6 @@ static const ay8910_interface ay8910_config = void kyugo_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 4386ffb958e..850b143f78b 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -96,7 +96,6 @@ READ8_MEMBER(ladybug_state::sraider_8005_r) /* Unknown IO */ WRITE8_MEMBER(ladybug_state::sraider_misc_w) { - switch(offset) { /* These 8 bits are stored in the latch at A7 */ @@ -184,14 +183,12 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(ladybug_state::coin1_inserted) { - /* left coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); } INPUT_CHANGED_MEMBER(ladybug_state::coin2_inserted) { - /* right coin insertion causes an IRQ */ if (newval) m_maincpu->set_input_line(0, HOLD_LINE); @@ -733,7 +730,6 @@ MACHINE_START_MEMBER(ladybug_state,ladybug) MACHINE_START_MEMBER(ladybug_state,sraider) { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_grid_color)); diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 3af9b526a93..d238b2bf426 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -72,7 +72,6 @@ WRITE8_MEMBER(ladyfrog_state::sound_cpu_reset_w) TIMER_CALLBACK_MEMBER(ladyfrog_state::nmi_callback) { - if (m_sound_nmi_enable) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); else @@ -92,7 +91,6 @@ WRITE8_MEMBER(ladyfrog_state::nmi_disable_w) WRITE8_MEMBER(ladyfrog_state::nmi_enable_w) { - m_sound_nmi_enable = 1; if (m_pending_nmi) { @@ -103,7 +101,6 @@ WRITE8_MEMBER(ladyfrog_state::nmi_enable_w) WRITE8_MEMBER(ladyfrog_state::unk_w) { - } static const ay8910_interface ay8910_config = @@ -278,7 +275,6 @@ GFXDECODE_END void ladyfrog_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_tilebank)); @@ -291,7 +287,6 @@ void ladyfrog_state::machine_start() void ladyfrog_state::machine_reset() { - m_tilebank = 0; m_palette_bank = 0; m_sound_nmi_enable = 0; diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index a39d0e62adb..22eb1c74496 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -65,7 +65,6 @@ public: void laserbas_state::video_start() { - save_item(NAME(m_vram1)); save_item(NAME(m_vram2)); } @@ -92,7 +91,6 @@ UINT32 laserbas_state::screen_update_laserbas(screen_device &screen, bitmap_ind1 READ8_MEMBER(laserbas_state::vram_r) { - if(!m_vrambank) return m_vram1[offset]; else @@ -101,7 +99,6 @@ READ8_MEMBER(laserbas_state::vram_r) WRITE8_MEMBER(laserbas_state::vram_w) { - if(!m_vrambank) m_vram1[offset] = data; else @@ -111,7 +108,6 @@ WRITE8_MEMBER(laserbas_state::vram_w) #if 0 READ8_MEMBER(laserbas_state::read_unk) { - m_count ^= 0x80; return m_count | 0x7f; } @@ -119,7 +115,6 @@ READ8_MEMBER(laserbas_state::read_unk) WRITE8_MEMBER(laserbas_state::vrambank_w) { - /* either bit 2 or 3 controls flip screen */ m_vrambank = data & 0x40; @@ -127,13 +122,11 @@ WRITE8_MEMBER(laserbas_state::vrambank_w) READ8_MEMBER(laserbas_state::protram_r) { - return m_protram[offset]; } WRITE8_MEMBER(laserbas_state::protram_w) { - m_protram[offset] = data; } @@ -233,14 +226,12 @@ INPUT_PORTS_END void laserbas_state::machine_start() { - save_item(NAME(m_vrambank)); save_item(NAME(m_count)); } void laserbas_state::machine_reset() { - m_vrambank = 0; m_count = 0; } diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index c8391a60245..2bdd486860b 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -480,14 +480,12 @@ GFXDECODE_END TILE_GET_INFO_MEMBER(laserbat_state::get_tile_info) { - // wrong color index! SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_colorram[tile_index] & 0x7f, 0); } void laserbat_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(laserbat_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(m_videoram)); @@ -653,7 +651,6 @@ INTERRUPT_GEN_MEMBER(laserbat_state::laserbat_interrupt) INTERRUPT_GEN_MEMBER(laserbat_state::zaccaria_cb1_toggle) { - m_pia->cb1_w(m_cb1_toggle & 1); m_cb1_toggle ^= 1; } @@ -685,7 +682,6 @@ static const s2636_interface s2636_3_config = void laserbat_state::machine_start() { - m_s2636_1 = machine().device("s2636_1"); m_s2636_2 = machine().device("s2636_2"); m_s2636_3 = machine().device("s2636_3"); @@ -720,7 +716,6 @@ void laserbat_state::machine_start() void laserbat_state::machine_reset() { - m_video_page = 0; m_input_mux = 0; m_active_8910 = 0; diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index 5e5cc95ad3b..ba9495fd33d 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -38,7 +38,6 @@ DIP locations verified for: INPUT_CHANGED_MEMBER(lasso_state::coin_inserted) { - /* coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } @@ -471,7 +470,6 @@ static const sn76496_config psg_intf = void lasso_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -480,7 +478,6 @@ void lasso_state::machine_start() MACHINE_START_MEMBER(lasso_state,wwjgtin) { - lasso_state::machine_start(); save_item(NAME(m_track_enable)); @@ -488,13 +485,11 @@ MACHINE_START_MEMBER(lasso_state,wwjgtin) void lasso_state::machine_reset() { - m_gfxbank = 0; } MACHINE_RESET_MEMBER(lasso_state,wwjgtin) { - lasso_state::machine_reset(); m_track_enable = 0; diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index 2ccae8c62f5..b542cd25c8c 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -467,7 +467,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastduel_state::madgear_timer_cb) MACHINE_START_MEMBER(lastduel_state,lastduel) { - save_item(NAME(m_tilemap_priority)); save_item(NAME(m_scroll)); } diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 238704717e5..7441092a346 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -147,7 +147,6 @@ void lastfght_state::video_start() UINT32 lastfght_state::screen_update_lastfght(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - #ifdef MAME_DEBUG #if 1 // gfx roms viewer (toggle with enter, use pgup/down to browse) @@ -189,7 +188,6 @@ UINT32 lastfght_state::screen_update_lastfght(screen_device &screen, bitmap_ind1 WRITE16_MEMBER(lastfght_state::colordac_w) { - if (ACCESSING_BITS_0_7) { m_colorram[m_clr_offset] = data; @@ -211,7 +209,6 @@ WRITE16_MEMBER(lastfght_state::colordac_w) // high byte of a 16 bit register WRITE16_MEMBER(lastfght_state::lastfght_hi_w) { - if (ACCESSING_BITS_8_15) logerror("%06x: 600000.b = %02x\n", space.device().safe_pc(), data >> 8); if (ACCESSING_BITS_0_7) @@ -224,7 +221,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_hi_w) // screen x WRITE16_MEMBER(lastfght_state::lastfght_x_w) { - if (ACCESSING_BITS_8_15) logerror("%06x: 800008.b = %02x\n", space.device().safe_pc(), data >> 8); if (ACCESSING_BITS_0_7) @@ -237,7 +233,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_x_w) // screen y, screen width - 1 WRITE16_MEMBER(lastfght_state::lastfght_yw_w) { - if (ACCESSING_BITS_8_15) { m_y = m_hi | (data >> 8); @@ -253,7 +248,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_yw_w) // screen height - 1 WRITE16_MEMBER(lastfght_state::lastfght_h_w) { - if (ACCESSING_BITS_8_15) { m_h = m_hi | (data >> 8); @@ -266,7 +260,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_h_w) // source delta x << 6, source x << 6 WRITE16_MEMBER(lastfght_state::lastfght_sx_w) { - if (ACCESSING_BITS_8_15) { m_dsx = m_hi | (data >> 8); @@ -282,7 +275,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_sx_w) // source y << 6, source y1 << 6 WRITE16_MEMBER(lastfght_state::lastfght_sy_w) { - if (ACCESSING_BITS_8_15) { m_sy = m_hi | (data >> 8); @@ -298,7 +290,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_sy_w) // source rom (0x200000 bytes), source page (512x256 bytes) WRITE16_MEMBER(lastfght_state::lastfght_sr_w) { - if (ACCESSING_BITS_8_15) { m_sp = (m_hi >> 8) >> 4; @@ -314,7 +305,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_sr_w) // source x1 << 6, source delta y << 6 WRITE16_MEMBER(lastfght_state::lastfght_sd_w) { - if (ACCESSING_BITS_8_15) { m_sx1 = m_hi | (data >> 8); @@ -330,7 +320,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_sd_w) // start blit WRITE16_MEMBER(lastfght_state::lastfght_blit_w) { - if (ACCESSING_BITS_8_15) { int x, y, addr; @@ -368,7 +357,6 @@ WRITE16_MEMBER(lastfght_state::lastfght_blit_w) // toggle framebuffer WRITE16_MEMBER(lastfght_state::lastfght_dest_w) { - if (ACCESSING_BITS_0_7) m_dest ^= 1; } @@ -530,13 +518,11 @@ INPUT_PORTS_END INTERRUPT_GEN_MEMBER(lastfght_state::unknown_interrupt) { - m_maincpu->set_input_line(H8_METRO_TIMER_HACK, HOLD_LINE); } void lastfght_state::machine_start() { - save_item(NAME(m_clr_offset)); save_item(NAME(m_dest)); save_item(NAME(m_hi)); @@ -557,7 +543,6 @@ void lastfght_state::machine_start() void lastfght_state::machine_reset() { - m_clr_offset = 0; m_dest = 0; m_hi = 0; diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index 3f1a87cd246..b6c5a3d68ed 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -294,7 +294,6 @@ READ8_MEMBER(lazercmd_state::lazercmd_data_port_r) WRITE8_MEMBER(lazercmd_state::lazercmd_hardware_w) { - switch (offset) { case 0: /* audio channels */ @@ -317,7 +316,6 @@ WRITE8_MEMBER(lazercmd_state::lazercmd_hardware_w) WRITE8_MEMBER(lazercmd_state::medlanes_hardware_w) { - switch (offset) { case 0: /* audio control */ @@ -343,7 +341,6 @@ WRITE8_MEMBER(lazercmd_state::medlanes_hardware_w) WRITE8_MEMBER(lazercmd_state::bbonk_hardware_w) { - switch (offset) { case 0: /* audio control */ @@ -602,7 +599,6 @@ void lazercmd_state::palette_init() void lazercmd_state::machine_start() { - m_dac = machine().device("dac"); save_item(NAME(m_marker_x)); @@ -614,7 +610,6 @@ void lazercmd_state::machine_start() void lazercmd_state::machine_reset() { - m_marker_x = 0; m_marker_y = 0; m_timer_count = 0; diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 6609321dec2..d9e35f52cd8 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -25,7 +25,6 @@ WRITE16_MEMBER(lemmings_state::lemmings_control_w) { - /* Offset==0 Pixel layer X scroll */ if (offset == 4) return; /* Watchdog or IRQ ack */ @@ -243,7 +242,6 @@ GFXDECODE_END void lemmings_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 679ed0960b6..38991598b4d 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -205,7 +205,6 @@ WRITE8_MEMBER(lethal_state::control2_w) INTERRUPT_GEN_MEMBER(lethal_state::lethalen_interrupt) { - if (k056832_is_irq_enabled(m_k056832, 0)) device.execute().set_input_line(HD6309_IRQ_LINE, HOLD_LINE); } @@ -238,7 +237,6 @@ WRITE8_MEMBER(lethal_state::le_bankswitch_w) READ8_MEMBER(lethal_state::le_4800_r) { - if (m_cur_control2 & 0x10) // RAM enable { return m_generic_paletteram_8[offset]; @@ -322,7 +320,6 @@ READ8_MEMBER(lethal_state::le_4800_r) WRITE8_MEMBER(lethal_state::le_4800_w) { - if (m_cur_control2 & 0x10) // RAM enable { paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data); diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 5a5cbe41698..db3e405b0b0 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -793,7 +793,6 @@ INTERRUPT_GEN_MEMBER(liberate_state::prosport_interrupt) MACHINE_START_MEMBER(liberate_state,liberate) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -808,7 +807,6 @@ MACHINE_START_MEMBER(liberate_state,liberate) MACHINE_RESET_MEMBER(liberate_state,liberate) { - memset(m_io_ram, 0, ARRAY_LENGTH(m_io_ram)); m_background_disable = 0; diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index 3ec40bb4c2f..caecb93ec5d 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -194,7 +194,6 @@ READ8_MEMBER(limenko_state::qs1000_p1_r) WRITE8_MEMBER(limenko_state::qs1000_p1_w) { - } WRITE8_MEMBER(limenko_state::qs1000_p2_w) @@ -1116,7 +1115,6 @@ READ32_MEMBER(limenko_state::spotty_speedup_r) DRIVER_INIT_MEMBER(limenko_state,common) { - // Set up the QS1000 program ROM banking, taking care not to overlap the internal RAM machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "bank"); membank("qs1000:bank")->configure_entries(0, 8, memregion("qs1000:cpu")->base()+0x100, 0x10000); diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c index 18477b002ba..419352c85d4 100644 --- a/src/mame/drivers/littlerb.c +++ b/src/mame/drivers/littlerb.c @@ -165,7 +165,6 @@ public: if ((!(m_spritelist[2] & 0x1000)) && (!(m_spritelist[1] & 0x1000))) { - } else { @@ -365,7 +364,6 @@ READ16_MEMBER(littlerb_state::littlerb_vdp_r) #define LOG_VDP 1 WRITE16_MEMBER(littlerb_state::littlerb_vdp_w) { - if (offset!=2) { if (m_type2_writes) @@ -667,8 +665,6 @@ static void littlerb_draw_sprites(running_machine &machine) for (offs=0;offs<(state->m_listoffset);) { - - UINT32 read_dword = ((spriteregion[offs+1])<<16)+ (spriteregion[offs+0]); littlerb_printf("read %08x\n", read_dword); diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 1b93527925e..575a63fdc3c 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -116,7 +116,6 @@ WRITE8_MEMBER(lkage_state::lkage_sh_nmi_disable_w) WRITE8_MEMBER(lkage_state::lkage_sh_nmi_enable_w) { - m_sound_nmi_enable = 1; if (m_pending_nmi) { @@ -493,7 +492,6 @@ static const ym2203_interface ym2203_config = void lkage_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -526,7 +524,6 @@ void lkage_state::machine_start() void lkage_state::machine_reset() { - m_bg_tile_bank = m_fg_tile_bank = m_tx_tile_bank =0; m_mcu_ready = 3; diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index b66efa7f1cc..640cf602bb3 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -95,7 +95,6 @@ WRITE16_MEMBER(lockon_state::main_obj_w) WRITE16_MEMBER(lockon_state::tst_w) { - if (offset < 0x800) { address_space &gndspace = m_ground->memory().space(AS_PROGRAM); @@ -453,7 +452,6 @@ static const ym2203_interface ym2203_config = void lockon_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_ground = machine().device("ground"); @@ -485,7 +483,6 @@ void lockon_state::machine_start() void lockon_state::machine_reset() { - m_ground_ctrl = 0; m_scroll_h = 0; m_scroll_v = 0; diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index cf7b64e56aa..b60717d1fc1 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -211,7 +211,6 @@ TILE_GET_INFO_MEMBER(looping_state::get_tile_info) void looping_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(looping_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); m_bg_tilemap->set_scroll_cols(0x20); diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index 7c3e7ea58fc..5b52561d413 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -546,7 +546,6 @@ static void irqhandler(device_t *device, int irq) WRITE8_MEMBER(lsasquad_state::unk) { - } @@ -594,7 +593,6 @@ MACHINE_START_MEMBER(lsasquad_state,lsasquad) MACHINE_RESET_MEMBER(lsasquad_state,lsasquad) { - m_sound_pending = 0; m_sound_nmi_enable = 0; m_pending_nmi = 0; diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 7abb5684353..ec68623e821 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -72,7 +72,6 @@ READ8_MEMBER(lwings_state::avengers_adpcm_r) WRITE8_MEMBER(lwings_state::lwings_bankswitch_w) { - /* bit 0 is flip screen */ flip_screen_set(~data & 0x01); @@ -89,14 +88,12 @@ WRITE8_MEMBER(lwings_state::lwings_bankswitch_w) INTERRUPT_GEN_MEMBER(lwings_state::lwings_interrupt) { - if(m_nmi_mask) device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xd7); /* RST 10h */ } INTERRUPT_GEN_MEMBER(lwings_state::avengers_interrupt) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -761,7 +758,6 @@ void lwings_state::machine_start() void lwings_state::machine_reset() { - m_bg2_image = 0; m_scroll_x[0] = 0; m_scroll_x[1] = 0; diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 8ff060ab2af..f330b0cb150 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -136,7 +136,6 @@ WRITE8_MEMBER(m10_state::ic8j1_output_changed) WRITE8_MEMBER(m10_state::ic8j2_output_changed) { - /* written from /Q to A with slight delight */ LOG(("ic8j2: %d\n", data)); ttl74123_a_w(m_ic8j2, space, 0, data); @@ -192,7 +191,6 @@ PALETTE_INIT_MEMBER(m10_state,m10) MACHINE_START_MEMBER(m10_state,m10) { - m_maincpu = machine().device("maincpu"); m_ic8j1 = machine().device("ic8j1"); m_ic8j2 = machine().device("ic8j2"); @@ -205,7 +203,6 @@ MACHINE_START_MEMBER(m10_state,m10) MACHINE_RESET_MEMBER(m10_state,m10) { - m_bottomline = 0; m_flip = 0; m_last = 0; @@ -238,7 +235,6 @@ MACHINE_RESET_MEMBER(m10_state,m10) WRITE8_MEMBER(m10_state::m10_ctrl_w) { - #if DEBUG if (data & 0x40) popmessage("ctrl: %02x",data); @@ -314,7 +310,6 @@ WRITE8_MEMBER(m10_state::m10_ctrl_w) WRITE8_MEMBER(m10_state::m11_ctrl_w) { - #if DEBUG if (data & 0x4c) popmessage("M11 ctrl: %02x",data); @@ -346,7 +341,6 @@ WRITE8_MEMBER(m10_state::m11_ctrl_w) WRITE8_MEMBER(m10_state::m15_ctrl_w) { - #if DEBUG if (data & 0xf0) popmessage("M15 ctrl: %02x",data); diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 1b426e9c145..be3129ae458 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -969,7 +969,6 @@ DRIVER_INIT_MEMBER(m107_state,dsoccr94) DRIVER_INIT_MEMBER(m107_state,wpksoc) { - m_irq_vectorbase = 0x80; m_spritesystem = 0; } diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index a17401b315f..226e82cf5ed 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -116,7 +116,6 @@ void m14_state::palette_init() TILE_GET_INFO_MEMBER(m14_state::m14_get_tile_info) { - int code = m_video_ram[tile_index]; int color = m_color_ram[tile_index] & 0x0f; @@ -131,13 +130,11 @@ TILE_GET_INFO_MEMBER(m14_state::m14_get_tile_info) void m14_state::video_start() { - m_m14_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m14_state::m14_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 m14_state::screen_update_m14(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_m14_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } @@ -145,14 +142,12 @@ UINT32 m14_state::screen_update_m14(screen_device &screen, bitmap_ind16 &bitmap, WRITE8_MEMBER(m14_state::m14_vram_w) { - m_video_ram[offset] = data; m_m14_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(m14_state::m14_cram_w) { - m_color_ram[offset] = data; m_m14_tilemap->mark_tile_dirty(offset); } @@ -172,7 +167,6 @@ READ8_MEMBER(m14_state::m14_rng_r) /* Here routes the hopper & the inputs */ READ8_MEMBER(m14_state::input_buttons_r) { - if (m_hop_mux) { m_hop_mux = 0; @@ -195,7 +189,6 @@ WRITE8_MEMBER(m14_state::test_w) WRITE8_MEMBER(m14_state::hopper_w) { - /* ---- x--- coin out */ /* ---- --x- hopper/input mux? */ m_hop_mux = data & 2; @@ -322,7 +315,6 @@ INTERRUPT_GEN_MEMBER(m14_state::m14_irq) void m14_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_hop_mux)); @@ -330,7 +322,6 @@ void m14_state::machine_start() void m14_state::machine_reset() { - m_hop_mux = 0; } diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index 0112973b88f..be0d56d9b5e 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -930,14 +930,12 @@ GFXDECODE_END void m62_state::machine_start() { - save_item(NAME(m_ldrun2_bankswap)); save_item(NAME(m_bankcontrol)); } void m62_state::machine_reset() { - m_flipscreen = 0; m_m62_background_hscroll = 0; m_m62_background_vscroll = 0; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 12ebc04d772..fc430fa6edb 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -247,28 +247,24 @@ PALETTE_INIT_MEMBER(m63_state,m63) WRITE8_MEMBER(m63_state::m63_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(m63_state::m63_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(m63_state::m63_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(m63_state::m63_palbank_w) { - if (m_pal_bank != (data & 0x01)) { m_pal_bank = data & 0x01; @@ -287,7 +283,6 @@ WRITE8_MEMBER(m63_state::m63_flipscreen_w) WRITE8_MEMBER(m63_state::fghtbskt_flipscreen_w) { - flip_screen_set(data); m_fg_flag = flip_screen() ? TILE_FLIPX : 0; } @@ -295,7 +290,6 @@ WRITE8_MEMBER(m63_state::fghtbskt_flipscreen_w) TILE_GET_INFO_MEMBER(m63_state::get_bg_tile_info) { - int attr = m_colorram[tile_index]; int code = m_videoram[tile_index] | ((attr & 0x30) << 4); int color = (attr & 0x0f) + (m_pal_bank << 4); @@ -305,7 +299,6 @@ TILE_GET_INFO_MEMBER(m63_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(m63_state::get_fg_tile_info) { - int code = m_videoram2[tile_index]; SET_TILE_INFO_MEMBER(0, code, 0, m_fg_flag); @@ -313,7 +306,6 @@ TILE_GET_INFO_MEMBER(m63_state::get_fg_tile_info) VIDEO_START_MEMBER(m63_state,m63) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m63_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m63_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -364,7 +356,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 m63_state::screen_update_m63(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int col; for (col = 0; col < 32; col++) @@ -390,7 +381,6 @@ WRITE8_MEMBER(m63_state::snd_irq_w) WRITE8_MEMBER(m63_state::snddata_w) { - if ((m_p2 & 0xf0) == 0xe0) ay8910_address_w(m_ay1, space, 0, offset); else if ((m_p2 & 0xf0) == 0xa0) @@ -410,7 +400,6 @@ WRITE8_MEMBER(m63_state::p1_w) WRITE8_MEMBER(m63_state::p2_w) { - m_p2 = data; if((m_p2 & 0xf0) == 0x50) { @@ -425,7 +414,6 @@ READ8_MEMBER(m63_state::snd_status_r) READ8_MEMBER(m63_state::irq_r) { - if (m_sound_irq) { m_sound_irq = 0; @@ -446,14 +434,12 @@ READ8_MEMBER(m63_state::snddata_r) WRITE8_MEMBER(m63_state::fghtbskt_samples_w) { - if (data & 1) m_samples->start_raw(0, m_samplebuf + ((data & 0xf0) << 8), 0x2000, 8000); } WRITE8_MEMBER(m63_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -727,7 +713,6 @@ INTERRUPT_GEN_MEMBER(m63_state::snd_irq) MACHINE_START_MEMBER(m63_state,m63) { - m_soundcpu = machine().device("soundcpu"); m_ay1 = machine().device("ay1"); m_ay2 = machine().device("ay2"); @@ -746,7 +731,6 @@ MACHINE_START_MEMBER(m63_state,m63) MACHINE_RESET_MEMBER(m63_state,m63) { - m_pal_bank = 0; m_fg_flag = 0; m_sound_irq = 0; @@ -758,7 +742,6 @@ MACHINE_RESET_MEMBER(m63_state,m63) INTERRUPT_GEN_MEMBER(m63_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index b2af4a40d93..42b8051add5 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -595,7 +595,6 @@ static const UINT8 nspirit_crc[CRC_LEN] = { 0xfe,0x94,0x6e,0x4e, 0xc8,0x33,0 /* Image Fight */ static const UINT8 imgfight_code[CODE_LEN] = { - 0x68,0x00,0xa0, // push 0a000h 0x1f, // pop ds 0xc6,0x06,0x38,0x38,0x50, // mov [3838h], byte 050h diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index b3d20cd38f1..eb51a005964 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -219,7 +219,6 @@ MACHINE_START_MEMBER(m92_state,m92) MACHINE_RESET_MEMBER(m92_state,m92) { - m_sprite_buffer_busy = 1; } diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 7a08e7b19ec..5b8f4ff962c 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -319,7 +319,6 @@ WRITE32_MEMBER(macrossp_state::paletteram32_macrossp_w) READ32_MEMBER(macrossp_state::macrossp_soundstatus_r) { - // logerror("%08x read soundstatus\n", space.device().safe_pc()); /* bit 1 is sound status */ @@ -332,7 +331,6 @@ READ32_MEMBER(macrossp_state::macrossp_soundstatus_r) WRITE32_MEMBER(macrossp_state::macrossp_soundcmd_w) { - if (ACCESSING_BITS_16_31) { //logerror("%08x write soundcmd %08x (%08x)\n",space.device().safe_pc(),data,mem_mask); @@ -346,7 +344,6 @@ WRITE32_MEMBER(macrossp_state::macrossp_soundcmd_w) READ16_MEMBER(macrossp_state::macrossp_soundcmd_r) { - // logerror("%06x read soundcmd\n",space.device().safe_pc()); m_sndpending = 0; return soundlatch_word_r(space, offset, mem_mask); @@ -384,7 +381,6 @@ static void update_colors( running_machine &machine ) WRITE32_MEMBER(macrossp_state::macrossp_palette_fade_w) { - m_fade_effect = ((data & 0xff00) >> 8) - 0x28; //it writes two times, first with a -0x28 then with the proper data // popmessage("%02x",fade_effect); @@ -599,7 +595,6 @@ static const es5506_interface es5506_config = void macrossp_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -611,7 +606,6 @@ void macrossp_state::machine_start() void macrossp_state::machine_reset() { - m_sndpending = 0; m_snd_toggle = 0; m_fade_effect = 0; @@ -771,7 +765,6 @@ PC :00018110 018110: beq 18104 #ifdef UNUSED_FUNCTION WRITE32_MEMBER(macrossp_state::quizmoon_speedup_w) { - COMBINE_DATA(&m_mainram[0x00020 / 4]); if (space.device().safe_pc() == 0x1cc) space.device().execute().spin_until_interrupt(); } diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index e6630d11271..18ac3421cac 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -511,13 +511,11 @@ MACHINE_CONFIG_END #define MACS_BIOS \ ROM_REGION( 0x1000000, "user1", 0 ) \ ROM_LOAD16_BYTE( "macsos_l.u43", 0x00000, 0x80000, CRC(0b5aed5e) SHA1(042e705017ee34656e2c6af45825bb2dd3447747) ) \ - ROM_LOAD16_BYTE( "macsos_h.u44", 0x00001, 0x80000, CRC(538b68e4) SHA1(a0534147791e94e726f49451d0e95671ae0a87d5) ) \ - + ROM_LOAD16_BYTE( "macsos_h.u44", 0x00001, 0x80000, CRC(538b68e4) SHA1(a0534147791e94e726f49451d0e95671ae0a87d5) ) #define MACS2_BIOS \ ROM_REGION( 0x1000000, "user1", 0 ) \ ROM_LOAD16_BYTE( "macs2os_l.bin", 0x00000, 0x80000, NO_DUMP ) \ - ROM_LOAD16_BYTE( "macs2os_h.bin", 0x00001, 0x80000, NO_DUMP ) \ - + ROM_LOAD16_BYTE( "macs2os_h.bin", 0x00001, 0x80000, NO_DUMP ) ROM_START( macsbios ) MACS_BIOS ROM_REGION( 0x400000, "user2", ROMREGION_ERASEFF ) // Slot A diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 8e5aa4a3674..3f5aaa7e18a 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -26,7 +26,6 @@ WRITE16_MEMBER(madmotor_state::madmotor_sound_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -221,7 +220,6 @@ GFXDECODE_END void madmotor_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -230,7 +228,6 @@ void madmotor_state::machine_start() void madmotor_state::machine_reset() { - m_flipscreen = 0; } diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index ec042f14f5f..99d02a7a40d 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -411,7 +411,6 @@ TODO: check this register,doesn't seem to be 100% correct. void magicard_state::video_start() { - } UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index a0973f5055e..4b7f99350fa 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -258,7 +258,6 @@ void magictg_state::machine_reset() void magictg_state::video_start() { - } UINT32 magictg_state::screen_update_magictg(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) @@ -281,7 +280,6 @@ static UINT32 pci_dev0_r(device_t *busdevice, device_t *device, int function, in static void pci_dev0_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask) { - } diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index af801a706b0..c6f10b500e4 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -33,7 +33,6 @@ Notes: INTERRUPT_GEN_MEMBER(mainevt_state::mainevt_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) irq0_line_hold(device); } @@ -45,7 +44,6 @@ WRITE8_MEMBER(mainevt_state::dv_nmienable_w) INTERRUPT_GEN_MEMBER(mainevt_state::dv_interrupt) { - if (m_nmi_enable) nmi_line_pulse(device); } @@ -53,7 +51,6 @@ INTERRUPT_GEN_MEMBER(mainevt_state::dv_interrupt) WRITE8_MEMBER(mainevt_state::mainevt_bankswitch_w) { - /* bit 0-1 ROM bank select */ membank("bank1")->set_entry(data & 0x03); @@ -91,7 +88,6 @@ READ8_MEMBER(mainevt_state::mainevt_sh_busy_r) WRITE8_MEMBER(mainevt_state::mainevt_sh_irqcontrol_w) { - upd7759_reset_w(m_upd, data & 2); upd7759_start_w(m_upd, data & 1); @@ -100,7 +96,6 @@ WRITE8_MEMBER(mainevt_state::mainevt_sh_irqcontrol_w) WRITE8_MEMBER(mainevt_state::devstor_sh_irqcontrol_w) { - m_sound_irq_mask = data & 4; } @@ -134,7 +129,6 @@ WRITE8_MEMBER(mainevt_state::dv_sh_bankswitch_w) READ8_MEMBER(mainevt_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -150,7 +144,6 @@ READ8_MEMBER(mainevt_state::k052109_051960_r) WRITE8_MEMBER(mainevt_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -427,20 +420,17 @@ void mainevt_state::machine_start() void mainevt_state::machine_reset() { - m_nmi_enable = 0; } INTERRUPT_GEN_MEMBER(mainevt_state::mainevt_sound_timer_irq) { - if(m_sound_irq_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(mainevt_state::devstors_sound_timer_irq) { - if(m_sound_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c index da2eb84794e..dc7e32ba321 100644 --- a/src/mame/drivers/mainsnk.c +++ b/src/mame/drivers/mainsnk.c @@ -114,7 +114,6 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k WRITE8_MEMBER(mainsnk_state::sound_command_w) { - m_sound_cpu_busy = 1; soundlatch_byte_w(space, 0, data); machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); @@ -127,14 +126,12 @@ READ8_MEMBER(mainsnk_state::sound_command_r) READ8_MEMBER(mainsnk_state::sound_ack_r) { - m_sound_cpu_busy = 0; return 0xff; } CUSTOM_INPUT_MEMBER(mainsnk_state::mainsnk_sound_r) { - return (m_sound_cpu_busy) ? 0x01 : 0x00; } diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index 49a9e7207db..e096436e4c6 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -503,7 +503,6 @@ public: TILE_GET_INFO_MEMBER(majorpkr_state::bg_get_tile_info) { - int code = m_videoram[0x800 + 2 * tile_index] + (m_videoram[0x800 + 2 * tile_index + 1] << 8); SET_TILE_INFO_MEMBER( @@ -515,7 +514,6 @@ TILE_GET_INFO_MEMBER(majorpkr_state::bg_get_tile_info) TILE_GET_INFO_MEMBER(majorpkr_state::fg_get_tile_info) { - int code = m_videoram[2 * tile_index] + (m_videoram[2 * tile_index + 1] << 8); SET_TILE_INFO_MEMBER( @@ -528,7 +526,6 @@ TILE_GET_INFO_MEMBER(majorpkr_state::fg_get_tile_info) void majorpkr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(majorpkr_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(majorpkr_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 16, 8, 36, 28); m_fg_tilemap->set_transparent_pen(0); @@ -539,7 +536,6 @@ void majorpkr_state::video_start() UINT32 majorpkr_state::screen_update_majorpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); rectangle custom_clip; @@ -575,7 +571,6 @@ WRITE8_MEMBER(majorpkr_state::rom_bank_w) WRITE8_MEMBER(majorpkr_state::palette_bank_w) { - m_palette_bank=data; } @@ -628,7 +623,6 @@ WRITE8_MEMBER(majorpkr_state::vram_w) WRITE8_MEMBER(majorpkr_state::vidreg_w) { - /* If bit6 is active, the screen is drawn upside down. (also 0xfc and 0x11 are written to the CRTC registers 0xc0 and 0xd0) So, the CRTC display start address = 0xfc11 @@ -655,7 +649,6 @@ WRITE8_MEMBER(majorpkr_state::vidreg_w) READ8_MEMBER(majorpkr_state::mux_port_r) { - switch( (m_mux_data & 0xf0) ) /* 00-10-20-30-0F-1F-2F-3F */ { case 0x00: return ioport("DSW1")->read(); /* confirmed */ @@ -669,7 +662,6 @@ READ8_MEMBER(majorpkr_state::mux_port_r) READ8_MEMBER(majorpkr_state::mux_port2_r) { - if ((m_mux_data & 0x0f) == 4) { return ioport("IN0-1")->read(); @@ -682,7 +674,6 @@ READ8_MEMBER(majorpkr_state::mux_port2_r) WRITE8_MEMBER(majorpkr_state::mux_sel_w) { - m_mux_data = data; /* 00-10-20-30-0F-1F-2F-3F */ } diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index a90a93f9105..8cb6d56020c 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -170,7 +170,6 @@ WRITE8_MEMBER(malzak_state::portc0_w) READ8_MEMBER(malzak_state::collision_r) { - // High 4 bits seem to refer to the row affected. if(++m_collision_counter > 15) m_collision_counter = 0; @@ -331,7 +330,6 @@ static SAA5050_INTERFACE( malzac_saa5050_intf ) void malzak_state::machine_start() { - membank("bank1")->configure_entries(0, 2, memregion("user2")->base(), 0x400); m_s2636_0 = machine().device("s2636_0"); @@ -345,7 +343,6 @@ void malzak_state::machine_start() void malzak_state::machine_reset() { - memset(m_playfield_code, 0, 256 * sizeof(int)); m_malzak_x = 0; diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c index 0b60ba4ca6e..00bc867370f 100644 --- a/src/mame/drivers/mappy.c +++ b/src/mame/drivers/mappy.c @@ -873,14 +873,12 @@ INTERRUPT_GEN_MEMBER(mappy_state::mappy_main_vblank_irq) INTERRUPT_GEN_MEMBER(mappy_state::sub_vblank_irq) { - if(m_sub_irq_mask) machine().device("sub")->execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(mappy_state::sub2_vblank_irq) { - if(m_sub2_irq_mask) machine().device("sub2")->execute().set_input_line(0, ASSERT_LINE); } @@ -1556,20 +1554,17 @@ READ8_MEMBER(mappy_state::dipA_h){ return machine().root_device().ioport("DSW1") READ8_MEMBER(mappy_state::dipB_mux)// dips B { - return ioport("DSW2")->read() >> (4 * m_mux); } READ8_MEMBER(mappy_state::dipB_muxi)// dips B { - // bits are interleaved in Phozon return BITSWAP8(ioport("DSW2")->read(),6,4,2,0,7,5,3,1) >> (4 * m_mux); } WRITE8_MEMBER(mappy_state::out_mux) { - m_mux = data & 1; } @@ -1613,7 +1608,6 @@ static const namcoio_interface intf1_interleave = MACHINE_START_MEMBER(mappy_state,mappy) { - save_item(NAME(m_main_irq_mask)); save_item(NAME(m_sub_irq_mask)); save_item(NAME(m_sub2_irq_mask)); diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c index fa8629e8a3a..126e12899ff 100644 --- a/src/mame/drivers/marineb.c +++ b/src/mame/drivers/marineb.c @@ -43,7 +43,6 @@ write void marineb_state::machine_reset() { - m_palette_bank = 0; m_column_scroll = 0; m_flipscreen_x = 0; @@ -53,7 +52,6 @@ void marineb_state::machine_reset() MACHINE_RESET_MEMBER(marineb_state,springer) { - marineb_state::machine_reset(); m_marineb_active_low_flipscreen = 1; @@ -61,7 +59,6 @@ MACHINE_RESET_MEMBER(marineb_state,springer) void marineb_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = NULL; @@ -70,7 +67,6 @@ void marineb_state::machine_start() WRITE8_MEMBER(marineb_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -525,14 +521,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(marineb_state::marineb_vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(marineb_state::wanted_vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 616c0014d99..34dcbc0263a 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -158,14 +158,12 @@ public: WRITE8_MEMBER(marinedt_state::tx_tileram_w) { - m_tx_tileram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } READ8_MEMBER(marinedt_state::marinedt_port1_r) { - //might need to be reversed for cocktail stuff /* x/y multiplexed */ @@ -623,7 +621,6 @@ UINT32 marinedt_state::screen_update_marinedt(screen_device &screen, bitmap_ind1 void marinedt_state::machine_start() { - save_item(NAME(m_obj1_a)); save_item(NAME(m_obj1_x)); save_item(NAME(m_obj1_y)); @@ -646,7 +643,6 @@ void marinedt_state::machine_start() void marinedt_state::machine_reset() { - m_obj1_a = 0; m_obj1_x = 0; m_obj1_y = 0; diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index 7ed3d790b32..28f061faa59 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -123,7 +123,6 @@ WRITE8_MEMBER(mario_state::mario_z80dma_rdy_w) WRITE8_MEMBER(mario_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -325,7 +324,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(mario_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c index 4116ed8d382..dcb3ec3bc85 100644 --- a/src/mame/drivers/matmania.c +++ b/src/mame/drivers/matmania.c @@ -298,7 +298,6 @@ GFXDECODE_END MACHINE_START_MEMBER(matmania_state,matmania) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -353,7 +352,6 @@ static const ym3526_interface ym3526_config = MACHINE_START_MEMBER(matmania_state,maniach) { - MACHINE_START_CALL_MEMBER(matmania); save_item(NAME(m_port_a_in)); @@ -373,7 +371,6 @@ MACHINE_START_MEMBER(matmania_state,maniach) MACHINE_RESET_MEMBER(matmania_state,maniach) { - m_port_a_in = 0; m_port_a_out = 0; m_ddr_a = 0; diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index 0774f60d824..f0ee82eb0be 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -898,7 +898,6 @@ WRITE8_MEMBER(maygay1b_state::m1ab_no_oki_w) DRIVER_INIT_MEMBER(maygay1b_state,m1) { - //AM_RANGE(0x2420, 0x2421) AM_WRITE(latch_ch2_w ) // oki // if there is no OKI region disable writes here, the rom might be missing, so alert user diff --git a/src/mame/drivers/maygay1bsw.c b/src/mame/drivers/maygay1bsw.c index b0fd5c045c9..2415b5f2423 100644 --- a/src/mame/drivers/maygay1bsw.c +++ b/src/mame/drivers/maygay1bsw.c @@ -28,8 +28,7 @@ INPUT_PORTS_EXTERN( maygay_m1 ); #define ROM_END_M1A_MCU \ ROM_REGION( 0x1000, "mcu", ROMREGION_ERASE00 ) \ ROM_LOAD( "m1a-mcu.bin", 0x0000, 0x1000, CRC(ae957b00) SHA1(83267b64335b4ab33cc033d5003c4c93c813fc37) ) \ - ROM_END \ - + ROM_END /******************************************************************************************************************************************************************************************************* Black Hole (Dutch) @@ -48,8 +47,7 @@ GAME( 199?, m1blkhol ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT // uPD7759 rom? #define m1_bargn_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bgsnd", 0x0000, 0x020000, CRC(abe7c01d) SHA1(21caadcd149772dfd79a9d30ebc1d8da91ff36f4) )\ - + ROM_LOAD( "bgsnd", 0x0000, 0x020000, CRC(abe7c01d) SHA1(21caadcd149772dfd79a9d30ebc1d8da91ff36f4) ) ROM_START( m1bargn ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa4-077.bin", 0x0000, 0x010000, CRC(7ae8ea12) SHA1(537f828bdaba3c63abb83b5417a4ec115834a48a) ) m1_bargn_sound ROM_END_M1A_MCU ROM_START( m1bargnp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa4-078.bin", 0x0000, 0x010000, CRC(dcc0b83e) SHA1(a85e3f60decb7dbc2de77b93dd8a79ff137d85b7) ) m1_bargn_sound ROM_END_M1A_MCU ROM_START( m1bargnc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa2-141", 0x0000, 0x010000, CRC(9dcaaaa9) SHA1(6cd015990036c2e20e4f4a2e19a363e6c565b473) ) m1_bargn_sound ROM_END_M1A_MCU @@ -67,8 +65,7 @@ GAME( 1990, m1bargncp ,m1bargn ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT // uPD7759 rom? #define m1_bounty_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bgsnd", 0x0000, 0x020000, CRC(abe7c01d) SHA1(21caadcd149772dfd79a9d30ebc1d8da91ff36f4) )\ - + ROM_LOAD( "bgsnd", 0x0000, 0x020000, CRC(abe7c01d) SHA1(21caadcd149772dfd79a9d30ebc1d8da91ff36f4) ) ROM_START( m1bountc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc4-107.bin", 0x0000, 0x010000, CRC(0bdf41b3) SHA1(ce3564433a708ba50ca4099a26b1f75cf3cec947) ) m1_bounty_sound ROM_END_M1A_MCU //1.3 ROM_START( m1bountcp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc4-108.bin", 0x0000, 0x010000, CRC(adf7139f) SHA1(5b2bd367df31e3c76d9fac2a71a90800d95c4719) ) m1_bounty_sound ROM_END_M1A_MCU //1.3P @@ -82,8 +79,7 @@ GAME( 199?, m1bountcp ,m1bountc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT // uPD7759 rom? #define m1_criss_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ccsound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) \ - + ROM_LOAD( "ccsound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) ROM_START( m1criss ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sdt-050", 0x0000, 0x010000, CRC(422c5c6d) SHA1(b3a86f7482f0376b93899d28d4e6c610200fcd3a) ) m1_criss_sound ROM_END_M1A_MCU GAME( 199?, m1criss ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Criss Cross Club (Maygay) (Dutch) (M1A/B)",GAME_FLAGS ) @@ -113,8 +109,7 @@ GAME( 199?, m1alley ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_bigdel_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "bdeal.u2", 0x000000, 0x080000, CRC(7ef1d4dd) SHA1(97a99dd9325634ee28dda943d92257010c60306c) ) \ - ROM_LOAD( "bdeal.u3", 0x080000, 0x080000, CRC(28f48d4b) SHA1(642c2a2fc4f2faff510cbca2488ab6904bb489f6) ) \ - + ROM_LOAD( "bdeal.u3", 0x080000, 0x080000, CRC(28f48d4b) SHA1(642c2a2fc4f2faff510cbca2488ab6904bb489f6) ) ROM_START( m1bigdel ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "bdeal.p1", 0x0000, 0x020000, CRC(3cdebbb8) SHA1(8578441ef269c41fbe3f253055f687e1ccbf4770) ) m1_bigdel_sound ROM_END_M1A_MCU GAME( 2000, m1bigdel ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Big Deal (Maygay) (M1A/B)",GAME_FLAGS ) @@ -174,8 +169,7 @@ GAME( 199?, m1bankbso ,m1bankbs ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_chain_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "chainreactionsnd.p1", 0x000000, 0x080000, CRC(25d6cc90) SHA1(e801219edff7745ec71cc146e7bf85e4ad8eb363) ) \ - ROM_LOAD( "chainreactionsnd.p2", 0x080000, 0x080000, CRC(77690cea) SHA1(10c655ab5ec922c31ab895b91096c89ef8220f99) ) \ - + ROM_LOAD( "chainreactionsnd.p2", 0x080000, 0x080000, CRC(77690cea) SHA1(10c655ab5ec922c31ab895b91096c89ef8220f99) ) ROM_START( m1chain ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "chainreaction.bin", 0x0000, 0x020000, CRC(0dfa71c7) SHA1(0979dd48000c9c9a03448a0ffdc9395bb131a5dd) ) m1_chain_sound ROM_END_M1A_MCU GAME( 1996, m1chain ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Chain Reaction (Maygay) (M1A/B)",GAME_FLAGS ) @@ -226,8 +220,7 @@ GAME( 1995, m1bankrl2p ,m1bankrl ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_clbfvr_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "cl_fever.sn1", 0x000000, 0x080000, CRC(0a5df5d2) SHA1(d73778a415656cd3880d5a011e015a760386a676) )\ - ROM_LOAD( "cl_fever.sn2", 0x080000, 0x080000, CRC(1d0b5e44) SHA1(fd21e4658dcc6a919b326eed81ccec942c6f1989) )\ - + ROM_LOAD( "cl_fever.sn2", 0x080000, 0x080000, CRC(1d0b5e44) SHA1(fd21e4658dcc6a919b326eed81ccec942c6f1989) ) ROM_START( m1clbfvr ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc001000", 0x0000, 0x020000, CRC(65ecc208) SHA1(2bf54a1e78d2816ec74137c63a3b44710c373baf) ) m1_clbfvr_sound ROM_END_M1A_MCU //1.1n ROM_START( m1clbfvrp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc001001", 0x0000, 0x020000, CRC(63f81e75) SHA1(db9220265fbe53cc1bec0c448046a031e14ebe13) ) m1_clbfvr_sound ROM_END_M1A_MCU //1.1p @@ -241,8 +234,7 @@ GAME( 199?, m1clbfvrp ,m1clbfvr ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_coderd_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "code_red.s1", 0x000000, 0x080000, CRC(616b939d) SHA1(1a94747efe430e508086fdb66da3f3e7daf7c4f3) )\ - ROM_LOAD( "code_red.s2", 0x080000, 0x080000, CRC(bee44524) SHA1(dd3837559b375e1055e6aa6c984bfd88102a5825) )\ - + ROM_LOAD( "code_red.s2", 0x080000, 0x080000, CRC(bee44524) SHA1(dd3837559b375e1055e6aa6c984bfd88102a5825) ) ROM_START( m1coderd ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc991130", 0x0000, 0x020000, CRC(d3add67f) SHA1(f7387978f18680921a2aff0296de2b9609f3215d) ) m1_coderd_sound ROM_END_M1A_MCU //ncr21 ROM_START( m1coderdp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc991131", 0x0000, 0x020000, CRC(d5b90a02) SHA1(18a5642175ee330832ce95ac2fcb3a662cfe4273) ) m1_coderd_sound ROM_END_M1A_MCU //pcr21 @@ -283,8 +275,7 @@ GAME( 1996, m1bondi1p ,m1bondi ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_albsq_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "albertsqsndu2.bin", 0x000000, 0x080000, CRC(b8f74f43) SHA1(003fa66a362b8cf943a0cb5e51a96097085d2785) ) \ - ROM_LOAD( "albertsqsndu3.bin", 0x080000, 0x080000, CRC(74be9302) SHA1(05547cebc23ae48a559c423990899b3342cb02d6) ) \ - + ROM_LOAD( "albertsqsndu3.bin", 0x080000, 0x080000, CRC(74be9302) SHA1(05547cebc23ae48a559c423990899b3342cb02d6) ) ROM_START( m1albsq ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa5-056", 0x0000, 0x010000, CRC(6f3bc318) SHA1(6dbe6e02ca762a8ffaed9c89a0da5f6a10d829cc) ) m1_albsq_sound ROM_END_M1A_MCU //4.1 Normal Token ROM_START( m1albsqp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa5-057", 0x0000, 0x010000, CRC(87d35efe) SHA1(6c40fa3d27e66d91a61f23eabcdbf273e7023a92) ) m1_albsq_sound ROM_END_M1A_MCU //4.1 Prot Token ROM_START( m1albsq3 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa4-188", 0x0000, 0x010000, CRC(e1d0822d) SHA1(47471baed1c98b597785d16784971b89210ff3f1) ) m1_albsq_sound ROM_END_M1A_MCU //3.0 LNA @@ -306,8 +297,7 @@ GAME( 1993, m1albsq1p ,m1albsq ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_cik_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "digi153_1.bin", 0x000000, 0x080000, CRC(107d92c8) SHA1(7ef1f1bf2c91216e0060350f06a89ca9ea948a9a) )\ - ROM_LOAD( "digi153_2.bin", 0x080000, 0x080000, CRC(59ab59d4) SHA1(0b55151f356c6866c0b37442a098c211e05715af) )\ - + ROM_LOAD( "digi153_2.bin", 0x080000, 0x080000, CRC(59ab59d4) SHA1(0b55151f356c6866c0b37442a098c211e05715af) ) ROM_START( m1cik ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk991024", 0x0000, 0x020000, CRC(ac9d4f5c) SHA1(d75ef9a64357a9ac549e33b0671ed6704c283ab8) ) m1_cik_sound ROM_END_M1A_MCU //11 ROM_START( m1cikp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk991025", 0x0000, 0x020000, CRC(aa899321) SHA1(6d02b0514fef131071aade01954810a735673655) ) m1_cik_sound ROM_END_M1A_MCU //11P ROM_START( m1cikh ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk991024h", 0x0000, 0x020000, CRC(dd1af636) SHA1(78ab959d14e7b2fd303aec50b12d5984e6fafcd0) ) m1_cik_sound ROM_END_M1A_MCU //cik5p8ct.bin - NOPd copyright string @@ -351,8 +341,7 @@ GAME( 1997, m1cik11np ,m1cik ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT // uPD7759 rom? #define m1_dxmono_sound\ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ - ROM_LOAD( "delmonopolysound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) )\ - + ROM_LOAD( "delmonopolysound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) ROM_START( m1dxmono ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-018", 0x0000, 0x010000, CRC(134e772a) SHA1(e85a90ed475cd3b38e9174146b15c66c958116e5) ) m1_dxmono_sound ROM_END_M1A_MCU //M5.1 (code 48) ROM_START( m1dxmonop ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-019", 0x0000, 0x010000, CRC(fba6eacc) SHA1(80576722f5862c1f27eb6e6d43d9a0a665e611c6) ) m1_dxmono_sound ROM_END_M1A_MCU //M5.1 Protocol (code 48) ROM_START( m1dxmono12n ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-015", 0x0000, 0x010000, CRC(fc7a30aa) SHA1(9133894464ba6bfb64996edb5bd99d88e34340c4) ) m1_dxmono_sound ROM_END_M1A_MCU //M1.2 (code 48) @@ -402,8 +391,7 @@ GAME( 1992, m1dxmono11mb,m1dxmono ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_cluedo_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "cluedosnd1.hex", 0x000000, 0x080000, CRC(5a18a395) SHA1(d309acb315a2f62306e850308424c98744dfc6eb) )\ - ROM_LOAD( "cluedosnd2.hex", 0x080000, 0x080000, CRC(0aa15ee0) SHA1(eb156743a44e66b86c0c0443db0356e2f25d1cd2) )\ - + ROM_LOAD( "cluedosnd2.hex", 0x080000, 0x080000, CRC(0aa15ee0) SHA1(eb156743a44e66b86c0c0443db0356e2f25d1cd2) ) ROM_START( m1cluedo ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa5-110", 0x0000, 0x010000, CRC(d80c8f47) SHA1(73be41e2ba96d4f6759d375d61b9208b8516f59e) ) m1_cluedo_sound ROM_END_M1A_MCU //nhf 6.1 ROM_START( m1cluedop ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa5-111", 0x0000, 0x010000, CRC(30e412a1) SHA1(0a8755158d905bbb582092d4525dc866f05e77ca) ) m1_cluedo_sound ROM_END_M1A_MCU //phf 6.1 ROM_START( m1cluedo5 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa5-521.bin", 0x0000, 0x010000, CRC(2fffafe0) SHA1(c15ebc0f8cc574a70c8f94a90c2f5381cc647f75) ) m1_cluedo_sound ROM_END_M1A_MCU //nhf 5.2 1995 @@ -474,8 +462,7 @@ GAME( 1993, m1clueshop ,m1cluesh ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_cluecb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "cluclub1", 0x000000, 0x080000, CRC(05e928ed) SHA1(41ae1f5342dc7afbdbdf3871e29d2a85c65a5965) )\ - ROM_LOAD( "cluclub2", 0x080000, 0x080000, CRC(91811c0e) SHA1(88b3259b241136cd549ed9b4930d165896eebcc4) )\ - + ROM_LOAD( "cluclub2", 0x080000, 0x080000, CRC(91811c0e) SHA1(88b3259b241136cd549ed9b4930d165896eebcc4) ) ROM_START( m1cluecb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc5-437", 0x0000, 0x010000, CRC(0282878c) SHA1(90624916699e5866678b02260e0b0502041f32bf) ) m1_cluecb_sound ROM_END_M1A_MCU //nhq 3.1 ROM_START( m1cluecbp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc5-438", 0x0000, 0x010000, CRC(26f6d094) SHA1(31fa78db1a581c00b39d4f6f64d8f08786dec97a) ) m1_cluecb_sound ROM_END_M1A_MCU //phq 3.1 (typo?) ROM_START( m1cluecb2 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc5-435", 0x0000, 0x010000, CRC(84095d36) SHA1(f86f7f25fa25eb2731d81a23aafaf5e4c8aa976b) ) m1_cluecb_sound ROM_END_M1A_MCU //nhq 2.1 @@ -497,8 +484,7 @@ GAME( 1993, m1cluecb1p ,m1cluecb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_coro_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "digi0421.bin", 0x000000, 0x080000, CRC(9489c9cd) SHA1(1a858b2a6f41898bbf95611e9f13d668c8a05c9c) )\ - ROM_LOAD( "digi0422.bin", 0x080000, 0x080000, CRC(cf17088e) SHA1(54c9a52ccdd1ca622367367e1304fe4e4037b0b9) )\ - + ROM_LOAD( "digi0422.bin", 0x080000, 0x080000, CRC(cf17088e) SHA1(54c9a52ccdd1ca622367367e1304fe4e4037b0b9) ) ROM_START( m1coro ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-192", 0x0000, 0x010000, CRC(5a4b0f17) SHA1(04ae2db3a29485672faaedd22c5780dd71176c96) ) m1_coro_sound ROM_END_M1A_MCU //1996 //CORO ROM_START( m1corop ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-193", 0x0000, 0x010000, CRC(b2a392f1) SHA1(d7b908373eb3e225e399c36847ef2481ea3ad65a) ) m1_coro_sound ROM_END_M1A_MCU //PCORO ROM_START( m1coro32g ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa6-049", 0x0000, 0x010000, CRC(dfa086ae) SHA1(c5fa5d435a603851ab6bbe5860ee38e41aea814e) ) m1_coro_sound ROM_END_M1A_MCU //1995 //3.2 G? @@ -573,8 +559,7 @@ GAME( 1993, m1coroshp ,m1corosh ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_corocb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "clubcorriesnd.p1snd", 0x000000, 0x080000, CRC(e4cf4412) SHA1(6849fb9a71a6f0bbf40368238ed9104026013d36) )\ - ROM_LOAD( "clubcorriesnd.p2snd", 0x080000, 0x080000, CRC(e33d2c08) SHA1(fd30b9c2936659a793d83e283d920c46990633c4) )\ - + ROM_LOAD( "clubcorriesnd.p2snd", 0x080000, 0x080000, CRC(e33d2c08) SHA1(fd30b9c2936659a793d83e283d920c46990633c4) ) ROM_START( m1corocb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc7-198", 0x0000, 0x020000, CRC(905b916d) SHA1(4c244ee49b4528e05cb074f0df0b3bbfd6b28fd2) ) m1_corocb_sound ROM_END_M1A_MCU //2.1 ROM_START( m1corocbp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc7-199", 0x0000, 0x020000, CRC(c01a6fd1) SHA1(2bb62f190843acb8850241ccd45fb17167c18376) ) m1_corocb_sound ROM_END_M1A_MCU //2.1 protocol ROM_START( m1corocb1 ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sc7-196", 0x0000, 0x020000, CRC(e2188b21) SHA1(86238d31595814d9d1f82544c9766d068b6df132) ) m1_corocb_sound ROM_END_M1A_MCU //sc7196 250 GBP 1.1 @@ -592,8 +577,7 @@ GAME( 1994, m1corocb1p ,m1corocb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_cororr_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "roversreturn.p1", 0x000000, 0x080000, CRC(b21d4cca) SHA1(ad54c4f44de2c596fd5e8330666d0f4f859bfcb2) )\ - ROM_LOAD( "roversreturn.p2", 0x080000, 0x080000, CRC(354a91e0) SHA1(13f3e1eacba3c80c83f12491d2668cc54536245a) )\ - + ROM_LOAD( "roversreturn.p2", 0x080000, 0x080000, CRC(354a91e0) SHA1(13f3e1eacba3c80c83f12491d2668cc54536245a) ) ROM_START( m1cororr ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa8-066", 0x0000, 0x010000, CRC(0656ad1b) SHA1(d1efb0cde9354087815ea260ccc81152c1ccf354) ) m1_cororr_sound ROM_END_M1A_MCU // 1.1 5p ROM_START( m1cororrp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa8-067", 0x0000, 0x010000, CRC(eebe30fd) SHA1(adc278973a08a81c4a62176e6ec33af570d719ac) ) m1_cororr_sound ROM_END_M1A_MCU //protocol ROM_START( m1cororra ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "rov5.10", 0x0000, 0x010000, CRC(04b421ca) SHA1(c0992edf4ecdfcf7231ae560f38954ce3a4db735) ) m1_cororr_sound ROM_END_M1A_MCU //1.1 10GBP 1995 sa8066 @@ -653,8 +637,7 @@ GAME( 1995, m1cororrlp ,m1cororr ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_cluess_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "supersleuth.p1", 0x000000, 0x080000, CRC(2417208f) SHA1(5c51bdcfa566aa8b2379d529441d37b2145864bb) )\ - ROM_LOAD( "supersleuth.p2", 0x080000, 0x080000, CRC(892d3a4d) SHA1(bb585a9fda56f2f0859707973f771d60c5dfa080) )\ - + ROM_LOAD( "supersleuth.p2", 0x080000, 0x080000, CRC(892d3a4d) SHA1(bb585a9fda56f2f0859707973f771d60c5dfa080) ) ROM_START( m1cluess ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk001027", 0x0000, 0x020000, CRC(4b4c9c92) SHA1(5c981b19175491c275668a5686a15b77571cc8e7) ) m1_cluess_sound ROM_END_M1A_MCU //ncf 2.3 ROM_START( m1cluessh ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sleu5p8c.bin", 0x0000, 0x020000, CRC(e4fc65d7) SHA1(ba573a33247682a1a1a213381e49fe390c661b8c) ) m1_cluess_sound ROM_END_M1A_MCU //hack ncf 2.3 ROM_START( m1cluessp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk001028", 0x0000, 0x020000, CRC(ad0ccb34) SHA1(1cfe0cc945ba3fe91645301abca40285984084e3) ) m1_cluess_sound ROM_END_M1A_MCU //pcf 2.3 @@ -728,8 +711,7 @@ GAME( 1996, m1cluesssp ,m1cluess ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_dkong_sound\ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 )\ ROM_LOAD( "donkeykong.p1", 0x000000, 0x080000, CRC(11019875) SHA1(b171b46a7a98967668793a7ea7b5931c7a76dd82) )\ - ROM_LOAD( "donkeykong.p2", 0x080000, 0x080000, CRC(e28f406f) SHA1(42a58c0f5c4f25dec4c0c49eb8415971a515c5a6) )\ - + ROM_LOAD( "donkeykong.p2", 0x080000, 0x080000, CRC(e28f406f) SHA1(42a58c0f5c4f25dec4c0c49eb8415971a515c5a6) ) ROM_START( m1dkong ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa001014", 0x0000, 0x020000, CRC(1c6db3b3) SHA1(2ae8797d1794358bde6dca296a921d0a96277531) ) m1_dkong_sound ROM_END_M1A_MCU //9_2 ROM_START( m1dkongp ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa001015", 0x0000, 0x020000, CRC(1a796fce) SHA1(163d58a3258309f5183b575b9e651f1c2f53ce36) ) m1_dkong_sound ROM_END_M1A_MCU //9_2 Protocol ROM_START( m1dkonga ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa8-168", 0x0000, 0x020000, CRC(367ab43f) SHA1(6940e6922d32126d67c2b0c47282e4bf42ebaf04) ) m1_dkong_sound ROM_END_M1A_MCU //sa8168 9_2 15gbp @@ -793,8 +775,7 @@ GAME( 1996, m1dkong11p ,m1dkong ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1_apollo_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "apl9snd1.bin", 0x000000, 0x080000, CRC(92ebbfb6) SHA1(ef15183416a208d5f51d9121af823ccbab53fc9f) )\ - ROM_LOAD( "apl9snd2.bin", 0x080000, 0x080000, CRC(83c1aba4) SHA1(fc1e2bd46be5de4edd4b66d06616e1ad805e35d8) )\ - + ROM_LOAD( "apl9snd2.bin", 0x080000, 0x080000, CRC(83c1aba4) SHA1(fc1e2bd46be5de4edd4b66d06616e1ad805e35d8) ) ROM_START( m1apollo ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk991006", 0x0000, 0x020000, CRC(4107d605) SHA1(0141cfc5d4265cea654c01790054401525ebb3c1) ) m1_apollo_sound ROM_END_M1A_MCU //A1 Newest ROM_START( m1apollop ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sk991007", 0x0000, 0x020000, CRC(47130a78) SHA1(1d3f99c54a20851880d91af4b8ebb6f8a14a7ec1) ) m1_apollo_sound ROM_END_M1A_MCU //A1 Newest P @@ -853,8 +834,7 @@ GAME( 1997, m1apollo2p ,m1apollo ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT #define m1eastnd_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "ee-snd1.bin", 0x000000, 0x080000, CRC(3eaa138c) SHA1(ad7d6e3ffc8fe19ea8cb9188998c75c90a77e09e) ) \ - ROM_LOAD( "ee-snd2.bin", 0x080000, 0x080000, CRC(89fde428) SHA1(f0942a2f1d3890ad18b01e8433333e5412c57644) ) \ - + ROM_LOAD( "ee-snd2.bin", 0x080000, 0x080000, CRC(89fde428) SHA1(f0942a2f1d3890ad18b01e8433333e5412c57644) ) ROM_START( m1eastnd ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "ea_x6_dd.2o1", 0x0000, 0x010000, CRC(aab297df) SHA1(57bbf04c09146183b9f3d7bd5a9126e549a7e877) ) m1eastnd_sound ROM_END_M1A_MCU GAME( 199?, m1eastnd ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1eastnda ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "ea_x6_ds.2o1", 0x0000, 0x010000, CRC(5929fb51) SHA1(ce1d6ee01d4647487e30d7ed49f3f2a14705cee3) ) m1eastnd_sound ROM_END_M1A_MCU GAME( 199?, m1eastnda ,m1eastnd ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1eastndb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "sa4-635", 0x0000, 0x010000, CRC(326a06cd) SHA1(4d85af4ac25660d36c661f578525063891908e8e) ) m1eastnd_sound ROM_END_M1A_MCU GAME( 199?, m1eastndb ,m1eastnd ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -904,8 +884,7 @@ ROM_START( m1eastndaf ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_ #define m1_eastqv_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "queenvic.p1", 0x000000, 0x080000, CRC(af665967) SHA1(b87b13e759765eeb701ff8ead41eb3c09bec1e92) ) \ - ROM_LOAD( "queenvic.p2", 0x080000, 0x080000, CRC(92ce90ce) SHA1(9fca67429b9f1496dc745818b3ed7747b8eedf5d) ) \ - + ROM_LOAD( "queenvic.p2", 0x080000, 0x080000, CRC(92ce90ce) SHA1(9fca67429b9f1496dc745818b3ed7747b8eedf5d) ) ROM_START( m1eastqv ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa7-496", 0x0000, 0x020000, CRC(efe47e9b) SHA1(83ce75026a1194e645a03016263f091be1ced437) ) m1_eastqv_sound ROM_END_M1A_MCU GAME( 199?, m1eastqv ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders - Queen Vic (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1eastqva ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-311", 0x0000, 0x020000, CRC(225461cb) SHA1(3d6398f3226e54dcfed1b670aeece82eec4f424d) ) m1_eastqv_sound ROM_END_M1A_MCU GAME( 199?, m1eastqva ,m1eastqv ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders - Queen Vic (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1eastqvb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-312", 0x0000, 0x020000, CRC(31935a9d) SHA1(74423332183927ebec40073bfb65e162da2b6f6d) ) m1_eastqv_sound ROM_END_M1A_MCU GAME( 199?, m1eastqvb ,m1eastqv ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Eastenders - Queen Vic (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -949,8 +928,7 @@ ROM_START( m1eastqvaa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) RO #define m1_fight_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "fnsnd.p1", 0x000000, 0x080000, CRC(f6f1334f) SHA1(607b136a3d8cf4ae2e306a4332b69f564936d383) ) \ - ROM_LOAD( "fnsnd.p2", 0x080000, 0x080000, CRC(13419292) SHA1(40f314b4f42384334e6929b0de6b6a899fa2c09f) ) \ - + ROM_LOAD( "fnsnd.p2", 0x080000, 0x080000, CRC(13419292) SHA1(40f314b4f42384334e6929b0de6b6a899fa2c09f) ) ROM_START( m1fight ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fight15f", 0x0000, 0x020000, CRC(ceb7ca5d) SHA1(911164a69541de05fd6dc64f54aad13a0d57ebd7) ) m1_fight_sound ROM_END_M1A_MCU GAME( 199?, m1fight ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fight Night (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1fighta ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fight15r", 0x0000, 0x020000, CRC(46c7d3ca) SHA1(24bc785d888cb051ded94b04a47d286f26cfe4e4) ) m1_fight_sound ROM_END_M1A_MCU GAME( 199?, m1fighta ,m1fight ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fight Night (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1fightb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fightnt10.bin", 0x0000, 0x020000, CRC(95e891b5) SHA1(3412ce4db34f89a4a18209440770c3b8b3b37024) ) m1_fight_sound ROM_END_M1A_MCU GAME( 199?, m1fightb ,m1fight ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fight Night (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -983,8 +961,7 @@ ROM_START( m1fightx ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_itsko_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "itsaknockout.p1", 0x000000, 0x080000, CRC(b7c9bf1b) SHA1(1de3758e1deca35e54f22921594d96a10491e8c0) ) \ - ROM_LOAD( "itsaknockout.p2", 0x080000, 0x080000, CRC(f37b0a62) SHA1(18af0ef42268a965fd5dd3ae30c677a75bd12033) ) \ - + ROM_LOAD( "itsaknockout.p2", 0x080000, 0x080000, CRC(f37b0a62) SHA1(18af0ef42268a965fd5dd3ae30c677a75bd12033) ) ROM_START( m1itsko ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("iak5p8cbin", 0x0000, 0x010000, CRC(15592078) SHA1(f8a55bb1623895eabe8b6cc8d2df14b70806a77c) ) m1_itsko_sound ROM_END_M1A_MCU GAME( 199?, m1itsko ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "It's A Knockout (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1itskoa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("iaknoc10", 0x0000, 0x010000, CRC(93ff1f4c) SHA1(7aed91b2abc2d8df6f85456320c94ce58746fe53) ) m1_itsko_sound ROM_END_M1A_MCU GAME( 199?, m1itskoa ,m1itsko ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "It's A Knockout (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1itskob ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("iako.bin", 0x0000, 0x010000, CRC(03e7c80b) SHA1(c8ca6f65f0d91f23b2714f7bd54760b1e4b6c949) ) m1_itsko_sound ROM_END_M1A_MCU GAME( 199?, m1itskob ,m1itsko ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "It's A Knockout (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1029,8 +1006,7 @@ ROM_START( m1itsko8 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_mono_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "monopolysnd.bin", 0x0000, 0x020000, CRC(f93ef281) SHA1(b2c2bf361c44499a13731d494af66d2aa45ccebd) ) \ - + ROM_LOAD( "monopolysnd.bin", 0x0000, 0x020000, CRC(f93ef281) SHA1(b2c2bf361c44499a13731d494af66d2aa45ccebd) ) ROM_START( m1mono ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("maygaymonopoly delx 5p-10p 6.bin", 0x0000, 0x010000, CRC(ed3c5997) SHA1(5a1e82894bd71073e08136a9071528833b529f5e) ) m1_mono_sound ROM_END_M1A_MCU GAME( 199?, m1mono ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1monoa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mon deluxe old 6 5_10.bin", 0x0000, 0x010000, CRC(f6ff2c55) SHA1(dec0be9c5584285b47943dd7d8751acd5e244daf) ) m1_mono_sound ROM_END_M1A_MCU GAME( 199?, m1monoa ,m1mono ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1monoc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mon5p5cbin", 0x0000, 0x010000, CRC(5589d97d) SHA1(d8776200d5c85fc1946ab4a4d0f7b7fb721a08f0) ) m1_mono_sound ROM_END_M1A_MCU GAME( 199?, m1monoc ,m1mono ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly (Maygay) (M1A/B) (set 4)",GAME_FLAGS ) @@ -1078,8 +1054,7 @@ ROM_START( m1monoaa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO ROM_LOAD( "gal16v8a.m1a.a.u32", 0x0000, 0x000117, CRC(5da2b5ab) SHA1(7af5ee675e280905fa41aee23b06394a59c8758d) ) \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "sound1.dig1-049.u2", 0x000000, 0x080000, CRC(ab0ef8aa) SHA1(e9cd8c7c0fd0bec44d0531eff6272aa10b88b08c) ) \ - ROM_LOAD( "sound2.dig1-049.u3", 0x080000, 0x080000, CRC(44c05fb6) SHA1(8d40d62d7c55224ddca8ff2f90779d5fad2af3ba) ) \ - + ROM_LOAD( "sound2.dig1-049.u3", 0x080000, 0x080000, CRC(44c05fb6) SHA1(8d40d62d7c55224ddca8ff2f90779d5fad2af3ba) ) ROM_START( m1glad ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("game.gladiatorsstd(fb8b)1.u6", 0x0000, 0x010000, CRC(eae9f323) SHA1(1a345480b37ff88f263beb0ba3715954e0c6ecb0) ) m1_glad_sound ROM_END_M1A_MCU GAME( 199?, m1glad ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Gladiators (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) // aka sa6-295 ROM_START( m1glada ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("glad20p", 0x0000, 0x010000, CRC(b8803541) SHA1(a7c96501c031a84638bacf34a3e2c76dcd26bfe2) ) m1_glad_sound ROM_END_M1A_MCU GAME( 199?, m1glada ,m1glad ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Gladiators (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1gladb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("glad5.10", 0x0000, 0x010000, CRC(1562bfcb) SHA1(294a770e42143b7a009a9f071b00a1ef0da20ae6) ) m1_glad_sound ROM_END_M1A_MCU GAME( 199?, m1gladb ,m1glad ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Gladiators (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1116,8 +1091,7 @@ ROM_START( m1glad1 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOA #define m1_suppot_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "superpots.p1", 0x000000, 0x080000, CRC(a17067d7) SHA1(5fc774251ca13e9d97559b68e560a456c0c364a8) ) \ - ROM_LOAD( "superpots.p2", 0x080000, 0x080000, CRC(4fa7759e) SHA1(7ba5099738ff3180eb9407b0772181c6cb6a81b8) ) \ - + ROM_LOAD( "superpots.p2", 0x080000, 0x080000, CRC(4fa7759e) SHA1(7ba5099738ff3180eb9407b0772181c6cb6a81b8) ) ROM_START( m1suppot ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-186", 0x0000, 0x010000, CRC(dfd15d88) SHA1(f493dab30f2c83f32de7cb209d6ba4e4412589ba) ) m1_suppot_sound ROM_END_M1A_MCU GAME( 199?, m1suppot ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Super Pots (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1suppota ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-387", 0x0000, 0x010000, CRC(3fd18c6f) SHA1(9b2a1620bedb6e06009a36f7cfd491c024b36b7a) ) m1_suppot_sound ROM_END_M1A_MCU GAME( 199?, m1suppota ,m1suppot ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Super Pots (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1suppotb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-388", 0x0000, 0x010000, CRC(99f9de43) SHA1(db0309cce34333d8cc8750c264d613a0ca316cc4) ) m1_suppot_sound ROM_END_M1A_MCU GAME( 199?, m1suppotb ,m1suppot ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Super Pots (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1153,8 +1127,7 @@ ROM_START( m1suppot0 ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_trivia_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "trivpusuit.p1", 0x000000, 0x080000, CRC(3c4b4e2c) SHA1(db570035a3b9b7587501f342c80ec52cb1a79b49) ) \ - ROM_LOAD( "trivpusuit.p2", 0x080000, 0x080000, CRC(5a9808c1) SHA1(29c011ee2dc3e8bc87cb4c5ded61dfa3fdb9d7f7) ) \ - + ROM_LOAD( "trivpusuit.p2", 0x080000, 0x080000, CRC(5a9808c1) SHA1(29c011ee2dc3e8bc87cb4c5ded61dfa3fdb9d7f7) ) ROM_START( m1trivia ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-297", 0x0000, 0x010000, CRC(b7a20f4d) SHA1(4b619f1ff26226304d86f69cfbf9d8e264af93b7) ) m1_trivia_sound ROM_END_M1A_MCU GAME( 199?, m1trivia ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1triviaa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-298", 0x0000, 0x010000, CRC(118a5d61) SHA1(41202c92710c5a9b2cbaea56e69a75366b6e3537) ) m1_trivia_sound ROM_END_M1A_MCU GAME( 199?, m1triviaa ,m1trivia ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1triviab ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa7-503", 0x0000, 0x010000, CRC(56c8ee8e) SHA1(c1c0b9df26fecdca066cab2b4d7dadd9df8dbc2f) ) m1_trivia_sound ROM_END_M1A_MCU GAME( 199?, m1triviab ,m1trivia ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1188,8 +1161,7 @@ ROM_START( m1triviaz ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_monmon_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "mmm.p1", 0x000000, 0x080000, CRC(687ccf90) SHA1(cd3fd5994b7809aa267eff419a54fddb38675947) ) \ - ROM_LOAD( "mmm.p2", 0x080000, 0x080000, CRC(da5a7d93) SHA1(107659124fabc2d8d7f91d8fe6d0e7d9d00bf2cb) ) \ - + ROM_LOAD( "mmm.p2", 0x080000, 0x080000, CRC(da5a7d93) SHA1(107659124fabc2d8d7f91d8fe6d0e7d9d00bf2cb) ) ROM_START( m1monmon ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mmm.bin", 0x0000, 0x020000, CRC(3b4eef7f) SHA1(4ad32a92eb2f31c1cefb1cf86f558dff3e8328bb) ) m1_monmon_sound ROM_END_M1A_MCU GAME( 199?, m1monmon ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Money Money (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1monmona ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mmm10v", 0x0000, 0x020000, CRC(da39e2f8) SHA1(8e289d2fcfb5455e3ec14f98e9f918e074964a8c) ) m1_monmon_sound ROM_END_M1A_MCU GAME( 199?, m1monmona ,m1monmon ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Money Money (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1monmonb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mmm55", 0x0000, 0x020000, CRC(f5506f09) SHA1(e4664a09f1a09f23363c07812cce93e9ac1acea4) ) m1_monmon_sound ROM_END_M1A_MCU GAME( 199?, m1monmonb ,m1monmon ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Money Money (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1221,8 +1193,7 @@ ROM_START( m1monmonw ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_jbond_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing or different sound system? */ \ - + /* missing or different sound system? */ ROM_START( m1jbond ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("jbnd2010", 0x0000, 0x010000, CRC(8a41f5c0) SHA1(f52187b04a9b0103495e93eac16b75789012e072) ) m1_jbond_sound ROM_END_M1A_MCU GAME( 199?, m1jbond ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "James Bond (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1jbonda ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-605", 0x0000, 0x010000, CRC(a0882696) SHA1(ae2055b7dbf5644408c21e799a4a2d5355617e0a) ) m1_jbond_sound ROM_END_M1A_MCU GAME( 199?, m1jbonda ,m1jbond ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "James Bond (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1jbondb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-606", 0x0000, 0x010000, CRC(1430f845) SHA1(687d54958db78c0da499e58814d916500e6d426e) ) m1_jbond_sound ROM_END_M1A_MCU GAME( 199?, m1jbondb ,m1jbond ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "James Bond (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1249,8 +1220,7 @@ ROM_START( m1jbondq ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO // uPD7759 rom? #define m1_pinkp_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD("digi16.bin", 0x0000, 0x040000, CRC(ee8bc3ea) SHA1(b58fad236055db30a75bb12946e8ad76638865a0) ) \ - + ROM_LOAD("digi16.bin", 0x0000, 0x040000, CRC(ee8bc3ea) SHA1(b58fad236055db30a75bb12946e8ad76638865a0) ) ROM_START( m1pinkp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("pink2010", 0x0000, 0x010000, CRC(a098952f) SHA1(d62351d16aa6f34b20774dd6f38ffdada09b49be) ) m1_pinkp_sound ROM_END_M1A_MCU GAME( 199?, m1pinkp ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1pinkpa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("pink58c", 0x0000, 0x010000, CRC(fb0ee333) SHA1(3af5362486de70971f606dd914f8e658015dcf82) ) m1_pinkp_sound ROM_END_M1A_MCU GAME( 199?, m1pinkpa ,m1pinkp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1pinkpb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("pink5p5bin", 0x0000, 0x010000, CRC(97f6cda4) SHA1(338362a2dc0538feea08c98c27af2aec1ec46c08) ) m1_pinkp_sound ROM_END_M1A_MCU GAME( 199?, m1pinkpb ,m1pinkp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1278,8 +1248,7 @@ ROM_START( m1pinkpr ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_nudbnk_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "nbanu2", 0x000000, 0x080000, CRC(4d5ef011) SHA1(f19ae0b958f08ccd9a40e91719e096bad1ae1d0e) ) \ - ROM_LOAD( "nbanu3", 0x080000, 0x080000, CRC(c2ea4a53) SHA1(74b6144f22903565ac3526c235a75bd85fe49256) ) \ - + ROM_LOAD( "nbanu3", 0x080000, 0x080000, CRC(c2ea4a53) SHA1(74b6144f22903565ac3526c235a75bd85fe49256) ) ROM_START( m1nudbnk ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("naban510", 0x0000, 0x020000, CRC(70c25167) SHA1(8aeeaecbc9fdf44bef6d4bf32ab3c36050c6d812) ) m1_nudbnk_sound ROM_END_M1A_MCU GAME( 199?, m1nudbnk ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Nudge Banker (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1nudbnka ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("nban55", 0x0000, 0x020000, CRC(a2d7b81c) SHA1(4ecd0f56ff6e043d1cff3c9a2baf0ebec2bf20d2) ) m1_nudbnk_sound ROM_END_M1A_MCU GAME( 199?, m1nudbnka ,m1nudbnk ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Nudge Banker (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1nudbnkb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("15nbro", 0x0000, 0x020000, CRC(fff4b810) SHA1(0dc941d54853eb9c3e26210e1f4032d7a6de3dc6) ) m1_nudbnk_sound ROM_END_M1A_MCU GAME( 199?, m1nudbnkb ,m1nudbnk ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Nudge Banker (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1311,8 +1280,7 @@ ROM_START( m1nudbnkv ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_inwin_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "iwsnd1.bin", 0x000000, 0x080000, CRC(7658063f) SHA1(89cb329dc792b6086e50c01aed7b483f941b4b27) ) \ - ROM_LOAD( "iwsnd2.bin", 0x080000, 0x080000, CRC(c9708d5b) SHA1(fe01a351911e48a386c5ce9200a2ac28cf399e54) ) \ - + ROM_LOAD( "iwsnd2.bin", 0x080000, 0x080000, CRC(c9708d5b) SHA1(fe01a351911e48a386c5ce9200a2ac28cf399e54) ) ROM_START( m1inwin ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("inst5.10", 0x0000, 0x010000, CRC(d45ccc7d) SHA1(333a5842ea77687d8281c553d709b533fd390f4c) ) m1_inwin_sound ROM_END_M1A_MCU GAME( 199?, m1inwin ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Win (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1inwina ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("inst5.8", 0x0000, 0x010000, CRC(b780b52b) SHA1(feb0ed1dfabcf06f39f8dbf5d40c74db2e1695a3) ) m1_inwin_sound ROM_END_M1A_MCU GAME( 199?, m1inwina ,m1inwin ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Win (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1inwinb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("inst55", 0x0000, 0x010000, CRC(edac7794) SHA1(8045d36a17a8fe5fb4907598f6174f989ce30e5e) ) m1_inwin_sound ROM_END_M1A_MCU GAME( 199?, m1inwinb ,m1inwin ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Win (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1346,8 +1314,7 @@ ROM_START( m1inwinx ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO ROM_LOAD( "digi141_2.bin", 0x080000, 0x080000, CRC(dfe50779) SHA1(643d1f932a7f42ee26c9a26dde470c87a8e00fc3) ) \ /* which set of sound roms is correct, is one a club set? */ \ ROM_LOAD( "italianjob.p1", 0x000000, 0x080000, CRC(21d6e0bf) SHA1(431510606c1c7fb1f452fa44a974361437bfada1) ) \ - ROM_LOAD( "italianjob.p2", 0x080000, 0x080000, CRC(ef58a68b) SHA1(f05215733fc47d6f33ab3b839b0dcc2bf7b12e7d) ) \ - + ROM_LOAD( "italianjob.p2", 0x080000, 0x080000, CRC(ef58a68b) SHA1(f05215733fc47d6f33ab3b839b0dcc2bf7b12e7d) ) ROM_START( m1itjob ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("ij5p810.bin", 0x0000, 0x020000, CRC(9596a49b) SHA1(67ab3a01f9e1522f8b8f53657b952e184ab07002) ) m1_itjob_sound ROM_END_M1A_MCU GAME( 199?, m1itjob ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Italian Job (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1itjobc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("it_job.bin", 0x0000, 0x020000, CRC(6fd00000) SHA1(bbdfb3af0d794207c27a6f9197706ae258806a75) ) m1_itjob_sound ROM_END_M1A_MCU GAME( 199?, m1itjobc ,m1itjob ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Italian Job (Maygay) (M1A/B) (set 4)",GAME_FLAGS ) ROM_START( m1itjobd ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("italianjob5.bin", 0x0000, 0x020000, CRC(aaf68bd6) SHA1(857eced307156032e7b35af25d58182d07ac4cd2) ) m1_itjob_sound ROM_END_M1A_MCU GAME( 199?, m1itjobd ,m1itjob ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Italian Job (Maygay) (M1A/B) (set 5)",GAME_FLAGS ) @@ -1373,8 +1340,7 @@ ROM_START( m1itjobr ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_frexpl_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "fexpsnd1.bin", 0x000000, 0x080000, CRC(68bb3788) SHA1(2e906d5ff597960ac0deeab0211a8eb0f0eba348) ) \ - ROM_LOAD( "fexpsnd2.bin", 0x080000, 0x080000, CRC(db357b2f) SHA1(10dc9c2c616582e12c423e52caa3686f334dd9ad) ) \ - + ROM_LOAD( "fexpsnd2.bin", 0x080000, 0x080000, CRC(db357b2f) SHA1(10dc9c2c616582e12c423e52caa3686f334dd9ad) ) ROM_START( m1frexpl ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fex312v.bin", 0x0000, 0x020000, CRC(1a64fcce) SHA1(e38bcfeebf055a0a70d5ba228bbb15c53c90011e) ) m1_frexpl_sound ROM_END_M1A_MCU GAME( 199?, m1frexpl , 0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fruit Explosion (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1frexpla ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fex5p8ct.bin", 0x0000, 0x020000, CRC(3335e861) SHA1(3dcd835217d977991ed0e3a08ebb18d934dd9caa) ) m1_frexpl_sound ROM_END_M1A_MCU GAME( 199?, m1frexpla ,m1frexpl ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fruit Explosion (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1frexplc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("fexp15f.bin", 0x0000, 0x020000, CRC(be6d81dc) SHA1(e6a3c38e1b231a3c31a5ff77c8c09f0ccde62138) ) m1_frexpl_sound ROM_END_M1A_MCU GAME( 199?, m1frexplc ,m1frexpl ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fruit Explosion (Maygay) (M1A/B) (set 4)",GAME_FLAGS ) @@ -1404,8 +1370,7 @@ ROM_START( m1frexplv ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_guvnor_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "dig1-036 snd u2.bin", 0x000000, 0x080000, CRC(ba0cec08) SHA1(03c009f0157000785931139107745df7df005227) ) \ - ROM_LOAD( "dig1-036 snd u3.bin", 0x080000, 0x080000, CRC(2213e2e9) SHA1(b442f1af81326946df2bf4c7ea12c805d221f4f6) ) \ - + ROM_LOAD( "dig1-036 snd u3.bin", 0x080000, 0x080000, CRC(2213e2e9) SHA1(b442f1af81326946df2bf4c7ea12c805d221f4f6) ) ROM_START( m1guvnor ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("guvnor-8.p1", 0x0000, 0x010000, CRC(b328a620) SHA1(47da578423c95c4bfe30c96b9cce357435f20376) ) m1_guvnor_sound ROM_END_M1A_MCU GAME( 199?, m1guvnor ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Guvnor (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1guvnora ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-386", 0x0000, 0x010000, CRC(912512fd) SHA1(4fc1591cfffa5de8501766092f425f8c39b353a5) ) m1_guvnor_sound ROM_END_M1A_MCU GAME( 199?, m1guvnora ,m1guvnor ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Guvnor (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1guvnorb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-548", 0x0000, 0x010000, CRC(b0a9bea6) SHA1(3ed5911e7d57deab662ec0c75c0b1f9b88970064) ) m1_guvnor_sound ROM_END_M1A_MCU GAME( 199?, m1guvnorb ,m1guvnor ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Guvnor (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1435,8 +1400,7 @@ ROM_START( m1guvnort ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_luckno_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "luckynumbersu2snd.bin", 0x000000, 0x080000, CRC(2c9216b2) SHA1(e6ebcc6fa6c5a88db592f21f07f4911edf2e4abc) ) \ - ROM_LOAD( "luckynumbersu3snd.bin", 0x080000, 0x080000, CRC(958ac365) SHA1(c307d973601336e3eb8769b15920465de92547a3) ) \ - + ROM_LOAD( "luckynumbersu3snd.bin", 0x080000, 0x080000, CRC(958ac365) SHA1(c307d973601336e3eb8769b15920465de92547a3) ) ROM_START( m1luckno ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("l10.bin", 0x0000, 0x010000, CRC(296ae5eb) SHA1(7e1f78038a997ccb228ed23b5dba0c28e7aa1a22) ) m1_luckno_sound ROM_END_M1A_MCU GAME( 199?, m1luckno ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lucky Numbers (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1lucknoa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-267", 0x0000, 0x010000, CRC(503167ab) SHA1(3922499857314dac7c6f067892c20fdb1036ffcb) ) m1_luckno_sound ROM_END_M1A_MCU GAME( 199?, m1lucknoa ,m1luckno ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lucky Numbers (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1lucknob ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-268", 0x0000, 0x010000, CRC(f6193587) SHA1(10eaae6e48862b97d868a275b7e996684d99836c) ) m1_luckno_sound ROM_END_M1A_MCU GAME( 199?, m1lucknob ,m1luckno ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lucky Numbers (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1465,8 +1429,7 @@ ROM_START( m1lucknos ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_nhp_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "noelshouseparty.p1", 0x000000, 0x080000, CRC(aa8e62e4) SHA1(719cb6d5c2b3ffca3952c01e143f6096207b2520) ) \ - ROM_LOAD( "noelshouseparty.p2", 0x080000, 0x080000, CRC(e8a06839) SHA1(7452f48355c64e0424879d53d87fa523953eec0a) ) \ - + ROM_LOAD( "noelshouseparty.p2", 0x080000, 0x080000, CRC(e8a06839) SHA1(7452f48355c64e0424879d53d87fa523953eec0a) ) ROM_START( m1nhp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("nhp.bin", 0x0000, 0x010000, CRC(b747e835) SHA1(98faaff432182adaf8ae7249187ac0e81bfe10d8) ) m1_nhp_sound ROM_END_M1A_MCU GAME( 199?, m1nhp ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Noel's House Party (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1nhpa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("noel10", 0x0000, 0x010000, CRC(84ad7b31) SHA1(e350a1806c05215e0a60f8dc724345b6b1a0be12) ) m1_nhp_sound ROM_END_M1A_MCU GAME( 199?, m1nhpa ,m1nhp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Noel's House Party (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1nhpb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-216", 0x0000, 0x010000, CRC(46e9e772) SHA1(098c23b8676b53dce6087c7812eb45a31e1cad0d) ) m1_nhp_sound ROM_END_M1A_MCU GAME( 199?, m1nhpb ,m1nhp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Noel's House Party (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1489,8 +1452,7 @@ ROM_START( m1nhpm ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD #define m1_fantfb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "fantasyfootball.p1", 0x000000, 0x080000, CRC(620a5736) SHA1(a202685b7b4882d262a111cfb1f35f91b00cbe5f) ) \ - ROM_LOAD( "fantasyfootball.p2", 0x080000, 0x080000, CRC(e25d95b0) SHA1(c6238d9d6c1ab3b478e40fa9145b6842bcc8fae5) ) \ - + ROM_LOAD( "fantasyfootball.p2", 0x080000, 0x080000, CRC(e25d95b0) SHA1(c6238d9d6c1ab3b478e40fa9145b6842bcc8fae5) ) ROM_START( m1fantfb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-327", 0x0000, 0x010000, CRC(05641cb9) SHA1(52ca66c9bf325b080477b6a09b6ee964f2aca6e3) ) m1_fantfb_sound ROM_END_M1A_MCU GAME( 199?, m1fantfb ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fantasy Football (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1fantfba ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("ffoot201", 0x0000, 0x010000, CRC(348c9517) SHA1(cc4d0d8964977a51bcb56b7ed1cb299581f6e0e7) ) m1_fantfb_sound ROM_END_M1A_MCU GAME( 199?, m1fantfba ,m1fantfb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fantasy Football (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1fantfbb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-045", 0x0000, 0x010000, CRC(6766a83f) SHA1(156e4f8212d8f3c4f1579d7d12da721096bf2fda) ) m1_fantfb_sound ROM_END_M1A_MCU GAME( 199?, m1fantfbb ,m1fantfb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Fantasy Football (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1510,8 +1472,7 @@ ROM_START( m1fantfbl ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_wldzne_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "wildzone(maygay)sound-p1.bin", 0x000000, 0x080000, CRC(9d512949) SHA1(65411c906f51f7d6d53ac897bedeab8fdd89d0a9) ) \ - ROM_LOAD( "wildzone(maygay)sound-p2.bin", 0x080000, 0x080000, CRC(78390d2c) SHA1(89c9d0f6deb74fee258bc614f61f0a82b3ef3959) ) \ - + ROM_LOAD( "wildzone(maygay)sound-p2.bin", 0x080000, 0x080000, CRC(78390d2c) SHA1(89c9d0f6deb74fee258bc614f61f0a82b3ef3959) ) ROM_START( m1wldzne ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-522", 0x0000, 0x010000, CRC(814ab843) SHA1(e2b076fd69abbd0186d4748f59be22db1e017a23) ) m1_wldzne_sound ROM_END_M1A_MCU GAME( 199?, m1wldzne ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Wild Zone (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1wldznea ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-527", 0x0000, 0x010000, CRC(eec99c71) SHA1(a142ea4929c3b9483aa87b076dfb192c520c16a8) ) m1_wldzne_sound ROM_END_M1A_MCU GAME( 199?, m1wldznea ,m1wldzne ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Wild Zone (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1wldzneb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-528", 0x0000, 0x010000, CRC(48e1ce5d) SHA1(90c5993fb5c519d7d5848b0a385c7bf3f41c8d6d) ) m1_wldzne_sound ROM_END_M1A_MCU GAME( 199?, m1wldzneb ,m1wldzne ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Wild Zone (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1540,8 +1501,7 @@ ROM_START( m1wldznes ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_onbus_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "otbsnd1.bin", 0x000000, 0x080000, CRC(c1868f4a) SHA1(606c5dbbea6f681485922ea498846a8b2d94eb4f) ) \ - ROM_LOAD( "otbsnd2.bin", 0x080000, 0x080000, CRC(aa60f721) SHA1(030a5a39ed9212c63a025dbdd9e79a86c77f4921) ) \ - + ROM_LOAD( "otbsnd2.bin", 0x080000, 0x080000, CRC(aa60f721) SHA1(030a5a39ed9212c63a025dbdd9e79a86c77f4921) ) ROM_START( m1onbus ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("onbuses10p10.bin", 0x0000, 0x020000, CRC(27765bd8) SHA1(890d4fc934b0e1d66a52896f176b086453909332) ) m1_onbus_sound ROM_END_M1A_MCU GAME( 199?, m1onbus ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "On The Buses (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1onbusa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("otbgame", 0x0000, 0x020000, CRC(48e1bdea) SHA1(bca684ae6def40ff5ba8cfda8ee90dcf6cda6e13) ) m1_onbus_sound ROM_END_M1A_MCU GAME( 199?, m1onbusa ,m1onbus ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "On The Buses (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1onbusb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa7-579", 0x0000, 0x020000, CRC(ed23e05c) SHA1(b798b71319f05ebae977696e3b38a9bdff24fca8) ) m1_onbus_sound ROM_END_M1A_MCU GAME( 199?, m1onbusb ,m1onbus ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "On The Buses (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1567,8 +1527,7 @@ ROM_START( m1onbusp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_monclb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "monsnd1.bin", 0x000000, 0x080000, CRC(f7303657) SHA1(a66c1110b38d36ebbd0ec3a2d3a08d9164b9d4a0) ) \ - ROM_LOAD( "monsnd2.bin", 0x080000, 0x080000, CRC(3881a59a) SHA1(e7f13152ff4c8e502bd97ea8ab90416126de73f3) ) \ - + ROM_LOAD( "monsnd2.bin", 0x080000, 0x080000, CRC(3881a59a) SHA1(e7f13152ff4c8e502bd97ea8ab90416126de73f3) ) ROM_START( m1monclb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mon.bin", 0x0000, 0x020000, CRC(9941e3ee) SHA1(2abae2333e35e55510eb73da03c8b385960a5d26) ) m1_monclb_sound ROM_END_M1A_MCU GAME( 199?, m1monclb ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1monclba ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mono250", 0x0000, 0x020000, CRC(c7b07773) SHA1(056c97adf93edaadd6174304136273122e76577c) ) m1_monclb_sound ROM_END_M1A_MCU GAME( 199?, m1monclba ,m1monclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1monclbb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc7-002", 0x0000, 0x020000, CRC(418de7f0) SHA1(a80c13a96d101cf8e94a342e1cece3cf4f0c72e4) ) m1_monclb_sound ROM_END_M1A_MCU GAME( 199?, m1monclbb ,m1monclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1591,8 +1550,7 @@ ROM_START( m1monclbm ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_hotpot_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "hotpots.p1", 0x000000, 0x080000, CRC(4988fd70) SHA1(7aaeca764b57787414dbec8d3519cb5681e011a5) ) \ - ROM_LOAD( "hotpots.p2", 0x080000, 0x080000, CRC(79f03328) SHA1(bcccfc62db91c79d6a4552ad4b15040137b254e6) ) \ - + ROM_LOAD( "hotpots.p2", 0x080000, 0x080000, CRC(79f03328) SHA1(bcccfc62db91c79d6a4552ad4b15040137b254e6) ) ROM_START( m1hotpot ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("hot5.8", 0x0000, 0x010000, CRC(bcba1c2b) SHA1(e8fa304b6775802d72ce21b7893659be34ca7921) ) m1_hotpot_sound ROM_END_M1A_MCU GAME( 199?, m1hotpot ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Hot Pots (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1hotpotd ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("hotp510", 0x0000, 0x010000, CRC(e6e61c12) SHA1(67f364dcdf228b8a673ae5ff565ac595c9d2c10a) ) m1_hotpot_sound ROM_END_M1A_MCU GAME( 199?, m1hotpotd ,m1hotpot ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Hot Pots (Maygay) (M1A/B) (set 5)",GAME_FLAGS ) ROM_START( m1hotpote ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("hotp58", 0x0000, 0x010000, CRC(c97afa46) SHA1(163c02a03931f1378e6b4274974b6ae013689cd7) ) m1_hotpot_sound ROM_END_M1A_MCU GAME( 199?, m1hotpote ,m1hotpot ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Hot Pots (Maygay) (M1A/B) (set 6)",GAME_FLAGS ) @@ -1624,8 +1582,7 @@ ROM_START( m1hotpot0 ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_gresc_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "greatescape.p1", 0x000000, 0x080000, CRC(a7e0a7a8) SHA1(f65171d72a6add5ebc903aac18b426d91134a492) ) \ - ROM_LOAD( "greatescape.p2", 0x080000, 0x080000, CRC(61de5e0f) SHA1(26ca6786de4da1e9c48de47887ed6e3e7e3a108b) ) \ - + ROM_LOAD( "greatescape.p2", 0x080000, 0x080000, CRC(61de5e0f) SHA1(26ca6786de4da1e9c48de47887ed6e3e7e3a108b) ) ROM_START( m1gresc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("ge5p810.bin", 0x0000, 0x020000, CRC(67cb37b9) SHA1(48ef081a52400afd533909eacf8872f094b98049) ) m1_gresc_sound ROM_END_M1A_MCU GAME( 199?, m1gresc ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Great Escape, The (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1gresca ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("geprog", 0x0000, 0x020000, CRC(f3c2bdd4) SHA1(9c71b6ef179f7c059715d9a7005cc36e07d8854b) ) m1_gresc_sound ROM_END_M1A_MCU GAME( 199?, m1gresca ,m1gresc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Great Escape, The (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1grescb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("gtesc55", 0x0000, 0x020000, CRC(96042c55) SHA1(e54c8d323d3bc845ed270f4325741fb7bf31f55e) ) m1_gresc_sound ROM_END_M1A_MCU GAME( 199?, m1grescb ,m1gresc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Great Escape, The (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1652,8 +1609,7 @@ ROM_START( m1grescq ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_infern_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "inferno.p1", 0x000000, 0x080000, CRC(ff8749ff) SHA1(509b53f09cdfe5ee865e60ab42fd578586ac53ea) ) \ - ROM_LOAD( "inferno.p2", 0x080000, 0x080000, CRC(c8165b6c) SHA1(7c5059ee8630da31fc3ad50d84a4730297757d46) ) \ - + ROM_LOAD( "inferno.p2", 0x080000, 0x080000, CRC(c8165b6c) SHA1(7c5059ee8630da31fc3ad50d84a4730297757d46) ) ROM_START( m1infern ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("inferno.bin", 0x0000, 0x010000, CRC(02b623e8) SHA1(1dcefb2da67dd27fc1270cd59b5019c3017f6eb0) ) m1_infern_sound ROM_END_M1A_MCU GAME( 199?, m1infern ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Inferno (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1inferna ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-072", 0x0000, 0x010000, CRC(a158f803) SHA1(949676619349ecf8274bf0c64ea897dcba485745) ) m1_infern_sound ROM_END_M1A_MCU GAME( 199?, m1inferna ,m1infern ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Inferno (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1infernb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-077", 0x0000, 0x010000, CRC(ea5ebe0e) SHA1(52b48c6e479191f31d6cbe0e6db7921d3d60b219) ) m1_infern_sound ROM_END_M1A_MCU GAME( 199?, m1infernb ,m1infern ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Inferno (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1675,8 +1631,7 @@ ROM_START( m1infernl ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_jdwins_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "jimwinstrku2snd.bin", 0x000000, 0x080000, CRC(ded378b7) SHA1(e974ace69cacbe27a98127e8623e79dec06fde08) ) \ - ROM_LOAD( "jimwinstrku3snd.bin", 0x080000, 0x080000, CRC(da05f628) SHA1(039276be47ce2d5be34a55cca91868ac93b0d9ae) ) \ - + ROM_LOAD( "jimwinstrku3snd.bin", 0x080000, 0x080000, CRC(da05f628) SHA1(039276be47ce2d5be34a55cca91868ac93b0d9ae) ) ROM_START( m1jdwins ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-187", 0x0000, 0x010000, CRC(f3afdfce) SHA1(caa55cd313420d86fed0a80d3029635dc95fb4df) ) m1_jdwins_sound ROM_END_M1A_MCU GAME( 199?, m1jdwins ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Jim Davison's Winning Streak (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1jdwinsa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-188", 0x0000, 0x010000, CRC(55878de2) SHA1(64544c19da5779761d583be31e9eca82b45cb4cb) ) m1_jdwins_sound ROM_END_M1A_MCU GAME( 199?, m1jdwinsa ,m1jdwins ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Jim Davison's Winning Streak (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1jdwinsb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-189", 0x0000, 0x010000, CRC(fc915a26) SHA1(66393e357da26f5e12007ec529b183cbb5b9736c) ) m1_jdwins_sound ROM_END_M1A_MCU GAME( 199?, m1jdwinsb ,m1jdwins ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Jim Davison's Winning Streak (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1725,8 +1680,7 @@ ROM_START( m1reeldmo ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_bignit_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "mikereidsbignightout-snd_p1.rom", 0x000000, 0x080000, CRC(846b6223) SHA1(cd337b3499bfa3fd88c44ede71e7777032ce3d1f) ) \ - ROM_LOAD( "mikereidsbignightout-snd_p2.rom", 0x080000, 0x080000, CRC(56630516) SHA1(5064afd678b92316ea7bceaf0097eae80b54ea31) ) \ - + ROM_LOAD( "mikereidsbignightout-snd_p2.rom", 0x080000, 0x080000, CRC(56630516) SHA1(5064afd678b92316ea7bceaf0097eae80b54ea31) ) ROM_START( m1bignit ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc4-336.bin", 0x0000, 0x010000, CRC(e5af59c0) SHA1(e4d17a65f24477e15494f97c1daea1d9fddfb8f6) ) m1_bignit_sound ROM_END_M1A_MCU GAME( 199?, m1bignit ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Mike Reid's Big Night Out (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1bignita ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc4-337.bin", 0x0000, 0x010000, CRC(0d47c426) SHA1(2ccf905f93484d6a2aa4400a19edbf44323482d3) ) m1_bignit_sound ROM_END_M1A_MCU GAME( 199?, m1bignita ,m1bignit ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Mike Reid's Big Night Out (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1bignitb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc4-338.bin", 0x0000, 0x010000, CRC(e642508e) SHA1(b2ae16092c98d825a9a6436ba82a0a225a6dcd07) ) m1_bignit_sound ROM_END_M1A_MCU GAME( 199?, m1bignitb ,m1bignit ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Mike Reid's Big Night Out (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1784,8 +1738,7 @@ ROM_START( m1manhat ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_monodt_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "monopolysnddutch.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) \ - + ROM_LOAD( "monopolysnddutch.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) ROM_START( m1monodt ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "monopoly.bin", 0x0000, 0x010000, CRC(b7a2911b) SHA1(74507dd3a947d1b4d7bd0b58adb53d4f6e7ce200) ) m1_monodt_sound ROM_END_M1A_MCU GAME( 199?, m1monodt ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly (Dutch) (Maygay) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* @@ -1795,8 +1748,7 @@ ROM_START( m1monodt ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_ppdt_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ppsound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) \ - + ROM_LOAD( "ppsound.bin", 0x0000, 0x040000, CRC(8742981e) SHA1(1ba33c59ec5f878ebab111a77551213aad4b0993) ) ROM_START( m1ppdt ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "pinkpanther.bin", 0x0000, 0x010000, CRC(09040f9d) SHA1(25c545e599711bf5ff2361c51e6629b69673da33) ) m1_ppdt_sound ROM_END_M1A_MCU GAME( 199?, m1ppdt ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther (German) (Maygay) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* @@ -1806,8 +1758,7 @@ ROM_START( m1ppdt ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOA // uPD7759 rom? #define m1_sprnov_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "supernovasnd.bin", 0x0000, 0x020000, CRC(f91e2c05) SHA1(e189c14214f4637d6a803893d79a41ad0fc8ebba) ) \ - + ROM_LOAD( "supernovasnd.bin", 0x0000, 0x020000, CRC(f91e2c05) SHA1(e189c14214f4637d6a803893d79a41ad0fc8ebba) ) ROM_START( m1sprnov ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( "supernovaprg.bin", 0x0000, 0x010000, CRC(6d533247) SHA1(475ecdcc10c9da558eb4d7c5e288d4724f65a5ce) ) m1_sprnov_sound ROM_END_M1A_MCU GAME( 199?, m1sprnov ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Super Nova (Dutch) (Maygay) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* @@ -1838,8 +1789,7 @@ ROM_START( m1tstunt ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_calyps_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "calypsosnd.p1", 0x000000, 0x080000, CRC(b29d170b) SHA1(1922a135ce2841716cd5fd16bbdb89a9fbb23b22) ) \ - ROM_LOAD( "calypsosnd.p2", 0x080000, 0x080000, CRC(69cea85d) SHA1(8b114bd0a4ed9bee0c62652fe77ee41164b6e420) ) \ - + ROM_LOAD( "calypsosnd.p2", 0x080000, 0x080000, CRC(69cea85d) SHA1(8b114bd0a4ed9bee0c62652fe77ee41164b6e420) ) ROM_START( m1calyps ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("calypso.5", 0x0000, 0x020000, CRC(3e66644d) SHA1(1292ff92ae8c3aeb1f37cdfab27725feb8092969) ) m1_calyps_sound ROM_END_M1A_MCU GAME( 199?, m1calyps ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Calypso (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1calypsa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa001008", 0x0000, 0x020000, CRC(f97cb079) SHA1(1bb0741bd34e6937c5c4711331f43bc0aaaab852) ) m1_calyps_sound ROM_END_M1A_MCU GAME( 199?, m1calypsa ,m1calyps ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Calypso (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1calypsb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa001009", 0x0000, 0x020000, CRC(ff686c04) SHA1(dd935a6acc88e8d9738176c22200c36505b48f18) ) m1_calyps_sound ROM_END_M1A_MCU GAME( 199?, m1calypsb ,m1calyps ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Calypso (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1851,8 +1801,7 @@ ROM_START( m1calypsb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_wotw_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "wotwsnd1", 0x000000, 0x080000, CRC(2a53544d) SHA1(46de438cfe5ca56886f10f293c59935036e08c72) ) \ - ROM_LOAD( "wotwsnd2", 0x080000, 0x080000, CRC(f5ffba54) SHA1(4b767236ee02a58f5430c77487b8f2e6ad2eccea) ) \ - + ROM_LOAD( "wotwsnd2", 0x080000, 0x080000, CRC(f5ffba54) SHA1(4b767236ee02a58f5430c77487b8f2e6ad2eccea) ) ROM_START( m1wotw ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa8-244", 0x0000, 0x020000, CRC(2bf62a60) SHA1(74f0cb4e33b7787b603e1e09066417f0d6700a68) ) m1_wotw_sound ROM_END_M1A_MCU GAME( 199?, m1wotw ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "War Of The Worlds (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1wotwa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa8-245", 0x0000, 0x020000, CRC(7bb7d4dc) SHA1(516ebe329396d5c565a34994dece1ea232b1e177) ) m1_wotw_sound ROM_END_M1A_MCU GAME( 199?, m1wotwa ,m1wotw ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "War Of The Worlds (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1wotwb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("15wotwro", 0x0000, 0x020000, CRC(12fd4bbf) SHA1(0936c9299871d3d06050bb25f16a8bfd1757ce48) ) m1_wotw_sound ROM_END_M1A_MCU GAME( 199?, m1wotwb ,m1wotw ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "War Of The Worlds (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1864,8 +1813,7 @@ ROM_START( m1wotwb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOA #define m1_przee_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "dig1-033 snd u2.bin", 0x000000, 0x080000, CRC(3eaa138c) SHA1(ad7d6e3ffc8fe19ea8cb9188998c75c90a77e09e) ) \ - ROM_LOAD( "dig1-033 snd u3.bin", 0x080000, 0x080000, CRC(89fde428) SHA1(f0942a2f1d3890ad18b01e8433333e5412c57644) ) \ - + ROM_LOAD( "dig1-033 snd u3.bin", 0x080000, 0x080000, CRC(89fde428) SHA1(f0942a2f1d3890ad18b01e8433333e5412c57644) ) ROM_START( m1przee ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-186", 0x0000, 0x010000, CRC(6e48b9e6) SHA1(bec5ad1ca06175c4217bbe3f6caae0061c7bfe99) ) m1_przee_sound ROM_END_M1A_MCU GAME( 199?, m1przee ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Prize Eastenders (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1przeea ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-556", 0x0000, 0x010000, CRC(0f6aeadd) SHA1(ed613d064c9991eed913f9579ea18a9ac70c2cf7) ) m1_przee_sound ROM_END_M1A_MCU GAME( 199?, m1przeea ,m1przee ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Prize Eastenders (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1przeeb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa5-058", 0x0000, 0x010000, CRC(3cc35697) SHA1(adaaafd6ae59497630660ec179212f0dd8dd3741) ) m1_przee_sound ROM_END_M1A_MCU GAME( 199?, m1przeeb ,m1przee ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Prize Eastenders (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1878,8 +1826,7 @@ ROM_START( m1przeec ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_ppc_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "clbppsd1.bin", 0x000000, 0x080000, CRC(bb3fe409) SHA1(9dafc470a0bc2d8a2b0e13c44fc81d7e3c905001) ) \ - ROM_LOAD( "clbppsd2.bin", 0x080000, 0x080000, CRC(abbe0f93) SHA1(1195c00a0ac917806316652c4ec5c0717d02876f) ) \ - + ROM_LOAD( "clbppsd2.bin", 0x080000, 0x080000, CRC(abbe0f93) SHA1(1195c00a0ac917806316652c4ec5c0717d02876f) ) ROM_START( m1ppc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("clubpp.bin", 0x0000, 0x010000, CRC(8df9165a) SHA1(cdd63e4824273eb242d6c579cc88c6b95cb319fa) ) m1_ppc_sound ROM_END_M1A_MCU GAME( 199?, m1ppc ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1ppca ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-396", 0x0000, 0x010000, CRC(4fa5db01) SHA1(ed253ebfa3dc5ff4ac3d547fc5068e358263367e) ) m1_ppc_sound ROM_END_M1A_MCU GAME( 199?, m1ppca ,m1ppc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1ppcb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-397", 0x0000, 0x010000, CRC(a74d46e7) SHA1(b0438c45685ae8a6c46b4b99a1710d8428e009ff) ) m1_ppc_sound ROM_END_M1A_MCU GAME( 199?, m1ppcb ,m1ppc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Pink Panther Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1891,8 +1838,7 @@ ROM_START( m1ppcb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD #define m1_imclb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) /* might be wrong, these weren't marked as club version */ \ ROM_LOAD( "instantmillionaresound.p1", 0x000000, 0x080000, CRC(c1e354c4) SHA1(420c6d862034fe4f6a30767f83671ac7fd86780a) ) \ - ROM_LOAD( "instantmillionaresound.p2", 0x080000, 0x080000, CRC(444b9b50) SHA1(cbb4f5ee3fb91ecb261bd79cb20823795d7c620a) ) \ - + ROM_LOAD( "instantmillionaresound.p2", 0x080000, 0x080000, CRC(444b9b50) SHA1(cbb4f5ee3fb91ecb261bd79cb20823795d7c620a) ) ROM_START( m1imclb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-363", 0x0000, 0x010000, CRC(b7e15193) SHA1(a026243b2ba71da26b058d899e1f04c9e897fd15) ) m1_imclb_sound ROM_END_M1A_MCU GAME( 199?, m1imclb ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Millionaire Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1imclba ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-364", 0x0000, 0x010000, CRC(bbf9092a) SHA1(459a9851c3e2316f57593bd4442a9633ef8d04de) ) m1_imclb_sound ROM_END_M1A_MCU GAME( 199?, m1imclba ,m1imclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Millionaire Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1imclbb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("imilclub", 0x0000, 0x020000, CRC(fbdf8964) SHA1(f71b8d70b28c0a2d7d96dd05128b7bc13437c97b) ) m1_imclb_sound ROM_END_M1A_MCU GAME( 199?, m1imclbb ,m1imclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Instant Millionaire Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1904,8 +1850,7 @@ ROM_START( m1imclbb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_lotmil_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "lottteymillion.p1", 0x000000, 0x080000, CRC(c1e354c4) SHA1(420c6d862034fe4f6a30767f83671ac7fd86780a) ) \ - ROM_LOAD( "lottteymillion.p2", 0x080000, 0x080000, CRC(444b9b50) SHA1(cbb4f5ee3fb91ecb261bd79cb20823795d7c620a) ) \ - + ROM_LOAD( "lottteymillion.p2", 0x080000, 0x080000, CRC(444b9b50) SHA1(cbb4f5ee3fb91ecb261bd79cb20823795d7c620a) ) ROM_START( m1lotmil ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-031", 0x0000, 0x010000, CRC(a283c82f) SHA1(8c0c487c3f6a16f777a9ba3dff74d724d00fea41) ) m1_lotmil_sound ROM_END_M1A_MCU GAME( 199?, m1lotmil ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lottery Millionaire Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1lotmila ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-032", 0x0000, 0x010000, CRC(5c83ed1b) SHA1(b4ba1955e44f86aec605958050d70101ee285ca1) ) m1_lotmil_sound ROM_END_M1A_MCU GAME( 199?, m1lotmila ,m1lotmil ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lottery Millionaire Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1lotmilb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc6-033", 0x0000, 0x010000, CRC(e0394256) SHA1(021b06f111bc5063c5ed6e5d470c7065f062701f) ) m1_lotmil_sound ROM_END_M1A_MCU GAME( 199?, m1lotmilb ,m1lotmil ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Lottery Millionaire Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1918,8 +1863,7 @@ ROM_START( m1lotmilc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_tpclb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "clubtpsnd.p1", 0x000000, 0x080000, CRC(252fbb57) SHA1(aad7c833fbcbdcc2ff001df9f97e8ba3adf95cc1) ) \ - ROM_LOAD( "clubtpsnd.p2", 0x080000, 0x080000, CRC(6c391632) SHA1(0cf02463b52b6b25fbeae2e6bd278a1364ae594d) ) \ - + ROM_LOAD( "clubtpsnd.p2", 0x080000, 0x080000, CRC(6c391632) SHA1(0cf02463b52b6b25fbeae2e6bd278a1364ae594d) ) ROM_START( m1tpclb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc991080", 0x0000, 0x020000, CRC(22556fe0) SHA1(6504ac7dbc6332972662c9abce0e4286f392c788) ) m1_tpclb_sound ROM_END_M1A_MCU GAME( 199?, m1tpclb ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1tpclba ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc991081", 0x0000, 0x020000, CRC(2441b39d) SHA1(857eafabbae8d2cb7f01b9fe215f8c16aed32174) ) m1_tpclb_sound ROM_END_M1A_MCU GAME( 199?, m1tpclba ,m1tpclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1tpclbb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("trivclub", 0x0000, 0x020000, CRC(d9732839) SHA1(1c4393dbbfc399842ff4d35d3c95cad991eb8caf) ) m1_tpclb_sound ROM_END_M1A_MCU GAME( 199?, m1tpclbb ,m1tpclb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Trivial Pursuit Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1932,8 +1876,7 @@ ROM_START( m1tpclbc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_vegas_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "v_gam_sn.1", 0x000000, 0x080000, CRC(66520213) SHA1(fd855732e51225da4f459c4797e01f77f4836935) ) \ - ROM_LOAD( "v_gam_sn.2", 0x080000, 0x080000, CRC(3d19abe9) SHA1(cf8ab030fcca5a37c2c936566a2b7c77db1740f6) ) \ - + ROM_LOAD( "v_gam_sn.2", 0x080000, 0x080000, CRC(3d19abe9) SHA1(cf8ab030fcca5a37c2c936566a2b7c77db1740f6) ) ROM_START( m1vegas ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("veg_gam.cl", 0x0000, 0x020000, CRC(f1019a72) SHA1(2358d30bc6fa27b6daf2b6c63f031b46e28e3cf5) ) m1_vegas_sound ROM_END_M1A_MCU GAME( 199?, m1vegas ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Vegas Gambler Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1vegasa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc991183", 0x0000, 0x020000, CRC(2ffe8e6e) SHA1(e3082f268293abe9a815240f2e8842acd3687653) ) m1_vegas_sound ROM_END_M1A_MCU GAME( 199?, m1vegasa ,m1vegas ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Vegas Gambler Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1vegasb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc991184", 0x0000, 0x020000, CRC(c3eed4ea) SHA1(4ad365a523179fac1b4e325e299663686534470d) ) m1_vegas_sound ROM_END_M1A_MCU GAME( 199?, m1vegasb ,m1vegas ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Vegas Gambler Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1953,8 +1896,7 @@ ROM_START( m1vegasb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO ROM_LOAD( "encsnd.u2", 0x000000, 0x080000, CRC(5568117a) SHA1(198aaead5a624902f31248e050231380b37167d4) ) \ ROM_LOAD( "encsnd.u3", 0x080000, 0x080000, CRC(d78bee50) SHA1(dc4663efc795f7c518ebb9f17124f09d263d0585) ) \ ROM_REGION( 0x010000, "dmddata", ROMREGION_ERASE00 ) /* what CPU? or is this MCU data? */ \ - ROM_LOAD( "encdot.bin", 0x0000, 0x010000, CRC(3b707399) SHA1(9bc9522625e97c7d60cc104a96f7312b1d88ec01) ) \ - + ROM_LOAD( "encdot.bin", 0x0000, 0x010000, CRC(3b707399) SHA1(9bc9522625e97c7d60cc104a96f7312b1d88ec01) ) ROM_START( m1winenc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-371", 0x0000, 0x010000, CRC(ecba5b6b) SHA1(7b50d1a6d4ec287bb5159b6018282107d5594227) ) m1_winenc_sound ROM_END_M1A_MCU GAME( 199?, m1winenc ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "John Francombe's Winners Enclosure (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1winenca ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa6-372", 0x0000, 0x010000, CRC(580285b8) SHA1(f0589184a60c73078c3cef9f89ca279fc67f9813) ) m1_winenc_sound ROM_END_M1A_MCU GAME( 199?, m1winenca ,m1winenc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "John Francombe's Winners Enclosure (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1winencb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa7-573", 0x0000, 0x010000, CRC(a597cd98) SHA1(3d28306004b1937e7d04380fe3f9afc5ec321b7b) ) m1_winenc_sound ROM_END_M1A_MCU GAME( 199?, m1winencb ,m1winenc ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "John Francombe's Winners Enclosure (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1967,8 +1909,7 @@ ROM_START( m1winencc ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_mongam_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "mgamesnd", 0x0000, 0x040000, CRC(80ea7b3d) SHA1(a26dbc55ba205fc94c9b224c549516ba149627d7) ) \ - + ROM_LOAD( "mgamesnd", 0x0000, 0x040000, CRC(80ea7b3d) SHA1(a26dbc55ba205fc94c9b224c549516ba149627d7) ) ROM_START( m1mongam ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("mgame200", 0x0000, 0x010000, CRC(4cfe0ef2) SHA1(8dae7d1fdb6481902bcc38f3f993b55c7acc919b) ) m1_mongam_sound ROM_END_M1A_MCU GAME( 199?, m1mongam ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Game Club (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1mongama ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc5-114", 0x0000, 0x010000, CRC(63dbb45e) SHA1(3ccb45ae290b5e2d2249a36268a9e690846bf3d9) ) m1_mongam_sound ROM_END_M1A_MCU GAME( 199?, m1mongama ,m1mongam ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Game Club (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1mongamb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sc5-115", 0x0000, 0x010000, CRC(8b3329b8) SHA1(2c89ac10ad82d8425104a74a7bc24aa9c28cbe01) ) m1_mongam_sound ROM_END_M1A_MCU GAME( 199?, m1mongamb ,m1mongam ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Money Game Club (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1980,8 +1921,7 @@ ROM_START( m1mongamb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_moncls_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "classicmonopoly(maygay)soundromdig1-027.bin", 0x0000, 0x040000, CRC(d5243b51) SHA1(c7e3a61071c566e8ea9c8842839b70242ca67308) ) \ - + ROM_LOAD( "classicmonopoly(maygay)soundromdig1-027.bin", 0x0000, 0x040000, CRC(d5243b51) SHA1(c7e3a61071c566e8ea9c8842839b70242ca67308) ) ROM_START( m1moncls ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-316", 0x0000, 0x010000, CRC(98f9d6b0) SHA1(f30fa1fb88bfd4098b189cf03a7e0b9dcc5bfdef) ) m1_moncls_sound ROM_END_M1A_MCU GAME( 199?, m1moncls ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Classic (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1monclsa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-318", 0x0000, 0x010000, CRC(01e8224c) SHA1(dfad509c00d6311eb1e8bbbfe1ca5fd6aeb9da43) ) m1_moncls_sound ROM_END_M1A_MCU GAME( 199?, m1monclsa ,m1moncls ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Classic (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1monclsb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-319", 0x0000, 0x010000, CRC(e900bfaa) SHA1(ce6f1021234979d0c27d5668b470fd31594ca222) ) m1_moncls_sound ROM_END_M1A_MCU GAME( 199?, m1monclsb ,m1moncls ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Monopoly Classic (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -1996,8 +1936,7 @@ ROM_START( m1monclsd ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_retpp_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ /* ROM_LOAD( "rotppsnd.bin", 0x0000, 0x002000, CRC(a8c8ff9a) SHA1(8069cf08f3a8481ebc589ad0c25887ea316facd5) ) */ /* bad dump of rom below */ \ - ROM_LOAD( "roppsnd.bin", 0x0000, 0x040000, CRC(9f3484b3) SHA1(9d454644c967b22cf6583335807a0ed8495492cb) ) \ - + ROM_LOAD( "roppsnd.bin", 0x0000, 0x040000, CRC(9f3484b3) SHA1(9d454644c967b22cf6583335807a0ed8495492cb) ) ROM_START( m1retpp ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("pinkpstd.bin", 0x0000, 0x010000, CRC(92bb56d8) SHA1(e033578c693f0faf1e91b76392106f0e6850d0dc) ) m1_retpp_sound ROM_END_M1A_MCU GAME( 199?, m1retpp ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Return Of The Pink Panther (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1retppa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-519.bin", 0x0000, 0x010000, CRC(b8e04479) SHA1(3be940b433174623d177ffd892d8bc59170422b8) ) m1_retpp_sound ROM_END_M1A_MCU GAME( 199?, m1retppa ,m1retpp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Return Of The Pink Panther (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1retppb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-520.bin", 0x0000, 0x010000, CRC(679b6b66) SHA1(a21e82221da54ba48a43c68d5c2c2f07ee9c2f34) ) m1_retpp_sound ROM_END_M1A_MCU GAME( 199?, m1retppb ,m1retpp ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "Return Of The Pink Panther (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2011,8 +1950,7 @@ ROM_START( m1retppd ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO // uPD7759 rom? #define m1_thatlf_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "thatslifesound", 0x0000, 0x040000, CRC(5ac3a1f6) SHA1(5be73deb23d58fdc27dd41d210702b627e7ed324) ) \ - + ROM_LOAD( "thatslifesound", 0x0000, 0x040000, CRC(5ac3a1f6) SHA1(5be73deb23d58fdc27dd41d210702b627e7ed324) ) ROM_START( m1thatlf ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa3-327.bin", 0x0000, 0x010000, CRC(634fc46e) SHA1(84e166a182384b3b6f29653a0542af74c268d766) ) m1_thatlf_sound ROM_END_M1A_MCU GAME( 199?, m1thatlf ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "That's Life (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1thatlfa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-075.bin", 0x0000, 0x010000, CRC(b5922c08) SHA1(c71cd3629436576c381b4f1b45011c34a49c66b7) ) m1_thatlf_sound ROM_END_M1A_MCU GAME( 199?, m1thatlfa ,m1thatlf ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "That's Life (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1thatlfb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-076.bin", 0x0000, 0x010000, CRC(012af2db) SHA1(d6f1a24fe6674a423d190e9e04390cb01768bf4a) ) m1_thatlf_sound ROM_END_M1A_MCU GAME( 199?, m1thatlfb ,m1thatlf ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "That's Life (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2026,8 +1964,7 @@ ROM_START( m1thatlfd ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_bghou_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "bgsnd1.bin", 0x000000, 0x080000, CRC(c0b13b6d) SHA1(d923cc71f9693a9321f984f51bd8f148cec1ac78) ) \ - ROM_LOAD( "bgsnd2.bin", 0x080000, 0x080000, CRC(1e19908b) SHA1(5d88e86798121d3355952daa3218925a00ef32fa) ) \ - + ROM_LOAD( "bgsnd2.bin", 0x080000, 0x080000, CRC(1e19908b) SHA1(5d88e86798121d3355952daa3218925a00ef32fa) ) ROM_START( m1bghou ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("bg39.bin", 0x0000, 0x020000, CRC(17889402) SHA1(3779e6f5ac7c2916e5e1af3a21af23a3b8923ef1) ) m1_bghou_sound ROM_END_M1A_MCU GAME( 199?, m1bghou ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Big Ghoulies (Gemini) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1bghoua ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("b_gool.4_3", 0x0000, 0x020000, CRC(eaa7d997) SHA1(061e4b8f4231018ef16200521ebb871b92df1f89) ) m1_bghou_sound ROM_END_M1A_MCU GAME( 199?, m1bghoua ,m1bghou ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Big Ghoulies (Gemini) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1bghoub ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("b_goul.1_6", 0x0000, 0x020000, CRC(530c64ae) SHA1(caea76573e92f33c3c652e62f3a7b79db45feb07) ) m1_bghou_sound ROM_END_M1A_MCU GAME( 199?, m1bghoub ,m1bghou ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Big Ghoulies (Gemini) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2044,8 +1981,7 @@ ROM_START( m1bghoug ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_crzco_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "crazycobrasnd.p1", 0x000000, 0x080000, CRC(c5ce740c) SHA1(c8e59ec36aaa0b35fe31e4f178e5c23093488151) ) \ - ROM_LOAD( "crazycobrasnd.p2", 0x080000, 0x080000, CRC(c49e6889) SHA1(e678a0c0f7ca067281248b48935f80756d161b39) ) \ - + ROM_LOAD( "crazycobrasnd.p2", 0x080000, 0x080000, CRC(c49e6889) SHA1(e678a0c0f7ca067281248b48935f80756d161b39) ) ROM_START( m1crzco ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("crazycobra.bin", 0x0000, 0x020000, CRC(31615cf8) SHA1(03ecef486350aa8ba0fbd0fbe0eb2c64b86c6848) ) m1_crzco_sound ROM_END_M1A_MCU GAME( 199?, m1crzco ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Crazy Cobra (Gemini) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1crzcoa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("cobra15.fo", 0x0000, 0x020000, CRC(2e2c08d6) SHA1(80faf478e5587742f20bd25a5f1828ec640ac4b6) ) m1_crzco_sound ROM_END_M1A_MCU GAME( 199?, m1crzcoa ,m1crzco ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Crazy Cobra (Gemini) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1crzcob ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("cobra15.foh", 0x0000, 0x020000, CRC(6852a8c7) SHA1(426d908f6aaaae6233af17d1c3bae95d70c73351) ) m1_crzco_sound ROM_END_M1A_MCU GAME( 199?, m1crzcob ,m1crzco ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Gemini", "Crazy Cobra (Gemini) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2060,8 +1996,7 @@ ROM_START( m1crzcoe ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_simps_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "si______.1_2", 0x000000, 0x080000, CRC(a1ac090e) SHA1(71133ac994dafa0993a600cbebb0cdfde5c09279) ) \ - ROM_LOAD( "si______.1_3", 0x080000, 0x080000, CRC(72cf719d) SHA1(707942c1b1beba3b3758cbf999b59e7a03bd137f) ) \ - + ROM_LOAD( "si______.1_3", 0x080000, 0x080000, CRC(72cf719d) SHA1(707942c1b1beba3b3758cbf999b59e7a03bd137f) ) ROM_START( m1simps ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-412", 0x0000, 0x010000, CRC(6f025e05) SHA1(182111f3b030589fe1829c3c24fcee9937d206dd) ) m1_simps_sound ROM_END_M1A_MCU GAME( 199?, m1simps ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Simpsons (Maygay) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1simpsa ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-413", 0x0000, 0x010000, CRC(87eac3e3) SHA1(d0b4cde28921870945e7d14642cd6f4abc699345) ) m1_simps_sound ROM_END_M1A_MCU GAME( 199?, m1simpsa ,m1simps ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Simpsons (Maygay) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1simpsb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("sa4-431", 0x0000, 0x010000, CRC(6ff34645) SHA1(13b224453164c6aaaf19fa19cdef296af17ec076) ) m1_simps_sound ROM_END_M1A_MCU GAME( 199?, m1simpsb ,m1simps ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Maygay", "The Simpsons (Maygay) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2078,8 +2013,7 @@ ROM_START( m1simpsg ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_trtrcl_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "trick or treat sound 0.bin", 0x000000, 0x080000, CRC(4900e4d3) SHA1(ce3342d076caadb793572411be8394e02a37cd11) ) \ - ROM_LOAD( "trick or treat sound 1.bin", 0x080000, 0x080000, CRC(42ae9bc3) SHA1(c82f3d8ac6004b827913e1940b0d06ed7c1584d0) ) \ - + ROM_LOAD( "trick or treat sound 1.bin", 0x080000, 0x080000, CRC(42ae9bc3) SHA1(c82f3d8ac6004b827913e1940b0d06ed7c1584d0) ) ROM_START( m1trtrcl ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("ttcb0-2n.p0", 0x0000, 0x020000, CRC(af72431c) SHA1(a6060445527372606bcfab9eb9f0a40882d00520) ) m1_trtrcl_sound ROM_END_M1A_MCU GAME( 199?, m1trtrcl ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Trick Or Treat Club (Global) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* @@ -2089,8 +2023,7 @@ ROM_START( m1trtrcl ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_vegcrw_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "vegesnd1.u2", 0x000000, 0x080000, CRC(9ce69785) SHA1(126e76ed1a8b7dc71df5c21c77d7daecbdeb2796) ) \ - ROM_LOAD( "vegesnd2.u3", 0x080000, 0x080000, CRC(341d43a6) SHA1(d10875e6b2c98afcc2244588d00602f0c26fb295) ) \ - + ROM_LOAD( "vegesnd2.u3", 0x080000, 0x080000, CRC(341d43a6) SHA1(d10875e6b2c98afcc2244588d00602f0c26fb295) ) ROM_START( m1vegcrw ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("vege0-2n.p1", 0x0000, 0x020000, CRC(71cc53b2) SHA1(1d0775aed64f1b622a958f99dd23d8fb86dad0de) ) m1_vegcrw_sound ROM_END_M1A_MCU GAME( 199?, m1vegcrw ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Vegetable Crew (Global) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* @@ -2100,8 +2033,7 @@ ROM_START( m1vegcrw ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_digdel_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "diggdelightsound3.bin", 0x000000, 0x080000, CRC(ff56068a) SHA1(cfd4cea5fc4f9278a01d0953ece92d3e6c59a8a4) ) \ - ROM_LOAD( "diggdelightsnd4.bin", 0x080000, 0x080000, CRC(1d7ea3c5) SHA1(902bc00be62b3106337cb7fe4d3e9a4d5a5533f4) ) \ - + ROM_LOAD( "diggdelightsnd4.bin", 0x080000, 0x080000, CRC(1d7ea3c5) SHA1(902bc00be62b3106337cb7fe4d3e9a4d5a5533f4) ) ROM_START( m1digdel ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("digg3-2p.p1", 0x0000, 0x020000, CRC(63d7037d) SHA1(3e29c3df2f4ff77bb4ac7f52a71c4fa2d4a8c66a) ) m1_digdel_sound ROM_END_M1A_MCU GAME( 199?, m1digdel ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Diggers Delight (Global) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1digdela ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("diggersdelight.p1", 0x0000, 0x020000, CRC(9beab502) SHA1(59773f49206497070ebffff99c3375177f352aff) ) m1_digdel_sound ROM_END_M1A_MCU GAME( 199?, m1digdela ,m1digdel ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Diggers Delight (Global) (M1A/B) (set 2)",GAME_FLAGS ) @@ -2112,8 +2044,7 @@ ROM_START( m1digdela ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L #define m1_jtjob_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "jobsnd1.u2", 0x000000, 0x080000, CRC(69b3c5d6) SHA1(4fcf16686e0fc322a8c03e697d0292270ceccc5a) ) \ - ROM_LOAD( "jobsnd2.u3", 0x080000, 0x080000, CRC(2e7d049e) SHA1(ee58c795e7da3735827dd6af0b44c03166cd99dc) ) \ - + ROM_LOAD( "jobsnd2.u3", 0x080000, 0x080000, CRC(2e7d049e) SHA1(ee58c795e7da3735827dd6af0b44c03166cd99dc) ) ROM_START( m1jtjob ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("just2-0n.p1", 0x0000, 0x020000, CRC(d63d1710) SHA1(feccdd6dc242d32f04a080ab6a637cd6ec330c0d) ) m1_jtjob_sound ROM_END_M1A_MCU GAME( 199?, m1jtjob ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Just The Job (Global) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1jtjoba ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("j_t_job.1_9", 0x0000, 0x020000, CRC(4f6da2b2) SHA1(43b4c314d5ee934d8dc8972c3c0585096d78793f) ) m1_jtjob_sound ROM_END_M1A_MCU GAME( 199?, m1jtjoba ,m1jtjob ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Just The Job (Global) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1jtjobb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("just2-0p.p1", 0x0000, 0x020000, CRC(8d809ba4) SHA1(a6fd142edb0a98c847cb376efe40756d19bccb02) ) m1_jtjob_sound ROM_END_M1A_MCU GAME( 199?, m1jtjobb ,m1jtjob ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Just The Job (Global) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2128,8 +2059,7 @@ ROM_START( m1jtjobe ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LO #define m1_lca_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "lcasnd1.bin", 0x000000, 0x080000, CRC(56cc170c) SHA1(c491897b748921201489b38703a3b208e7fdd2f3) ) \ - ROM_LOAD( "lcasnd2.bin", 0x080000, 0x080000, CRC(73062bef) SHA1(a02f91306c46205ca518d90fdde27508e9d14f63) ) \ - + ROM_LOAD( "lcasnd2.bin", 0x080000, 0x080000, CRC(73062bef) SHA1(a02f91306c46205ca518d90fdde27508e9d14f63) ) ROM_START( m1lca ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("lca11-4n.p1", 0x0000, 0x020000, CRC(65d5efab) SHA1(5b2b6849bfc47360d47e93ca2605d4e18d18a760) ) m1_lca_sound ROM_END_M1A_MCU GAME( 199?, m1lca ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Lights Camera Action (Global) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1lcaa ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("lca11-4p.p1", 0x0000, 0x020000, CRC(c60bcf0f) SHA1(ea9a79b0a76e8102c1c483987d22411a78cc5525) ) m1_lca_sound ROM_END_M1A_MCU GAME( 199?, m1lcaa ,m1lca ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Lights Camera Action (Global) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1lcab ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("lght1-4n.p1", 0x0000, 0x020000, CRC(31bfdc29) SHA1(3e3efed25e07772ca4903aeca1cee94cf527c382) ) m1_lca_sound ROM_END_M1A_MCU GAME( 199?, m1lcab ,m1lca ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Lights Camera Action (Global) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2142,8 +2072,7 @@ ROM_START( m1lcac ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD #define m1_mb_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "mb_snd_1.bin", 0x000000, 0x080000, CRC(05594e7c) SHA1(7caf32e4827b574a68cac6ad5cfae73ef228ae09) ) \ - ROM_LOAD( "mb_snd_2.bin", 0x080000, 0x080000, CRC(bd477c2c) SHA1(cbca3d637ce221fe2763e598afc93aabcf464c35) ) \ - + ROM_LOAD( "mb_snd_2.bin", 0x080000, 0x080000, CRC(bd477c2c) SHA1(cbca3d637ce221fe2763e598afc93aabcf464c35) ) ROM_START( m1mb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("monk0-9n.p1", 0x0000, 0x020000, CRC(6d51040c) SHA1(a97ecd2324622abe5298919d4bda298f6f736572) ) m1_mb_sound ROM_END_M1A_MCU GAME( 199?, m1mb ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Monkey Business (Global) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1mba ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("monkey.07", 0x0000, 0x020000, CRC(fb92ac29) SHA1(f066a4b5968fdac040dc65b6a7727a91ae41233b) ) m1_mb_sound ROM_END_M1A_MCU GAME( 199?, m1mba ,m1mb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Monkey Business (Global) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1mbb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("monkey business v0-4.bin", 0x0000, 0x020000, CRC(ead89920) SHA1(de7da735429956e8fdb0593937d3cf3dd2e4e7d8) ) m1_mb_sound ROM_END_M1A_MCU GAME( 199?, m1mbb ,m1mb ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Monkey Business (Global) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2156,8 +2085,7 @@ ROM_START( m1mbc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD( #define m1_thrill_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "thrillsandspillssnd.p1", 0x000000, 0x080000, CRC(591653ba) SHA1(60eea91d57b82eec427a4e10746f272d42d99891) ) \ - ROM_LOAD( "thrillsandspillssnd.p2", 0x080000, 0x080000, CRC(0b715a55) SHA1(988034855ed337bdb3b360aae282f22b67de0c64) ) \ - + ROM_LOAD( "thrillsandspillssnd.p2", 0x080000, 0x080000, CRC(0b715a55) SHA1(988034855ed337bdb3b360aae282f22b67de0c64) ) ROM_START( m1thrill ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("thrillsandspills.bin", 0x0000, 0x020000, CRC(415d9c87) SHA1(3af0580c65a2242516c83d4208fc5b4ae0d8cf21) ) m1_thrill_sound ROM_END_M1A_MCU GAME( 199?, m1thrill ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Thrills 'n' Spills (Global) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1thrilla ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("spil0-8n.p1", 0x0000, 0x020000, CRC(76297570) SHA1(b0aaa98cbc2e7331d96d27408214936133bf5726) ) m1_thrill_sound ROM_END_M1A_MCU GAME( 199?, m1thrilla ,m1thrill ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Thrills 'n' Spills (Global) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1thrillb ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("spil0-4n.p1", 0x0000, 0x020000, CRC(9d3a4936) SHA1(88073f46ebd9622643078561be00fcd98093eee2) ) m1_thrill_sound ROM_END_M1A_MCU GAME( 199?, m1thrillb ,m1thrill ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Global", "Thrills 'n' Spills (Global) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2170,8 +2098,7 @@ ROM_START( m1thrillc ) ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASE00 ) ROM_L // uPD7759 rom? #define m1_startr_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "mdmstartrekkingsound.rom", 0x0000, 0x040000, CRC(4b673184) SHA1(dd90719ebc8644b4aa50091dc9ddd79f5d0f3395) ) \ - + ROM_LOAD( "mdmstartrekkingsound.rom", 0x0000, 0x040000, CRC(4b673184) SHA1(dd90719ebc8644b4aa50091dc9ddd79f5d0f3395) ) ROM_START( m1startr ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("tk20d3_1.bin", 0x0000, 0x010000, CRC(a911ebc7) SHA1(7e74df1ca0fd5e0d04ece5ca307f4b1ab817c044) ) m1_startr_sound ROM_END_M1A_MCU GAME( 199?, m1startr ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Mdm", "Star Trekking (Mdm) (M1A/B) (set 1)",GAME_FLAGS ) ROM_START( m1startra ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("st58dt", 0x0000, 0x010000, CRC(29b73d2d) SHA1(f4bfcce7b8f158e8ec964936c365a2c6f27f7945) ) m1_startr_sound ROM_END_M1A_MCU GAME( 199?, m1startra ,m1startr ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Mdm", "Star Trekking (Mdm) (M1A/B) (set 2)",GAME_FLAGS ) ROM_START( m1startrb ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("st58st", 0x0000, 0x010000, CRC(b4b4c3f3) SHA1(7179d970c0e903ae3b4ba925fba29b9777bf969d) ) m1_startr_sound ROM_END_M1A_MCU GAME( 199?, m1startrb ,m1startr ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Mdm", "Star Trekking (Mdm) (M1A/B) (set 3)",GAME_FLAGS ) @@ -2198,8 +2125,7 @@ ROM_START( m1startrr ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_L // M6295 rom? (wrong or unique due to being an empire game?) #define m1_ttcash_sound \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "ttcsnd.bin", 0x0000, 0x080000, CRC(a191218e) SHA1(d89c33538d1f1804b2f5acac713e760d089fbac0) ) \ - + ROM_LOAD( "ttcsnd.bin", 0x0000, 0x080000, CRC(a191218e) SHA1(d89c33538d1f1804b2f5acac713e760d089fbac0) ) ROM_START( m1ttcash ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_LOAD("ttc2-01.bin", 0x0000, 0x010000, CRC(fa3a1d75) SHA1(055aac3bd82892e30efb6f0a359f53045f8d226e) ) m1_ttcash_sound ROM_END_M1A_MCU GAME( 199?, m1ttcash ,0 ,maygay_m1,maygay_m1, maygay1b_state,m1, ROT0, "Empire", "Tick Tock Cash (Empire) (M1A/B)",GAME_FLAGS ) /******************************************************************************************************************************************************************************************************* diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c index b7fc5d0bb79..129ba8d8e94 100644 --- a/src/mame/drivers/maygayep.c +++ b/src/mame/drivers/maygayep.c @@ -102,7 +102,6 @@ DRIVER_INIT_MEMBER(maygayep_state,maygayep) static void irqhandler(device_t *device, int state) { - } static const ymz280b_interface ymz280b_config = @@ -124,16 +123,14 @@ MACHINE_CONFIG_END #define MISSING_SOUND \ ROM_REGION( 0x100000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD16_BYTE( "sound_roms", 0x000000, 0x080000, NO_DUMP ) \ - + ROM_LOAD16_BYTE( "sound_roms", 0x000000, 0x080000, NO_DUMP ) /* Only a handful of games have dumped sound roms! */ #define EP_SIMP_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "simpsnd0", 0x000000, 0x080000, CRC(d58d16cc) SHA1(75eb2ab106855156831399a08eed66295c0c288f) ) \ - ROM_LOAD( "simpsnd1", 0x080000, 0x080000, CRC(26d12470) SHA1(4ea92b9d80c73d784534185313a6d5534cb6f3b2) ) \ - + ROM_LOAD( "simpsnd1", 0x080000, 0x080000, CRC(26d12470) SHA1(4ea92b9d80c73d784534185313a6d5534cb6f3b2) ) ROM_START( ep_simp ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -232,8 +229,7 @@ ROM_END #define EP_DBLIM_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "doubleimpact_snd0.bin", 0x000000, 0x080000, CRC(d83b2a30) SHA1(1bf94b246941dfd3b8c84249085e6f93072da432) ) \ - ROM_LOAD( "doubleimpact_snd1.bin", 0x080000, 0x080000, CRC(3f4bb32a) SHA1(af2f8e7f341dec0ffaae4c3b2efca847cddd8a11) ) \ - + ROM_LOAD( "doubleimpact_snd1.bin", 0x080000, 0x080000, CRC(3f4bb32a) SHA1(af2f8e7f341dec0ffaae4c3b2efca847cddd8a11) ) ROM_START( ep_dblim ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "i99ndi10.g0", 0x000000, 0x020000, CRC(caee435c) SHA1(3dc8e1c0cf2f8b7f177fd785260d0d14fa835743) ) @@ -273,8 +269,7 @@ ROM_END #define EP_ITJB3_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "italianjobsound0.bin", 0x000000, 0x080000, CRC(680f5932) SHA1(08d212625c16ff63f57a8c0165f1b9a158513879) ) \ - ROM_LOAD( "italianjobsound1.bin", 0x080000, 0x080000, CRC(595514ab) SHA1(9586fb22dd748bafa10553090f48b42b750c7e97) ) \ - + ROM_LOAD( "italianjobsound1.bin", 0x080000, 0x080000, CRC(595514ab) SHA1(9586fb22dd748bafa10553090f48b42b750c7e97) ) ROM_START( ep_itjb3 ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "italianjobgame0.bin", 0x000000, 0x020000, CRC(ceaefd73) SHA1(b4f756212773c88b0c09364c1981773e6a4c5527) ) @@ -296,8 +291,7 @@ ROM_END #define EP_MERLN_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "merlsnd0.bin", 0x000000, 0x080000, CRC(f0841966) SHA1(d67446723735a780675590ca05a19de58da1f6f2) ) \ - ROM_LOAD( "merlsnd1.bin", 0x080000, 0x080000, CRC(e7de17a6) SHA1(586d9843b4c235027f6f9a40f1155248ffc54ea9) ) \ - + ROM_LOAD( "merlsnd1.bin", 0x080000, 0x080000, CRC(e7de17a6) SHA1(586d9843b4c235027f6f9a40f1155248ffc54ea9) ) ROM_START( ep_merln ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "merlg0.bin", 0x000000, 0x020000, CRC(1d64717f) SHA1(a259228d31968381da09786b3b2a9fabfb384b08) ) @@ -311,8 +305,7 @@ ROM_END #define EP_WIPEO_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "wipeoutsnd0.bin", 0x000000, 0x080000, CRC(c8d75e9d) SHA1(fff911ad015f09cac5b92033a01de3775f47d87d) ) \ - ROM_LOAD( "wipeoutsnd1.bin", 0x080000, 0x080000, CRC(8e2332db) SHA1(c363bc254eb59f5fdee623bad49439a4cb19c746) ) \ - + ROM_LOAD( "wipeoutsnd1.bin", 0x080000, 0x080000, CRC(8e2332db) SHA1(c363bc254eb59f5fdee623bad49439a4cb19c746) ) ROM_START( ep_wipeo ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "i00nwo18.g0", 0x000000, 0x020000, CRC(12c623e5) SHA1(3473adea1b4e93f1d848a8af996a7e18b3c0ee21) ) @@ -358,8 +351,7 @@ ROM_END #define EP_FUNNY_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "funnymoneysound0.bin", 0x000000, 0x080000, CRC(81354590) SHA1(f11e46ed0dadf98ffc2476ee993708cc15ffc7bd) ) \ - ROM_LOAD( "funnymoneysound1.bin", 0x080000, 0x080000, CRC(65b728e1) SHA1(aa5b8b20d33ffd834e58fa872e27594846a7567b) ) \ - + ROM_LOAD( "funnymoneysound1.bin", 0x080000, 0x080000, CRC(65b728e1) SHA1(aa5b8b20d33ffd834e58fa872e27594846a7567b) ) ROM_START( ep_funny ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -428,8 +420,7 @@ ROM_END #define EP_BATHL_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "hellsnd.p0", 0x000000, 0x080000, CRC(c143174d) SHA1(7b86281a653d85e0020245e05db2489489c7fe55) ) \ - ROM_LOAD( "hellsnd.p1", 0x080000, 0x080000, CRC(44af956b) SHA1(49ed8fde3aec64304090be795eaae09a78b3619d) ) \ - + ROM_LOAD( "hellsnd.p1", 0x080000, 0x080000, CRC(44af956b) SHA1(49ed8fde3aec64304090be795eaae09a78b3619d) ) ROM_START( ep_bathl ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -516,14 +507,12 @@ ROM_END #define EP_BEAVR_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "bblvsnd.p0", 0x000000, 0x100000, CRC(eeb9d956) SHA1(37961d32fe48d2815049ed12e10b61c533f5c610) ) \ - + ROM_LOAD( "bblvsnd.p0", 0x000000, 0x100000, CRC(eeb9d956) SHA1(37961d32fe48d2815049ed12e10b61c533f5c610) ) // are these the same? check.. #define EP_BEAV3_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "blvesnd.p0", 0x000000, 0x080000, CRC(d7f5ad5a) SHA1(a73257a18ae3361b87fb62bf5dd9ceeb8c9ef8c3) ) \ - ROM_LOAD( "blvesnd.p1", 0x080000, 0x080000, CRC(bb892e3e) SHA1(536cc315e6b2d2f716becb938ef3533ffceaae4d) ) \ - + ROM_LOAD( "blvesnd.p1", 0x080000, 0x080000, CRC(bb892e3e) SHA1(536cc315e6b2d2f716becb938ef3533ffceaae4d) ) ROM_START( ep_beavr ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -682,8 +671,7 @@ ROM_END #define EP_BVRUC_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "bvunsnd.p0", 0x000000, 0x080000, CRC(422ddcd3) SHA1(fc0f5b19e32a47ab04bc76f23c2839a823dc6836) ) \ - ROM_LOAD( "bvunsnd.p1", 0x080000, 0x080000, CRC(beb1de17) SHA1(084ff32a0b7a061f61d4dcc6d7cffe3d0af588ef) ) \ - + ROM_LOAD( "bvunsnd.p1", 0x080000, 0x080000, CRC(beb1de17) SHA1(084ff32a0b7a061f61d4dcc6d7cffe3d0af588ef) ) ROM_START( ep_bvruc ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -727,8 +715,7 @@ ROM_END #define EP_BJCLB_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "bkjksnd.p0", 0x000000, 0x0ab42c, BAD_DUMP CRC(8f574d3f) SHA1(3ce26f0bd7e88baddcf80abeebf190eb2a5f8333) ) \ - + ROM_LOAD( "bkjksnd.p0", 0x000000, 0x0ab42c, BAD_DUMP CRC(8f574d3f) SHA1(3ce26f0bd7e88baddcf80abeebf190eb2a5f8333) ) ROM_START( ep_bjclb ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -741,8 +728,7 @@ ROM_END #define EP_CBRUN_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "cannsnd.p0", 0x000000, 0x080000, CRC(435cc88e) SHA1(d1d4818ecc82580ee5d2c478afa595c38ebe3a18) ) \ - ROM_LOAD( "cannsnd.p1", 0x080000, 0x080000, CRC(86623111) SHA1(8515d5bb51266c472c4e87408bf112bec55015f7) ) \ - + ROM_LOAD( "cannsnd.p1", 0x080000, 0x080000, CRC(86623111) SHA1(8515d5bb51266c472c4e87408bf112bec55015f7) ) ROM_START( ep_cbrun ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "cann2-2n.p0", 0x000000, 0x020000, CRC(7a896390) SHA1(18e70e8687bc0fc40d913619887a9f8baf233c61) ) @@ -801,8 +787,7 @@ ROM_END #define EP_CBRCL_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "ccansnd.p0", 0x000000, 0x100000, CRC(d0dc482a) SHA1(8ca7fdcf0fcd5d451c6d68269b1fef681095be20) ) \ - ROM_LOAD( "ccansnd.p1", 0x100000, 0x100000, CRC(9cf088a5) SHA1(94bef848066050b0f04556f59cc859cb646dafc5) ) \ - + ROM_LOAD( "ccansnd.p1", 0x100000, 0x100000, CRC(9cf088a5) SHA1(94bef848066050b0f04556f59cc859cb646dafc5) ) ROM_START( ep_cbrcl ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -892,8 +877,7 @@ ROM_END #define EP_CCLAS_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "casisnd.p0", 0x000000, 0x100000, CRC(7050e393) SHA1(363e939675d47fa234a6ec29be9032dba3cc25dc) ) \ - + ROM_LOAD( "casisnd.p0", 0x000000, 0x100000, CRC(7050e393) SHA1(363e939675d47fa234a6ec29be9032dba3cc25dc) ) ROM_START( ep_cclas ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "casi1-5n.p0", 0x000000, 0x020000, CRC(b834ddca) SHA1(4547414d0de2fd4445a08b9787b8ebe96b6b6d10) ) @@ -910,8 +894,7 @@ ROM_END #define EP_CGRED_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "cgresnd.p0", 0x000000, 0x100000, CRC(25e60f16) SHA1(06cbdd97faedcc6c9a14e02d49787ee94d7a1bb9) ) \ - + ROM_LOAD( "cgresnd.p0", 0x000000, 0x100000, CRC(25e60f16) SHA1(06cbdd97faedcc6c9a14e02d49787ee94d7a1bb9) ) ROM_START( ep_cgred ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -932,8 +915,7 @@ ROM_END #define EP_CSTRK_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "clcssnd.p0", 0x000000, 0x100000, CRC(93baa48d) SHA1(95098b5be5f354811fd2f6c460fd8b3f8849f868) ) \ - ROM_LOAD( "clcssnd.p1", 0x100000, 0x100000, CRC(33208356) SHA1(189333ad3d9180dd3785fb6ce72d808d0b0ed083) ) \ - + ROM_LOAD( "clcssnd.p1", 0x100000, 0x100000, CRC(33208356) SHA1(189333ad3d9180dd3785fb6ce72d808d0b0ed083) ) ROM_START( ep_cstrk ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "clcs1-0n.p0", 0x000000, 0x020000, CRC(1a7dd627) SHA1(bd1ba7f3448f799bb05fb15e2dca98f843001e3f) ) @@ -993,8 +975,7 @@ ROM_END #define EP_DDQCL_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "cddqsnd.p0", 0x000000, 0x100000, CRC(bc5eec74) SHA1(29b7676a263c043428f3028759c6609468162bee) ) \ - + ROM_LOAD( "cddqsnd.p0", 0x000000, 0x100000, CRC(bc5eec74) SHA1(29b7676a263c043428f3028759c6609468162bee) ) ROM_START( ep_ddqcl ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "cddq1-0n.p0", 0x000000, 0x020000, CRC(2371b69e) SHA1(9594b92dd13881b92ec91778531812eb6b450119) ) @@ -1059,8 +1040,7 @@ ROM_END ROM_LOAD( "gridrunnersound0.bin", 0x000000, 0x080000, CRC(dc8f0bbb) SHA1(a375eff2fa5d109491479e050c5267ae73f63ebc) ) \ ROM_LOAD( "gridrunnersound1.bin", 0x080000, 0x080000, CRC(d965860b) SHA1(ceaabf092777c50035baf13545a0280047d530ae) ) \ /* this is verified EPOCH, but has no partner */ \ - ROM_LOAD( "grid run.s0", 0x0000, 0x080000, CRC(9c8938ef) SHA1(f6bc299097c64984cb8356d62bf935582b86d6bc) ) \ - + ROM_LOAD( "grid run.s0", 0x0000, 0x080000, CRC(9c8938ef) SHA1(f6bc299097c64984cb8356d62bf935582b86d6bc) ) ROM_START( ep_grun ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "grid031n.p0", 0x000000, 0x020000, CRC(02eae1b1) SHA1(68311fc3237da30cf96b42ae0cf16342ecf9cb45) ) @@ -1082,8 +1062,7 @@ ROM_END #define EP_HEYBG_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "heybsnd.p0", 0x000000, 0x100000, CRC(b81e94b2) SHA1(2fc0d84096ce00bd7ff5fd5518ab53f8cd94f8b0) ) \ - + ROM_LOAD( "heybsnd.p0", 0x000000, 0x100000, CRC(b81e94b2) SHA1(2fc0d84096ce00bd7ff5fd5518ab53f8cd94f8b0) ) ROM_START( ep_heybg ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1116,8 +1095,7 @@ ROM_END #define EP_SPIRT_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "hispsnd.p1", 0x000000, 0x080000, CRC(3d4b265b) SHA1(6a5ca56395c4c57b302aa6f0a066ceb54deedacc) ) \ - ROM_LOAD( "hispsnd.p2", 0x080000, 0x080000, CRC(57a60f8d) SHA1(4de7fbf14da9ca214af96307dccfae719571eab8) ) \ - + ROM_LOAD( "hispsnd.p2", 0x080000, 0x080000, CRC(57a60f8d) SHA1(4de7fbf14da9ca214af96307dccfae719571eab8) ) ROM_START( ep_spirt ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1150,8 +1128,7 @@ ROM_END #define EP_MONRT_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "monrsnd.p0", 0x000000, 0x100000, CRC(01532b1e) SHA1(233973c57e314ef04a3910a7c8c9eafeb288363c) ) \ - ROM_LOAD( "monrsnd.p1", 0x100000, 0x100000, CRC(3cb3021d) SHA1(aa5858fc2c7030bcf37240a074739014d0e8caca) ) \ - + ROM_LOAD( "monrsnd.p1", 0x100000, 0x100000, CRC(3cb3021d) SHA1(aa5858fc2c7030bcf37240a074739014d0e8caca) ) ROM_START( ep_monrt ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1206,8 +1183,7 @@ ROM_END #define EP_PKNI_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "phoesnd.p0", 0x000000, 0x080000, CRC(4128577f) SHA1(016098257aec8e7b4e9c535479303aef4896b03c) ) \ - ROM_LOAD( "phoesnd.p1", 0x080000, 0x080000, CRC(62b78d0d) SHA1(92284b04257ff498ff10c4b026e33b06214c9bb8) ) \ - + ROM_LOAD( "phoesnd.p1", 0x080000, 0x080000, CRC(62b78d0d) SHA1(92284b04257ff498ff10c4b026e33b06214c9bb8) ) ROM_START( ep_pkni ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1275,8 +1251,7 @@ ROM_END #define EP_SNBEV_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "snbvsnd.p0", 0x000000, 0x100000, CRC(18e21765) SHA1(dd50499c779dde72964117178e004093777a6edf) ) \ - ROM_LOAD( "snbvsnd.p1", 0x100000, 0x100000, CRC(73d65f34) SHA1(13d11a60eb579d1a99d28ba42915fdc45b0c1681) ) \ - + ROM_LOAD( "snbvsnd.p1", 0x100000, 0x100000, CRC(73d65f34) SHA1(13d11a60eb579d1a99d28ba42915fdc45b0c1681) ) ROM_START( ep_snbev ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "snbv1-8n.p0", 0x000000, 0x020000, CRC(f018f20a) SHA1(d9e28fa94ed08c06de65018bbe7169233a5fad91) ) @@ -1338,8 +1313,7 @@ ROM_END #define EP_SPOOK_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "spkysnd.p0", 0x000000, 0x080000, CRC(005a1383) SHA1(92d3400a89906c990ba2ab46a70ed1e3453e50fc) ) \ - ROM_LOAD( "spkysnd.p1", 0x080000, 0x080000, CRC(6258dceb) SHA1(e7b00318ff57affe8ac54cca54d1e095ab8cd40e) ) \ - + ROM_LOAD( "spkysnd.p1", 0x080000, 0x080000, CRC(6258dceb) SHA1(e7b00318ff57affe8ac54cca54d1e095ab8cd40e) ) ROM_START( ep_spook ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1374,8 +1348,7 @@ ROM_END /* these sound roms might not belong to this as there was another HW game in here */ \ ROM_LOAD( "spotteddisksnd.bin", 0x000000, 0x100000, CRC(f2c66aab) SHA1(6fe94a193779c91711588365591cf42d197cb7b9) ) \ ROM_LOAD( "sdclsnd.p1", 0x000001, 0x100000, CRC(487ed1e5) SHA1(3f9b0a4d0655906a8863765c26099c8871f1f8cf) ) \ - ROM_LOAD( "sdclsnd.p2", 0x100000, 0x100000, CRC(91f0a42a) SHA1(d0953f89f44267be216495586c5e5d2cbbf1e349) ) \ - + ROM_LOAD( "sdclsnd.p2", 0x100000, 0x100000, CRC(91f0a42a) SHA1(d0953f89f44267be216495586c5e5d2cbbf1e349) ) ROM_START( ep_sdclb ) @@ -1397,8 +1370,7 @@ ROM_END #define EP_STMCL_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "clsfsnd.p0", 0x000000, 0x100000, CRC(09860f64) SHA1(0c32828b912bc1a94bd8ab2dc77604803835fc40) ) \ - ROM_LOAD( "clsfsnd.p1", 0x100000, 0x100000, CRC(eb751795) SHA1(db28fd0c00b08cad6db0c7d6d1768705610de119) ) \ - + ROM_LOAD( "clsfsnd.p1", 0x100000, 0x100000, CRC(eb751795) SHA1(db28fd0c00b08cad6db0c7d6d1768705610de119) ) ROM_START( ep_stmcl ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1416,8 +1388,7 @@ ROM_END #define EP_UTNUT_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "anutsnd0.p0", 0x000000, 0x100000, CRC(bb9b9a9e) SHA1(f6aee7e059fab9698e763a4c42b6b30cda2d6e77) ) \ - + ROM_LOAD( "anutsnd0.p0", 0x000000, 0x100000, CRC(bb9b9a9e) SHA1(f6aee7e059fab9698e763a4c42b6b30cda2d6e77) ) ROM_START( ep_utnut ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "anut1-2n.p0", 0x000000, 0x020000, CRC(26d767a9) SHA1(a919d8b7f4733d21e1456f9ba21d3a55fef5bad1) ) @@ -1453,8 +1424,7 @@ ROM_END ROM_LOAD( "haresnd.p1", 0x080000, 0x080000, CRC(38ddf39f) SHA1(eec475b3329dc0f82a19a8f4134249d0803e7bc1) ) \ ROM_REGION( 0x100000, "altymz", 0 ) \ ROM_LOAD( "sound.0", 0x000000, 0x080000, CRC(093220bb) SHA1(064bf28aa031222f85c3c74a2693ad06df231a1c) ) \ - ROM_LOAD( "sound.1", 0x080000, 0x080000, CRC(2eb13cda) SHA1(9343fe11a43e5d0213533cb81ad4a3c3d5476b85) ) \ - + ROM_LOAD( "sound.1", 0x080000, 0x080000, CRC(2eb13cda) SHA1(9343fe11a43e5d0213533cb81ad4a3c3d5476b85) ) ROM_START( ep_milhr ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1533,8 +1503,7 @@ ROM_END #define EP_MLHRC_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "cmlhsnd.p0", 0x000000, 0x100000, CRC(e6e60e63) SHA1(dba38ff4e1d0ed803083cce42c858a2110945a4e) ) \ - + ROM_LOAD( "cmlhsnd.p0", 0x000000, 0x100000, CRC(e6e60e63) SHA1(dba38ff4e1d0ed803083cce42c858a2110945a4e) ) ROM_START( ep_mlhrc ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "cmlh1-0n.p0", 0x000000, 0x020000, CRC(857b0ca9) SHA1(904190c2de27f69d29d6e472e78a422980f838d0) ) @@ -1636,8 +1605,7 @@ ROM_END #define EP_CFALL_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "cash falls sound 0 sy980007.bin", 0x000000, 0x080000, CRC(7dbe0b80) SHA1(d2454d923b8a479e14513f2201b9725f3b92ef4d) ) \ - ROM_LOAD( "cash falls sound 1 sy980007.bin", 0x080000, 0x080000, CRC(ff7f4c42) SHA1(491d38bdd73bcb9725bfb90942560379f6c8ee40) ) \ - + ROM_LOAD( "cash falls sound 1 sy980007.bin", 0x080000, 0x080000, CRC(ff7f4c42) SHA1(491d38bdd73bcb9725bfb90942560379f6c8ee40) ) ROM_START( ep_cfall ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1783,8 +1751,7 @@ ROM_END #define EP_NYNY_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "nyny.s0", 0x000000, 0x080000, CRC(ded53db1) SHA1(d1085d7ead67b2d125c74deccb1b9f154351c3ac) ) \ - ROM_LOAD( "nyny.s1", 0x080000, 0x080000, CRC(8a03bcb2) SHA1(0cb633fa9044be11ad2f60ab53225114d144df3d) ) \ - + ROM_LOAD( "nyny.s1", 0x080000, 0x080000, CRC(8a03bcb2) SHA1(0cb633fa9044be11ad2f60ab53225114d144df3d) ) ROM_START( ep_nyny ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -1915,8 +1882,7 @@ ROM_END #define EP_MARIO_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) /* contains 'Super Mario' string */ \ ROM_LOAD( "sm64snd0", 0x000000, 0x080000, CRC(1e5c350d) SHA1(1f7e0ba84b122882b82ae4edd78628cfcae92977) ) \ - ROM_LOAD( "sm64snd1", 0x080000, 0x080000, CRC(5ed95303) SHA1(b58e557b56c7b943e19b9bf1229de85c3ca99fe8) ) \ - + ROM_LOAD( "sm64snd1", 0x080000, 0x080000, CRC(5ed95303) SHA1(b58e557b56c7b943e19b9bf1229de85c3ca99fe8) ) ROM_START( ep_mario ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -2146,8 +2112,7 @@ ROM_END #define EP_25CRT_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) /* not 100% these are right, '25.s0' isn't exactly a telling name */ \ ROM_LOAD( "25.s0", 0x000000, 0x080000, CRC(fb4dd880) SHA1(4ccb92b4f14f49fef45d804671c429355cf75dcf) ) \ - ROM_LOAD( "25.s1", 0x080000, 0x080000, CRC(ba09b8c7) SHA1(91141f06425e4ac7fed371768062d171e300e8f1) ) \ - + ROM_LOAD( "25.s1", 0x080000, 0x080000, CRC(ba09b8c7) SHA1(91141f06425e4ac7fed371768062d171e300e8f1) ) ROM_START( ep_25crt ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -2404,8 +2369,7 @@ ROM_END #define EP_CCOCK_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "c_cockt.s0", 0x000000, 0x080000, CRC(ad3d60e4) SHA1(ac45ae46517e92fc41ebd249bd6a5a5a29c7bb38) ) \ - ROM_LOAD( "c_cockt.s1", 0x080000, 0x080000, CRC(25758aa4) SHA1(7a8ee383da39b2443affb807ff60a8a960042cef) ) \ - + ROM_LOAD( "c_cockt.s1", 0x080000, 0x080000, CRC(25758aa4) SHA1(7a8ee383da39b2443affb807ff60a8a960042cef) ) ROM_START( ep_ccock ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "msa01056.g0", 0x000000, 0x020000, CRC(8a7ccb9d) SHA1(a9dc43dd6427e3dda0f8c19c7b1eb5a09d80dc89) ) @@ -2754,8 +2718,7 @@ ROM_END #define EP_DUFF_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "duff.s0", 0x000000, 0x080000, CRC(639b6528) SHA1(2ff6b84531f3a2a18e5c846b7a2b14102faf8864) ) \ - ROM_LOAD( "duff.s1", 0x080000, 0x080000, CRC(5c18f8cb) SHA1(c850c386b0b00ba982bd473a2ba4d464bbfd57d0) ) \ - + ROM_LOAD( "duff.s1", 0x080000, 0x080000, CRC(5c18f8cb) SHA1(c850c386b0b00ba982bd473a2ba4d464bbfd57d0) ) ROM_START( ep_duff ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -2793,8 +2756,7 @@ ROM_END #define EP_FLASH_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "fl_back.s0", 0x0000, 0x080000, CRC(acaa4b38) SHA1(6960e29181f67ca77fee9f6bce84dfa6bea4bdf7) ) \ - ROM_LOAD( "fl_back.s1", 0x0000, 0x080000, CRC(4ff8b006) SHA1(bfe7b83b1bcc81f5980263db26e0c3dd8074518b) ) \ - + ROM_LOAD( "fl_back.s1", 0x0000, 0x080000, CRC(4ff8b006) SHA1(bfe7b83b1bcc81f5980263db26e0c3dd8074518b) ) ROM_START( ep_flash ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -2854,8 +2816,7 @@ ROM_END #define EP_FORTG_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "f_n_g.s0", 0x000000, 0x080000, CRC(e257502d) SHA1(5be9ea39299582c0c68feeb9537d887c7562b293) ) \ - ROM_LOAD( "f_n_g.s1", 0x080000, 0x080000, CRC(87e2f4bd) SHA1(b515b294384dbfa24bf3d7a561a572aa9c041831) ) \ - + ROM_LOAD( "f_n_g.s1", 0x080000, 0x080000, CRC(87e2f4bd) SHA1(b515b294384dbfa24bf3d7a561a572aa9c041831) ) ROM_START( ep_fortg ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "f_n_gl.g0", 0x000000, 0x020000, CRC(ea112032) SHA1(2e06447058f5d697fc4263348106342faf9c41ab) ) @@ -3163,8 +3124,7 @@ ROM_END #define EP_HHCLB_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) /* guess based on name */ \ ROM_LOAD( "h_house.s0", 0x000000, 0x080000, CRC(387fb6bb) SHA1(e532a74792792c17347560cdc5aa890223b99abc) ) \ - ROM_LOAD( "h_house.s1", 0x080000, 0x080000, CRC(a8df24cb) SHA1(b57590c128ce7cc40050ed1149741ca2c16e656b) ) \ - + ROM_LOAD( "h_house.s1", 0x080000, 0x080000, CRC(a8df24cb) SHA1(b57590c128ce7cc40050ed1149741ca2c16e656b) ) ROM_START( ep_hhclb ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -3306,8 +3266,7 @@ ROM_END #define EP_HOMER_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "homer.sn0", 0x000000, 0x080000, CRC(f276596d) SHA1(675679271da7dc71f0e93a8ce519c1a6214a467b) ) \ - ROM_LOAD( "homer.sn1", 0x080000, 0x080000, CRC(1820f976) SHA1(32c1af52906dd40494a002a66eb314bec74b3361) ) \ - + ROM_LOAD( "homer.sn1", 0x080000, 0x080000, CRC(1820f976) SHA1(32c1af52906dd40494a002a66eb314bec74b3361) ) ROM_START( ep_homer ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "sa000070.g0", 0x000000, 0x020000, CRC(cd838170) SHA1(2dcb8729dafa69c4afe335cc48822341bd58fc4f) ) @@ -3425,8 +3384,7 @@ ROM_END ROM_LOAD( "huricane.sn0", 0x000000, 0x080000, CRC(b34b4667) SHA1(8b0b7b3668506de8433aa662556118a8b0e203d6) ) \ ROM_LOAD( "huricane.sn1", 0x080000, 0x080000, CRC(324e255d) SHA1(6a30a512f19774b99bdbc14026a3b1cbfb65fe6d) ) \ ROM_LOAD( "hurrican.s0", 0x000000, 0x080000, CRC(a50f8fa5) SHA1(bde27c5b536cdc97384adb3c2eb842d1c31eddde) ) \ - ROM_LOAD( "hurrican.s1", 0x080000, 0x080000, CRC(22412ebf) SHA1(36fa6da835f2a1f005d08b8e1c6bde9b0fb3ef6b) ) \ - + ROM_LOAD( "hurrican.s1", 0x080000, 0x080000, CRC(22412ebf) SHA1(36fa6da835f2a1f005d08b8e1c6bde9b0fb3ef6b) ) ROM_START( ep_huric ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -3695,8 +3653,7 @@ ROM_END #define EP_IJOB_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "it_job.s1", 0x000000, 0x080000, CRC(77ea2225) SHA1(fb02bccf4555797b60871070821afe2162be26c2) ) \ - ROM_LOAD( "it_job.s2", 0x080000, 0x080000, CRC(b6f86703) SHA1(f09f9d88132919ca24fc1ed7094b5b22c1136eb8) ) \ - + ROM_LOAD( "it_job.s2", 0x080000, 0x080000, CRC(b6f86703) SHA1(f09f9d88132919ca24fc1ed7094b5b22c1136eb8) ) ROM_START( ep_ijob ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -3913,8 +3870,7 @@ ROM_END #define EP_MKART_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "m_kart.sn0", 0x000000, 0x080000, CRC(cb9f8fe6) SHA1(8e0d10c55ebf225c395094a720b797185df94365) ) \ - ROM_LOAD( "m_kart.sn1", 0x080000, 0x080000, CRC(f725261c) SHA1(1ad0cf2af55e7bf6c5711ffd03b12191f8489942) ) \ - + ROM_LOAD( "m_kart.sn1", 0x080000, 0x080000, CRC(f725261c) SHA1(1ad0cf2af55e7bf6c5711ffd03b12191f8489942) ) ROM_START( ep_mkart ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4006,8 +3962,7 @@ ROM_END #define EP_MWOM_SOUND \ ROM_REGION( 0x080000, "ymz", 0 ) \ - ROM_LOAD( "mortal.snd", 0x0000, 0x080000, CRC(34a24e83) SHA1(df464ffdaf3225beecd9facdb86a87ed501c261e) ) \ - + ROM_LOAD( "mortal.snd", 0x0000, 0x080000, CRC(34a24e83) SHA1(df464ffdaf3225beecd9facdb86a87ed501c261e) ) ROM_START( ep_mwom ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4123,8 +4078,7 @@ ROM_END #define EP_NUNS_SOUND \ ROM_REGION( 0x080000, "ymz", 0 ) \ - ROM_LOAD( "nuns s0", 0x0000, 0x080000, CRC(158dadca) SHA1(e65dd64517f5e9ccf93a993ee22ab1b96d0a2a22) ) \ - + ROM_LOAD( "nuns s0", 0x0000, 0x080000, CRC(158dadca) SHA1(e65dd64517f5e9ccf93a993ee22ab1b96d0a2a22) ) ROM_START( ep_nuns ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4306,8 +4260,7 @@ ROM_END #define EP_PHARO_HDD \ DISK_REGION( "ide" ) \ - DISK_IMAGE( "ep_pharo", 0, SHA1(daf56705178bb2b6f3547418a98c361478702aed) ) \ - + DISK_IMAGE( "ep_pharo", 0, SHA1(daf56705178bb2b6f3547418a98c361478702aed) ) ROM_START( ep_pharo ) @@ -4335,8 +4288,7 @@ ROM_END ROM_REGION( 0x100000, "ymz", 0 ) \ /* guess based on filenames */ \ ROM_LOAD( "p pesos.s0", 0x0000, 0x080000, CRC(970b2947) SHA1(14b0cc21a2fdb019143332869a656c4a4e3fb4a8) ) \ - ROM_LOAD( "p pesos.s1", 0x0000, 0x080000, CRC(d98d0a73) SHA1(db6fcf7d4f1e12d9484c308613660d6da9e423f6) ) \ - + ROM_LOAD( "p pesos.s1", 0x0000, 0x080000, CRC(d98d0a73) SHA1(db6fcf7d4f1e12d9484c308613660d6da9e423f6) ) ROM_START( ep_pesos ) @@ -4556,8 +4508,7 @@ ROM_END ROM_REGION( 0x100000, "ymz", 0 ) \ /* guess based on filename */ \ ROM_LOAD( "royal r.s0", 0x000000, 0x080000, CRC(a1060eac) SHA1(47b0383e4c0eb714eaba55014fbc5597233a5d53) ) \ - ROM_LOAD( "royal r.s1", 0x080000, 0x080000, CRC(c0caaeb8) SHA1(79efa22844137a0326b5887df186a3220cd2577b) ) \ - + ROM_LOAD( "royal r.s1", 0x080000, 0x080000, CRC(c0caaeb8) SHA1(79efa22844137a0326b5887df186a3220cd2577b) ) ROM_START( ep_royrl ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4657,8 +4608,7 @@ ROM_END #define EP_SECAG_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "s_agent.s0", 0x000000, 0x080000, CRC(58a509db) SHA1(339a69eab79c4e7886a18b92392a25ba2ccb7c9a) ) \ - ROM_LOAD( "s_agent.s1", 0x080000, 0x080000, CRC(8e0117f8) SHA1(e7d1c64d995a7f7e2d4e2ed0bccb303fe5bb267e) ) \ - + ROM_LOAD( "s_agent.s1", 0x080000, 0x080000, CRC(8e0117f8) SHA1(e7d1c64d995a7f7e2d4e2ed0bccb303fe5bb267e) ) ROM_START( ep_secag ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4705,8 +4655,7 @@ ROM_END #define EP_SRWIN_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "s_winlot.s0", 0x000000, 0x080000, CRC(33ec2d5a) SHA1(57309e9053a685f54ebd8051c01862e9bd5cd72d) ) \ - ROM_LOAD( "s_winlot.s1", 0x080000, 0x080000, CRC(f0d3078e) SHA1(e89ccb9fa1d4e85a35497f677572a3723300fd79) ) \ - + ROM_LOAD( "s_winlot.s1", 0x080000, 0x080000, CRC(f0d3078e) SHA1(e89ccb9fa1d4e85a35497f677572a3723300fd79) ) ROM_START( ep_srwin ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -4967,8 +4916,7 @@ ROM_END #define EP_SPIN_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "spinonit.sn0", 0x000000, 0x080000, CRC(ad92e501) SHA1(adea1d2751c0fbf4637d5eb2b1003995c829413d) ) \ - ROM_LOAD( "spinonit.sn1", 0x080000, 0x080000, CRC(e052ff0c) SHA1(afa2b2f4d51c95352d6fd1d69af87fef07c2f039) ) \ - + ROM_LOAD( "spinonit.sn1", 0x080000, 0x080000, CRC(e052ff0c) SHA1(afa2b2f4d51c95352d6fd1d69af87fef07c2f039) ) ROM_START( ep_spin ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -5058,8 +5006,7 @@ ROM_END #define EP_SUBB_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "subbuteo.s0", 0x000000, 0x080000, CRC(3140ed84) SHA1(418fd6a1fd06c59f524f03116f0d284ebf481f58) ) \ - ROM_LOAD( "subbuteo.s1", 0x080000, 0x080000, CRC(e87da3e7) SHA1(9443b8304ad75612186a97f0dafcdd698bf43c04) ) \ - + ROM_LOAD( "subbuteo.s1", 0x080000, 0x080000, CRC(e87da3e7) SHA1(9443b8304ad75612186a97f0dafcdd698bf43c04) ) ROM_START( ep_subb ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -5469,8 +5416,7 @@ ROM_END #define EP_XSPOT_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) \ ROM_LOAD( "x_marks.s0", 0x000000, 0x080000, CRC(2e6f4524) SHA1(8f3e0cf3bbdbb32c13b6bcaadee86ddb081e7e81) ) \ - ROM_LOAD( "x_marks.s1", 0x080000, 0x080000, CRC(5f0315d4) SHA1(d6ef3060f382fbc8012635196497b764ce635181) ) \ - + ROM_LOAD( "x_marks.s1", 0x080000, 0x080000, CRC(5f0315d4) SHA1(d6ef3060f382fbc8012635196497b764ce635181) ) ROM_START( ep_xspot ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "msa02195.g0", 0x000000, 0x020000, CRC(18cb2ae4) SHA1(610e7c6820c4b6ed45a50080e9c8624e653cd950) ) @@ -5723,8 +5669,7 @@ ROM_END #define EP_DMBUS_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "d bus.s0", 0x000000, 0x080000, CRC(dcf93e70) SHA1(c005daa041bcc2bb8c4aa422593599a530390b28) ) \ - ROM_LOAD( "d bus.s1", 0x080000, 0x080000, CRC(d6ebc176) SHA1(c554358839463d706f93e4eee4462d91a3961a59) ) \ - + ROM_LOAD( "d bus.s1", 0x080000, 0x080000, CRC(d6ebc176) SHA1(c554358839463d706f93e4eee4462d91a3961a59) ) ROM_START( ep_dmbus ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -5906,8 +5851,7 @@ ROM_END #define EP_FULLM_SOUND \ ROM_REGION( 0x100000, "ymz", 0 ) /* guess based on name */ \ ROM_LOAD( "fmoon.s0", 0x000000, 0x080000, CRC(e8b06465) SHA1(269c2f271f5338dea6aed0be7ef49ba2ae2025c3) ) \ - ROM_LOAD( "fmoon.s1", 0x080000, 0x080000, CRC(4781c1bd) SHA1(a9f66ad2b111c75edf29d4ea65c546a969504bb6) ) \ - + ROM_LOAD( "fmoon.s1", 0x080000, 0x080000, CRC(4781c1bd) SHA1(a9f66ad2b111c75edf29d4ea65c546a969504bb6) ) ROM_START( ep_fullm ) ROM_REGION( 0x080000, "maincpu", 0 ) @@ -6961,8 +6905,7 @@ ROM_END #define EP_LUG_SOUND \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "udrgnd.sn0", 0x000000, 0x080000, CRC(743e3936) SHA1(89d34a36c0506ee690011951713c8bc1844955cf) ) \ - ROM_LOAD( "udrgnd.s1" , 0x080000, 0x080000, CRC(db9aa3db) SHA1(5688e21db228d0d7d195fd70fb1b32d75d350a54) ) \ - + ROM_LOAD( "udrgnd.s1" , 0x080000, 0x080000, CRC(db9aa3db) SHA1(5688e21db228d0d7d195fd70fb1b32d75d350a54) ) ROM_START( ep_lug ) ROM_REGION( 0x080000, "maincpu", 0 ) ROM_LOAD16_BYTE( "undergr.g0", 0x00000, 0x020000, CRC(ad34ecc5) SHA1(b0122ed340e76b52529ec12b237e93773674d314) ) diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 51fa61a4f35..a7c3d21b568 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -292,7 +292,6 @@ READ16_MEMBER(maygayv1_state::i82716_r) void maygayv1_state::video_start() { - } @@ -1236,14 +1235,12 @@ ROM_END ROM_REGION( 0x10000, "soundcpu", 0 ) \ ROM_LOAD( "reels.bin", 0x00000, 0x10000, NO_DUMP ) \ ROM_REGION( 0x20000, "upd", 0 ) \ - ROM_LOAD( "upd.bin", 0x00000, 0x20000, NO_DUMP ) \ - + ROM_LOAD( "upd.bin", 0x00000, 0x20000, NO_DUMP ) #define MV1_MISSING_ROMSU1U4 \ ROM_LOAD16_BYTE( "u2.bin", 0x80000, 0x20000, NO_DUMP ) \ ROM_LOAD16_BYTE( "u1.bin", 0x80001, 0x20000, NO_DUMP ) \ ROM_LOAD16_BYTE( "u4.bin", 0xc0000, 0x20000, NO_DUMP ) \ - ROM_LOAD16_BYTE( "u3.bin", 0xc0001, 0x20000, NO_DUMP ) \ - + ROM_LOAD16_BYTE( "u3.bin", 0xc0001, 0x20000, NO_DUMP ) ROM_START( mv1bon ) ROM_REGION( 0x100000, "maincpu", 0 ) diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 049f6a1fbf4..2fc1b4fcde5 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -89,7 +89,6 @@ UINT32 mayumi_state::screen_update_mayumi(screen_device &screen, bitmap_ind16 &b INTERRUPT_GEN_MEMBER(mayumi_state::mayumi_interrupt) { - if (m_int_enable) device.execute().set_input_line(0, HOLD_LINE); } @@ -388,7 +387,6 @@ void mayumi_state::machine_start() void mayumi_state::machine_reset() { - m_int_enable = 0; m_input_sel = 0; } diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 1672869bab6..06b36f51fc7 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -186,7 +186,6 @@ void mazerbla_state::palette_init() void mazerbla_state::video_start() { - #if 0 m_planes_enabled[0] = m_planes_enabled[1] = m_planes_enabled[2] = m_planes_enabled[3] = 1; m_dbg_info = 1; @@ -329,7 +328,6 @@ UINT32 mazerbla_state::screen_update_mazerbla(screen_device &screen, bitmap_ind1 WRITE8_MEMBER(mazerbla_state::cfb_backgnd_color_w) { - if (m_bknd_col != data) { int r, g, b, bit0, bit1, bit2; @@ -361,7 +359,6 @@ WRITE8_MEMBER(mazerbla_state::cfb_backgnd_color_w) WRITE8_MEMBER(mazerbla_state::cfb_vbank_w) { - /* only bit 6 connected */ m_vbank = BIT(data, 6); } @@ -510,7 +507,6 @@ READ8_MEMBER(mazerbla_state::vcu_set_gfx_addr_r) // { // if (m_vbank == m_dbg_vbank) { - for (y = 0; y <= m_pix_ysize; y++) { for (x = 0; x <= m_pix_xsize; x++) @@ -766,7 +762,6 @@ READ8_MEMBER(mazerbla_state::vcu_set_clr_addr_r) WRITE8_MEMBER(mazerbla_state::cfb_zpu_int_req_set_w) { - m_zpu_int_vector &= ~2; /* clear D1 on INTA (interrupt acknowledge) */ m_maincpu->set_input_line(0, ASSERT_LINE); /* main cpu interrupt (comes from CFB (generated at the start of INT routine on CFB) - vblank?) */ @@ -774,7 +769,6 @@ WRITE8_MEMBER(mazerbla_state::cfb_zpu_int_req_set_w) READ8_MEMBER(mazerbla_state::cfb_zpu_int_req_clr) { - m_zpu_int_vector |= 2; /* clear the INT line when there are no more interrupt requests */ @@ -786,7 +780,6 @@ READ8_MEMBER(mazerbla_state::cfb_zpu_int_req_clr) READ8_MEMBER(mazerbla_state::ls670_0_r) { - /* set a timer to force synchronization after the read */ machine().scheduler().synchronize(); @@ -809,7 +802,6 @@ WRITE8_MEMBER(mazerbla_state::ls670_0_w) READ8_MEMBER(mazerbla_state::ls670_1_r) { - /* set a timer to force synchronization after the read */ machine().scheduler().synchronize(); @@ -885,7 +877,6 @@ Vertical movement of gun is Strobe 9, Bits 0-7. WRITE8_MEMBER(mazerbla_state::zpu_bcd_decoder_w) { - /* bcd decoder used a input select (a mux) for reads from port 0x62 */ m_bcd_7445 = data & 0xf; } @@ -1436,7 +1427,6 @@ INTERRUPT_GEN_MEMBER(mazerbla_state::sound_interrupt) void mazerbla_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index c034cbd0d2b..37cb586a10a 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -146,7 +146,6 @@ Stephh's notes (based on the games M68000 code and some tests) : WRITE16_MEMBER(mcatadv_state::mcat_soundlatch_w) { - soundlatch_byte_w(space, 0, data); m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 2b5fd3d2057..c095ba528de 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -429,7 +429,6 @@ READ32_MEMBER(mediagx_state::disp_ctrl_r) WRITE32_MEMBER(mediagx_state::disp_ctrl_w) { - // printf("disp_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); COMBINE_DATA(m_disp_ctrl_reg + offset); } @@ -476,13 +475,11 @@ WRITE32_MEMBER(mediagx_state::fdc_w) READ32_MEMBER(mediagx_state::memory_ctrl_r) { - return m_memory_ctrl_reg[offset]; } WRITE32_MEMBER(mediagx_state::memory_ctrl_w) { - // printf("memory_ctrl_w %08X, %08X, %08X\n", data, offset*4, mem_mask); if (offset == 0x20/4) { @@ -519,7 +516,6 @@ WRITE32_MEMBER(mediagx_state::memory_ctrl_w) READ32_MEMBER(mediagx_state::biu_ctrl_r) { - if (offset == 0) { return 0xffffff; @@ -529,7 +525,6 @@ READ32_MEMBER(mediagx_state::biu_ctrl_r) WRITE32_MEMBER(mediagx_state::biu_ctrl_w) { - //mame_printf_debug("biu_ctrl_w %08X, %08X, %08X\n", data, offset, mem_mask); COMBINE_DATA(m_biu_ctrl_reg + offset); @@ -542,7 +537,6 @@ WRITE32_MEMBER(mediagx_state::biu_ctrl_w) #ifdef UNUSED_FUNCTION WRITE32_MEMBER(mediagx_state::bios_ram_w) { - } #endif @@ -744,7 +738,6 @@ static void cx5510_pci_w(device_t *busdevice, device_t *device, int function, in TIMER_DEVICE_CALLBACK_MEMBER(mediagx_state::sound_timer_callback) { - m_ad1847_sample_counter = 0; timer.adjust(attotime::from_msec(10)); @@ -796,7 +789,6 @@ static void ad1847_reg_write(running_machine &machine, int reg, UINT8 data) READ32_MEMBER(mediagx_state::ad1847_r) { - switch (offset) { case 0x14/4: @@ -807,7 +799,6 @@ READ32_MEMBER(mediagx_state::ad1847_r) WRITE32_MEMBER(mediagx_state::ad1847_w) { - if (offset == 0) { if (ACCESSING_BITS_16_31) @@ -863,7 +854,6 @@ READ8_MEMBER(mediagx_state::at_page8_r) WRITE8_MEMBER(mediagx_state::at_page8_w) { - m_at_pages[offset % 0x10] = data; switch(offset % 8) @@ -1065,7 +1055,6 @@ static IRQ_CALLBACK(irq_callback) void mediagx_state::machine_start() { - m_pit8254 = machine().device( "pit8254" ); m_pic8259_1 = machine().device( "pic8259_master" ); m_pic8259_2 = machine().device( "pic8259_slave" ); diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 1c07153b496..18709c84c31 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -76,7 +76,6 @@ static INTERRUPT_GEN (megaplay_bios_irq) } if (sline <= 192) { - // if (sline != 192) segae_drawscanline(sline,1,1); if (sline == 192) @@ -685,8 +684,7 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 0, "ver1", "Megaplay Bios (Ver. 1)" ) \ ROM_LOAD_BIOS( 0, "ep15294.ic2", 0x000000, 0x20000, CRC(aa8dc2d8) SHA1(96771ad7b79dc9c83a1594243250d65052d23176) ) \ ROM_SYSTEM_BIOS( 1, "ver2", "Megaplay Bios (Ver. 2)" ) /* this one doesn't boot .. dump was verified with another working pcb */ \ - ROM_LOAD_BIOS( 1, "epr-a15294.ic2",0x000000, 0x20000, CRC(f97c68aa) SHA1(bcabc879950bca1ced11c550a484e697ec5706b2) ) \ - + ROM_LOAD_BIOS( 1, "epr-a15294.ic2",0x000000, 0x20000, CRC(f97c68aa) SHA1(bcabc879950bca1ced11c550a484e697ec5706b2) ) ROM_START( megaplay ) ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF ) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 38b99fc36ed..f31d06e9066 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -1381,7 +1381,6 @@ READ16_MEMBER(megasys1_state::protection_peekaboo_r) WRITE16_MEMBER(megasys1_state::protection_peekaboo_w) { - COMBINE_DATA(&m_protection_val); if ((m_protection_val & 0x90) == 0x90) @@ -4003,7 +4002,6 @@ READ16_MEMBER(megasys1_state::stdragon_mcu_hs_r) WRITE16_MEMBER(megasys1_state::stdragon_mcu_hs_w) { - COMBINE_DATA(&m_mcu_hs_ram[offset]); if(MCU_HS_SEQ(0x0000,0x0055,0x00aa,0x00ff) && offset == 0x8/2) diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 7878a048610..964831c2f66 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -448,7 +448,6 @@ VIDEO_START_MEMBER(mtech_state,mtnew) //attotime::never UINT32 mtech_state::screen_update_mtnew(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - /* if we're running an sms game then use the SMS update.. maybe this should be moved to the megadrive emulation core as compatibility mode is a feature of the chip */ if (!m_current_game_is_sms) SCREEN_UPDATE32_CALL(megadriv); @@ -652,8 +651,7 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 1, "ver0a", "Ver 0 Rev A" ) \ ROMX_LOAD( "epr-12263a.20", 0x000000, 0x8000, CRC(07c3f423) SHA1(50c28bbc2d4349c820d988ae3f20aae3f808545f), ROM_BIOS(2)) \ ROM_SYSTEM_BIOS( 2, "ver0b", "Ver 0 Rev B" ) \ - ROMX_LOAD( "epr-12263b.20", 0x000000, 0x8000, CRC(ca26c87a) SHA1(987a18bede6e54cd73c4434426eb6c302a37cdc5), ROM_BIOS(3)) \ - + ROMX_LOAD( "epr-12263b.20", 0x000000, 0x8000, CRC(ca26c87a) SHA1(987a18bede6e54cd73c4434426eb6c302a37cdc5), ROM_BIOS(3)) /* no games */ ROM_START( megatech ) MEGATECH_BIOS diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index ae899051993..44134c650e0 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -62,7 +62,6 @@ WRITE8_MEMBER(megazone_state::megazone_i8039_irq_w) WRITE8_MEMBER(megazone_state::i8039_irqen_and_status_w) { - if ((data & 0x80) == 0) m_daccpu->set_input_line(0, CLEAR_LINE); m_i8039_status = (data & 0x70) >> 4; @@ -75,7 +74,6 @@ WRITE8_MEMBER(megazone_state::megazone_coin_counter_w) WRITE8_MEMBER(megazone_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -228,7 +226,6 @@ static const ay8910_interface ay8910_config = void megazone_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_daccpu = machine().device("daccpu"); @@ -239,14 +236,12 @@ void megazone_state::machine_start() void megazone_state::machine_reset() { - m_flipscreen = 0; m_i8039_status = 0; } INTERRUPT_GEN_MEMBER(megazone_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index e6411722c2e..b4951407dc5 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -337,7 +337,6 @@ static const ay8910_interface ay8910_config = void meijinsn_state::machine_start() { - save_item(NAME(m_deposits1)); save_item(NAME(m_deposits2)); save_item(NAME(m_credits)); @@ -345,7 +344,6 @@ void meijinsn_state::machine_start() void meijinsn_state::machine_reset() { - m_deposits1 = 0; m_deposits2 = 0; m_credits = 0; diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 8a092118547..11e117a786e 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -1097,7 +1097,6 @@ static const z80_daisy_config meritm_daisy_chain[] = MACHINE_START_MEMBER(meritm_state,merit_common) { - m_z80pio_0->strobe_a(1); m_z80pio_0->strobe_b(1); m_z80pio_1->strobe_a(1); diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 8f2879fe8a9..ea99816792e 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -137,7 +137,6 @@ WRITE8_MEMBER(mermaid_state::mermaid_ay8910_control_port_w) WRITE8_MEMBER(mermaid_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -174,19 +173,16 @@ ADDRESS_MAP_END WRITE8_MEMBER(mermaid_state::rougien_sample_rom_lo_w) { - m_adpcm_rom_sel = (data & 1) | (m_adpcm_rom_sel & 2); } WRITE8_MEMBER(mermaid_state::rougien_sample_rom_hi_w) { - m_adpcm_rom_sel = ((data & 1)<<1) | (m_adpcm_rom_sel & 1); } WRITE8_MEMBER(mermaid_state::rougien_sample_playback_w) { - if((m_adpcm_play_reg & 1) && ((data & 1) == 0)) { m_adpcm_pos = m_adpcm_rom_sel*0x1000; @@ -364,7 +360,6 @@ GFXDECODE_END void mermaid_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_ay1 = machine().device("ay1"); m_ay2 = machine().device("ay2"); @@ -388,7 +383,6 @@ void mermaid_state::machine_start() void mermaid_state::machine_reset() { - m_coll_bit0 = 0; m_coll_bit1 = 0; m_coll_bit2 = 0; @@ -441,7 +435,6 @@ static const msm5205_interface msm5205_config = INTERRUPT_GEN_MEMBER(mermaid_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index 53e8fe66fc9..55c5c8a878c 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -275,7 +275,6 @@ Logic: void metalmx_state::video_start() { - } UINT32 metalmx_state::screen_update_metalmx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -318,17 +317,14 @@ READ32_MEMBER(metalmx_state::watchdog_r) WRITE32_MEMBER(metalmx_state::shifter_w) { - } WRITE32_MEMBER(metalmx_state::motor_w) { - } WRITE32_MEMBER(metalmx_state::reset_w) { - if (ACCESSING_BITS_16_31) { data >>= 16; @@ -376,7 +372,6 @@ static void cage_irq_callback(running_machine &machine, int reason) WRITE32_MEMBER(metalmx_state::dsp32c_1_w) { - offset <<= 1; if (ACCESSING_BITS_0_15) @@ -406,7 +401,6 @@ READ32_MEMBER(metalmx_state::dsp32c_1_r) WRITE32_MEMBER(metalmx_state::dsp32c_2_w) { - offset <<= 1; if (ACCESSING_BITS_0_15) @@ -462,13 +456,11 @@ READ32_MEMBER(metalmx_state::host_gsp_r) READ32_MEMBER(metalmx_state::host_dram_r) { - return (m_gsp_dram[offset * 2] << 16) | m_gsp_dram[offset * 2 + 1]; } WRITE32_MEMBER(metalmx_state::host_dram_w) { - COMBINE_DATA(m_gsp_dram + offset * 2 + 1); data >>= 16; mem_mask >>= 16; @@ -477,13 +469,11 @@ WRITE32_MEMBER(metalmx_state::host_dram_w) READ32_MEMBER(metalmx_state::host_vram_r) { - return (m_gsp_vram[offset * 2] << 16) | m_gsp_vram[offset * 2 + 1]; } WRITE32_MEMBER(metalmx_state::host_vram_w) { - COMBINE_DATA(m_gsp_vram + offset * 2 + 1); data >>= 16; mem_mask >>= 16; @@ -777,7 +767,6 @@ DRIVER_INIT_MEMBER(metalmx_state,metalmx) void metalmx_state::machine_reset() { - m_dsp32c_1->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); m_dsp32c_2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index a4595c5e5c5..3b5a2a3fe53 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -262,7 +262,6 @@ static const ym3526_interface ym3526_config = void metlclsh_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); @@ -272,7 +271,6 @@ void metlclsh_state::machine_start() void metlclsh_state::machine_reset() { - flip_screen_set(0); m_write_mask = 0; diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 02076bc03e6..8860657596a 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1937,8 +1937,7 @@ ADDRESS_MAP_END PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_##_b1_ ) PORT_PLAYER(_n_) \ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_##_b2_ ) PORT_PLAYER(_n_) \ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_##_b3_ ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_##_b4_ ) PORT_PLAYER(_n_) \ - + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_##_b4_ ) PORT_PLAYER(_n_) #define JOY_MSB(_n_, _b1_, _b2_, _b3_, _b4_) \ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(_n_) \ @@ -1948,8 +1947,7 @@ ADDRESS_MAP_END PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_##_b1_ ) PORT_PLAYER(_n_) \ PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_##_b2_ ) PORT_PLAYER(_n_) \ PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_##_b3_ ) PORT_PLAYER(_n_) \ - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_##_b4_ ) PORT_PLAYER(_n_) \ - + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_##_b4_ ) PORT_PLAYER(_n_) #define COINS \ PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 33219f38b36..f9be0bb057a 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -448,7 +448,6 @@ void mexico86_state::machine_start() void mexico86_state::machine_reset() { - /*TODO: check the PCB and see how the halt / reset lines are connected. */ if (machine().device("sub") != NULL) machine().device("sub")->execute().set_input_line(INPUT_LINE_RESET, (ioport("DSW1")->read() & 0x80) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 603d600effa..de48ff328ef 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -307,7 +307,6 @@ GFXDECODE_END void mgolf_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_prev)); diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index 867340150e9..7522a8b1a22 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -651,7 +651,6 @@ static IRQ_CALLBACK(irq_callback) void midqslvr_state::machine_start() { - m_bios_ram = auto_alloc_array(machine(), UINT32, 0x10000/4); m_bios_ext1_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); m_bios_ext2_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index 235e77c12b1..ca9bafed6ed 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -87,7 +87,6 @@ MACHINE_START_MEMBER(midzeus_state,midzeus) MACHINE_RESET_MEMBER(midzeus_state,midzeus) { - memcpy(m_ram_base, machine().root_device().memregion("user1")->base(), 0x40000*4); *m_ram_base <<= 1; machine().device("maincpu")->reset(); diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c index 50051cbfa17..f042cb6d7bd 100644 --- a/src/mame/drivers/mikie.c +++ b/src/mame/drivers/mikie.c @@ -66,7 +66,6 @@ READ8_MEMBER(mikie_state::mikie_sh_timer_r) WRITE8_MEMBER(mikie_state::mikie_sh_irqtrigger_w) { - if (m_last_irq == 0 && data == 1) { // setting bit 0 low then high triggers IRQ on the sound CPU @@ -83,7 +82,6 @@ WRITE8_MEMBER(mikie_state::mikie_coin_counter_w) WRITE8_MEMBER(mikie_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -249,7 +247,6 @@ static const sn76496_config psg_intf = void mikie_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -259,14 +256,12 @@ void mikie_state::machine_start() void mikie_state::machine_reset() { - m_palettebank = 0; m_last_irq = 0; } INTERRUPT_GEN_MEMBER(mikie_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index d8a4420a862..40ec6135e16 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -133,7 +133,6 @@ WRITE16_MEMBER(miragemi_state::okim1_rombank_w) WRITE16_MEMBER(miragemi_state::okim0_rombank_w) { - /*bits 4-6 used on POST? */ m_oki_bgm->set_bank_base(0x40000 * (data & 0x7)); } @@ -305,13 +304,11 @@ static const deco16ic_interface mirage_deco16ic_tilegen1_intf = void miragemi_state::machine_start() { - save_item(NAME(m_mux_data)); } void miragemi_state::machine_reset() { - m_mux_data = 0; } diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 3648f05011f..93087122c8a 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -147,7 +147,6 @@ INLINE void bg_changecolor_RRRRGGGGBBBBxxxx( running_machine &machine, pen_t col WRITE8_MEMBER(missb2_state::bg_paletteram_RRRRGGGGBBBBxxxx_be_w) { - m_bg_paletteram[offset] = data; bg_changecolor_RRRRGGGGBBBBxxxx(machine(), offset / 2, m_bg_paletteram[offset | 1] | (m_bg_paletteram[offset & ~1] << 8)); } @@ -438,7 +437,6 @@ INTERRUPT_GEN_MEMBER(missb2_state::missb2_interrupt) MACHINE_START_MEMBER(missb2_state,missb2) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_slave = machine().device("slave"); @@ -452,7 +450,6 @@ MACHINE_START_MEMBER(missb2_state,missb2) MACHINE_RESET_MEMBER(missb2_state,missb2) { - m_sound_nmi_enable = 0; m_pending_nmi = 0; m_sound_status = 0; @@ -588,7 +585,6 @@ static void configure_banks( running_machine& machine ) DRIVER_INIT_MEMBER(missb2_state,missb2) { - configure_banks(machine()); m_video_enable = 0; } diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index eeaa62a37df..160c9ba0668 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -493,7 +493,6 @@ TIMER_CALLBACK_MEMBER(missile_state::adjust_cpu_speed) void missile_state::machine_start() { - /* initialize globals */ m_writeprom = memregion("proms")->base(); m_flipscreen = 0; diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 7097b3d0d90..b6802b1548f 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -94,7 +94,6 @@ static const eeprom_interface eeprom_intf = READ8_MEMBER(mitchell_state::pang_port5_r) { - /* bits 0 and (sometimes) 3 are checked in the interrupt handler. bit 3 is checked before updating the palette so it really seems to be vblank. bit 0 may be vblank (or vblank irq flag) related too, but I'm not sure. @@ -190,7 +189,6 @@ READ8_MEMBER(mitchell_state::block_input_r) WRITE8_MEMBER(mitchell_state::block_dial_control_w) { - if (data == 0x08) { /* reset the dial counters */ @@ -257,7 +255,6 @@ READ8_MEMBER(mitchell_state::input_r) WRITE8_MEMBER(mitchell_state::input_w) { - switch (m_input_type) { case 0: @@ -1054,7 +1051,6 @@ GFXDECODE_END MACHINE_START_MEMBER(mitchell_state,mitchell) { - save_item(NAME(m_sample_buffer)); save_item(NAME(m_sample_select)); save_item(NAME(m_dial_selected)); @@ -1067,7 +1063,6 @@ MACHINE_START_MEMBER(mitchell_state,mitchell) MACHINE_RESET_MEMBER(mitchell_state,mitchell) { - m_sample_buffer = 0; m_sample_select = 0; m_dial_selected = 0; diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index ac7f75a41e3..fde80d89299 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -187,7 +187,6 @@ READ8_MEMBER(mjkjidai_state::keyboard_r) WRITE8_MEMBER(mjkjidai_state::keyboard_select_w) { - // logerror("%04x: keyboard_select %d = %02x\n",space.device().safe_pc(),offset,data); switch (offset) @@ -416,7 +415,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(mjkjidai_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index f554184375b..e7a016628e3 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -231,7 +231,6 @@ WRITE8_MEMBER(mjsister_state::mjsister_banksel1_w) WRITE8_MEMBER(mjsister_state::mjsister_banksel2_w) { - switch (data) { case 0xa: m_dac_bank = 0; break; @@ -475,7 +474,6 @@ void mjsister_state::machine_start() void mjsister_state::machine_reset() { - m_dac_busy = 0; m_flip_screen = 0; m_video_enable = 0; diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 6121cc03b50..be2ee7e0caf 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1197,8 +1197,7 @@ INPUT_PORTS_END ROM_LOAD("opr14745.bin", 0x060000, 0x20000, CRC(4c934d96) SHA1(e3349ece0e47f684d61ad11bfea4a90602287350) ) \ ROM_LOAD("opr14746.bin", 0x080000, 0x20000, CRC(2a266cbd) SHA1(34e047a93459406c22acf4c25089d1a4955f94ca) ) \ ROM_LOAD("opr14747.bin", 0x0a0000, 0x20000, CRC(a4ad5e19) SHA1(7d7ec300eeb9a8de1590011e37108688c092f329) ) \ - ROM_LOAD("opr14748.bin", 0x0c0000, 0x20000, CRC(4a532cb8) SHA1(23280ebbcd6b2bc8a8e643a2d07a58d6598301b8) ) \ - + ROM_LOAD("opr14748.bin", 0x0c0000, 0x20000, CRC(4a532cb8) SHA1(23280ebbcd6b2bc8a8e643a2d07a58d6598301b8) ) ROM_START( vf ) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 8f4df711620..1f5178c89e5 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -579,7 +579,6 @@ WRITE32_MEMBER(model2_state::srallyc_devices_w) READ32_MEMBER(model2_state::copro_prg_r) { - return 0xffffffff; } @@ -2253,8 +2252,7 @@ OPR-14747 / Linked to 315-5679B ROM_LOAD("opr-14744.58", 0x040000, 0x20000, CRC(730ea9e0) SHA1(651f1db4089a400d073b19ada299b4b08b08f372) ) \ ROM_LOAD("opr-14745.59", 0x060000, 0x20000, CRC(4c934d96) SHA1(e3349ece0e47f684d61ad11bfea4a90602287350) ) \ ROM_LOAD("opr-14746.62", 0x080000, 0x20000, CRC(2a266cbd) SHA1(34e047a93459406c22acf4c25089d1a4955f94ca) ) \ - ROM_LOAD("opr-14747.63", 0x0a0000, 0x20000, CRC(a4ad5e19) SHA1(7d7ec300eeb9a8de1590011e37108688c092f329) ) \ - + ROM_LOAD("opr-14747.63", 0x0a0000, 0x20000, CRC(a4ad5e19) SHA1(7d7ec300eeb9a8de1590011e37108688c092f329) ) /* These are smt ROMs found on Sega Model 2A Video board They are linked to a QFP208 IC labelled 315-5645 @@ -2264,8 +2262,7 @@ They are linked to a QFP208 IC labelled 315-5645 ROM_REGION( 0x180000, "user6", 0 ) \ ROM_LOAD("mpr-16310.15", 0x000000, 0x80000, CRC(c078a780) SHA1(0ad5b49774172743e2708b7ca4c061acfe10957a) ) \ ROM_LOAD("mpr-16311.16", 0x080000, 0x80000, CRC(452a492b) SHA1(88c2f6c2dbfd0c1b39a7bf15c74455fb68c7274e) ) \ - ROM_LOAD("mpr-16312.14", 0x100000, 0x80000, CRC(a25fef5b) SHA1(c6a37856b97f5bc4996cb6b66209f47af392cc38) ) \ - + ROM_LOAD("mpr-16312.14", 0x100000, 0x80000, CRC(a25fef5b) SHA1(c6a37856b97f5bc4996cb6b66209f47af392cc38) ) /* Is there an undumped Zero Gunner with program roms EPR-20292 & EPR-20293? Numbering would suggest so, Japan Model2C or Model2A US? */ ROM_START( zeroguna ) /* Zero Gunner (Export), Model 2A */ diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 57fe3f6e801..221829f1efb 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1223,7 +1223,6 @@ static void configure_fast_ram(running_machine &machine) TIMER_CALLBACK_MEMBER(model3_state::model3_sound_timer_tick) { - if (m_sound_irq_enable) { model3_set_irq_line(machine(), 0x40, ASSERT_LINE); @@ -1413,7 +1412,6 @@ WRITE64_MEMBER(model3_state::model3_ctrl_w) case 4: if (ACCESSING_BITS_56_63) /* Port 4 direction */ { - } if (ACCESSING_BITS_24_31) /* Serial comm TX FIFO 1 */ { /* Used for reading the light gun in Lost World */ @@ -1629,7 +1627,6 @@ READ64_MEMBER(model3_state::real3d_status_r) /* SCSP interface */ WRITE8_MEMBER(model3_state::model3_sound_w) { - switch (offset) { case 0: diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 5bde9dc396b..e033c661e06 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -192,7 +192,6 @@ GFXDECODE_END void mogura_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_dac1 = machine().device("dac1"); m_dac2 = machine().device("dac2"); diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 1b3c48b96af..8d697893ca0 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -125,7 +125,6 @@ WRITE8_MEMBER(mole_state::mole_flipscreen_w) UINT32 mole_state::screen_update_mole(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 370863a8162..8e52f3f34d5 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -245,7 +245,6 @@ void momoko_state::machine_start() void momoko_state::machine_reset() { - m_fg_scrollx = 0; m_fg_scrolly = 0; m_fg_select = 0; diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index d764ce828d9..cc37c0f96eb 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -187,7 +187,6 @@ WRITE8_MEMBER(moo_state::sound_bankswitch_w) /* of RAM, but they put 0x10000 there. The CPU can access them all. */ READ16_MEMBER(moo_state::K053247_scattered_word_r) { - if (offset & 0x0078) return m_spriteram[offset]; else @@ -199,7 +198,6 @@ READ16_MEMBER(moo_state::K053247_scattered_word_r) WRITE16_MEMBER(moo_state::K053247_scattered_word_w) { - if (offset & 0x0078) COMBINE_DATA(m_spriteram + offset); else @@ -422,7 +420,6 @@ INPUT_PORTS_END MACHINE_START_MEMBER(moo_state,moo) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("soundcpu"); m_k054539 = machine().device("k054539"); diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c index e476990ae50..fcba23680dd 100644 --- a/src/mame/drivers/mosaic.c +++ b/src/mame/drivers/mosaic.c @@ -14,7 +14,6 @@ WRITE8_MEMBER(mosaic_state::protection_w) { - if (!BIT(data, 7)) { /* simply increment given value */ @@ -50,7 +49,6 @@ READ8_MEMBER(mosaic_state::protection_r) WRITE8_MEMBER(mosaic_state::gfire2_protection_w) { - logerror("%06x: protection_w %02x\n", space.device().safe_pc(), data); switch(data) @@ -251,13 +249,11 @@ static const ym2203_interface ym2203_config = void mosaic_state::machine_start() { - save_item(NAME(m_prot_val)); } void mosaic_state::machine_reset() { - m_prot_val = 0; } diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 00f4ec164ff..77eabf646d7 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -27,7 +27,6 @@ WRITE8_MEMBER(mouser_state::mouser_nmi_enable_w) INTERRUPT_GEN_MEMBER(mouser_state::mouser_nmi_interrupt) { - if (BIT(m_nmi_enable, 0)) nmi_line_pulse(device); } @@ -183,7 +182,6 @@ GFXDECODE_END void mouser_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -193,7 +191,6 @@ void mouser_state::machine_start() void mouser_state::machine_reset() { - m_sound_byte = 0; m_nmi_enable = 0; } diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index df28e18136f..fdcae06f0e0 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -203,7 +203,6 @@ public: void mpoker_state::video_start() { - } UINT32 mpoker_state::screen_update_mpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c index f7b5b076646..521caaad48c 100644 --- a/src/mame/drivers/mpu12wbk.c +++ b/src/mame/drivers/mpu12wbk.c @@ -284,7 +284,6 @@ UINT32 mpu12wbk_state::screen_update_mpu12wbk(screen_device &screen, bitmap_ind1 void mpu12wbk_state::palette_init() { - } diff --git a/src/mame/drivers/mpu2.c b/src/mame/drivers/mpu2.c index 41fa2636b28..e3c5629ed4e 100644 --- a/src/mame/drivers/mpu2.c +++ b/src/mame/drivers/mpu2.c @@ -73,8 +73,7 @@ MACHINE_CONFIG_END // technically not a 'bios' because they're all on the same board. #define MPU2_MASKROM \ ROM_REGION( 0x800, "maskrom", 0 ) \ - ROM_LOAD( "rom1.bin", 0x0000, 0x0800, CRC(198d77ee) SHA1(ef466e539efd6e31c82ef01b09d63b7580f068fe) ) \ - + ROM_LOAD( "rom1.bin", 0x0000, 0x0800, CRC(198d77ee) SHA1(ef466e539efd6e31c82ef01b09d63b7580f068fe) ) ROM_START( m2hilite ) MPU2_MASKROM diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c index e1da922bb93..689f6541b44 100644 --- a/src/mame/drivers/mpu3.c +++ b/src/mame/drivers/mpu3.c @@ -539,7 +539,6 @@ static const pia6821_interface pia_ic4_intf = /* IC5, AUX ports, coin lockouts and AY sound chip select (MODs below 4 only) */ WRITE8_MEMBER(mpu3_state::pia_ic5_porta_w) { - LOG(("%s: IC5 PIA Port A Set to %2x (Reel)\n", machine().describe_context(),data)); stepper_update(0, data & 0x03 ); stepper_update(1, (data>>2) & 0x03 ); diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index fd4bfb9b7a7..11c8161eddc 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -228,8 +228,7 @@ ROM_END ROM_LOAD( "chaseinvaders.chr", 0x0000, 0x000048, CRC(d7703dcd) SHA1(16fd998d1b44f35c10e5486882aa7f2d018dc82b) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cha.s1", 0x000000, 0x080000, CRC(8200b6bc) SHA1(bcc4ffbddcdcc1dd994fe29e9b24e83272f59442) ) \ - ROM_LOAD( "cha.s2", 0x080000, 0x080000, CRC(542863fa) SHA1(501d66b2badb5036bb5dd8bac3cdb681f630a982) ) \ - + ROM_LOAD( "cha.s2", 0x080000, 0x080000, CRC(542863fa) SHA1(501d66b2badb5036bb5dd8bac3cdb681f630a982) ) ROM_START( m4chasei ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -295,8 +294,7 @@ ROM_END ROM_LOAD( "cvegas.chr", 0x0000, 0x000048, CRC(a6c341b0) SHA1(c8c838c9bb1ced52889504b9cea8d88f1e7fa79f) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cvegass1.hex", 0x0000, 0x080000, CRC(13a8c857) SHA1(c66e10bca1ad54f467b9c5eacd502c54397c09b2) ) \ - ROM_LOAD( "cvegass2.hex", 0x0000, 0x080000, CRC(88b37145) SHA1(1c6c9ad2010e1688d3370d1f2a5ae83dc683b500) ) \ - + ROM_LOAD( "cvegass2.hex", 0x0000, 0x080000, CRC(88b37145) SHA1(1c6c9ad2010e1688d3370d1f2a5ae83dc683b500) ) ROM_START( m4clbveg ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -325,8 +323,7 @@ ROM_END #define M4CLBX_EXTRAS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cxs1.hex", 0x000000, 0x080000, CRC(4ce005f1) SHA1(ee0f59a9c7e0222dd63fa63ccff8f194abd01ddb) ) \ - ROM_LOAD( "cxs2.hex", 0x080000, 0x080000, CRC(495e0730) SHA1(7ba8150fbcf974ac494a82fd373ff02185543e35) ) \ - + ROM_LOAD( "cxs2.hex", 0x080000, 0x080000, CRC(495e0730) SHA1(7ba8150fbcf974ac494a82fd373ff02185543e35) ) ROM_START( m4clbx ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -358,8 +355,7 @@ ROM_END ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "cjsound1.bin", 0x000000, 0x080000, CRC(b023f6b9) SHA1(04c362c6511442d3ab775a5ff2051bfe26d5e624) ) \ ROM_LOAD( "cjsound2.bin", 0x080000, 0x080000, CRC(02563a43) SHA1(dfcee4e0fdf81c726c8e13278e7950459bcaab18) ) \ - ROM_LOAD( "cjsound3.bin", 0x100000, 0x080000, CRC(e722e438) SHA1(070f3772920fa64d5214843c313b27a5b2a4c105) ) \ - + ROM_LOAD( "cjsound3.bin", 0x100000, 0x080000, CRC(e722e438) SHA1(070f3772920fa64d5214843c313b27a5b2a4c105) ) ROM_START( m4crzjwl ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -418,8 +414,7 @@ ROM_END #define M4CRJWL_EXTRAS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* Missing? or in above set? */ \ - + /* Missing? or in above set? */ ROM_START( m4crjwl ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -450,8 +445,7 @@ ROM_END ROM_LOAD( "chr.chr", 0x0000, 0x000048, CRC(c5812913) SHA1(d167b1f512c183cf01a1f4e1c1588ea0ae21331b) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cjcs1.hex", 0x000000, 0x080000, CRC(2ac3ba9f) SHA1(3332f29f81918c34aeec3da6f7d001dc9922840d) ) \ - ROM_LOAD( "cjcs2.hex", 0x080000, 0x080000, CRC(89838a9d) SHA1(502243cc0a14e63882b537f05c4cc0eb852e4a0c) ) \ - + ROM_LOAD( "cjcs2.hex", 0x080000, 0x080000, CRC(89838a9d) SHA1(502243cc0a14e63882b537f05c4cc0eb852e4a0c) ) ROM_START( m4crjwl2 ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -478,8 +472,7 @@ ROM_END ROM_LOAD( "drasnd.p1", 0x000000, 0x080000, CRC(54c3821c) SHA1(1fcc62e2b127dd7f1d5d27a3afdf56dc27f122f8) ) \ ROM_LOAD( "drasnd.p2", 0x080000, 0x080000, CRC(9096d2bc) SHA1(1b4c530b7b0fde869980d519255e2585c5461e13) ) \ ROM_LOAD( "drasnd.p3", 0x100000, 0x080000, CRC(a07f412b) SHA1(cca8f5cfe620ece45ca40bf801f0643cd76547e9) ) \ - ROM_LOAD( "drasnd.p4", 0x180000, 0x080000, CRC(018ed789) SHA1(64202da2c542f5ef208faeb04945eb1a758d4746) ) \ - + ROM_LOAD( "drasnd.p4", 0x180000, 0x080000, CRC(018ed789) SHA1(64202da2c542f5ef208faeb04945eb1a758d4746) ) ROM_START( m4drac ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -520,8 +513,7 @@ ROM_END #define M4FORTCB_EXTRAS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cfosnd.p1", 0x000000, 0x080000, CRC(74bbf913) SHA1(52ddc89ab34b11ede2c0e9b9b27e119b0c1eb2d9) ) \ - ROM_LOAD( "cfosnd.p2", 0x080000, 0x080000, CRC(1b2bb79a) SHA1(5f19ea000f34bb404ed6c8ea5ec7b809ccb1ae36) ) \ - + ROM_LOAD( "cfosnd.p2", 0x080000, 0x080000, CRC(1b2bb79a) SHA1(5f19ea000f34bb404ed6c8ea5ec7b809ccb1ae36) ) ROM_START( m4fortcb ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cfod.p1", 0x0000, 0x010000, CRC(9d0e2b63) SHA1(cce871d2bbe486793de5de9fadfbddf67c382e5c) ) @@ -748,8 +740,7 @@ ROM_END ROM_LOAD( "lwbs3.bin", 0x0000, 0x07dc89, CRC(ee102376) SHA1(3fed581a4654acf285dd430fbfbac33cd67411b8) ) \ ROM_LOAD( "lwbs7.bin", 0x0000, 0x080000, CRC(5d4177c7) SHA1(e13f145885bb719b0021ae4ce289261a3eaa2e18) ) \ ROM_LOAD( "lwbs8.bin", 0x0000, 0x080000, CRC(187cdf5b) SHA1(87ec189af27c95f278a7531ec13df53a08889af8) ) \ - ROM_LOAD( "lwbs9.bin", 0x0000, 0x080000, CRC(2e02b617) SHA1(2502a1d2cff155a7fc5148e23a4723d4d60e9d42) ) \ - + ROM_LOAD( "lwbs9.bin", 0x0000, 0x080000, CRC(2e02b617) SHA1(2502a1d2cff155a7fc5148e23a4723d4d60e9d42) ) ROM_START( m4luckwb ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1093,8 +1084,7 @@ ROM_END ROM_LOAD( "sbjsnd2.hex", 0x080000, 0x080000, CRC(1d588554) SHA1(48c092ce83d2f881fc217a3d566e896718ad6f24) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "sbj.s1", 0x000000, 0x080000, CRC(9bcba966) SHA1(5ced282aca9d39ebf0828aa19357026d5298e955) ) \ - ROM_LOAD( "sbj.s2", 0x080000, 0x080000, CRC(1d588554) SHA1(48c092ce83d2f881fc217a3d566e896718ad6f24) ) \ - + ROM_LOAD( "sbj.s2", 0x080000, 0x080000, CRC(1d588554) SHA1(48c092ce83d2f881fc217a3d566e896718ad6f24) ) ROM_START( m4supbjc ) @@ -1158,8 +1148,7 @@ ROM_END #define M4TECHNO_EXTRAS \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "techno.bin", 0x0000, 0x080000, CRC(3e80f8bd) SHA1(2e3a195b49448da11cc0c089a8a9b462894c766b) ) \ - + ROM_LOAD( "techno.bin", 0x0000, 0x080000, CRC(3e80f8bd) SHA1(2e3a195b49448da11cc0c089a8a9b462894c766b) ) ROM_START( m4techno ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1206,8 +1195,7 @@ ROM_END ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "ttimer.chr", 0x0000, 0x000048, CRC(f694224e) SHA1(936ab5e349fa59accbb37959cce9519fd97f3978) ) \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "toptimer-snd.bin", 0x0000, 0x080000, CRC(50450909) SHA1(181659b0594ba8d196b7130c5999c91676a363c0) ) \ - + ROM_LOAD( "toptimer-snd.bin", 0x0000, 0x080000, CRC(50450909) SHA1(181659b0594ba8d196b7130c5999c91676a363c0) ) ROM_START( m4toptim ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1228,8 +1216,7 @@ ROM_END #define M4TROPCL_EXTRAS \ ROM_REGION( 0x48, "fakechr", 0 ) \ - ROM_LOAD( "tro20.chr", 0x0000, 0x000048, CRC(97618d38) SHA1(7958e99684d50b9bdb56c97f7fcfe161f0824578) ) \ - + ROM_LOAD( "tro20.chr", 0x0000, 0x000048, CRC(97618d38) SHA1(7958e99684d50b9bdb56c97f7fcfe161f0824578) ) ROM_START( m4tropcl ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1267,8 +1254,7 @@ ROM_END ROM_LOAD( "dtpchr.chr", 0x0000, 0x000048, CRC(7743df66) SHA1(69b1943837ccf8671861ac8ef690138b41de0e5b) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "dtps10_1", 0x000000, 0x080000, CRC(d1d2c981) SHA1(6a4940248b0bc8df0a9de0d60e98cfebf1962504) ) \ - ROM_LOAD( "dtps20_1", 0x080000, 0x080000, CRC(f77c4f39) SHA1(dc0e056f4d8c00824b3e672a02da64613bbf204e) ) \ - + ROM_LOAD( "dtps20_1", 0x080000, 0x080000, CRC(f77c4f39) SHA1(dc0e056f4d8c00824b3e672a02da64613bbf204e) ) ROM_START( m4tbplay ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1438,8 +1424,7 @@ ROM_END #define M4LAZY_EXTRAS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4lazy ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -1790,8 +1775,7 @@ ROM_END #define M4SBX_EXTRAS \ ROM_REGION( 0x40000, "upd", 0 ) /* not oki at least... */ \ - ROM_LOAD( "sbsnd", 0x0000, 0x040000, CRC(27fd9fe6) SHA1(856fdc95a833affde0ada7041c68a4b6b729b715) ) \ - + ROM_LOAD( "sbsnd", 0x0000, 0x040000, CRC(27fd9fe6) SHA1(856fdc95a833affde0ada7041c68a4b6b729b715) ) ROM_START( m4sbx ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1849,8 +1833,7 @@ ROM_END #define M4JUNGJ_EXTRAS \ ROM_REGION( 0x40000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4jungj ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "jj2410p.bin", 0x8000, 0x008000, CRC(490838c6) SHA1(a1e9963df9a429ae594592312e977f22f96c6073) ) @@ -1878,8 +1861,7 @@ ROM_END #define M4FSX_EXTRAS \ ROM_REGION( 0x40000, "upd", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4fsx ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -1908,8 +1890,7 @@ ROM_END ROM_LOAD( "cash-copssnd2.bin", 0x080000, 0x080000, CRC(107816a2) SHA1(f5d4a0390b85a665a3536da4689ec91b1a2da3ae) ) \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "cashcops.p1", 0x000000, 0x080000, CRC(9a59a3a1) SHA1(72cfc99b22ec5fb89714c6d2d66760d86dc19f2f) ) \ - ROM_LOAD( "cashcops.p2", 0x080000, 0x080000, CRC(deb3e755) SHA1(01f92881c451919be549a1c58afa1fa4630bf171) ) \ - + ROM_LOAD( "cashcops.p2", 0x080000, 0x080000, CRC(deb3e755) SHA1(01f92881c451919be549a1c58afa1fa4630bf171) ) ROM_START( m4ccop ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -2035,8 +2016,7 @@ ROM_END #define M4SURF_EXTRAS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "s_surf.sn1", 0x000000, 0x080000, CRC(f20a7d69) SHA1(7887230613b497dc71a60125dd1e265ebbc8eb23) ) \ - ROM_LOAD( "s_surf.sn2", 0x080000, 0x080000, CRC(6c4a9074) SHA1(3b993120156677de893e5dc1e0c5d6e0285c5570) ) \ - + ROM_LOAD( "s_surf.sn2", 0x080000, 0x080000, CRC(6c4a9074) SHA1(3b993120156677de893e5dc1e0c5d6e0285c5570) ) ROM_START( m4surf ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2069,8 +2049,7 @@ ROM_END ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "blackgoldsnd1.bin", 0x000000, 0x080000, CRC(d251b59e) SHA1(960b81b87f0fb5000028c863892a273362cb897f) ) \ ROM_LOAD( "blackgoldsnd2.bin", 0x080000, 0x080000, CRC(87cbcd1e) SHA1(a6cd186af7c5682e216f549b77735b9bf1b985ae) ) \ - ROM_LOAD( "blackgoldsnd3.bin", 0x100000, 0x080000, CRC(258f7b83) SHA1(a6df577d98ade8c5c5ff68ef891667e65e83ac17) ) \ - + ROM_LOAD( "blackgoldsnd3.bin", 0x100000, 0x080000, CRC(258f7b83) SHA1(a6df577d98ade8c5c5ff68ef891667e65e83ac17) ) ROM_START( m4blkgd ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "blackgoldprg.bin", 0x0000, 0x080000, CRC(a04736b2) SHA1(9e060cc79e7922b38115f1412ed76f8c76deb917) ) @@ -2085,8 +2064,7 @@ ROM_END #define M4ZILL_EXTRAS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "zillsnd.bin", 0x0000, 0x080000, CRC(171ed677) SHA1(25d63f4d9c64f13bec4feffa265c5b0c5f6be4ec) ) \ - + ROM_LOAD( "zillsnd.bin", 0x0000, 0x080000, CRC(171ed677) SHA1(25d63f4d9c64f13bec4feffa265c5b0c5f6be4ec) ) ROM_START( m4zill ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2106,8 +2084,7 @@ ROM_END ROM_LOAD( "happystreak.p1", 0x0000, 0x080000, CRC(b1f328ff) SHA1(2bc6605965cb5743a2f8b813d68cf1646a4bcac1) ) \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "happystreaksnd.p1", 0x0000, 0x080000, CRC(76cda195) SHA1(21a985cd6cf1f63f4aa799563099a0527a7c0ea2) ) \ - ROM_LOAD( "happystreaksnd.p2", 0x080000, 0x080000, CRC(f3b4c763) SHA1(7fd6230c13b66a16daad9d45935c7803a5a4c35c) ) \ - + ROM_LOAD( "happystreaksnd.p2", 0x080000, 0x080000, CRC(f3b4c763) SHA1(7fd6230c13b66a16daad9d45935c7803a5a4c35c) ) ROM_START( m4hstr ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -2162,8 +2139,7 @@ ROM_END #define M4DDB_EXTRAS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "ddbsound1", 0x000000, 0x080000, CRC(47c87bd5) SHA1(c1578ae553c38e93235cea2142cb139170de2a7e) ) \ - ROM_LOAD( "ddbsound2", 0x080000, 0x080000, CRC(9c733ab1) SHA1(a83c3ebe99703bb016370a8caf76bdeaff5f2f40) ) \ - + ROM_LOAD( "ddbsound2", 0x080000, 0x080000, CRC(9c733ab1) SHA1(a83c3ebe99703bb016370a8caf76bdeaff5f2f40) ) ROM_START( m4ddb ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "ddb3_1.bin", 0x0000, 0x010000, CRC(3b2da727) SHA1(8a677be3b82464d1bf1e97d22adad3b27374079f) ) diff --git a/src/mame/drivers/mpu4avan.c b/src/mame/drivers/mpu4avan.c index 8d11fefc495..2ce19b151b9 100644 --- a/src/mame/drivers/mpu4avan.c +++ b/src/mame/drivers/mpu4avan.c @@ -21,8 +21,7 @@ INPUT_PORTS_EXTERN( mpu4 ); ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // robotica - latvia @@ -92,8 +91,7 @@ M4ROBO_SET( 199?, m4robo__0, m4robo, "rou2b317.bin", 0x0000, 0x010000, CRC(8a ROM_LOAD( "abcz.jd", 0x0000, 0x000580, CRC(86fcaa33) SHA1(c0146cd4a289d5dff26e6edc15a0781f437f46ac) ) \ ROM_LOAD( "abl.jd", 0x0000, 0x000580, CRC(d99e4b62) SHA1(6ae11967f7bc6edd69bd8be20c0c1960e6f3369e) ) \ ROM_LOAD( "abr.jd", 0x0000, 0x000580, CRC(389c4cea) SHA1(c431c51c47cbd8a7f3bd0497dd7fffccb4a3416f) ) \ - ROM_LOAD( "abu.jd", 0x0000, 0x000580, CRC(95f7892d) SHA1(dc2ab97ff60f3532967119ff6d2dc8d9596caa01) ) \ - + ROM_LOAD( "abu.jd", 0x0000, 0x000580, CRC(95f7892d) SHA1(dc2ab97ff60f3532967119ff6d2dc8d9596caa01) ) #define M4ABEAUT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -101,8 +99,7 @@ M4ROBO_SET( 199?, m4robo__0, m4robo, "rou2b317.bin", 0x0000, 0x010000, CRC(8a ROM_LOAD( name, offset, length, hash ) \ M4ABEAUT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // ab M4ABEAUT_SET( 199?, m4abeaut, 0, "aba305.bin", 0x0000, 0x010000, CRC(ab70802c) SHA1(0cb59947b0bc177b10c55e02a0c8016620e0c346), "Avantime?","American Beauty (Avantime?) (MPU4) (AB, set 1)" ) @@ -301,8 +298,7 @@ M4ABEAUT_SET( 199?, m4abeaut_k2, m4abeaut, "a2k0b618.bin", 0x0000, 0x010000 #define M4TRG_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "trgsound.dat", 0x0000, 0x080000, CRC(b9eeffbd) SHA1(9ab8005bbabb30358e3e1ccc007372542bc2e799) ) \ - + ROM_LOAD( "trgsound.dat", 0x0000, 0x080000, CRC(b9eeffbd) SHA1(9ab8005bbabb30358e3e1ccc007372542bc2e799) ) #define M4TRG_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -310,8 +306,7 @@ M4ABEAUT_SET( 199?, m4abeaut_k2, m4abeaut, "a2k0b618.bin", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4TRG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // roms of different sizes again, might also be main / sub setups @@ -352,8 +347,7 @@ M4TRG_SET( 199?, m4trg__4, m4trg, "rmtp4cz", 0x0000, 0x010000, CRC(1c5fd8 #define M4RMTP_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "rm.s3", 0x0000, 0x080000, CRC(250e64f2) SHA1(627c4dc5cdc7d0a7cb6f74991ae91b71a2f4dbc6) ) \ - + ROM_LOAD( "rm.s3", 0x0000, 0x080000, CRC(250e64f2) SHA1(627c4dc5cdc7d0a7cb6f74991ae91b71a2f4dbc6) ) #define M4RMTP_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -361,8 +355,7 @@ M4TRG_SET( 199?, m4trg__4, m4trg, "rmtp4cz", 0x0000, 0x010000, CRC(1c5fd8 ROM_LOAD( name, offset, length, hash ) \ M4RMTP_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4RMTP_SET( 199?, m4rmtp, 0, "r4iha202.bin", 0x0000, 0x010000, CRC(b1588632) SHA1(ad21bbc5e99fd6b511e6881e8b20dcad177b937f), "Avantime?","Reel Magic Turbo Play (Avantime?) (MPU4) (set 1)" ) @@ -379,8 +372,7 @@ M4RMTP_SET( 199?, m4rmtp__g, m4rmtp, "r4iua205.bin", 0x0000, 0x010000, CRC(46 ROM_REGION( 0x10000, "gal", 0 ) \ ROM_LOAD( "rmdxi", 0x0000, 0x000b57, CRC(c16021ec) SHA1(df77e410ea2edae1559e40a877e292f0d1969b0a) ) \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing */ \ - + /* missing */ #define M4RMTPD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -388,8 +380,7 @@ M4RMTP_SET( 199?, m4rmtp__g, m4rmtp, "r4iua205.bin", 0x0000, 0x010000, CRC(46 ROM_LOAD( name, offset, length, hash ) \ M4RMTPD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) @@ -447,8 +438,7 @@ M4RMTPD_SET( 199?, m4rmtpd__am, m4rmtpd, "rduhb511.bin", 0x0000, 0x010000, CR #define M4MBEL_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing */ \ - + /* missing */ #define M4MBEL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -456,8 +446,7 @@ M4RMTPD_SET( 199?, m4rmtpd__am, m4rmtpd, "rduhb511.bin", 0x0000, 0x010000, CR ROM_LOAD( name, offset, length, hash ) \ M4MBEL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4MBEL_SET( 199?, m4mbel, 0, "mb1.1k", 0x0000, 0x020000, CRC(00763b37) SHA1(2314ea5e8541e2be2492135785317f4fdd998692), "Avantime?","Millennium Bells (Avantime?) (MPU4) (set 1)" ) M4MBEL_SET( 199?, m4mbel__a, m4mbel, "mb1.1kw", 0x0000, 0x010000, CRC(d1ccefe4) SHA1(dba63d0a75fe614e77ac24ae23bfd0d924dd3e9a), "Avantime?","Millennium Bells (Avantime?) (MPU4) (set 2)" ) @@ -529,8 +518,7 @@ M4MBEL_SET( 199?, m4mbel__a0, m4mbel, "mbpl3.3c", 0x0000, 0x020000, CR #define M4CMONT_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "mcsnd1.dat", 0x000000, 0x080000, CRC(9477e648) SHA1(1abefced0cf708ad035720d5e58dc7dae50de5d1) ) \ - ROM_LOAD( "mcsnd2.dat", 0x080000, 0x080000, CRC(088796bd) SHA1(877bf21add8ef95f5384a88e1287bd9aa5dbfa95) ) \ - + ROM_LOAD( "mcsnd2.dat", 0x080000, 0x080000, CRC(088796bd) SHA1(877bf21add8ef95f5384a88e1287bd9aa5dbfa95) ) #define M4CMONT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -538,8 +526,7 @@ M4MBEL_SET( 199?, m4mbel__a0, m4mbel, "mbpl3.3c", 0x0000, 0x020000, CR ROM_LOAD( name, offset, length, hash ) \ M4CMONT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // cmc M4CMONT_SET( 199?, m4cmont, 0, "cmc1.7", 0x0000, 0x020000, CRC(aaebab34) SHA1(36145b7d062ad5a740bcf326933f78274b99495c), "Avantime?","Casino Monte Carlo (Avantime?) (MPU4) (Czech, set 1)" ) @@ -618,8 +605,7 @@ M4CMONT_SET( 199?, m4cmont_gt3, m4cmont, "gtr58gaa", 0x0000, 0x020000, CR #define M4BLKMGC_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "bmsnd", 0x0000, 0x080000, CRC(81da8bc9) SHA1(a60fd689e2683b987f48e3a4c8817b169a9c3fdf) ) \ - + ROM_LOAD( "bmsnd", 0x0000, 0x080000, CRC(81da8bc9) SHA1(a60fd689e2683b987f48e3a4c8817b169a9c3fdf) ) #define M4BLKMGC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -627,8 +613,7 @@ M4CMONT_SET( 199?, m4cmont_gt3, m4cmont, "gtr58gaa", 0x0000, 0x020000, CR ROM_LOAD( name, offset, length, hash ) \ M4BLKMGC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // new - latvia @@ -646,8 +631,7 @@ M4BLKMGC_SET( 199?, m4blkmgc_u6, m4blkmgc, "bau1b307.bin", 0x0000, 0x010000 #define M4AMALAD_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "aasnd", 0x0000, 0x080000, CRC(6b78f3de) SHA1(4f10afdc5cf7c84e2d048f7c9c5f83323f1e5a6e) ) \ - + ROM_LOAD( "aasnd", 0x0000, 0x080000, CRC(6b78f3de) SHA1(4f10afdc5cf7c84e2d048f7c9c5f83323f1e5a6e) ) #define M4AMALAD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -655,8 +639,7 @@ M4BLKMGC_SET( 199?, m4blkmgc_u6, m4blkmgc, "bau1b307.bin", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4AMALAD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4AMALAD_SET( 199?, m4amalad, 0, "aag1.4", 0x0000, 0x020000, CRC(0da943a1) SHA1(50915ce67687f15a36b5c38b1c1c6773bd3ecf9f), "Avantime?","American Aladdin (Avantime?) (MPU4) (set 1)" ) M4AMALAD_SET( 199?, m4amalad__a, m4amalad, "aag1.3", 0x0000, 0x020000, CRC(3a9552a9) SHA1(7695899b6ed52d0c7530b5ed0829cfdbb3892fa2), "Avantime?","American Aladdin (Avantime?) (MPU4) (set 2)" ) @@ -679,16 +662,14 @@ M4AMALAD_SET( 199?, m4amalad__n, m4amalad, "jpaltst2.dat", 0x0000, 0x02 #define M4BBEN_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "bben1s.bin", 0x0000, 0x02dbc5, CRC(9240317e) SHA1(d9167e52a09ff1783bb10e2e34fb80bdf555f00e) ) \ - + ROM_LOAD( "bben1s.bin", 0x0000, 0x02dbc5, CRC(9240317e) SHA1(d9167e52a09ff1783bb10e2e34fb80bdf555f00e) ) #define M4BBEN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BBEN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BBEN_SET( 199?, m4bben, 0, "bbc1a102.bin", 0x0000, 0x010000, CRC(c5010bb6) SHA1(f39ab219eafaa391b5b777c2918f059ba67b4504), "Avantime?","Big Ben (Avantime?) (MPU4) (set 1)" ) @@ -707,16 +688,14 @@ M4BBEN_SET( 199?, m4bben__i, m4bben, "bbc2b106.bin", 0x0000, 0x010000, CRC(d0 #define M4BBOX_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "bb1snd.bin", 0x0000, 0x068880, CRC(69d53f5a) SHA1(dd7958060804fda97a1fdf69c230bfab092b9707) ) \ - + ROM_LOAD( "bb1snd.bin", 0x0000, 0x068880, CRC(69d53f5a) SHA1(dd7958060804fda97a1fdf69c230bfab092b9707) ) #define M4BBOX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BBOX_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BBOX_SET( 199?, m4bbox, 0, "bbb1.bin", 0x0000, 0x010000, CRC(b668e08e) SHA1(f401405419689ea5ad06dfd815aaef9e1b7ed4e1), "Avantime?","Brain Box (Avantime?) (MPU4) (set 1)" ) @@ -734,16 +713,14 @@ M4BBOX_SET( 199?, m4bbox__i, m4bbox, "bbb9.bin", 0x0000, 0x010000, CRC(19 #define M4FRNUDG_EXTRA_ROMS \ - ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) #define M4FRNUDG_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4FRNUDG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4FRNUDG_SET( 199?, m4frnudg, 0, "fanhc11.bin", 0x0000, 0x010000, CRC(d2fe9df9) SHA1(7b519e4ed447f8c59fda972fc398f6ff423a8f92), "Avantime?","Fruit & Nudge (Avantime?) (MPU4) (set 1)" ) M4FRNUDG_SET( 199?, m4frnudg__a, m4frnudg, "fanhc12.bin", 0x0000, 0x010000, CRC(2b2176e0) SHA1(9acffc05c02e76a6cbe4cfd708ff2d94ecb6c308), "Avantime?","Fruit & Nudge (Avantime?) (MPU4) (set 2)" ) @@ -755,16 +732,14 @@ M4FRNUDG_SET( 199?, m4frnudg__c, m4frnudg, "fanhc9.bin", 0x0000, 0x010000 ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "fmsnd1.bin", 0x0000, 0x080000, CRC(300fcb23) SHA1(c3a7424089e7893972e04a6a5e77cfb4e0ffc8ec)) \ ROM_REGION( 0x100000, "pals", 0 ) \ - ROM_LOAD( "fm.jed", 0x0000, 0x000580, CRC(dc166c8e) SHA1(0cc49836b7ad57daa54e08f10f07aa279ccc53a0)) \ - + ROM_LOAD( "fm.jed", 0x0000, 0x000580, CRC(dc166c8e) SHA1(0cc49836b7ad57daa54e08f10f07aa279ccc53a0)) #define M4FRMTX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4FRMTX_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4FRMTX_SET( 199?, m4frmtx, 0, "fm1.bin", 0x0000, 0x010000, CRC(0d11ffee) SHA1(50a3f97cf76855ba503a833e4198c154a57b6847), "Avantime?","Fruit Matrix (Avantime?) (MPU4) (set 1)" ) M4FRMTX_SET( 199?, m4frmtx__a, m4frmtx, "fm2.bin", 0x0000, 0x010000, CRC(ab143a49) SHA1(c4ba0671b154707fd69d58fd3bf65f5ba4d2bf53), "Avantime?","Fruit Matrix (Avantime?) (MPU4) (set 2)" ) M4FRMTX_SET( 199?, m4frmtx__b, m4frmtx, "fm4.bin", 0x0000, 0x010000, CRC(cbe09e1d) SHA1(00d17c6a189ac1a60ec9acbe2babb5a69dec3711), "Avantime?","Fruit Matrix (Avantime?) (MPU4) (set 3)" ) @@ -777,16 +752,14 @@ M4FRMTX_SET( 199?, m4frmtx__f, m4frmtx, "frmatx3", 0x0000, 0x010000, CR #define M4JOK2K_EXTRA_ROMS \ - ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) #define M4JOK2K_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4JOK2K_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) // latvia M4JOK2K_SET( 199?, m4jok2k, 0, "j300 1.512", 0x0000, 0x010000, CRC(3a52da14) SHA1(b2b7f32093938f8b793fa4c425cd5beaeaa83286), "Avantime?","Joker 2000 (Avantime?) (MPU4) (set 1)" ) M4JOK2K_SET( 199?, m4jok2k__a, m4jok2k, "j300 2.512", 0x0000, 0x010000, CRC(6d3c6b99) SHA1(b5f34043e3cc93908b7ff969ae2546862a3a79ce), "Avantime?","Joker 2000 (Avantime?) (MPU4) (set 2)" ) @@ -798,16 +771,14 @@ M4JOK2K_SET( 199?, m4jok2k__b, m4jok2k, "joker2000.dat", 0x0000, 0x020000 #define M4MJP_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "mjsnd1.bin", 0x0000, 0x080000, CRC(e9b62ebb) SHA1(d930dffdb933f3359ae210d2c1ab5ada9964c398) ) \ - + ROM_LOAD( "mjsnd1.bin", 0x0000, 0x080000, CRC(e9b62ebb) SHA1(d930dffdb933f3359ae210d2c1ab5ada9964c398) ) #define M4MJP_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MJP_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4MJP_SET( 199?, m4mjp, 0, "code.bin", 0x0000, 0x020000, CRC(c57d0148) SHA1(4d21a501ea64eb4fcf22ae9fba81b8982a55730e), "Avantime?","Mega Jackpot (Avantime?) (MPU4) (set 1)" ) M4MJP_SET( 199?, m4mjp__a, m4mjp, "mjl02.bin", 0x0000, 0x010000, CRC(014d1765) SHA1(5cc4039e574b3a68be6d639453b217ce9a0841f0), "Avantime?","Mega Jackpot (Avantime?) (MPU4) (set 2)" ) @@ -821,16 +792,14 @@ M4MJP_SET( 199?, m4mjp__g, m4mjp, "tl01.bin", 0x0000, 0x010000, CRC(a36a32 #define M4MILROU_EXTRA_ROMS \ - ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) #define M4MILROU_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MILROU_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4MILROU_SET( 199?, m4milrou, 0, "nonp1.dat", 0x0000, 0x020000, CRC(b7503d57) SHA1(dc0ba6073ae278b8406cc7e30e4b4fed21df61c8), "Avantime?","Millennium Roulette (Avantime?) (MPU4) (set 1)" ) M4MILROU_SET( 199?, m4milrou__a, m4milrou, "p1.dat", 0x0000, 0x020000, CRC(b3f4a2b0) SHA1(01ee5ef5eea0f83791d68b2d9bdb5be6c6495a28), "Avantime?","Millennium Roulette (Avantime?) (MPU4) (set 2)" ) @@ -839,16 +808,14 @@ M4MILROU_SET( 199?, m4milrou__a, m4milrou, "p1.dat", 0x0000, 0x020000 #define M4KINGG_EXTRA_ROMS \ - ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) #define M4KINGG_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4KINGG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4KINGG_SET( 199?, m4kingg, 0, "kgiha101.bin", 0x0000, 0x010000, CRC(4da8bea1) SHA1(63fbad82877f772f3f559026eaddb69e09d6556b), "Avantime?","King George (Avantime?) (MPU4) (set 1)" ) M4KINGG_SET( 199?, m4kingg__a, m4kingg, "kgiha102.bin", 0x0000, 0x010000, CRC(573687b0) SHA1(eafc90120297201fc1ba40029b592ec25d972690), "Avantime?","King George (Avantime?) (MPU4) (set 2)" ) diff --git a/src/mame/drivers/mpu4bwb.c b/src/mame/drivers/mpu4bwb.c index 24bac93ad70..be4459e6ec5 100644 --- a/src/mame/drivers/mpu4bwb.c +++ b/src/mame/drivers/mpu4bwb.c @@ -36,16 +36,14 @@ INPUT_PORTS_EXTERN( mpu4 ); ROM_REGION( 0x180000, "altmsm6376", 0 ) /* this is NOT the same, some samples are changed */ \ ROM_LOAD( "bigmsnd", 0x0000, 0x07db60, CRC(876c53ae) SHA1(ea2511ec9ba4ff67879212c6e2ba908873130a4e) ) \ ROM_REGION( 0x180000, "msm6376", 0 ) \ - ROM_LOAD( "tbmsnd.hex", 0x0000, 0x080000, CRC(e98da8de) SHA1(36668f2b82778f441224c94831f5b95efb9fa92b) ) \ - + ROM_LOAD( "tbmsnd.hex", 0x0000, 0x080000, CRC(e98da8de) SHA1(36668f2b82778f441224c94831f5b95efb9fa92b) ) #define M4BIGMT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BIGMT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BIGMT_SET( 199?, m4bigmt, 0, "bigm1320", 0x0000, 0x010000, CRC(a5085347) SHA1(93a7f7656e53461270e04190ff538959d6c917c1), "Bwb","The Big Match (Bwb) (MPU4) (set 1)" ) M4BIGMT_SET( 199?, m4bigmt__a, m4bigmt, "tb_20___.7_1", 0x0000, 0x010000, CRC(22fae0f0) SHA1(a875adccf96fbbff69f5fe76720514767cdcae66), "Bwb","The Big Match (Bwb) (MPU4) (set 2)" ) @@ -58,16 +56,14 @@ M4BIGMT_SET( 199?, m4bigmt__f, m4bigmt, "tbi20___.7_1", 0x0000, 0x010000, CR #define M4BINGBL_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* Missing, or not OKI? */ \ - + /* Missing, or not OKI? */ #define M4BINGBL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BINGBL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BINGBL_SET( 199?, m4bingbl, 0, "bb_20a__.8_1", 0x0000, 0x010000, CRC(10f29ba3) SHA1(739b413f35676834ebafeb121c6059759586ec72), "Bwb","Bingo Belle (Bwb) (MPU4) (set 1)" ) @@ -81,16 +77,14 @@ M4BINGBL_SET( 199?, m4bingbl__g, m4bingbl, "bbi20___.8_1", 0x0000, 0x010000 #define M4BINGBS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* Missing, or not OKI? */ \ - + /* Missing, or not OKI? */ #define M4BINGBS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BINGBS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BINGBS_SET( 199?, m4bingbs, 0, "bp_20a__.2_1", 0x0000, 0x010000, CRC(ca005003) SHA1(271ff0dbee529ca15c79c9aa1047efa8993ea073), "Bwb","Bingo Belle Showcase (Bwb) (MPU4) (set 1)" ) M4BINGBS_SET( 199?, m4bingbs__a, m4bingbs, "bp_20bg_.2_1", 0x0000, 0x010000, CRC(1b59c32f) SHA1(0c7df33f921639bfedbddd969dcbcd62e38ff912), "Bwb","Bingo Belle Showcase (Bwb) (MPU4) (set 2)" ) @@ -102,16 +96,14 @@ M4BINGBS_SET( 199?, m4bingbs__f, m4bingbs, "bp_20sk_.2_1", 0x0000, 0x010000 #define M4BINGCL_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* Missing, or not OKI? */ \ - + /* Missing, or not OKI? */ #define M4BINGCL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BINGCL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4BINGCL_SET( 199?, m4bingcl, 0, "bc_xe___.2_1", 0x0000, 0x010000, CRC(3abbc215) SHA1(b5e59b30c07c4ffef69c5729f1a28d7ee55636bd), "Bwb","Bingo Club (Bwb) (MPU4) (set 1)" ) M4BINGCL_SET( 199?, m4bingcl__a, m4bingcl, "bc_xe_b_.2_1", 0x0000, 0x010000, CRC(3e11c5c0) SHA1(2d9bc987fed040664f211bb9d13984b6cba5e25f), "Bwb","Bingo Club (Bwb) (MPU4) (set 2)" ) @@ -122,16 +114,14 @@ M4BINGCL_SET( 199?, m4bingcl__b, m4bingcl, "bc_xe_d_.2_1", 0x0000, 0x010000 #define M4BLSBYS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "bbsnd.p1", 0x000000, 0x080000, CRC(715c9e95) SHA1(6a0c9c63e56cfc21bf77cf29c1b844b8e0844c1e) ) \ - ROM_LOAD( "bbsnd.p2", 0x080000, 0x080000, CRC(594a87f8) SHA1(edfef7d08fab41fb5814c92930f08a565371eae1) ) \ - + ROM_LOAD( "bbsnd.p2", 0x080000, 0x080000, CRC(594a87f8) SHA1(edfef7d08fab41fb5814c92930f08a565371eae1) ) #define M4BLSBYS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BLSBYS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,bwboki ,mpu4 , mpu4_state,m_blsbys ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,bwboki ,mpu4 , mpu4_state,m_blsbys ,ROT0,company,title,GAME_FLAGS ) M4BLSBYS_SET( 199?, m4blsbys, 0, "bbprog.bin", 0x0000, 0x020000, CRC(c262cfda) SHA1(f004895e0dd3f8420683927915554e19e41bd20b), "Bwb","Blues Boys (Bwb) (MPU4) (set 1)" ) M4BLSBYS_SET( 199?, m4blsbys__a, m4blsbys, "bf_20a__.3_1", 0x0000, 0x020000, CRC(fca7764f) SHA1(a88378247b6710d6122c515c31c39c5cd9678ce2), "Bwb","Blues Boys (Bwb) (MPU4) (set 2)" ) @@ -181,16 +171,14 @@ M4BLSBYS_SET( 199?, m4blsbys__ad, m4blsbys, "bsix3___.2v1", 0x0000, 0x020000 ROM_LOAD( "bluesboyz.bi2", 0x000000, 0x080000, CRC(7f19a61b) SHA1(dd8742d84df24e118bdbffb1efffad1c71eb2283) ) \ ROM_LOAD( "bluesboyz.bi3", 0x080000, 0x080000, CRC(32363184) SHA1(8f3f53ce4d9f9b54c441263def9d8e23880507a1) ) \ ROM_LOAD( "bluesboyz.bi4", 0x100000, 0x080000, CRC(aa94281d) SHA1(e15b7bf97b8e307ed465d9b8cb6e5de0044f6fb5) ) \ - ROM_LOAD( "bluesboyz.bi5", 0x180000, 0x080000, CRC(d8d7aa2e) SHA1(2d8b86fa63e6649d628c7e343d8f5c329c8f8ced) ) \ - + ROM_LOAD( "bluesboyz.bi5", 0x180000, 0x080000, CRC(d8d7aa2e) SHA1(2d8b86fa63e6649d628c7e343d8f5c329c8f8ced) ) #define M4BLUESN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BLUESN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4BLUESN_SET( 199?, m4bluesn, m4blsbys, "bluesboys.bin", 0x0000, 0x020000, CRC(c1395649) SHA1(3cd0eed1f966f5391fe5de496dc747385ebfb556), "Bwb","Blues Boys (Nova) (MPU4)" ) @@ -199,16 +187,14 @@ M4BLUESN_SET( 199?, m4bluesn, m4blsbys, "bluesboys.bin", 0x0000, 0x020000, C ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "ch_socc.s1", 0x000000, 0x080000, CRC(abaea3f3) SHA1(cf3b6e4ee99680726efd2a839b49b4d86e2bd270) ) \ ROM_LOAD( "ch_socc.s2", 0x080000, 0x080000, CRC(2048f5b2) SHA1(b07addfd9d861b1d19d4db248e16c597cf79b159) ) \ - ROM_LOAD( "ch_socc.s3", 0x100000, 0x080000, CRC(064224b0) SHA1(99a8bacfd3a42f72e40b93d1f7eeea633c3cf366) ) \ - + ROM_LOAD( "ch_socc.s3", 0x100000, 0x080000, CRC(064224b0) SHA1(99a8bacfd3a42f72e40b93d1f7eeea633c3cf366) ) #define M4CSOC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CSOC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4CSOC_SET( 199?, m4csoc, 0, "chsoc8ac", 0x0000, 0x040000, CRC(8e0471ba) SHA1(3b7e6edbb3490e99af148c0cfe8d39c13c282880), "Bwb","Championship Soccer (Bwb) (MPU4) (set 1)" ) @@ -227,16 +213,14 @@ M4CSOC_SET( 199?, m4csoc__j, m4csoc, "ch_socc.5", 0x0000, 0x040000, CRC(1b #define M4CPFINL_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "cupsnd_1.0_2", 0x000000, 0x080000, CRC(54384ce8) SHA1(ff78c4ea16722662a480bff1f85af7efe84b01e5) ) \ - ROM_LOAD( "cupsnd_1.0_3", 0x080000, 0x080000, CRC(24d3d848) SHA1(64287c3cbe2e9693954bc880d6edf2bc17b0ed65) ) \ - + ROM_LOAD( "cupsnd_1.0_3", 0x080000, 0x080000, CRC(24d3d848) SHA1(64287c3cbe2e9693954bc880d6edf2bc17b0ed65) ) #define M4CPFINL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CPFINL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4CPFINL_SET( 199?, m4cpfinl, 0, "cu_10___.5_1", 0x0000, 0x010000, CRC(47a85443) SHA1(d308b9a6dcb0200f72d5c5b380907d2d55f3e40d), "Bwb","Cup Final (Bwb) (MPU4) (set 1)" ) @@ -255,16 +239,14 @@ M4CPFINL_SET( 199?, m4cpfinl__k, m4cpfinl, "cui20_k_.5_1", 0x0000, 0x010000 #define M4DANCED_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", 0 ) \ - ROM_LOAD( "dd______.1_2", 0x0000, 0x080000, CRC(b9043a08) SHA1(5d87a30f23e8b5e3eaa0584d0d49efc08209882b) ) \ - + ROM_LOAD( "dd______.1_2", 0x0000, 0x080000, CRC(b9043a08) SHA1(5d87a30f23e8b5e3eaa0584d0d49efc08209882b) ) #define M4DANCED_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4DANCED_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4DANCED_SET( 199?, m4danced, 0, "dd_22bg_.2_1", 0x0000, 0x020000, CRC(f79525a1) SHA1(babfbf8beae423626057235bcad5eae18531160e), "Bwb","Dancing Diamonds (Bwb) (MPU4) (set 1)" ) @@ -295,16 +277,14 @@ M4DANCED_SET( 199?, m4danced__w, m4danced, "dd_sja__.2_1", 0x0000, 0x020000 #define M4DAYTN_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4DAYTN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4DAYTN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) @@ -331,16 +311,14 @@ M4DAYTN_SET( 199?, m4daytn__n, m4daytn, "da_92_d_.1_0", 0x0000, 0x040000, CR ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "ex______.1_2", 0x000000, 0x080000, CRC(9305e516) SHA1(5a5c67f97761fe2e042ba31594d1881238d3227b) ) \ ROM_LOAD( "ex______.1_3", 0x080000, 0x080000, CRC(29e3709a) SHA1(2e2f089aa2a938158930f235bf821685932d698b) ) \ - ROM_LOAD( "ex______.1_4", 0x100000, 0x080000, CRC(dd747003) SHA1(cf0a2936c897e3b833984c55f4825c358b723ab8) ) \ - + ROM_LOAD( "ex______.1_4", 0x100000, 0x080000, CRC(dd747003) SHA1(cf0a2936c897e3b833984c55f4825c358b723ab8) ) #define M4EXCAL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4EXCAL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4EXCAL_SET( 199?, m4excal, 0, "ex_05a__.6_1", 0x0000, 0x020000, CRC(317fa289) SHA1(8a0e83a764e2a04285367e0f7ebb814fedc81400), "Bwb","Excalibur (Bwb) (MPU4) (set 1)" ) M4EXCAL_SET( 199?, m4excal__a, m4excal, "ex_20a_6.6_1", 0x0000, 0x020000, CRC(284937c8) SHA1(3be8bf21ab0ff97f67ce170cee48cd08ea325571), "Bwb","Excalibur (Bwb) (MPU4) (set 2)" ) @@ -357,16 +335,14 @@ M4EXCAL_SET( 199?, m4excal__j, m4excal, "ex_20sd8.6_1", 0x0000, 0x020000, CR #define M4EXOTIC_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4EXOTIC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4EXOTIC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4EXOTIC_SET( 199?, m4exotic, 0, "eo_49bg_.2_0", 0x0000, 0x020000, CRC(c3bf2286) SHA1(74090fd0a103a6c311d426f4aae8e7af8b1d3bc0), "Bwb","Exotic Fruits (Bwb) (MPU4) (set 1)" ) M4EXOTIC_SET( 199?, m4exotic__a, m4exotic, "eo_49bm_.2_0", 0x0000, 0x020000, CRC(c748c4ca) SHA1(7d0d498f9edd792ed861c8bf9cf1bb03698d144d), "Bwb","Exotic Fruits (Bwb) (MPU4) (set 2)" ) @@ -381,16 +357,14 @@ M4EXOTIC_SET( 199?, m4exotic__e, m4exotic, "eo_sja__.2_0", 0x0000, 0x020000 ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "fire_ice.s1", 0x000000, 0x080000, CRC(74ee37c1) SHA1(bc9b419dd1fd1c66090f8946247e754c0267baa3) ) \ ROM_LOAD( "fire_ice.s2", 0x080000, 0x080000, CRC(b86bafeb) SHA1(ee237f601b970dc5be8096a4018cb6a3edac500f) ) \ - ROM_LOAD( "fire_ice.s3", 0x100000, 0x080000, CRC(75f349b3) SHA1(1505bec7b69e1eabd679b70d95ae58fd264ca698) ) \ - + ROM_LOAD( "fire_ice.s3", 0x100000, 0x080000, CRC(75f349b3) SHA1(1505bec7b69e1eabd679b70d95ae58fd264ca698) ) #define M4FIRICE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4FIRICE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4FIRICE_SET( 199?, m4firice, 0, "fi_20__d.5_0", 0x0000, 0x040000, CRC(ab46574c) SHA1(d233b137f8f42b9b644b34a627fbcc5b662e8ae1), "Bwb","Fire & Ice (Bwb) (MPU4) (set 1)" ) M4FIRICE_SET( 199?, m4firice__a, m4firice, "fi_20_bd.5_0", 0x0000, 0x040000, CRC(9b2bc052) SHA1(34b970659218fde097238b852dadedcb928f69fd), "Bwb","Fire & Ice (Bwb) (MPU4) (set 2)" ) @@ -408,16 +382,14 @@ M4FIRICE_SET( 199?, m4firice__j, m4firice, "fi_sja__.e_0", 0x0000, 0x040000 #define M4HARLE_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "hq______.1_2", 0x000000, 0x080000, CRC(0c8c14be) SHA1(a1268e71ea43772a532b63327f24c64fabd7e715) ) \ - ROM_LOAD( "hq______.1_3", 0x080000, 0x080000, CRC(5a07e514) SHA1(6e589756c0fc4b0458ca856e918fa3b7cd396c39) ) \ - + ROM_LOAD( "hq______.1_3", 0x080000, 0x080000, CRC(5a07e514) SHA1(6e589756c0fc4b0458ca856e918fa3b7cd396c39) ) #define M4HARLE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4HARLE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default ,ROT0,company,title,GAME_FLAGS ) M4HARLE_SET( 199?, m4harle, 0, "hq_20a__.1_1", 0x0000, 0x010000, CRC(b8ae3025) SHA1(94a449eff103bf6ba1fc6e85b03061b9ce658ae0), "Bwb","Harlequin (Bwb) (MPU4) (set 1)" ) @@ -451,16 +423,14 @@ M4HARLE_SET( 199?, m4harle__x, m4harle, "ph_20sk_.1_1", 0x0000, 0x010000, CR ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "hh___snd.1_1", 0x000000, 0x080000, CRC(afa7ba60) SHA1(25278046252e49364d4a51de79295b87baf6018e) ) \ ROM_LOAD( "hh___snd.1_2", 0x080000, 0x080000, CRC(ec1ec822) SHA1(3fdee0526cb70f4951b7bbced74e32641ded9b7b) ) \ - ROM_LOAD( "hh___snd.1_3", 0x100000, 0x080000, CRC(d4119155) SHA1(b61c71e1ee0dbfc0bb9eff1a8c019cf11731ee11) ) \ - + ROM_LOAD( "hh___snd.1_3", 0x100000, 0x080000, CRC(d4119155) SHA1(b61c71e1ee0dbfc0bb9eff1a8c019cf11731ee11) ) #define M4HVHEL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4HVHEL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4HVHEL_SET( 199?, m4hvhel, 0, "hh_20__d.2_0", 0x0000, 0x040000, CRC(801de788) SHA1(417b985714d8f0ebed93b65a3f865e03474ce9e5), "Bwb","Heaven & Hell (Bwb) (MPU4) (set 1)" ) M4HVHEL_SET( 199?, m4hvhel__a, m4hvhel, "hh_20a_d.2_0", 0x0000, 0x040000, CRC(ea4e7876) SHA1(5bf711c2bdff50fe745edefa0eebf719824d9e5b), "Bwb","Heaven & Hell (Bwb) (MPU4) (set 2)" ) M4HVHEL_SET( 199?, m4hvhel__b, m4hvhel, "hh_20s_d.2_0", 0x0000, 0x040000, CRC(a519a441) SHA1(f3c19d316c82d1ebbcfdabb6d4eaa6cfa369d287), "Bwb","Heaven & Hell (Bwb) (MPU4) (set 3)" ) @@ -480,16 +450,14 @@ M4HVHEL_SET( 199?, m4hvhel__h, m4hvhel, "h_hell._pound5", 0x0000, 0x040000 ROM_LOAD( "da______.1_1", 0x000000, 0x080000, CRC(99d36c12) SHA1(f8848a28b5546649d6a3f8599dbc4ca84bdac77c) ) \ ROM_LOAD( "da______.1_2", 0x080000, 0x080000, CRC(32b40094) SHA1(f02c3b088d76116f817b536cf7cec5188b2f73bf) ) \ ROM_LOAD( "da______.1_3", 0x100000, 0x080000, CRC(2df33d18) SHA1(40afa32d6c72c6a76e3e2e61db19a16003f4e176) ) \ - ROM_LOAD( "da______.1_4", 0x180000, 0x080000, CRC(8e254a3b) SHA1(bc3643ea5878bbde110ee6971c5149b3320bcffc) ) \ - + ROM_LOAD( "da______.1_4", 0x180000, 0x080000, CRC(8e254a3b) SHA1(bc3643ea5878bbde110ee6971c5149b3320bcffc) ) #define M4INDYCR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4INDYCR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4INDYCR_SET( 199?, m4indycr, 0, "ic_sj___.1_0", 0x0000, 0x040000, CRC(4dea0d17) SHA1(4fa19896dbb5e8f21ac7e74efc56de5cadd5bf54), "Bwb","Indy Cars (Bwb) (MPU4) (set 1)" ) M4INDYCR_SET( 199?, m4indycr__a, m4indycr, "ic_sj___.2_0", 0x0000, 0x040000, CRC(6d0ddf54) SHA1(0985aa9fddb71a499d266c12893aabbab8755319), "Bwb","Indy Cars (Bwb) (MPU4) (set 2)" ) M4INDYCR_SET( 199?, m4indycr__b, m4indycr, "ic_sj_b_.1_0", 0x0000, 0x040000, CRC(4bc0cb73) SHA1(d4c048ba9578add0104f0c529f20356c3502ea71), "Bwb","Indy Cars (Bwb) (MPU4) (set 3)" ) @@ -503,16 +471,14 @@ M4INDYCR_SET( 199?, m4indycr__f, m4indycr, "ic_sjs__.1_0", 0x0000, 0x040000 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "jj_____.1_1", 0x000000, 0x080000, CRC(e759a958) SHA1(b107f4ef5a2805e56d4024940bfc632155de1eb1) ) \ ROM_LOAD( "jj_____.1_2", 0x080000, 0x080000, CRC(aa215ff0) SHA1(4bf2c6f8153730cc3ca86f78ec14063ece7d8700) ) \ - ROM_LOAD( "jj_____.1_3", 0x100000, 0x080000, CRC(03c0ffc3) SHA1(2572f62362325df8b235b487d4a764218e7f1589) ) \ - + ROM_LOAD( "jj_____.1_3", 0x100000, 0x080000, CRC(03c0ffc3) SHA1(2572f62362325df8b235b487d4a764218e7f1589) ) #define M4JAKJOK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4JAKJOK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4JAKJOK_SET( 199?, m4jakjok, 0, "jj_sj___.6_0", 0x0000, 0x040000, CRC(7bc45b0e) SHA1(f30fef8fccdac04859f1ff93198a497eff723020), "Bwb","Jackpot Jokers (Bwb) (MPU4) (set 1)" ) M4JAKJOK_SET( 199?, m4jakjok__a, m4jakjok, "jj_sj_k_.3_0", 0x0000, 0x040000, CRC(c33dd82f) SHA1(c1f3f6ca1c45503b7f71e897e5c27368f5efb439), "Bwb","Jackpot Jokers (Bwb) (MPU4) (set 2)" ) @@ -523,31 +489,27 @@ M4JAKJOK_SET( 199?, m4jakjok__c, m4jakjok, "jj_vc___.7_0", 0x0000, 0x040000 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "j_joker.s1", 0x0000, 0x080000, CRC(4ad711d2) SHA1(500381ac2a5075acd606a131cd1b382342cc3a80) ) \ ROM_LOAD( "j_joker.s2", 0x0000, 0x080000, CRC(840ba491) SHA1(f7f43d5d8e521a59fdccbd5f22935c525c3d43c2) ) \ - ROM_LOAD( "j_joker.s3", 0x0000, 0x080000, CRC(2ed74890) SHA1(a3d039b4c3c9dd792300eb045e542a212d4d50ae) ) \ - + ROM_LOAD( "j_joker.s3", 0x0000, 0x080000, CRC(2ed74890) SHA1(a3d039b4c3c9dd792300eb045e542a212d4d50ae) ) #define M4JAKJOKA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4JAKJOKA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4JAKJOKA_SET( 199?, m4jakjoka, m4jakjok, "j_joker", 0x0000, 0x040000, CRC(4f0c7ab8) SHA1(af962863ee55f6c2752bbe8a997e3b2102e42431), "Bwb","Jackpot Jokers (alt) (Bwb) (MPU4)" ) #define M4JFLASH_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4JFLASH_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4JFLASH_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4JFLASH_SET( 199?, m4jflash, 0, "jf_25__c.2_1", 0x0000, 0x020000, CRC(4d5f1a12) SHA1(c25b6d899b74231da505bde7b671be001bdcea5d), "Bwb","Jumping Jack Flash (Bwb) (MPU4) (set 1)" ) M4JFLASH_SET( 199?, m4jflash__a, m4jflash, "jf_25a_c.2_1", 0x0000, 0x020000, CRC(76722e15) SHA1(4bd107049ad98b848cdaba3a1318373bbd06ab9f), "Bwb","Jumping Jack Flash (Bwb) (MPU4) (set 2)" ) M4JFLASH_SET( 199?, m4jflash__b, m4jflash, "jf_25b_c.2_1", 0x0000, 0x020000, CRC(35a927c6) SHA1(6776fe77ad8a85feecdedfad0eac89f9cb826fbf), "Bwb","Jumping Jack Flash (Bwb) (MPU4) (set 3)" ) @@ -562,16 +524,14 @@ M4JFLASH_SET( 199?, m4jflash__i, m4jflash, "jf_25sbc.2_1", 0x0000, 0x020000 #define M4LN7_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "l7______.1_2", 0x000000, 0x080000, CRC(216209e3) SHA1(af274a7f27ba0e7ac03400e9919537ab36464e64) ) \ - ROM_LOAD( "l7______.1_3", 0x080000, 0x080000, CRC(e909c3ec) SHA1(68ce743729aaefd6c20ee447af40d99e0f4c072b) ) \ - + ROM_LOAD( "l7______.1_3", 0x080000, 0x080000, CRC(e909c3ec) SHA1(68ce743729aaefd6c20ee447af40d99e0f4c072b) ) #define M4LN7_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LN7_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4LN7_SET( 199?, m4ln7, 0, "l7_20a__.1_1", 0x0000, 0x010000, CRC(bfe82d2a) SHA1(4477d737a2326602a355758d8fc06220312fc085), "Bwb","Lucky No7 (Bwb) (MPU4) (set 1)" ) M4LN7_SET( 199?, m4ln7__a, m4ln7, "l7_20s__.1_1", 0x0000, 0x010000, CRC(0037cd57) SHA1(b5882027269cf71878a73009bc3e40d9fcfac60d), "Bwb","Lucky No7 (Bwb) (MPU4) (set 2)" ) @@ -582,16 +542,14 @@ M4LN7_SET( 199?, m4ln7__d, m4ln7, "l7_20sk_.1_1", 0x0000, 0x010000, CRC(7d2104 #define M4MADMON_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4MADMON_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MADMON_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4MADMON_SET( 199?, m4madmon, 0, "mm_20a__.7_1", 0x0000, 0x020000, CRC(7df66388) SHA1(4e5bcbcb2fb08b23989c83f11751400f666bbdc2), "Bwb","Mad Money (Bwb) (MPU4) (set 1)" ) M4MADMON_SET( 199?, m4madmon__a, m4madmon, "mm_20b__.7_1", 0x0000, 0x020000, CRC(7f592e44) SHA1(05e78347cd09d1e58f0a50a724e0563490ec5185), "Bwb","Mad Money (Bwb) (MPU4) (set 2)" ) M4MADMON_SET( 199?, m4madmon__b, m4madmon, "mm_20bg_.7_1", 0x0000, 0x020000, CRC(2cd8dcc2) SHA1(c4a2a423a55c6b0668739429c24c69b25e3824cf), "Bwb","Mad Money (Bwb) (MPU4) (set 3)" ) @@ -608,16 +566,14 @@ M4MADMON_SET( 199?, m4madmon__k, m4madmon, "mm_25bdc.3_1", 0x0000, 0x020000 #define M4MADMNC_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4MADMNC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MADMNC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4MADMNC_SET( 199?, m4madmnc, 0, "cm_25__c.3_1", 0x0000, 0x020000, CRC(3d9ff5fe) SHA1(b918bb15251514f50a669216c7d00ecf23e64d1b), "Bwb","Mad Money Classic (Bwb) (MPU4) (set 1)" ) M4MADMNC_SET( 199?, m4madmnc__a, m4madmnc, "cm_25_bc.3_1", 0x0000, 0x020000, CRC(65a7b870) SHA1(58b910d7e002164cbbe1aa32c5e17dfe7cfb507d), "Bwb","Mad Money Classic (Bwb) (MPU4) (set 2)" ) @@ -651,16 +607,14 @@ M4MADMNC_SET( 199?, m4madmnc__w, m4madmnc, "cm_49btc.4_1", 0x0000, 0x020000 ROM_LOAD( "mu___snd.1_1", 0x000000, 0x080000, CRC(570cf5f8) SHA1(48b3703bf385d037e4e870dfb671b75e9bab84a7) ) \ ROM_LOAD( "mu___snd.1_2", 0x080000, 0x080000, CRC(6ec1910b) SHA1(4920fe0b7c7f4ddb14d56f50598aaf62e5867014) ) \ ROM_LOAD( "mu___snd.1_3", 0x100000, 0x080000, CRC(8699378c) SHA1(55c3e310cfde8046e58bf21a8788e697c8275b8d) ) \ - ROM_LOAD( "mu___snd.1_4", 0x180000, 0x080000, CRC(54b193d8) SHA1(ab24624ce69d352a14f6bd3db127fa1c8c5f07db) ) \ - + ROM_LOAD( "mu___snd.1_4", 0x180000, 0x080000, CRC(54b193d8) SHA1(ab24624ce69d352a14f6bd3db127fa1c8c5f07db) ) #define M4MMM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MMM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4MMM_SET( 199?, m4mmm, 0, "mu_sj___.3_0", 0x0000, 0x040000, CRC(abdf9d1c) SHA1(e8c6a056025b44e4ec995b42b2720e6366a97283), "Bwb","Money Mummy Money (Bwb) (MPU4) (set 1)" ) M4MMM_SET( 199?, m4mmm__a, m4mmm, "mu_sja__.3_0", 0x0000, 0x040000, CRC(3d2a9ea4) SHA1(f2ec904c8cef84affaad603edf26a864bd34be29), "Bwb","Money Mummy Money (Bwb) (MPU4) (set 2)" ) M4MMM_SET( 199?, m4mmm__b, m4mmm, "mu_sjk__.3_0", 0x0000, 0x040000, CRC(34e4f8ba) SHA1(606d607faeb43190f5167aa3d10c55d9986b7e58), "Bwb","Money Mummy Money (Bwb) (MPU4) (set 3)" ) @@ -672,16 +626,14 @@ M4MMM_SET( 199?, m4mmm__f, m4mmm, "mu_ssjb_.2_0", 0x0000, 0x040000, CRC(572897 #define M4ORLAND_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "orlandosnd.p1", 0x000000, 0x080000, CRC(2735649d) SHA1(7b27bf2d4091ab581d399679b03f538f449f180c) ) \ - ROM_LOAD( "orlandosnd.p2", 0x080000, 0x080000, CRC(0741e2ff) SHA1(c49a2809073dd058ba85ae14c888e19d3eb2b133) ) \ - + ROM_LOAD( "orlandosnd.p2", 0x080000, 0x080000, CRC(0741e2ff) SHA1(c49a2809073dd058ba85ae14c888e19d3eb2b133) ) #define M4ORLAND_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ORLAND_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4ORLAND_SET( 199?, m4orland, 0, "or 05a v2-1(27c010)", 0x0000, 0x020000, CRC(a33c22ee) SHA1(3598a2940f05622405fdef16426f3f5f30dfef29), "Bwb","Orlando Magic (Bwb) (MPU4) (set 1)" ) M4ORLAND_SET( 199?, m4orland__a, m4orland, "or_05a__.1_1", 0x0000, 0x020000, CRC(3e7fe3ac) SHA1(9f4c0d5b7ba10726376b0654c8ddbc62b62c9eed), "Bwb","Orlando Magic (Bwb) (MPU4) (set 2)" ) @@ -696,16 +648,14 @@ M4ORLAND_SET( 199?, m4orland__h, m4orland, "or_20sd_.7_1", 0x0000, #define M4PZBING_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4PZBING_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PZBING_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4PZBING_SET( 199?, m4pzbing, 0, "pb_20a__.4_1", 0x0000, 0x010000, CRC(52aa92e5) SHA1(3dc20e521677e829967e1d689c9905fb96aee639), "Bwb","Prize Bingo (Bwb) (MPU4) (set 1)" ) M4PZBING_SET( 199?, m4pzbing__a, m4pzbing, "pb_20ad_.4_1", 0x0000, 0x010000, CRC(f6bd6ad0) SHA1(092cb895c576ed2e995b62aba21851af6fb90959), "Bwb","Prize Bingo (Bwb) (MPU4) (set 2)" ) @@ -718,16 +668,14 @@ M4PZBING_SET( 199?, m4pzbing__e, m4pzbing, "pb_20sb_.4_1", 0x0000, 0x010000 #define M4QUIDIN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "qi_____.1_2", 0x000000, 0x080000, CRC(216209e3) SHA1(af274a7f27ba0e7ac03400e9919537ab36464e64) ) \ - ROM_LOAD( "qi_____.1_3", 0x080000, 0x080000, CRC(e909c3ec) SHA1(68ce743729aaefd6c20ee447af40d99e0f4c072b) ) \ - + ROM_LOAD( "qi_____.1_3", 0x080000, 0x080000, CRC(e909c3ec) SHA1(68ce743729aaefd6c20ee447af40d99e0f4c072b) ) #define M4QUIDIN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4QUIDIN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) @@ -738,16 +686,14 @@ M4QUIDIN_SET( 199?, m4quidin__b, m4quidin, "qi_20sb_.3_1", 0x0000, 0x010000 #define M4QUIDIS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4QUIDIS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4QUIDIS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4QUIDIS_SET( 199?, m4quidis, 0, "pq_20a__.3_1", 0x0000, 0x010000, CRC(7eb762a1) SHA1(4546a7bf43f8ab6eb9713348e3f919de7532eed2), "Bwb","Quids In Showcase (Bwb) (MPU4) (set 1)" ) M4QUIDIS_SET( 199?, m4quidis__a, m4quidis, "pq_20s__.3_1", 0x0000, 0x010000, CRC(71360992) SHA1(0b64f27f0edfdebca41552181ff0f2b5491ec308), "Bwb","Quids In Showcase (Bwb) (MPU4) (set 2)" ) @@ -760,16 +706,14 @@ M4QUIDIS_SET( 199?, m4quidis__d, m4quidis, "pq_20sk_.3_1", 0x0000, 0x010000 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "re_snd.p1", 0x000000, 0x080000, CRC(aea88892) SHA1(457dab5cddfb9762f7e0bd61187b8052aee71c28) ) \ ROM_LOAD( "re_snd.p2", 0x080000, 0x080000, CRC(57394ec6) SHA1(cba7abebd3ab165e9531017168f51ada6cf35991) ) \ - ROM_LOAD( "re_snd.p3", 0x100000, 0x080000, CRC(5d5d5309) SHA1(402615633976410225a1ee50c454391dc69a68cb) ) \ - + ROM_LOAD( "re_snd.p3", 0x100000, 0x080000, CRC(5d5d5309) SHA1(402615633976410225a1ee50c454391dc69a68cb) ) #define M4RACKEM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RACKEM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RACKEM_SET( 199?, m4rackem, 0, "re_sj___.2_0", 0x0000, 0x040000, CRC(e36d3f86) SHA1(a5f522c86482517b8dc735b1012f8f7668c2f18d), "Bwb","Rack Em Up (Bwb) (MPU4) (set 1)" ) M4RACKEM_SET( 199?, m4rackem__a, m4rackem, "re_sj___.3_0", 0x0000, 0x040000, CRC(2f463d2f) SHA1(3410cc8a6d097a4edfcb4c57c237d1d514b507ba), "Bwb","Rack Em Up (Bwb) (MPU4) (set 2)" ) @@ -781,16 +725,14 @@ M4RACKEM_SET( 199?, m4rackem__d, m4rackem, "re_sjsw_.2_0", 0x0000, 0x040000 #define M4RBGOLD_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4RBGOLD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RBGOLD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RBGOLD_SET( 199?, m4rbgold, 0, "rb_20a_p.2a1", 0x0000, 0x010000, CRC(d7e6e514) SHA1(25645b69e86335622df43113908ed88a21f27e30), "Bwb","Rainbow Gold (Bwb) (MPU4) (set 1)" ) M4RBGOLD_SET( 199?, m4rbgold__a, m4rbgold, "rb_20a_p.2f1", 0x0000, 0x010000, CRC(62af6db6) SHA1(0dcb679c05f090f8dab7228009a700c31f0179d8), "Bwb","Rainbow Gold (Bwb) (MPU4) (set 2)" ) M4RBGOLD_SET( 199?, m4rbgold__b, m4rbgold, "rb_20sbp.2a1", 0x0000, 0x010000, CRC(ba4c2e74) SHA1(fcc325754f96e742998373c6c5c13a8509f48cd5), "Bwb","Rainbow Gold (Bwb) (MPU4) (set 3)" ) @@ -816,16 +758,14 @@ M4RBGOLD_SET( 199?, m4rbgold__q, m4rbgold, "rbixe___.2s1", 0x0000, 0x010000 ROM_LOAD( "rf_____.1_1", 0x000000, 0x080000, CRC(ac8d539d) SHA1(8baf14bece50774f93ae9eaf3effabb6882d2c43) ) \ ROM_LOAD( "rf_____.1_2", 0x080000, 0x080000, CRC(cc2fadd8) SHA1(681850e2e6164cf8af8e7501ac44f475cc07b742) ) \ ROM_LOAD( "rf_____.1_3", 0x100000, 0x080000, CRC(165aaf9f) SHA1(815224fe94a77628cef1dd0d8a238edcb4813006) ) \ - ROM_LOAD( "rf_____.1_4", 0x180000, 0x080000, CRC(4f7e7b49) SHA1(f9d421eeab73e0c795a08cf166c8807e0b14ec82) ) \ - + ROM_LOAD( "rf_____.1_4", 0x180000, 0x080000, CRC(4f7e7b49) SHA1(f9d421eeab73e0c795a08cf166c8807e0b14ec82) ) #define M4RHFEV_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHFEV_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RHFEV_SET( 199?, m4rhfev, 0, "rt_sj___.7_0", 0x0000, 0x040000, CRC(3dd895ef) SHA1(433ecc268956c94c51dbccefd006b72e0ad8567b), "Bwb","Red Hot Fever (Bwb) (MPU4) (set 1)" ) M4RHFEV_SET( 199?, m4rhfev__a, m4rhfev, "rt_sja__.7_0", 0x0000, 0x040000, CRC(0ab59402) SHA1(485b4d2efd8f99085ed6ce5b7e07ede001c982c4), "Bwb","Red Hot Fever (Bwb) (MPU4) (set 2)" ) @@ -839,16 +779,14 @@ M4RHFEV_SET( 199?, m4rhfev__e, m4rhfev, "rtv.p1", 0x0000, 0x008000, CR ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ /*These were with the last listed set, though I have no reason to believe they aren't valid for all BwB Sinbad games */ \ ROM_LOAD( "sinbadbwb1_2snd.bin", 0x000000, 0x080000, CRC(2ee60ce6) SHA1(865860639e8471f97ace0beac2f4c7fddb8ca97c) ) \ - ROM_LOAD( "sinbadbwb1_3snd.bin", 0x000000, 0x080000, CRC(7701e5cc) SHA1(4f9ff91f2b6b15a9c08396b52fc8509ba476ed8d) ) \ - + ROM_LOAD( "sinbadbwb1_3snd.bin", 0x000000, 0x080000, CRC(7701e5cc) SHA1(4f9ff91f2b6b15a9c08396b52fc8509ba476ed8d) ) #define M4SINBD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SINBD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SINBD_SET( 199?, m4sinbd, 0, "sd_20__c.1_1", 0x0000, 0x020000, CRC(28cd336e) SHA1(45bdf5403c04b7d3a3645b6b44ac3d12e6463a55), "Bwb","Sinbad (Bwb) (MPU4) (set 1)" ) M4SINBD_SET( 199?, m4sinbd__a, m4sinbd, "sd_20a__.4_1", 0x0000, 0x020000, CRC(12b8f629) SHA1(c8540ecb217cf0615d7a8d080136926646ca8497), "Bwb","Sinbad (Bwb) (MPU4) (set 2)" ) @@ -879,16 +817,14 @@ M4SINBD_SET( 199?, m4sinbd__x, m4sinbd, "sinbadbwb1_1game.bin", 0x0000, 0x02 #define M4SKY_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4SKY_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SKY_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SKY_SET( 199?, m4sky, 0, "sk_s____.3_1", 0x0000, 0x040000, CRC(749af008) SHA1(036514f2bcb84193cfa84313f0617f3196aea73e), "Bwb","Sky Sports (Bwb) (MPU4) (set 1)" ) M4SKY_SET( 199?, m4sky__a, m4sky, "sk_sj___.5_0", 0x0000, 0x040000, CRC(45ae0423) SHA1(94d5b3d4aacb69a18ff3f45681eb5f7fba7657e8), "Bwb","Sky Sports (Bwb) (MPU4) (set 2)" ) @@ -901,16 +837,14 @@ M4SKY_SET( 199?, m4sky__d, m4sky, "sk_sjs__.5_0", 0x0000, 0x040000, CRC(d17643 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "ss______.1_2", 0x000000, 0x080000, CRC(ddea9d75) SHA1(fe5f88d49434109d0f51425e790e179dc1a02767) ) \ ROM_LOAD( "ss______.1_3", 0x080000, 0x080000, CRC(23d1e57a) SHA1(b17afdaa95522fd7ea6c12f513fa338e1fcb06f6) ) \ - ROM_LOAD( "ss______.1_4", 0x100000, 0x080000, CRC(0ba3046a) SHA1(ec21fa328669bc7a5baf1ce8b9ac05f38f98e360) ) \ - + ROM_LOAD( "ss______.1_4", 0x100000, 0x080000, CRC(0ba3046a) SHA1(ec21fa328669bc7a5baf1ce8b9ac05f38f98e360) ) #define M4SOULS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SOULS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SOULS_SET( 199?, m4souls, 0, "ss_06a__.4_1", 0x0000, 0x020000, CRC(00390a21) SHA1(d31d1307301fa4e8cf0ce3677e68a4c1723e4404), "Bwb","Soul Sister (Bwb) (MPU4) (set 1)" ) M4SOULS_SET( 199?, m4souls__a, m4souls, "ss_16a__.4_1", 0x0000, 0x020000, CRC(b9ab9612) SHA1(ad30916a0f2cc745741c99d23c23192ae4088daf), "Bwb","Soul Sister (Bwb) (MPU4) (set 2)" ) M4SOULS_SET( 199?, m4souls__b, m4souls, "ss_26a__.2_1", 0x0000, 0x020000, CRC(bf9acf05) SHA1(13698b453e975a1801631163d06468f07c181b48), "Bwb","Soul Sister (Bwb) (MPU4) (set 3)" ) @@ -923,16 +857,14 @@ M4SOULS_SET( 199?, m4souls__f, m4souls, "ss_26sk_.2_1", 0x0000, 0x020000, CR #define M4SPINBT_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4SPINBT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SPINBT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SPINBT_SET( 199?, m4spinbt, 0, "sn_37ad_.5_0", 0x0000, 0x040000, CRC(42d6faaa) SHA1(3789e85981b33ffae7c50ccca3278ae62974972d), "Bwb","Spin The Bottle (Bwb) (MPU4) (set 1)" ) M4SPINBT_SET( 199?, m4spinbt__a, m4spinbt, "sn_37b__.5_0", 0x0000, 0x040000, CRC(3a259a6f) SHA1(1acabb9e725ae1374b87808c4b3d06a329c824d0), "Bwb","Spin The Bottle (Bwb) (MPU4) (set 2)" ) @@ -945,16 +877,14 @@ M4SPINBT_SET( 199?, m4spinbt__g, m4spinbt, "sn_s7s__.5_0", 0x0000, 0x040000 #define M4STARST_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "starsnd3", 0x0000, 0x080000, CRC(96882952) SHA1(bf366670aec5cb545c56caac3c63855db03d8c14) )/* (?)strange id number? */ \ - + ROM_LOAD( "starsnd3", 0x0000, 0x080000, CRC(96882952) SHA1(bf366670aec5cb545c56caac3c63855db03d8c14) )/* (?)strange id number? */ #define M4STARST_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4STARST_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4STARST_SET( 199?, m4starst, 0, "sr_20__d.3_0", 0x0000, 0x040000, CRC(98f6619b) SHA1(fc0a568e6695c9ad0fda7bc6703c752af26a7777), "Bwb","Stars & Stripes (Bwb) (MPU4) (set 1)" ) M4STARST_SET( 199?, m4starst__a, m4starst, "sr_20_bd.3_0", 0x0000, 0x040000, CRC(ff8209de) SHA1(41a4c20c89b3a04612ad6298276472b888915c89), "Bwb","Stars & Stripes (Bwb) (MPU4) (set 2)" ) M4STARST_SET( 199?, m4starst__b, m4starst, "sr_20_kd.3_0", 0x0000, 0x040000, CRC(4c9a53d5) SHA1(43ebf6c06db58de9c3934e2dbba0d8126f3e2dda), "Bwb","Stars & Stripes (Bwb) (MPU4) (set 3)" ) @@ -972,16 +902,14 @@ M4STARST_SET( 199?, m4starst__j, m4starst, "sr_sjs__.5_0", 0x0000, 0x040000 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "sls1.hex", 0x000000, 0x080000, CRC(341e3d3e) SHA1(b42ec737e95e766b1b26d6225416ee0c5cad2663) ) \ ROM_LOAD( "sls2.hex", 0x080000, 0x080000, CRC(f4ab6f0d) SHA1(4b59608ca16c9d158d4d1ac532e7fbe6ff0da959) ) \ - ROM_LOAD( "sls3.hex", 0x100000, 0x080000, CRC(dcba96a1) SHA1(d474c63b37cb18a0b3b1299b5cacadfd8cd5458b) ) \ - + ROM_LOAD( "sls3.hex", 0x100000, 0x080000, CRC(dcba96a1) SHA1(d474c63b37cb18a0b3b1299b5cacadfd8cd5458b) ) #define M4SUPLEG_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SUPLEG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SUPLEG_SET( 199?, m4supleg, 0, "sl_sj.hex", 0x0000, 0x040000, CRC(254835f7) SHA1(2fafaa3da747edd27d393ad106008e898e465283), "Bwb","Super League (Bwb) (MPU4) (set 1)" ) M4SUPLEG_SET( 199?, m4supleg__a, m4supleg, "sl_sjs.hex", 0x0000, 0x040000, CRC(98942cd3) SHA1(858fde0a350159d089c6a0e0cc2e2eed6ab2092c), "Bwb","Super League (Bwb) (MPU4) (set 2)" ) @@ -993,16 +921,14 @@ M4SUPLEG_SET( 199?, m4supleg__d, m4supleg, "sls.hex", 0x0000, 0x040000 ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "s_leag.s1",0x000000, 0x080000, CRC(e8d90896) SHA1(4c67507f18b5dc966e2df3685dc6c257f5053e61) ) \ ROM_LOAD( "sls2.hex", 0x080000, 0x080000, CRC(f4ab6f0d) SHA1(4b59608ca16c9d158d4d1ac532e7fbe6ff0da959) ) \ - ROM_LOAD( "sls3.hex", 0x100000, 0x080000, CRC(dcba96a1) SHA1(d474c63b37cb18a0b3b1299b5cacadfd8cd5458b) ) \ - + ROM_LOAD( "sls3.hex", 0x100000, 0x080000, CRC(dcba96a1) SHA1(d474c63b37cb18a0b3b1299b5cacadfd8cd5458b) ) #define M4SUPLEGW_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SUPLEGW_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SUPLEGW_SET( 199?, m4suplegw, m4supleg, "s_leag._pound5", 0x0000, 0x040000, CRC(4c6bd78e) SHA1(f67793a2a16adacc8d92b57050f02cffa50a1283), "Bwb","Super League (Whitbread / Bwb) (MPU4)" ) //Whitbread? @@ -1010,16 +936,14 @@ M4SUPLEGW_SET( 199?, m4suplegw, m4supleg, "s_leag._pound5", 0x0000, 0x040000, #define M4SUPSCR_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4SUPSCR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SUPSCR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SUPSCR_SET( 199?, m4supscr, 0, "multistakesoccer.bin", 0x0000, 0x040000, CRC(ce27b6a7) SHA1(f9038336137b0642da4d1520b5d71a047d8fbe12), "Bwb","Super Soccer (Bwb) (MPU4) (set 1)" ) M4SUPSCR_SET( 199?, m4supscr__a, m4supscr, "sm_78___.6_0", 0x0000, 0x040000, CRC(e7022c44) SHA1(da3a5b9954f7e50dce73aeb9c46bd4631c8350d5), "Bwb","Super Soccer (Bwb) (MPU4) (set 2)" ) M4SUPSCR_SET( 199?, m4supscr__b, m4supscr, "sm_78_d_.6_0", 0x0000, 0x040000, CRC(4dbe6a87) SHA1(fe2ce1fca7105afbf459ee6558744f8fee417169), "Bwb","Super Soccer (Bwb) (MPU4) (set 3)" ) @@ -1038,16 +962,14 @@ M4SUPSCR_SET( 199?, m4supscr__n, m4supscr, "sm_90_d_.6_0", 0x0000, #define M4SURE_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4SURE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SURE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SURE_SET( 199?, m4sure, 0, "su_xf___.3_1", 0x0000, 0x010000, CRC(f85dae5c) SHA1(4c761c355fb6651f1e0cb041342f8a2ff510dfd2), "Bwb","Sure Thing (Bwb) (MPU4) (set 1)" ) M4SURE_SET( 199?, m4sure__a, m4sure, "su_xf_b_.3_1", 0x0000, 0x010000, CRC(9a760e0f) SHA1(fdacdae0e2322daa004b2385616dd34626814d42), "Bwb","Sure Thing (Bwb) (MPU4) (set 2)" ) M4SURE_SET( 199?, m4sure__b, m4sure, "su_xf_d_.3_1", 0x0000, 0x010000, CRC(5c4a5669) SHA1(55e1e853fdfdbb43e7b61b59ab642fb013a0db0e), "Bwb","Sure Thing (Bwb) (MPU4) (set 3)" ) @@ -1057,16 +979,14 @@ M4SURE_SET( 199?, m4sure__c, m4sure, "suixf___.3_1", 0x0000, 0x010000, CRC(ca #define M4TREX_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "tr______.1_2", 0x000000, 0x080000, CRC(75687514) SHA1(dc8f5f1db7da164175c241187cf3f0db1dd71fc9) ) \ - ROM_LOAD( "tr______.1_3", 0x080000, 0x080000, CRC(1e30d4ed) SHA1(8cd916d28f5060d74a0d795f9b75ab597de1cd60) ) \ - + ROM_LOAD( "tr______.1_3", 0x080000, 0x080000, CRC(1e30d4ed) SHA1(8cd916d28f5060d74a0d795f9b75ab597de1cd60) ) #define M4TREX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TREX_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4TREX_SET( 199?, m4trex, 0, "tr_20a__.2_1", 0x0000, 0x010000, CRC(21150b8e) SHA1(1531bc6fdb8b787fed6f4f98c6463313c55efc3c), "Bwb","Trex (Bwb) (MPU4) (set 1)" ) M4TREX_SET( 199?, m4trex__a, m4trex, "tr_20a_p.2_1", 0x0000, 0x010000, CRC(ec1b35bc) SHA1(944959c6d1f8e9b0bb33c659b7c515cb7585fed0), "Bwb","Trex (Bwb) (MPU4) (set 2)" ) @@ -1089,16 +1009,14 @@ M4TREX_SET( 199?, m4trex__l, m4trex, "tr_20skp.2_1", 0x0000, 0x010000, CRC(9e ROM_LOAD( "vo___snd.1_1", 0x000000, 0x080000, CRC(62bb0166) SHA1(17e5557cce4e7841cbcf5d67783fe78452aacc63) ) \ ROM_LOAD( "vo___snd.1_2", 0x080000, 0x080000, CRC(1eded545) SHA1(0010833e42b33fb0fd621a1059e1cf9a123c3fbd) ) \ ROM_LOAD( "vo___snd.1_3", 0x100000, 0x080000, CRC(915f4adf) SHA1(fac6644329ee6ef0026d65d8b94c971e01770d45) ) \ - ROM_LOAD( "vo___snd.1_4", 0x180000, 0x080000, CRC(fec0fbe9) SHA1(26f651c5558a80e88666403d01cf916c3a13d948) ) \ - + ROM_LOAD( "vo___snd.1_4", 0x180000, 0x080000, CRC(fec0fbe9) SHA1(26f651c5558a80e88666403d01cf916c3a13d948) ) #define M4VOLCAN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VOLCAN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4VOLCAN_SET( 199?, m4volcan, 0, "vo_sj___.5_0", 0x0000, 0x040000, CRC(78096ebf) SHA1(96915bc2eca00fbd82fab8b3f62e697da118acdd), "Bwb","Volcano (Bwb) (MPU4) (set 1)" ) @@ -1115,16 +1033,14 @@ M4VOLCAN_SET( 199?, m4volcan__g, m4volcan, "volcano_bwb_2-0.bin", 0x0000, ROM_LOAD( "vd___snd.1_1", 0x000000, 0x080000, CRC(d66b43a9) SHA1(087cf1571a9afb8c1c7cac13640fa453b614fd53) ) \ ROM_LOAD( "vd___snd.1_2", 0x080000, 0x080000, CRC(a501c887) SHA1(c56a05fd8196afb86e665fec3fe7d02b9bf94c1a) ) \ ROM_LOAD( "vd___snd.1_3", 0x100000, 0x080000, CRC(70c6bd96) SHA1(ecdd4276ff72939433630e04bba5be3df569e17e) ) \ - ROM_LOAD( "vd___snd.1_4", 0x180000, 0x080000, CRC(a6753f41) SHA1(b4af3054b62c3f00f2b5a19b816507fc3a62bef4) ) \ - + ROM_LOAD( "vd___snd.1_4", 0x180000, 0x080000, CRC(a6753f41) SHA1(b4af3054b62c3f00f2b5a19b816507fc3a62bef4) ) #define M4VDEXPR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VDEXPR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4VDEXPR_SET( 199?, m4vdexpr, 0, "vd_sj___.2_0", 0x0000, 0x040000, CRC(03efd2a5) SHA1(4fc3695c24335aef11ba168f660fb519d8c9d473), "Bwb","Voodoo Express (Bwb) (MPU4) (set 1)" ) M4VDEXPR_SET( 199?, m4vdexpr__a, m4vdexpr, "vd_sj_d_.2_0", 0x0000, 0x040000, CRC(5073b98e) SHA1(66b020b8c096e78e1c9694f1cbc139e97314ab48), "Bwb","Voodoo Express (Bwb) (MPU4) (set 2)" ) @@ -1135,16 +1051,14 @@ M4VDEXPR_SET( 199?, m4vdexpr__d, m4vdexpr, "vd_vc___.1_0", 0x0000, 0x040000 #define M4XCH_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "xchasnd.bin", 0x0000, 0x080000, CRC(32c44cd5) SHA1(baafb48e6f95ba152942d1e1c273ffb3c95afa82) ) \ - + ROM_LOAD( "xchasnd.bin", 0x0000, 0x080000, CRC(32c44cd5) SHA1(baafb48e6f95ba152942d1e1c273ffb3c95afa82) ) #define M4XCH_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4XCH_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4XCH_SET( 199?, m4xch, 0, "ec_25b__.b_0", 0x0000, 0x020000, CRC(cec9e836) SHA1(460ec38566d7608e51b62f1ffebc18a395002ed4), "Bwb","X-change (Bwb) (MPU4) (set 1)" ) M4XCH_SET( 199?, m4xch__a, m4xch, "ec_36bg_.bv0", 0x0000, 0x020000, CRC(c5d1523a) SHA1(813916008d7e7576e4594a6eb79a76c514470f31), "Bwb","X-change (Bwb) (MPU4) (set 2)" ) @@ -1162,16 +1076,14 @@ M4XCH_SET( 199?, m4xch__k, m4xch, "xchange.bin", 0x0000, 0x010000, CRC(c96cd0 #define M4XS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4XS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4XS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4XS_SET( 199?, m4xs, 0, "es_39b__.3_0", 0x0000, 0x020000, CRC(ba478372) SHA1(c13f9cc4261e91119aa694ec3ac81d94d9f32d22), "Bwb","X-s (Bwb) (MPU4) (set 1)" ) M4XS_SET( 199?, m4xs__a, m4xs, "es_39bg_.3_0", 0x0000, 0x020000, CRC(b689f14f) SHA1(0c3253e1f747a979f55d53fe637fc61cf50e01a3), "Bwb","X-s (Bwb) (MPU4) (set 2)" ) @@ -1184,16 +1096,14 @@ M4XS_SET( 199?, m4xs__f, m4xs, "es_sja__.3_0", 0x0000, 0x020000, CRC(590909 #define M4XTRM_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4XTRM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4XTRM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4XTRM_SET( 199?, m4xtrm, 0, "et_39bg_.2_0", 0x0000, 0x020000, CRC(db1a3c3c) SHA1(081c934ebfc0a9dfa195bb20f51e025e53d9c4b9), "Bwb","X-treme (Bwb) (MPU4) (set 1)" ) M4XTRM_SET( 199?, m4xtrm__a, m4xtrm, "et_49bg_.2_0", 0x0000, 0x020000, CRC(f858d927) SHA1(e7ab84c8898a95075a41fb0249e4b103d60e7d85), "Bwb","X-treme (Bwb) (MPU4) (set 2)" ) M4XTRM_SET( 199?, m4xtrm__b, m4xtrm, "et_sja__.2_0", 0x0000, 0x020000, CRC(8ee2602b) SHA1(b9a779b900ac71ec842dd7eb1643f7a2f1cb6a38), "Bwb","X-treme (Bwb) (MPU4) (set 3)" ) @@ -1201,32 +1111,28 @@ M4XTRM_SET( 199?, m4xtrm__b, m4xtrm, "et_sja__.2_0", 0x0000, 0x020000, CRC(8e #define M4CFINLN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4CFINLN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CFINLN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4CFINLN_SET( 199?, m4cfinln, m4cpfinl, "cfd_7_1.bin", 0x0000, 0x020000, CRC(e42ec2aa) SHA1(6495448c1d11ce0ab9ad794bc3a0981432e22945), "Bwb","Cup Final (Nova) (MPU4) (set 1)" ) M4CFINLN_SET( 199?, m4cfinln__a, m4cpfinl, "cfd_d0.bin", 0x0000, 0x020000, CRC(179fcf13) SHA1(abd18ed28118ba0a62ab321a9d963105946d5eef), "Bwb","Cup Final (Nova) (MPU4) (set 2)" ) #define M4ABRA_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4ABRA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ABRA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4ABRA_SET( 199?, m4abra, 0, "nn_sj___.4_0", 0x0000, 0x040000, CRC(48437d29) SHA1(72a2e9337fc0a004c382931f3af856253c44ed61), "Bwb","Abracadabra (Bwb) (MPU4) (set 1)" ) M4ABRA_SET( 199?, m4abra__a, m4abra, "nn_sja__.4_0", 0x0000, 0x040000, CRC(766cd4ae) SHA1(4d630b967ede615d325f524c2e4c92c7e7a60886), "Bwb","Abracadabra (Bwb) (MPU4) (set 2)" ) M4ABRA_SET( 199?, m4abra__b, m4abra, "nn_sjb__.4_0", 0x0000, 0x040000, CRC(ca77a68a) SHA1(e753c065d299038bae4c451e647b9bcda36421d9), "Bwb","Abracadabra (Bwb) (MPU4) (set 3)" ) @@ -1234,30 +1140,26 @@ M4ABRA_SET( 199?, m4abra__c, m4abra, "nn_sjk__.4_0", 0x0000, 0x040000, CRC(19 #define M4WCNOV_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4WCNOV_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4WCNOV_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4WCNOV_SET( 199?, m4wcnov, 0, "wcdsxh__.5_0", 0x0000, 0x080000, CRC(a82d11de) SHA1(ece14fd5f56da8cc788c53d5c1404275e9000b65), "Bwb","World Cup (Nova) (MPU4)" ) #define M4EXCALN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4EXCALN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4EXCALN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4EXCALN_SET( 199?, m4excaln, m4excal, "exdsx___.6_0", 0x0000, 0x080000, CRC(fcdc703c) SHA1(927870723106aebbb2b492ce9bfebe4aa25d0325), "Bwb","Excalibur (Nova) (MPU4) (set 1)" ) M4EXCALN_SET( 199?, m4excaln__a,m4excal, "exdsx_e_.6_0", 0x0000, 0x080000, CRC(f6421feb) SHA1(5b3cf7fa4bf9711097ed1c9d2d5689329d73193d), "Bwb","Excalibur (Nova) (MPU4) (set 2)" ) @@ -1265,46 +1167,40 @@ M4EXCALN_SET( 199?, m4excaln__a,m4excal, "exdsx_e_.6_0", 0x0000, 0x080000, CR #define M4OLYGN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4OLYGN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4OLYGN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4OLYGN_SET( 199?, m4olygn, 0, "ogdsx___.8_0", 0x0000, 0x040000, CRC(b51a2538) SHA1(d54f37dc14c44ab66e6d6ba6e2df8bc9ed003054), "Bwb","Olympic Gold (German) (Nova) (MPU4) (set 1)" ) M4OLYGN_SET( 199?, m4olygn__a, m4olygn, "ogdsxe__.8_0", 0x0000, 0x040000, CRC(13aa70aa) SHA1(3878c181ec07e24060935bec96e5128e6e4baf31), "Bwb","Olympic Gold (German) (Nova) (MPU4) (set 2)" ) #define M4FTLADN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4FTLADN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4FTLADN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4FTLADN_SET( 199?, m4ftladn, 0, "fidse___.5_0", 0x00000, 0x20000, CRC(62347bbf) SHA1(2b1cd5adda831a8c74c9484ee1b616259d3e3981), "Bwb","Find the Lady (Nova) (MPU4)" ) #define M4SINBDN_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4SINBDN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SINBDN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SINBDN_SET( 199?, m4sinbdn, 0, "sbds3___.a_1", 0x0000, 0x020000, CRC(9bff0e40) SHA1(f8a1263a58f828554e9df77ed0db78e627666fb5), "Bwb","Sinbad (Nova) (MPU4) (set 1)" ) M4SINBDN_SET( 199?, m4sinbdn__a, m4sinbdn, "sbds3___.7w1", 0x0000, 0x020000, CRC(23bc9ce0) SHA1(f750de2b781bc902c65de7109e10a5fc2d4e1c61), "Bwb","Sinbad (Nova) (MPU4) (set 2)" ) diff --git a/src/mame/drivers/mpu4concept.c b/src/mame/drivers/mpu4concept.c index 2dc7acdb3d7..6da7cbafbf1 100644 --- a/src/mame/drivers/mpu4concept.c +++ b/src/mame/drivers/mpu4concept.c @@ -11,16 +11,14 @@ INPUT_PORTS_EXTERN( mpu4 ); #define M4RHFEVC_EXTRA_ROMS \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "rhfs1.bin", 0x0000, 0x03de5e, CRC(0dddd05f) SHA1(908a58752fb1cf76667695a40bcaa7778201c3a2) ) \ - + ROM_LOAD( "rhfs1.bin", 0x0000, 0x03de5e, CRC(0dddd05f) SHA1(908a58752fb1cf76667695a40bcaa7778201c3a2) ) #define M4RHFEVC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHFEVC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RHFEVC_SET( 199?, m4rhfevc, 0, "rhb6a58e.bin", 0x0000, 0x010000, CRC(c5a1ec02) SHA1(3a4dc552fffc34673e590e903a5c15a409f9aeec), "Concept Games Ltd","Red Hot Fever (Concept Games Ltd) (MPU4) (set 1)" ) @@ -54,16 +52,14 @@ M4RHFEVC_SET( 199?, m4rhfevc__y, m4rhfevc, "lxled1.bin", 0x0000, 0x010000 #define M4PULWNC_EXTRA_ROMS \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "paws1.bin", 0x0000, 0x03e72f, CRC(124b14ba) SHA1(b6b84c306c83b3159d88992ad88a10aff161fce8) ) \ - + ROM_LOAD( "paws1.bin", 0x0000, 0x03e72f, CRC(124b14ba) SHA1(b6b84c306c83b3159d88992ad88a10aff161fce8) ) #define M4PULWNC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PULWNC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) @@ -104,16 +100,14 @@ M4PULWNC_SET( 199?, m4pulwnc__4, m4pulwnc, "tchm02.bin", 0x0000, 0x010000 #define M4SPNWNC_EXTRA_ROMS \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "sawsnd1", 0x0000, 0x080000, CRC(7957381f) SHA1(8fd45e5bf67248607f7d98032e08516ded493d74) ) \ - + ROM_LOAD( "sawsnd1", 0x0000, 0x080000, CRC(7957381f) SHA1(8fd45e5bf67248607f7d98032e08516ded493d74) ) #define M4SPNWNC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SPNWNC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SPNWNC_SET( 199?, m4spnwnc, 0, "saw01.bin", 0x0000, 0x010000, CRC(5350e50e) SHA1(0d7ba3280eddb4400545729c55bcfaff7918d553), "Concept Games Ltd","Spin-A-Win (Concept Games Ltd) (MPU4) (set 1)" ) M4SPNWNC_SET( 199?, m4spnwnc__a, m4spnwnc, "saw02.bin", 0x0000, 0x010000, CRC(daf85100) SHA1(ff89adb0d6530bcf5ff0807f48c6008198948d50), "Concept Games Ltd","Spin-A-Win (Concept Games Ltd) (MPU4) (set 2)" ) @@ -121,16 +115,14 @@ M4SPNWNC_SET( 199?, m4spnwnc__b, m4spnwnc, "saw03.bin", 0x0000, 0x010000, C #define M4NUDGWC_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "naws1.bin", 0x0000, 0x02373f, CRC(b2ea8c50) SHA1(a02181f8f4636e69287073f4ffb8604ff2f14b9c) ) \ - + ROM_LOAD( "naws1.bin", 0x0000, 0x02373f, CRC(b2ea8c50) SHA1(a02181f8f4636e69287073f4ffb8604ff2f14b9c) ) #define M4NUDGWC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4NUDGWC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4NUDGWC_SET( 199?, m4nudgwc, 0, "naw02.bin", 0x0000, 0x010000, CRC(eb3ff27d) SHA1(ff0a80a75162380c6cc2d1b31f0bb0579faa1a2c), "Concept Games Ltd","Nudge-A-Win (Concept Games Ltd) (MPU4) (set 1)" ) M4NUDGWC_SET( 199?, m4nudgwc__a, m4nudgwc, "nawhc6.bin", 0x0000, 0x010000, CRC(f9389823) SHA1(e1db35200c9ed9d59cf817901cf75bdbb48507b2), "Concept Games Ltd","Nudge-A-Win (Concept Games Ltd) (MPU4) (set 2)" ) diff --git a/src/mame/drivers/mpu4crystal.c b/src/mame/drivers/mpu4crystal.c index 6c6b2d98108..40fe6bd6a4a 100644 --- a/src/mame/drivers/mpu4crystal.c +++ b/src/mame/drivers/mpu4crystal.c @@ -15,8 +15,7 @@ INPUT_PORTS_EXTERN( mpu4 ); #define M4FRKSTN_SOUND \ ROM_REGION( 0x40000, "upd", 0 ) \ - ROM_LOAD("fr1snd.bin", 0x00000, 0x40000, CRC(2d77bbde) SHA1(0397ede538e913dc2972e260589022564fcd8fe4) ) \ - + ROM_LOAD("fr1snd.bin", 0x00000, 0x40000, CRC(2d77bbde) SHA1(0397ede538e913dc2972e260589022564fcd8fe4) ) ROM_START( m4frkstn ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) @@ -75,8 +74,7 @@ ROM_END #define M4ALADN_SOUND \ ROM_REGION( 0x80000, "upd", 0 ) \ - ROM_LOAD( "alladinscavesnd.bin", 0x0000, 0x080000, CRC(e3831190) SHA1(3dd0e8beafb628f5138a6943518b477095ac2e56) ) \ - + ROM_LOAD( "alladinscavesnd.bin", 0x0000, 0x080000, CRC(e3831190) SHA1(3dd0e8beafb628f5138a6943518b477095ac2e56) ) ROM_START( m4aladn ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) @@ -141,8 +139,7 @@ ROM_END #define M4BASCSH_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4bagcsh ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "cg27.bin", 0x8000, 0x008000, CRC(2e1ce880) SHA1(fcfbbba832ae7d9e79066b27305b3406207caefc) ) @@ -157,8 +154,7 @@ ROM_END #define M4BUCCLB_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4bucclb ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -184,8 +180,7 @@ ROM_END #define M4BULLIO_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4bullio ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -208,8 +203,7 @@ ROM_END #define M4CAROU_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fa_sound.bin", 0x0000, 0x080000, CRC(39837e76) SHA1(74b66f77d9af47a5caab5b6441563b196fdadb37) ) \ - + ROM_LOAD( "fa_sound.bin", 0x0000, 0x080000, CRC(39837e76) SHA1(74b66f77d9af47a5caab5b6441563b196fdadb37) ) ROM_START( m4carou ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "fa110.bin", 0x0000, 0x010000, CRC(ade2a7f8) SHA1(18b9287ab9747ee623e58afa2a4e6f517ff7a8ca) ) @@ -237,8 +231,7 @@ ROM_END #define M4CCLIMB_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4cclimb ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -254,8 +247,7 @@ ROM_END #define M4CRZCL_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4crzcl ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "fu105.bin", 0x0000, 0x010000, CRC(d7ae1644) SHA1(d04c6f96c0f59c782a170bfabfbf670be28c9d3a) ) @@ -288,8 +280,7 @@ ROM_END #define M4ELITC_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4elitc ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -306,8 +297,7 @@ ROM_END #define M4FAIRG_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "fairgroundcrysv2-1snd.bin", 0x0000, 0x040000, CRC(9b09f98a) SHA1(e980bb0039f087ee563165a3aeb66e627fc3afe9) ) \ - + ROM_LOAD( "fairgroundcrysv2-1snd.bin", 0x0000, 0x040000, CRC(9b09f98a) SHA1(e980bb0039f087ee563165a3aeb66e627fc3afe9) ) ROM_START( m4fairg ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "fairgroundcrysv2-16cash.bin", 0x0000, 0x010000, CRC(4a6c6470) SHA1(3211fb0245343d0fcf4581352faf606b7785f00c) ) @@ -317,8 +307,7 @@ ROM_END #define M4FRMANI_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4frmani ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -348,8 +337,7 @@ ROM_END #define M4GOLDXC_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4goldxc ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "gx105.b8", 0x0000, 0x010000, CRC(3a94ea0d) SHA1(e81f5edec6bca1d098d2c72e063b2c7456c99eda) ) @@ -389,8 +377,7 @@ ROM_END #define M4GOLDFC_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "goldfeversamplesound.bin", 0x0000, 0x080000, CRC(eb7d3c7b) SHA1(53b7c048e78506f0188b4dd2750c8dc31a625523) ) \ - + ROM_LOAD( "goldfeversamplesound.bin", 0x0000, 0x080000, CRC(eb7d3c7b) SHA1(53b7c048e78506f0188b4dd2750c8dc31a625523) ) ROM_START( m4goldfc ) @@ -415,8 +402,7 @@ ROM_END #define M4HIROL_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4hirol ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -433,8 +419,7 @@ ROM_END #define M4KINGQN_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "kingsandqueenscrystalsnd.bin", 0x0000, 0x080000, CRC(93e4b644) SHA1(920579db52c5bb820437023e35707780ed503acc) ) \ - + ROM_LOAD( "kingsandqueenscrystalsnd.bin", 0x0000, 0x080000, CRC(93e4b644) SHA1(920579db52c5bb820437023e35707780ed503acc) ) ROM_START( m4kingqn ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -452,8 +437,7 @@ ROM_END #define M4LOTCLB_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4lotclb ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "ds14.bin", 0x0000, 0x010000, CRC(a7e9969b) SHA1(daa1b38002c75cf4802078789955ae58d0cf163e) ) @@ -472,8 +456,7 @@ ROM_END #define M4MONTRL_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "moneytrailsnd.bin", 0x0000, 0x040000, CRC(0f0d52dc) SHA1(79e1a89858f95006a1d2a0dd18d677c84a3087c6) ) \ - + ROM_LOAD( "moneytrailsnd.bin", 0x0000, 0x040000, CRC(0f0d52dc) SHA1(79e1a89858f95006a1d2a0dd18d677c84a3087c6) ) ROM_START( m4montrl ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -510,8 +493,7 @@ ROM_END #define M4MYSTIQ_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4mystiq ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -540,8 +522,7 @@ ROM_END #define M4NUDWIN_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4nudwin ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "dn56.bin", 0x8000, 0x008000, CRC(ca90f7a8) SHA1(1ae92162f02feb5f391617d4180ef1c154e10d1a) ) @@ -557,8 +538,7 @@ ROM_END #define M4PARACL_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4paracl ) @@ -576,8 +556,7 @@ ROM_END #define M4RLPICK_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4rlpick ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "fh15a.bin", 0x0000, 0x010000, CRC(ac448a6e) SHA1(4a99f7b293476e3e477f37cbd28f1e2a99b0f2d2) ) @@ -606,8 +585,7 @@ ROM_END #define M4TWSTR_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "twistersound.bin", 0x000000, 0x100000, CRC(5aa2729b) SHA1(cf490ec6c75c038addcff24655cd6e498cad60c1) ) \ - + ROM_LOAD( "twistersound.bin", 0x000000, 0x100000, CRC(5aa2729b) SHA1(cf490ec6c75c038addcff24655cd6e498cad60c1) ) ROM_START( m4twstr ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -645,8 +623,7 @@ ROM_END #define M4TWSTCL_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "twistersound.bin", 0x000000, 0x100000, CRC(5aa2729b) SHA1(cf490ec6c75c038addcff24655cd6e498cad60c1) )/* From original, may be wrong */ \ - + ROM_LOAD( "twistersound.bin", 0x000000, 0x100000, CRC(5aa2729b) SHA1(cf490ec6c75c038addcff24655cd6e498cad60c1) )/* From original, may be wrong */ ROM_START( m4twstcl ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "fl106.bin", 0x0000, 0x010000, CRC(d43f06a6) SHA1(d3762853dee2779a06a02ad3c1dfd804053d7f7d) ) @@ -670,8 +647,7 @@ ROM_END #define M4DZ_SOUND \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "dangerzonesnd.bin", 0x0000, 0x080000, CRC(bdfcffa2) SHA1(9e3be8fd1c42fd19afcde682662bef82f7e0f7e9) ) \ - + ROM_LOAD( "dangerzonesnd.bin", 0x0000, 0x080000, CRC(bdfcffa2) SHA1(9e3be8fd1c42fd19afcde682662bef82f7e0f7e9) ) ROM_START( m4dz ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "dangerzone1_2.bin", 0x8000, 0x08000, CRC(eb4582f8) SHA1(df4cbbbb927b512b1ace34986ce29b17d7815e49) ) @@ -680,8 +656,7 @@ ROM_END #define M4TYLB_SOUND \ ROM_REGION( 0x080000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "tylbsnd.bin", 0x0000, 0x080000, CRC(781175c7) SHA1(43cf6fe91c756cdd4acc735411ac166647bf29e7) ) \ - + ROM_LOAD( "tylbsnd.bin", 0x0000, 0x080000, CRC(781175c7) SHA1(43cf6fe91c756cdd4acc735411ac166647bf29e7) ) ROM_START( m4tylb ) ROM_REGION( 0x010000, "maincpu", 0 ) @@ -698,8 +673,7 @@ ROM_END #define M4MAGI7_SOUND \ ROM_REGION( 0x080000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4magi7 ) ROM_REGION( 0x010000, "maincpu", 0 ) ROM_LOAD( "m716.bin", 0x0000, 0x010000, CRC(a26d52a8) SHA1(34228654a922f6c2b01c3fbf1a58755ec6968cbc) ) /* only 0x8000-0xffff used */ @@ -715,8 +689,7 @@ ROM_END #define M4RAGS_SOUND \ ROM_REGION( 0x080000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4rags ) ROM_REGION( 0x010000, "maincpu", 0 ) ROM_LOAD( "ct15.bin", 0x8000, 0x008000, CRC(27eab355) SHA1(0ad6a09015b2ddfe87563f3d88f84d2d5b3c74a0) ) @@ -743,8 +716,7 @@ ROM_END #define M4RIOCR_SOUND \ ROM_REGION( 0x080000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4riocr ) ROM_REGION( 0x010000, "maincpu", 0 ) @@ -760,8 +732,7 @@ ROM_END #define M4NDUP_SOUND \ ROM_REGION( 0x080000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ ROM_START( m4ndup ) ROM_REGION( 0x010000, "maincpu", 0 ) ROM_LOAD( "ndu26n.bin", 0x8000, 0x008000, CRC(562668f6) SHA1(aaebdb649e0399551f32520d28b27d7654271fee) ) diff --git a/src/mame/drivers/mpu4dealem.c b/src/mame/drivers/mpu4dealem.c index 2f5d5e08dcb..5bb301feeb1 100644 --- a/src/mame/drivers/mpu4dealem.c +++ b/src/mame/drivers/mpu4dealem.c @@ -24,7 +24,6 @@ public: : mpu4_state(mconfig, type, tag), m_dealem_videoram(*this, "dealem_videoram") { - } optional_shared_ptr m_dealem_videoram; diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c index 76297130b5f..c1b8040e8b9 100644 --- a/src/mame/drivers/mpu4hw.c +++ b/src/mame/drivers/mpu4hw.c @@ -527,7 +527,6 @@ READ8_MEMBER(mpu4_state::bankswitch_r) WRITE8_MEMBER(mpu4_state::bankset_w) { - // printf("bankset_w %02x\n", data); // m_pageset is never even set?? @@ -2253,7 +2252,6 @@ WRITE8_MEMBER(mpu4_state::bwb_characteriser_w) READ8_MEMBER(mpu4_state::bwb_characteriser_r) { - LOG_CHR(("Characteriser read offset %02X \n",offset)); diff --git a/src/mame/drivers/mpu4misc.c b/src/mame/drivers/mpu4misc.c index b7c74849030..e0623aefa44 100644 --- a/src/mame/drivers/mpu4misc.c +++ b/src/mame/drivers/mpu4misc.c @@ -56,8 +56,7 @@ ROM_END ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "wacky1snd.bin", 0x000000, 0x080000, CRC(45d6869a) SHA1(c1294522d190d22852b5c6006c92911f9e89cfac) ) \ ROM_LOAD( "wacky2snd.bin", 0x080000, 0x080000, CRC(18b5f8c8) SHA1(e4dc312eea777c2375ba8c2be2f3c2be71bea5c4) ) \ - ROM_LOAD( "wacky3snd.bin", 0x100000, 0x080000, CRC(0516acad) SHA1(cfecd089c7250cb19c9e4ca251591f820acefd88) ) \ - + ROM_LOAD( "wacky3snd.bin", 0x100000, 0x080000, CRC(0516acad) SHA1(cfecd089c7250cb19c9e4ca251591f820acefd88) ) ROM_START( m4wwc ) ROM_REGION( 0x020000, "maincpu", 0 ) @@ -129,8 +128,7 @@ ROM_END #define M4JIGGIN_SOUND \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "jigsnd1.oki", 0x000000, 0x080000, CRC(581fa143) SHA1(e35186597fc7932d306080ecc82c55af4b769367) ) \ - ROM_LOAD( "jigsnd2.oki", 0x080000, 0x080000, CRC(34c6fc3a) SHA1(6bfe52a94d8bed5b30d9ed741db7816ddc712aa3) ) \ - + ROM_LOAD( "jigsnd2.oki", 0x080000, 0x080000, CRC(34c6fc3a) SHA1(6bfe52a94d8bed5b30d9ed741db7816ddc712aa3) ) ROM_START( m4jiggin ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -148,8 +146,7 @@ ROM_END #define M4DCRLS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "dcr_sounds.bin", 0x0000, 0x09664e, CRC(431cecbc) SHA1(b564ae8d083fef84328526192626a220e979d5ad) ) /* intelhex */ \ - ROM_LOAD( "71000110.bin", 0x0000, 0x080000, CRC(0373a197) SHA1(b32bf521e36b5a53170d3a6ec545ce8db3a5094d) ) \ - + ROM_LOAD( "71000110.bin", 0x0000, 0x080000, CRC(0373a197) SHA1(b32bf521e36b5a53170d3a6ec545ce8db3a5094d) ) #define M4DCRLS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -157,8 +154,7 @@ ROM_END ROM_LOAD( name, offset, length, hash ) \ M4DCRLS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4DCRLS_SET( 199?, m4dcrls, 0, "70000116.bin", 0x0000, 0x040000, CRC(27e5ad77) SHA1(83cabd8b52efc6c0d5530b55683295208f64abb6), "Qps","Double Crazy Reels (Qps) (MPU4) (set 1)" ) // dcr_std_340.bin @@ -187,8 +183,7 @@ M4DCRLS_SET( 199?, m4dcrls__r, m4dcrls, "dcr_data_340.bin", ROM_LOAD( "71000080.lo.hex", 0x0000, 0x134084, CRC(f3866082) SHA1(f33f6d7e078d7072cc7c67672b3afa3e90e1f805) ) \ ROM_LOAD( "71000080.hi.hex", 0x0000, 0x12680f, CRC(2a9db1df) SHA1(73823c3db5c68068dadf6d9b4c93b47c0cf13bd3) ) \ ROM_LOAD( "71000080.p1", 0x000000, 0x080000, CRC(b39d5e03) SHA1(94c9208601ea230463b460f5b6ea668363d239f4) ) \ - ROM_LOAD( "71000080.p2", 0x080000, 0x080000, CRC(ad6da9af) SHA1(9ec8c8fd7b9bcd1d4c6ed93726fafe9a50a15894) ) \ - + ROM_LOAD( "71000080.p2", 0x080000, 0x080000, CRC(ad6da9af) SHA1(9ec8c8fd7b9bcd1d4c6ed93726fafe9a50a15894) ) #define M4JUNGJK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -196,8 +191,7 @@ M4DCRLS_SET( 199?, m4dcrls__r, m4dcrls, "dcr_data_340.bin", ROM_LOAD( name, offset, length, hash ) \ M4JUNGJK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) @@ -213,8 +207,7 @@ M4JUNGJK_SET( 199?, m4jungjk__e, m4jungjk, "jungle.p1", #define M4RHNOTE_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "71000120.hex", 0x0000, 0x112961, CRC(5eb5245e) SHA1(449b02baf56e5798f656d9aee497b88d34f562cc) ) \ - ROM_LOAD( "rhnsnd.bin", 0x0000, 0x080000, CRC(e03eaa43) SHA1(69117021adc1a8968d50703336147a7344c62100) ) \ - + ROM_LOAD( "rhnsnd.bin", 0x0000, 0x080000, CRC(e03eaa43) SHA1(69117021adc1a8968d50703336147a7344c62100) ) #define M4RHNOTE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -222,8 +215,7 @@ M4JUNGJK_SET( 199?, m4jungjk__e, m4jungjk, "jungle.p1", ROM_LOAD( name, offset, length, hash ) \ M4RHNOTE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RHNOTE_SET( 199?, m4rhnote, 0, "70000120.bin", 0x0000, 0x040000, CRC(d1ce1e1c) SHA1(2fc2b041b4e9fcade4b2ce6a0bc709f4174e2d88), "Qps","Red Hot Notess (Qps) (MPU4) (set 1)" ) M4RHNOTE_SET( 199?, m4rhnote__a, m4rhnote, "70000121.bin", 0x0000, 0x040000, CRC(1e1a26c0) SHA1(8a80a94d280c82887a0f7da607988597df23e1fb), "Qps","Red Hot Notess (Qps) (MPU4) (set 2)" ) M4RHNOTE_SET( 199?, m4rhnote__b, m4rhnote, "70000125.bin", 0x0000, 0x080000, CRC(67a617a2) SHA1(3900c0cc3f8e4d52105096c1e21903cb83b8c1b7), "Qps","Red Hot Notess (Qps) (MPU4) (set 3)" ) @@ -254,8 +246,7 @@ M4RHNOTE_SET( 199?, m4rhnote__y, m4rhnote, "rhn_std_110_lv.bin", #define M4RHROCK_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) /* intelhex, needs converting */ \ ROM_LOAD( "71000200.hi.hex", 0x0000, 0x0ff0f8, CRC(998e28ea) SHA1(f54a69af16e05119df2697bc01e548ac51ed3e11) ) \ - ROM_LOAD( "71000200.lo.hex", 0x0000, 0x134084, CRC(ccd0b35f) SHA1(6d3ef65577a46c68f8628675d146f829c9a99659) ) \ - + ROM_LOAD( "71000200.lo.hex", 0x0000, 0x134084, CRC(ccd0b35f) SHA1(6d3ef65577a46c68f8628675d146f829c9a99659) ) #define M4RHROCK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -263,8 +254,7 @@ M4RHNOTE_SET( 199?, m4rhnote__y, m4rhnote, "rhn_std_110_lv.bin", ROM_LOAD( name, offset, length, hash ) \ M4RHROCK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RHROCK_SET( 199?, m4rhrock, 0, "rhr_v200_1625_da8c_nlv.bin", 0x0000, 0x040000, CRC(dd67f5b3) SHA1(19b7b57ef20a2ad7997cf748396b246fda87db70), "Qps","Red Hot Rocks (Qps) (MPU4) (set 1)" ) @@ -277,16 +267,14 @@ M4RHROCK_SET( 199?, m4rhrock__a, m4rhrock, "rhr_v300_1216_ce52_nlv.bin", 0x ROM_LOAD( "71000180.hi.hex", 0x0000, 0x04da98, CRC(0ffa11a5) SHA1(a3f8eb00b6771cb49965a717e27d0b544c6b2f4f) ) \ ROM_LOAD( "71000180.lo.hex", 0x0000, 0x134084, CRC(6dfc7474) SHA1(806b4b8ca5fa868581b4bf33080b9c486ce71bb6) ) \ ROM_LOAD( "redhotwheelssnd.p1", 0x0000, 0x080000, CRC(7b274a71) SHA1(38ba69084819133253b41f2eb1d784104e5f10f7) ) \ - ROM_LOAD( "redhotwheelssnd.p2", 0x0000, 0x080000, CRC(e36e19e2) SHA1(204554622c9020479b095acd4fbab1f21f829137) ) \ - + ROM_LOAD( "redhotwheelssnd.p2", 0x0000, 0x080000, CRC(e36e19e2) SHA1(204554622c9020479b095acd4fbab1f21f829137) ) #define M4RHWHL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHWHL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RHWHL_SET( 199?, m4rhwhl, 0, "70001184.bin", 0x0000, 0x080000, CRC(8792d95b) SHA1(24b4f78728db7ee95d1fcd3ba38b49a20baaae6b), "Qps","Red Hot Wheels (Qps) (MPU4) (set 1)" ) M4RHWHL_SET( 199?, m4rhwhl__a, m4rhwhl, "rhw_v100_1333_6d40_lv.bin", 0x0000, 0x080000, CRC(9ef7b655) SHA1(605822eaee44bebf554218ef7346192a6a84077e), "Qps","Red Hot Wheels (Qps) (MPU4) (set 2)" ) M4RHWHL_SET( 199?, m4rhwhl__b, m4rhwhl, "rhw_v310_0925_0773_lv_p.bin", 0x0000, 0x080000, CRC(11880908) SHA1(0165bacf73dd54959975b3f186e256fd8d690d34), "Qps","Red Hot Wheels (Qps) (MPU4) (set 3)" ) @@ -296,16 +284,14 @@ M4RHWHL_SET( 199?, m4rhwhl__c, m4rhwhl, "rhw_v310_0931_fa02_lv.bin", 0x00 #define M4RDEAL_EXTRA_ROMS \ - ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) #define M4RDEAL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RDEAL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4RDEAL_SET( 199?, m4rdeal, 0, "70000703.bin", 0x0000, 0x080000, CRC(11e51311) SHA1(71a4327fa01cd7e899d423adc34c732ed56118d8), "Qps","Reel Deal (Qps) (MPU4) (set 1)" ) M4RDEAL_SET( 199?, m4rdeal__a, m4rdeal, "70000704.bin", 0x0000, 0x080000, CRC(b161c08b) SHA1(bb914eb900aff0f6eeec33ff8a595a288306e073), "Qps","Reel Deal (Qps) (MPU4) (set 2)" ) @@ -323,16 +309,14 @@ M4RDEAL_SET( 199?, m4rdeal__i, m4rdeal, "70001745.bin", 0x0000, 0x080000, CR ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ ROM_LOAD( "snrsnd.p1", 0x000000, 0x080000, CRC(985c7c8c) SHA1(d2740ff6192c21af3a8a8a9a92b6fd604b40e9d1) ) \ ROM_LOAD( "snrsnd.p2", 0x080000, 0x080000, CRC(6a3a57ce) SHA1(3aaa0a761e17a2a14196cb023b10a49b44ba1046) ) \ - ROM_LOAD( "shock.s2", 0x080000, 0x080000, CRC(10e9912f) SHA1(833d2b125bf30bdb8de71f6c9d8a9fe92701f741) ) /* alt snd2 */ \ - + ROM_LOAD( "shock.s2", 0x080000, 0x080000, CRC(10e9912f) SHA1(833d2b125bf30bdb8de71f6c9d8a9fe92701f741) ) /* alt snd2 */ #define M4SHOKNR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SHOKNR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SHOKNR_SET( 199?, m4shoknr, 0, "snr_v300_1218_3019_lv.bin", 0x0000, 0x040000, CRC(bec80497) SHA1(08de5e29a063b01fb904a156170a3063633115ab), "Qps","Shock 'n' Roll (Qps) (MPU4) (set 1)" ) M4SHOKNR_SET( 199?, m4shoknr__a, m4shoknr, "snr_v300_1221_c8ff_nlv.bin", 0x0000, 0x040000, CRC(d191b361) SHA1(4146e509e77878a51e32de877768504b3c85e6f8), "Qps","Shock 'n' Roll (Qps) (MPU4) (set 2)" ) @@ -345,16 +329,14 @@ M4SHOKNR_SET( 199?, m4shoknr__d, m4shoknr, "shock.p1", ROM_LOAD( "71000300.hi.hex", 0x0000, 0x0be342, CRC(f9021a32) SHA1(4bd7d7306385ef37dd9cbb5085dbc104657abc0e) ) \ ROM_LOAD( "71000300.lo.hex", 0x0000, 0x134084, CRC(af34658d) SHA1(63a6db1f5ed00fa6208c63e0a2211ba2afe0e9a1) ) \ ROM_LOAD( "tornadosnd.p1", 0x0000, 0x080000, CRC(cac88f25) SHA1(6ccbf372d983a47a49caedb8a526fc7703b31ed4) ) \ - ROM_LOAD( "tornadosnd.p2", 0x080000, 0x080000, CRC(ef4f563d) SHA1(1268061edd93474296e3454e0a2e706b90c0621c) ) \ - + ROM_LOAD( "tornadosnd.p2", 0x080000, 0x080000, CRC(ef4f563d) SHA1(1268061edd93474296e3454e0a2e706b90c0621c) ) #define M4TORNAD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TORNAD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4TORNAD_SET( 199?, m4tornad, 0, "torn_v110_1146_979d_lv.bin", 0x0000, 0x040000, CRC(3160bddd) SHA1(4f36b081c8f6859a3fe55e1f177a0406c2480987), "Qps","Tornado (Qps) (MPU4) (set 1)" ) M4TORNAD_SET( 199?, m4tornad__a, m4tornad, "torn_v110_1153_955f_nlv.bin", 0x0000, 0x040000, CRC(c437040d) SHA1(50c5ba655989b7f6a2ee61af0ad007ce825f4364), "Qps","Tornado (Qps) (MPU4) (set 2)" ) @@ -371,16 +353,14 @@ M4TORNAD_SET( 199?, m4tornad__g, m4tornad, "tornsp_v200_1626_ec93_lv.bin", ROM_LOAD( "71000250.hi.hex", 0x0000, 0x0c852b, CRC(e3a857c7) SHA1(66619b7926ae7df970045fffd7e20763abfe14a4) ) \ ROM_LOAD( "71000250.lo.hex", 0x0000, 0x134084, CRC(46758bc5) SHA1(18d02960580646b276e7a6aabdeb4ca449ec5ea0) ) \ ROM_LOAD( "shocksnd.p1", 0x000000, 0x080000, CRC(54bf0ddb) SHA1(693b855367972b5a45e9d2d6152849ab2cde38a7) ) \ - ROM_LOAD( "shocksnd.p2", 0x080000, 0x080000, CRC(facebc55) SHA1(75367473646cfc735f4d1267e13a9c92ea19c4e3) ) \ - + ROM_LOAD( "shocksnd.p2", 0x080000, 0x080000, CRC(facebc55) SHA1(75367473646cfc735f4d1267e13a9c92ea19c4e3) ) #define M4SHKWAV_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SHKWAV_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SHKWAV_SET( 199?, m4shkwav, 0, "swave_v210_1135_08dd_lv.bin", 0x0000, 0x040000, CRC(ca9d40a3) SHA1(65c9e4aa022eb6fe70d619f67638c37ad578ddbf), "Qps","Shockwave (Qps) (MPU4) (set 1)" ) M4SHKWAV_SET( 199?, m4shkwav__a, m4shkwav, "swave_v210_11376_0bb3_nlv.bin", 0x0000, 0x040000, CRC(3fcaf973) SHA1(28258c8c60e6b542e1789cd8a4cfd530d1ed6084), "Qps","Shockwave (Qps) (MPU4) (set 2)" ) M4SHKWAV_SET( 199?, m4shkwav__b, m4shkwav, "swsplv.bin", 0x0000, 0x040000, CRC(1e33e93f) SHA1(3e87f8ed35da776e1968c9574c140cc3984ea8de), "Qps","Shockwave (Qps) (MPU4) (set 3)" ) @@ -396,16 +376,14 @@ M4SHKWAV_SET( 199?, m4shkwav__g, m4shkwav, "swsp_v300_1606_ded8_lv.bin", ROM_LOAD( "71000010.lo", 0x0000, 0x134084, CRC(c39bbae4) SHA1(eee333376612a96a4c344729a96cc60c217bfde3) ) \ ROM_LOAD( "71000010.hi", 0x0000, 0x091c0b, CRC(d0d3cb4f) SHA1(eaacf9ed3a6b6dcda8e1a3edbc3a9a2a51ffcbd8) ) \ ROM_LOAD( "clab_snd1_c8a6.bin", 0x0000, 0x080000, CRC(cf9de981) SHA1(e5c73e9b9db9ac512602c2dd586ca5cf65f98bc1) ) \ - ROM_LOAD( "clab_snd2_517a.bin", 0x080000, 0x080000, CRC(d4eb949e) SHA1(0ebbd1b5e3c86da94f35c69d9d60e36844cc4d7e) ) \ - + ROM_LOAD( "clab_snd2_517a.bin", 0x080000, 0x080000, CRC(d4eb949e) SHA1(0ebbd1b5e3c86da94f35c69d9d60e36844cc4d7e) ) #define M4CLAB_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CLAB_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4CLAB_SET( 199?, m4clab, 0, "70000019.bin", 0x0000, 0x040000, CRC(23a12863) SHA1(4047cb8cbc03f96f2b8681b6276e100e8e9194a5), "Qps","Cash Lab (Qps) (MPU4) (set 1)" ) M4CLAB_SET( 199?, m4clab__a, m4clab, "70000020.bin", 0x0000, 0x040000, CRC(88af7368) SHA1(14dea4267a4365286eea1e02b9b44d4053618cbe), "Qps","Cash Lab (Qps) (MPU4) (set 2)" ) @@ -420,16 +398,14 @@ M4CLAB_SET( 199?, m4clab__i, m4clab, "clab_v410_1254_6e11_nlv.bin", 0x00 M4CLAB_SET( 199?, m4clab__j, m4clab, "clabrom", 0x0000, 0x040000, CRC(d80ecff5) SHA1(2608e95b718ecd49d880fd9911cb97e6644a307d), "Qps","Cash Lab (Qps) (MPU4) (set 11)" ) #define M4SDQUID_EXTRA_ROMS \ - ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) #define M4SDQUID_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SDQUID_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4SDQUID_SET( 199?, m4sdquid, 0, "70000352.bin", 0x0000, 0x040000, CRC(303d6177) SHA1(aadff8a81244bfd62d1cc088caf01496e1ff61db), "Qps","Sundance Quid (Qps) (MPU4) (set 1)" ) M4SDQUID_SET( 199?, m4sdquid__a, m4sdquid, "70000353.bin", 0x0000, 0x040000, CRC(6e3a9dfc) SHA1(1d5d04140811e17267102c0618ffdaf70f71f717), "Qps","Sundance Quid (Qps) (MPU4) (set 2)" ) @@ -448,16 +424,14 @@ M4SDQUID_SET( 199?, m4sdquid__k, m4sdquid, "70001461.bin", 0x0000, 0x080000 #define M4LOOPLT_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - ROM_LOAD( "71000500.bin", 0x0000, 0x080000, CRC(94fe58f4) SHA1(e07d8e6d4b1e660abc4fa08d703fc0e586f3570d) ) \ - + ROM_LOAD( "71000500.bin", 0x0000, 0x080000, CRC(94fe58f4) SHA1(e07d8e6d4b1e660abc4fa08d703fc0e586f3570d) ) #define M4LOOPLT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LOOPLT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4default_big ,ROT0,company,title,GAME_FLAGS ) M4LOOPLT_SET( 199?, m4looplt, 0, "70000500.bin", 0x0000, 0x080000, CRC(040699a5) SHA1(e1ebc23684c5bc1faaac7409d2179488c3022872), "Qps","Loop The Loot (Qps) (MPU4) (set 1)" ) M4LOOPLT_SET( 199?, m4looplt__a, m4looplt, "70000500a.bin", 0x0000, 0x080000, CRC(0668f52d) SHA1(6560309facf0022e3c14421b848f212b18be7550), "Qps","Loop The Loot (Qps) (MPU4) (set 2)" ) diff --git a/src/mame/drivers/mpu4mod4yam.c b/src/mame/drivers/mpu4mod4yam.c index ba80995c037..c486ab7b023 100644 --- a/src/mame/drivers/mpu4mod4yam.c +++ b/src/mame/drivers/mpu4mod4yam.c @@ -229,8 +229,7 @@ ROM_END ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4COJOK_SET( 199?, m4cojok, 0, "cojx.p1", 0x0000, 0x010000, CRC(a9c0aefb) SHA1(c5b367a01ddee2cb90e266f1e62459b9b96eb3e3), "Barcrest","Carry On Joker (Barcrest) (MPU4) (set 1)" ) M4COJOK_SET( 199?, m4cojok__a, m4cojok, "cojxb.p1", 0x0000, 0x010000, CRC(2680c84a) SHA1(6cf9bb72df41ea1389334597a772fd197aba4fc4), "Barcrest","Carry On Joker (Barcrest) (MPU4) (set 2)" ) M4COJOK_SET( 199?, m4cojok__b, m4cojok, "cojxc.p1", 0x0000, 0x010000, CRC(a67db981) SHA1(08ac65baf774c63705c3a4db36248777375404f6), "Barcrest","Carry On Joker (Barcrest) (MPU4) (set 3)" ) @@ -246,8 +245,7 @@ M4COJOK_SET( 199?, m4cojok__f, m4cojok, "cojxy.p1", 0x0000, 0x010000, CR ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAMEL(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4gambal ,ROT0,company,title,GAME_REQUIRES_ARTWORK|GAME_MECHANICAL,layout_gamball ) \ - + GAMEL(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4gambal ,ROT0,company,title,GAME_REQUIRES_ARTWORK|GAME_MECHANICAL,layout_gamball ) M4GAMBAL_SET( 199?, m4gambal, 0, "gbbx.p1", 0x0000, 0x010000, CRC(0b5adcd0) SHA1(1a198bd4a1e7d6bf4cf025c43d35aaef351415fc), "Barcrest","Gambal (Barcrest) (MPU4) (set 1)" ) M4GAMBAL_SET( 199?, m4gambal__a, m4gambal, "gabcx.p1", 0x0000, 0x010000, CRC(52c35266) SHA1(bda49005de88094fbc84621f63b33f0e0a9c0bd3), "Barcrest","Gambal (Barcrest) (MPU4) (set 2)" ) @@ -260,8 +258,7 @@ M4GAMBAL_SET( 199?, m4gambal__c, m4gambal, "gbll20-6", 0x0000, 0x010000, CR ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4GRAFF_SET( 199?, m4graff, 0, "graffo6", 0x0000, 0x010000, CRC(7349c9ca) SHA1(2744035d6c7897394c8fead27f48779047590fba), "Barcrest","Graffiti (Barcrest) (MPU4) (set 1)" ) M4GRAFF_SET( 199?, m4graff__a, m4graff, "grax.p1", 0x0000, 0x010000, CRC(2e03a7d8) SHA1(333373fe15ae165dd24d5c11fef23f2e9b0388bf), "Barcrest","Graffiti (Barcrest) (MPU4) (set 2)" ) @@ -272,8 +269,7 @@ M4GRAFF_SET( 199?, m4graff__b, m4graff, "graxc.p1", 0x0000, 0x010000, CRC(76 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4MONTE_SET( 199?, m4monte, 0, "nm8b.p1", 0x0000, 0x010000, CRC(1632080e) SHA1(9ca2cd8f00e49c29f4a216d3c9eacba221ada6ce), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 1)" ) M4MONTE_SET( 199?, m4monte__a, m4monte, "nm8ad.p1", 0x0000, 0x010000, CRC(92a07e05) SHA1(94015b219fffb8ad9a40a804a4e0b0fad61cdf21), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 2)" ) @@ -295,8 +291,7 @@ M4MONTE_SET( 199?, m4monte__m, m4monte, "nmns.p1", 0x0000, 0x010000, CRC(48 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4NUDBNK_SET( 199?, m4nudbnk, 0, "nb6", 0x0000, 0x010000, CRC(010dd3fc) SHA1(645cbe54200a6c3327e10909b1ef3a80579e96e5), "Barcrest","Nudge Banker (Barcrest) (MPU4) (set 1)" ) M4NUDBNK_SET( 199?, m4nudbnk__a, m4nudbnk, "nbncx.p1", 0x0000, 0x010000, CRC(57bbbedf) SHA1(d42d3176f41aedf2ddc15cdf73ab97e963b92213), "Barcrest","Nudge Banker (Barcrest) (MPU4) (set 2)" ) @@ -309,8 +304,7 @@ M4NUDBNK_SET( 199?, m4nudbnk__d, m4nudbnk, "sbnx.p1", 0x0000, 0x010000, CR ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZMC_SET( 199?, m4przmc, 0, "mssb.p1", 0x0000, 0x010000, CRC(5210dae0) SHA1(cc9916718249505e031ccdbc126f3fa1e6675f27), "Barcrest","Prize Monte Carlo (Barcrest) (MPU4) (set 1)" ) M4PRZMC_SET( 199?, m4przmc__a, m4przmc, "mssad.p1", 0x0000, 0x010000, CRC(e3690c35) SHA1(fdaacda0d03ce8d54841525feff2529b1ee1f970), "Barcrest","Prize Monte Carlo (Barcrest) (MPU4) (set 2)" ) M4PRZMC_SET( 199?, m4przmc__b, m4przmc, "mssd.p1", 0x0000, 0x010000, CRC(cf59305e) SHA1(7ba6f37aa1077561129f66ab663730fb6e5108ed), "Barcrest","Prize Monte Carlo (Barcrest) (MPU4) (set 3)" ) @@ -325,8 +319,7 @@ M4PRZMC_SET( 199?, m4przmc__f, m4przmc, "mssy.p1", 0x0000, 0x010000, CRC(15 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZSSS_SET( 199?, m4przsss, 0, "ps302b.p1", 0x0000, 0x010000, CRC(1749ae18) SHA1(f04f91a1d534f2d2dc844862bb21160c5903d1df), "Barcrest","Prize Spend Spend Spend (Barcrest) (MPU4) (set 1)" ) M4PRZSSS_SET( 199?, m4przsss__a, m4przsss, "ps302ad.p1", 0x0000, 0x010000, CRC(e57f52d7) SHA1(25384517b68c488acd38956aeb69dda26d63c3ca), "Barcrest","Prize Spend Spend Spend (Barcrest) (MPU4) (set 2)" ) M4PRZSSS_SET( 199?, m4przsss__b, m4przsss, "ps302bd.p1", 0x0000, 0x010000, CRC(d3633f9d) SHA1(2500425d736a5c45f5bf40a7660b549f822266dc), "Barcrest","Prize Spend Spend Spend (Barcrest) (MPU4) (set 3)" ) @@ -361,8 +354,7 @@ M4PRZSSS_SET( 199?, m4przsss__0, m4przsss, "sspy.p1", 0x0000, 0x010000 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4SSS_SET( 199?, m4sss, 0, "spend6 10m.bin", 0x0000, 0x010000, CRC(a7519725) SHA1(cdab0ae00b865291ff7389122d174ef2e2676c6e), "Barcrest","Spend Spend Spend (Barcrest) (MPU4) (set 1)" ) M4SSS_SET( 199?, m4sss__a, m4sss, "sp_05a__.1o3", 0x0000, 0x010000, CRC(044a0133) SHA1(7cf85cf19f5c3f588daf5c0d7efe4204d67161a2), "Barcrest","Spend Spend Spend (Barcrest) (MPU4) (set 2)" ) M4SSS_SET( 199?, m4sss__b, m4sss, "sp_05s__.1o3", 0x0000, 0x010000, CRC(2e000a62) SHA1(e60390a383388e385bbde79ca14c63e5d69a8869), "Barcrest","Spend Spend Spend (Barcrest) (MPU4) (set 3)" ) @@ -383,8 +375,7 @@ M4SSS_SET( 199?, m4sss__l, m4sss, "sxi10___.2_1", 0x0000, 0x010000, CRC(bb ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RA_SET( 199?, m4ra, 0, "r2tx.p1", 0x0000, 0x010000, CRC(7efffe3d) SHA1(5472bc76f4450726fc49fce281a6ec69693d0923), "Barcrest","Red Alert (Barcrest) (MPU4) (set 1)" ) M4RA_SET( 199?, m4ra__a, m4ra, "r2txr.p1", 0x0000, 0x010000, CRC(9ff95e34) SHA1(79d19602b88e1c9d23e910332a968e6b820a39f5), "Barcrest","Red Alert (Barcrest) (MPU4) (set 2)" ) M4RA_SET( 199?, m4ra__b, m4ra, "ra2s.p1", 0x0000, 0x010000, CRC(cd0fd068) SHA1(a347372f7f737ca87f44e692015338831465f123), "Barcrest","Red Alert (Barcrest) (MPU4) (set 3)" ) @@ -412,8 +403,7 @@ M4RA_SET( 199?, m4ra__r, m4ra, "redx_20_.8", 0x0000, 0x010000, CRC(b5e8de ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4SAYNO_SET( 199?, m4sayno, 0, "snms.p1", 0x0000, 0x010000, CRC(be1f2222) SHA1(7d8319796e1d45a3d0246bf13b6d818f20796db3), "Barcrest","Say No More (Barcrest) (MPU4) (set 1)" ) M4SAYNO_SET( 199?, m4sayno__a, m4sayno, "snm 5p.bin", 0x0000, 0x010000, CRC(4fba5c0a) SHA1(85438c531d4122bc31f59127a577dc6d71a4ba9d), "Barcrest","Say No More (Barcrest) (MPU4) (set 2)" ) M4SAYNO_SET( 199?, m4sayno__b, m4sayno, "say no more 425b.bin", 0x0000, 0x010000, CRC(2cf27394) SHA1(fb7688b7d9d2e68f0c84a57b66dd02dbbc6accc7), "Barcrest","Say No More (Barcrest) (MPU4) (set 3)" ) @@ -425,8 +415,7 @@ M4SAYNO_SET( 199?, m4sayno__d, m4sayno, "snmx.p1", 0x0000, 0x01 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4ACECHS_SET( 199?, m4acechs, 0, "ae_05a__.2_3", 0x0000, 0x010000, CRC(c9a03623) SHA1(8daf7e71057528c481915eb8506e03ce9cf372c8), "Barcrest","Ace Chase (Barcrest) (MPU4) (set 1)" ) M4ACECHS_SET( 199?, m4acechs__a, m4acechs, "ae_05a__.3_1", 0x0000, 0x010000, CRC(900e1789) SHA1(dbb13f1728d8527a7de5d257c866732adb0a95b5), "Barcrest","Ace Chase (Barcrest) (MPU4) (set 2)" ) @@ -457,16 +446,14 @@ M4ACECHS_SET( 199?, m4acechs__u, m4acechs, "aei20___.3_1", 0x0000, 0x010000 #define M4SUPST_EXTRA_ROMS \ ROM_REGION( 0x48, "fakechr", 0 ) \ - ROM_LOAD( "ss.chr", 0x0000, 0x000048, CRC(bd206d57) SHA1(ecfe38d9b4823ae6bc2fc440c243e6ae5e2edaa4) ) \ - + ROM_LOAD( "ss.chr", 0x0000, 0x000048, CRC(bd206d57) SHA1(ecfe38d9b4823ae6bc2fc440c243e6ae5e2edaa4) ) #define M4SUPST_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SUPST_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4SUPST_SET( 199?, m4supst, 0, "cs4b.p1", 0x0000, 0x010000, CRC(fb0aac20) SHA1(3a40be78f7add7905afa8d1226ad41bf0041a2ec), "Barcrest","Super Streak (Barcrest) (MPU4) (set 1)" ) M4SUPST_SET( 199?, m4supst__a, m4supst, "cs4ad.p1", 0x0000, 0x010000, CRC(c0e81dfd) SHA1(2da922df6c102f8d0f1678e974df9e4d356e5133), "Barcrest","Super Streak (Barcrest) (MPU4) (set 2)" ) M4SUPST_SET( 199?, m4supst__b, m4supst, "cs4bd.p1", 0x0000, 0x010000, CRC(dafc7ed6) SHA1(3e92d5557d2f587132f4b3b633978ab7d4333fcc), "Barcrest","Super Streak (Barcrest) (MPU4) (set 3)" ) @@ -578,8 +565,7 @@ M4SUPST_SET( 199?, m4supst__b5, m4supst, "supst2515", 0x0000, 0x01 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4FASTFW_SET( 199?, m4fastfw, 0, "ffo05__1.0", 0x0000, 0x010000, CRC(8b683969) SHA1(7469b551e4d6f65550d54ee39b2bac07cf3dbd4b), "Bwb / Barcrest","Fast Forward (Barcrest) (MPU4) (set 1)" ) M4FASTFW_SET( 199?, m4fastfw__a, m4fastfw, "ffo10__1.0", 0x0000, 0x010000, CRC(294288fd) SHA1(87d25f6333b6862fcc57a550b5cc7c0bc64e72cd), "Bwb / Barcrest","Fast Forward (Barcrest) (MPU4) (set 2)" ) M4FASTFW_SET( 199?, m4fastfw__b, m4fastfw, "ffo10d_1.0", 0x0000, 0x010000, CRC(8d96f3d4) SHA1(2070a335cfa3f9de1bd9e9094d91cce81b91347d), "Bwb / Barcrest","Fast Forward (Barcrest) (MPU4) (set 3)" ) @@ -593,16 +579,14 @@ M4FASTFW_SET( 199?, m4fastfw__f, m4fastfw, "fastf206", 0x0000, 0x010000 ROM_REGION( 0x080000, "msm6376", 0 ) \ ROM_LOAD( "vivalasvegas4.bin", 0x0000, 0x080000, CRC(76971425) SHA1(0974a9dce51cc3dd4e26cec11a948c9c8021fde4) ) \ ROM_REGION( 0x48, "fakechr", 0 ) /* from viva last vegas 'six' set */ \ - ROM_LOAD( "vlvs.chr", 0x0000, 0x000048, CRC(31acf949) SHA1(d622ea1caee968b786f3183ca44355f9db190081) ) \ - + ROM_LOAD( "vlvs.chr", 0x0000, 0x000048, CRC(31acf949) SHA1(d622ea1caee968b786f3183ca44355f9db190081) ) #define M4VIVALV_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VIVALV_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4yam ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4VIVALV_SET( 199?, m4vivalv, 0, "5p5vivalasvegas6.bin", 0x0000, 0x010000, CRC(4d365b57) SHA1(69ff75ccc91f1f7b867a0914d350d1649834a48e), "Barcrest","Viva Las Vegas (Barcrest) (MPU4) (set 1)" ) M4VIVALV_SET( 199?, m4vivalv__a, m4vivalv, "v.las vegas 6 10p 10m.bin", 0x0000, 0x010000, CRC(f09d5a2c) SHA1(6f9df58767e88a1ca7fc7dd17c618d30ab97067d), "Barcrest","Viva Las Vegas (Barcrest) (MPU4) (set 2)" ) M4VIVALV_SET( 199?, m4vivalv__b, m4vivalv, "vegas15g", 0x0000, 0x020000, CRC(5b804e4d) SHA1(5967b9f4e28e5a5e5e7005a29ecb30fc661800e0), "Barcrest","Viva Las Vegas (Barcrest) (MPU4) (set 3)" ) diff --git a/src/mame/drivers/mpu4plasma.c b/src/mame/drivers/mpu4plasma.c index 0c85366be03..73cba8891e8 100644 --- a/src/mame/drivers/mpu4plasma.c +++ b/src/mame/drivers/mpu4plasma.c @@ -16,7 +16,6 @@ public: : mpu4_state(mconfig, type, tag), m_plasmaram(*this, "plasmaram") { - } required_shared_ptr m_plasmaram; @@ -28,7 +27,6 @@ public: DECLARE_WRITE16_MEMBER( mpu4plasma_unk_w ) { - } UINT32 screen_update_mpu4plasma(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; @@ -103,8 +101,7 @@ MACHINE_CONFIG_END #define M4BIGCHF_PLASMA \ ROM_REGION( 0x40000, "plasmacpu", 0 ) \ ROM_LOAD16_BYTE( "b6cpl.p0", 0x00000, 0x020000, CRC(7fbb2efb) SHA1(c21136bf10407f1685f3933d426ef53925aca8d8) ) \ - ROM_LOAD16_BYTE( "b6cpl.p1", 0x00001, 0x020000, CRC(a9f67f3e) SHA1(1309cc2dc8565ee79ac8cdc754187c8db6ddb3ea) ) \ - + ROM_LOAD16_BYTE( "b6cpl.p1", 0x00001, 0x020000, CRC(a9f67f3e) SHA1(1309cc2dc8565ee79ac8cdc754187c8db6ddb3ea) ) ROM_START( m4bigchf ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "b6cs.p1", 0x0000, 0x010000, CRC(4f45086b) SHA1(e1d639b068951df8f25b9c77d4fb86336ad19933) ) @@ -134,8 +131,7 @@ ROM_END #define M4CLICK_PLASMA \ ROM_REGION( 0x40000, "plasmacpu", 0 ) \ ROM_LOAD16_BYTE( "clcpl.p0", 0x00000, 0x010000, CRC(b774c1f1) SHA1(2708a1e4c539d72d9ada8c37d3372b64f6edc4a0) ) \ - ROM_LOAD16_BYTE( "clcpl.p1", 0x00001, 0x010000, CRC(51cf5f53) SHA1(f7b14acb0fd831aa19fdaa1bb36272ac9910f0b3) ) \ - + ROM_LOAD16_BYTE( "clcpl.p1", 0x00001, 0x010000, CRC(51cf5f53) SHA1(f7b14acb0fd831aa19fdaa1bb36272ac9910f0b3) ) ROM_START( m4click ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "clcs.p1", 0x0000, 0x010000, CRC(99dcea3e) SHA1(2ec9842f7d920d449cfeac43f7fe79f8c62ecec9) ) @@ -169,8 +165,7 @@ ROM_END #define M4APACH_PLASMA \ ROM_REGION( 0x40000, "plasmacpu", 0 ) \ ROM_LOAD16_BYTE( "plasma.p0", 0x00000, 0x010000, NO_DUMP ) \ - ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP ) \ - + ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP ) ROM_START( m4apach ) ROM_REGION( 0x10000, "maincpu", 0 ) @@ -185,8 +180,7 @@ ROM_END #define M4ELITE_PLASMA \ ROM_REGION( 0x40000, "plasmacpu", 0 ) \ ROM_LOAD16_BYTE( "plasma.p0", 0x00000, 0x010000, NO_DUMP ) \ - ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP ) \ - + ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP ) ROM_START( m4elite ) ROM_REGION( 0x10000, "maincpu", 0 ) diff --git a/src/mame/drivers/mpu4sw.c b/src/mame/drivers/mpu4sw.c index a3f5db8326e..bcde2a8a9bb 100644 --- a/src/mame/drivers/mpu4sw.c +++ b/src/mame/drivers/mpu4sw.c @@ -76,16 +76,14 @@ DRIVER_INIT_MEMBER(mpu4_state,m_grtecpss) ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "acapp1.bin", 0x000000, 0x080000, CRC(bda61fc6) SHA1(b94f39fa92d3d0cb580eaafa0f58bd5cde947e3a) ) \ ROM_LOAD( "andsnd.bin", 0x000000, 0x080000, CRC(7d568671) SHA1(3a0a6af3dc980f2ccff0b6ef85833eb2e352031a) ) \ - ROM_LOAD( "andsnd2.bin", 0x080000, 0x080000, CRC(98a586ee) SHA1(94b94d198725e8174e14873b99afa19217a1d4fa) ) \ - + ROM_LOAD( "andsnd2.bin", 0x080000, 0x080000, CRC(98a586ee) SHA1(94b94d198725e8174e14873b99afa19217a1d4fa) ) #define M4ANDYCP_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ANDYCP_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) // "(C)1994 B.W.B." and "AC101.0" M4ANDYCP_SET( 1994, m4andycp, 0, "ac10.hex", 0x0000, 0x010000, CRC(0e250923) SHA1(9557315cca7a47c307e811d437ff424fe77a2843), "Bwb", "Andy Capp (Bwb / Barcrest) (MPU4) (AC10)" ) @@ -166,8 +164,7 @@ M4ANDYCP_SET( 199?, m4andycp20_b, m4andycp, "acap20_11", 0x0000, ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "sdac_1.snd", 0x000000, 0x080000, CRC(5ce93532) SHA1(547f98740889e6fbafc5a0c517ff75de41f2acc7) ) \ ROM_LOAD( "sdac_2.snd", 0x080000, 0x080000, CRC(22dacd4b) SHA1(ad2dc943d4e3ec54937acacb963da938da809614) ) \ - ROM_LOAD( "sjcv2.snd", 0x080000, 0x080000, CRC(f247ba83) SHA1(9b173503e63a4a861d1380b2ab1fe14af1a189bd) ) \ - + ROM_LOAD( "sjcv2.snd", 0x080000, 0x080000, CRC(f247ba83) SHA1(9b173503e63a4a861d1380b2ab1fe14af1a189bd) ) ROM_START( m4andycpdut ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "dac13.bin", 0x0000, 0x010000, CRC(a0cdd5b3) SHA1(7b7bc40a9a9aed3569f491acad15c606fe243e9b) ) @@ -182,16 +179,14 @@ GAME(199?, m4andycpdut, m4andycp ,mod4oki ,mpu4 , mpu4_s ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "alf.chr", 0x0000, 0x000048, CRC(22f09b0d) SHA1(5a612e54e0bb5ea5c35f1a7b1d7bc3cdc34e3bdd) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "alfsnd0.1", 0x0000, 0x080000, CRC(6691bc25) SHA1(4dd67b8bbdc5d707814b756005075fcb4f0c8be4) ) \ - + ROM_LOAD( "alfsnd0.1", 0x0000, 0x080000, CRC(6691bc25) SHA1(4dd67b8bbdc5d707814b756005075fcb4f0c8be4) ) #define M4ANDYFL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ANDYFL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) // "(C)1996 B.W.B." and "AL4 2.1" M4ANDYFL_SET( 1996, m4andyfl, 0, "andy loves flo 05a 4 2-1",0x0000, 0x010000, CRC(773d2c6f) SHA1(944be6fff70439077a9c0d858e76806e0317585c), "Bwb", "Andy Loves Flo (Bwb / Barcrest) (MPU4) (AL4 2.1KS)" ) // "(C)1996 B.W.B." and "AL_ 2.4" @@ -252,16 +247,14 @@ M4ANDYFL_SET( 1991, m4andyfluyd, m4andyfl, "alu03dy.p1", 0x00 ROM_LOAD( "df503s.chr", 0x0000, 0x000048, CRC(46c28f35) SHA1(e229b211180f9f7b30cd0bb9de162971d16b2d33) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "dutsnd.p1", 0x000000, 0x080000, CRC(a5829cec) SHA1(eb65c86125350a7f384f9033f6a217284b6ff3d1) ) \ - ROM_LOAD( "dutsnd.p2", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) \ - + ROM_LOAD( "dutsnd.p2", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) #define M4DTYFRE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4DTYFRE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) // "(C)1993 BARCREST" and "DUT 0.4" M4DTYFRE_SET( 1993, m4dtyfre, 0, "duts.p1", 0x0000, 0x010000, CRC(8c7d6567) SHA1(8e82c4168d4d455c7cb95a895c04f7ad327894ec), "Barcrest","Duty Free (Barcrest) (MPU4) (DUT 0.4)" ) M4DTYFRE_SET( 1993, m4dtyfreutb, m4dtyfre, "dutb.p1", 0x0000, 0x010000, CRC(479acab7) SHA1(645e876b2c59dd4c091b5f168dcfd2cfa7eda0a3), "Barcrest","Duty Free (Barcrest) (MPU4) (DUT 0.4B)" ) @@ -353,8 +346,7 @@ M4DTYFRE_SET( 199?, m4dtyfre_h2, m4dtyfre, "duty2010", 0x00 ROM_LOAD( name, offset, length, hash ) \ M4RHOG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring,ROT0,company,title,GAME_FLAGS ) // "(C)1991 BARCREST" and "RR6 1.2" M4RHOG_SET( 1991, m4rhog, 0, "rr6s.p1", 0x0000, 0x010000, CRC(f978ca0b) SHA1(11eeac41f4c77b38b33baefb16dab7de1268d161), "Barcrest","Road Hog (Barcrest) (MPU4) (RR6 1.2)" ) M4RHOG_SET( 1991, m4rhogr6d, m4rhog, "rr6d.p1", 0x0000, 0x010000, CRC(b61115ea) SHA1(92b97cc8b71eb31e8377a59344faaf0d800d1bdc), "Barcrest","Road Hog (Barcrest) (MPU4) (RR6 1.2D)" ) @@ -420,8 +412,7 @@ M4RHOG_SET( 1995, m4rhog_roc, m4rhog, "roadhog5p4std.bin", 0x00 ROM_LOAD( name, offset, length, hash ) \ M4ANDYGE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,grtecp , mpu4_state,m_grtecpss ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,grtecp , mpu4_state,m_grtecpss ,ROT0,company,title,GAME_FLAGS ) // "(C)1991 BARCREST" and "AN2 0.3" M4ANDYGE_SET( 1991, m4andyge, 0, "an2s.p1", 0x0000, 0x010000, CRC(65399fa0) SHA1(ecefdf63e7aa477001fa530ed340e90e85252c3c), "Barcrest","Andy's Great Escape (Barcrest) (MPU4) (AN2 0.3, set 1)" ) // one of these is probably hacked M4ANDYGE_SET( 1991, m4andygen2_a, m4andyge, "agesc20p", 0x0000, 0x010000, CRC(94fec0f3) SHA1(7678e01a4e0fcc4136f6d4a668c4d1dd9a8f1246), "Barcrest","Andy's Great Escape (Barcrest) (MPU4) (AN2 0.3, set 2)" ) // or has the wrong id strings @@ -496,8 +487,7 @@ M4ANDYGE_SET( 199?, m4andyge_h4, m4andyge, "age20_101", ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) // all the adders and ladders sets kill the cpu, end up jumping to the ram area after an RTI/RTS combo? are we saturating the CPU with too many interrupts or is there a bug? // also the BWB versioning is.. illogical // I think this is a mod2, but because it doesn't boot I haven't moved it to mpu4mod2sw.c yet @@ -559,16 +549,14 @@ M4ADDR_SET( 1994, m4addr_h2, m4addr, "ad05.6c", 0x0000, 0x01 #define M4DENMEN_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "densnd1.hex", 0x000000, 0x080000, CRC(468a8ec7) SHA1(ec450cd86fda09bc94caf913e9ee7900cfeaa0f2) ) \ - ROM_LOAD( "densnd2.hex", 0x080000, 0x080000, CRC(1c20a490) SHA1(62eddc469e4b93ea1f82070600fce628dc526f54) ) \ - + ROM_LOAD( "densnd2.hex", 0x080000, 0x080000, CRC(1c20a490) SHA1(62eddc469e4b93ea1f82070600fce628dc526f54) ) #define M4DENMEN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( 0x10000, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4DENMEN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4DENMEN_SET( 199?, m4denmen, 0, "dens.p1", 0x0000, 0x010000, CRC(d3687138) SHA1(611985a9116ea14992b34a84ed31693f88d99797), "Barcrest","Dennis The Menace (Barcrest) (MPU4) (DEN 1.2)" ) M4DENMEN_SET( 199?, m4denmendnd, m4denmen, "dend.p1", 0x0000, 0x010000, CRC(176cd283) SHA1(f72c69b346f926a6e11b685ab9a6a2783b836450), "Barcrest","Dennis The Menace (Barcrest) (MPU4) (DEN 1.2D)" ) @@ -617,16 +605,14 @@ M4DENMEN_SET( 199?, m4denmen_h3, m4denmen, "denm2010", ROM_LOAD( "crmsnd.p1", 0x000000, 0x080000, CRC(e05cdf96) SHA1(c85c7b31b775e3cc2d7f943eb02ff5ebae6c6080) ) \ ROM_LOAD( "crmsnd.p2", 0x080000, 0x080000, CRC(11da0781) SHA1(cd63834bf5d5034c2473372bfcc4930c300333f7) ) \ ROM_REGION( 0x100000, "altmsm6376", 0 ) /* which sets are meant to use this? */ \ - ROM_LOAD( "cmazep1.bin", 0x000000, 0x080000, CRC(3d94a320) SHA1(a9b4e89ce36dbc2ef584b3adffffa00b7ae7e245) ) \ - + ROM_LOAD( "cmazep1.bin", 0x000000, 0x080000, CRC(3d94a320) SHA1(a9b4e89ce36dbc2ef584b3adffffa00b7ae7e245) ) #define M4CRMAZE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CRMAZE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4jackpot8tkn , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4jackpot8tkn , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) // "(C)1993 BARCREST" and "CRM 3.0" M4CRMAZE_SET( 1993, m4crmaze, 0, "crms.p1", 0x0000, 0x020000, CRC(b289c54b) SHA1(eb74bb559e2be2737fc311d044b9ce87014616f3), "Barcrest","Crystal Maze (Barcrest) (MPU4) (CRM 3.0)" ) M4CRMAZE_SET( 1993, m4crmaze__h, m4crmaze, "crmd.p1", 0x0000, 0x020000, CRC(1232a809) SHA1(483b96b3b3ea50cbf5c3823c3ba20369b88bd459), "Barcrest","Crystal Maze (Barcrest) (MPU4) (CRM 3.0D)" ) @@ -663,16 +649,14 @@ M4CRMAZE_SET( 199?, m4crmaze__s, m4crmaze, "cmaz58t", 0x0000, ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cmasnd.p1", 0x000000, 0x080000, CRC(1e7e13b8) SHA1(2db5c3789ad1b9bdb59e058562bd8be181ba0259) ) \ - ROM_LOAD( "cmasnd.p2", 0x080000, 0x080000, CRC(cce703a8) SHA1(97487f3df0724d3ee01f6f4deae126aec6d2dd68) ) \ - + ROM_LOAD( "cmasnd.p2", 0x080000, 0x080000, CRC(cce703a8) SHA1(97487f3df0724d3ee01f6f4deae126aec6d2dd68) ) #define M4CASHMN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CASHMN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4jackpot8tkn , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4jackpot8tkn , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CASHMN_SET( 199?, m4cashmn, 0, "cma07s.p1", 0x0000, 0x020000, CRC(e9c1d9f2) SHA1(f2df4ae650ec2b62d15bbaa562d638476bf926e7), "Barcrest","Cash Machine (Barcrest) (MPU4) (set 1)" ) M4CASHMN_SET( 199?, m4cashmn__a, m4cashmn, "camc2010", 0x0000, 0x020000, CRC(82e459ab) SHA1(62e1906007f6bba99e3e8badc3472070e8ae84f8), "Barcrest","Cash Machine (Barcrest) (MPU4) (set 2)" ) @@ -735,16 +719,14 @@ M4CASHMN_SET( 199?, m4cashmn__zb, m4cashmn, "cma15t", 0x0000, ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "tops1.hex", 0x000000, 0x080000, CRC(70f16892) SHA1(e6448831d3ce7fa251b40023bc7d5d6dee9d6793) ) \ - ROM_LOAD( "tops2.hex", 0x080000, 0x080000, CRC(5fc888b0) SHA1(8d50ee4f36bd36aed5d0e7a77f76bd6caffc6376) ) \ - + ROM_LOAD( "tops2.hex", 0x080000, 0x080000, CRC(5fc888b0) SHA1(8d50ee4f36bd36aed5d0e7a77f76bd6caffc6376) ) #define M4TOPTEN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TOPTEN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4TOPTEN_SET( 199?, m4topten, 0, "tts04s.p1", 0x0000, 0x020000, CRC(5e53f04f) SHA1(d49377966ed787cc3571eadff8c4c16fac74434c), "Barcrest","Top Tenner (Barcrest) (type 1) (MPU4) (TTS 0.4)" ) @@ -820,16 +802,14 @@ M4TOPTEN_SET( 199?, m4topten__b, m4topten, "topt15t", 0x0000, 0x020000 ROM_LOAD( "tocsnd.p1", 0x000000, 0x080000, CRC(b9527b0e) SHA1(4dc5f6794c3e63c8faced34e166dcc748ffb4941) ) \ ROM_LOAD( "tocsnd.p2", 0x080000, 0x080000, CRC(f684a488) SHA1(7c93cda3d3b55d9818625f696798c7c2cde79fa8) ) \ ROM_REGION( 0x100000, "altmsm6376", 0 ) \ - ROM_LOAD( "totsnd.p1", 0x0000, 0x080000, CRC(684e9eb1) SHA1(8af28de879ae41efa07dfb07ecbd6c72201749a7) ) \ - + ROM_LOAD( "totsnd.p1", 0x0000, 0x080000, CRC(684e9eb1) SHA1(8af28de879ae41efa07dfb07ecbd6c72201749a7) ) #define M4TOOT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TOOT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4TOOT_SET( 199?, m4toot, 0, "toc03c.p1", 0x0000, 0x020000, CRC(752ffa3f) SHA1(6cbe521ff85173159b6d34cc3e29a4192cd66394), "Barcrest","Ten Out Of Ten (Barcrest) (MPU4) (set 1)" ) M4TOOT_SET( 199?, m4toot__a, m4toot, "toc03ad.p1", 0x0000, 0x020000, CRC(f67e53c1) SHA1(07a50fb649c5085a33f0a1a9b3d65b0b61a3f152), "Barcrest","Ten Out Of Ten (Barcrest) (MPU4) (set 2)" ) @@ -888,16 +868,14 @@ M4TOOT_SET( 199?, m4toot__zb, m4toot, "tot15t", 0x0000, 0x020000, CRC(1c ROM_LOAD( "m683.chr", 0x0000, 0x000048, CRC(cbe68b44) SHA1(60efc69eba86531f51230dee17efdbbf8917f907) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "er4snd.p1", 0x000000, 0x080000, CRC(32fd0836) SHA1(ea68252b690fe1d6070209cbcfb65fe20926c6ce) ) \ - ROM_LOAD( "er4snd.p2", 0x080000, 0x080000, CRC(1df9c24f) SHA1(f0d31b1bec6f3a9791f7fabe57b45687df900efa) ) \ - + ROM_LOAD( "er4snd.p2", 0x080000, 0x080000, CRC(1df9c24f) SHA1(f0d31b1bec6f3a9791f7fabe57b45687df900efa) ) #define M4EAW_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4EAW_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4EAW_SET( 199?, m4eaw, 0, "er4s.p1", 0x0000, 0x010000, CRC(163fc987) SHA1(8e1768ed2fbddbd5e00652ff40614de3978c9567), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 1)" ) M4EAW_SET( 199?, m4eaw__a, m4eaw, "cet03ad.p1", 0x0000, 0x010000, CRC(33afe7a5) SHA1(5d3bdb74c6babd49e88915282ad81c184bd7aa68), "Barcrest","Everyone's A Winner (Barcrest) (MPU4) (set 2)" ) @@ -1004,16 +982,14 @@ M4EAW_SET( 199?, m4eaw__bz, m4eaw, "everyones a winner v2-5p", 0x0000, 0x008000 ROM_LOAD( "wn5s.chr", 0x0000, 0x000048, CRC(b90e5068) SHA1(14c57dcd7242104eb48a9be36192170b97bc5110) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "winsnd.p1", 0x000000, 0x080000, CRC(a913ad0d) SHA1(5f39b661912da903ce8d6658b7848081b191ea56) ) \ - ROM_LOAD( "winsnd.p2", 0x080000, 0x080000, CRC(6a22b39f) SHA1(0e0dbeac4310e03490b665fff514392481ad265f) ) \ - + ROM_LOAD( "winsnd.p2", 0x080000, 0x080000, CRC(6a22b39f) SHA1(0e0dbeac4310e03490b665fff514392481ad265f) ) #define M4WTA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4WTA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4WTA_SET( 199?, m4wta, 0, "wta55", 0x0000, 0x010000, CRC(df3e66cd) SHA1(68e769816cb1a71dea8a3ccf4636414c45c01646), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 1)" ) M4WTA_SET( 199?, m4wta__b, m4wta, "windy.p1", 0x0000, 0x010000, CRC(d8b78c2d) SHA1(d8c2a2ac30a9b876acfbe99e3c540ba0e82cde33), "Barcrest","Winner Takes All (Barcrest) (MPU4) (set 3)" ) @@ -1062,16 +1038,14 @@ M4WTA_SET( 199?, m4wta__ag, m4wta, "wta5.8t", #define M4GOODTM_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "gtrsnd.p1", 0x000000, 0x080000, CRC(23317580) SHA1(c0c5244ddcf976211e2a5e5a0b1dbc6faaec22b4) ) \ - ROM_LOAD( "gtrsnd.p2", 0x080000, 0x080000, CRC(866ce0d2) SHA1(46e800c7364a6d291c6af87b30c680c530100e74) ) \ - + ROM_LOAD( "gtrsnd.p2", 0x080000, 0x080000, CRC(866ce0d2) SHA1(46e800c7364a6d291c6af87b30c680c530100e74) ) #define M4GOODTM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4GOODTM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4GOODTM_SET( 199?, m4goodtm, 0, "gtr20d.p1", 0x0000, 0x020000, CRC(a19eaef1) SHA1(5e9f9cffd841b9d4f21175e3dcec7436d016bb19), "Barcrest","Let The Good Times Roll (Barcrest) (MPU4) (set 1)" ) M4GOODTM_SET( 199?, m4goodtm__a, m4goodtm, "gta01ad.p1", 0x0000, 0x020000, CRC(2b556e66) SHA1(50a042fdb53294f74ab23a41a8a850dd14ad580d), "Barcrest","Let The Good Times Roll (Barcrest) (MPU4) (set 2)" ) @@ -1151,8 +1125,7 @@ M4GOODTM_SET( 199?, m4goodtm__a6, m4goodtm, "gts10y.p1", 0x0000, 0x020000 ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "jagsnd.p1", 0x080000, 0x080000, CRC(7488f7a7) SHA1(d581e9d6b5052ee8fee353a83e9d9031443d060a) ) \ - + ROM_LOAD( "jagsnd.p1", 0x080000, 0x080000, CRC(7488f7a7) SHA1(d581e9d6b5052ee8fee353a83e9d9031443d060a) ) #define M4JPGEM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1160,8 +1133,7 @@ M4GOODTM_SET( 199?, m4goodtm__a6, m4goodtm, "gts10y.p1", 0x0000, 0x020000 ROM_LOAD( name, offset, length, hash ) \ M4JPGEM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4JPGEM_SET( 199?, m4jpgem, 0, "cg4ad.p1", 0x0000, 0x010000, CRC(417c98c1) SHA1(2ce23e27742c418d5ebaa0f4f0597e29955ea57d), "Barcrest","Jackpot Gems (Barcrest) (MPU4) (set 1)" ) M4JPGEM_SET( 199?, m4jpgem__a, m4jpgem, "cg4b.p1", 0x0000, 0x010000, CRC(c57cca63) SHA1(80a440912362d55cac6bc77b6ff6d6672af378c6), "Barcrest","Jackpot Gems (Barcrest) (MPU4) (set 2)" ) M4JPGEM_SET( 199?, m4jpgem__b, m4jpgem, "cg4bd.p1", 0x0000, 0x010000, CRC(7604ea50) SHA1(3d6eee763bd21119ab52a2388229da076caf78a4), "Barcrest","Jackpot Gems (Barcrest) (MPU4) (set 3)" ) @@ -1254,8 +1226,7 @@ M4JPGEM_SET( 199?, m4jpgem__bp, m4jpgem, "rrh01y.p1", 0x0000, 0x010000, CR #define M4JPGEMC_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4JPGEMC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1263,8 +1234,7 @@ M4JPGEM_SET( 199?, m4jpgem__bp, m4jpgem, "rrh01y.p1", 0x0000, 0x010000, CR ROM_LOAD( name, offset, length, hash ) \ M4JPGEMC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4JPGEMC_SET( 199?, m4jpgemc, 0, "gtc01ad.p1", 0x0000, 0x010000, CRC(e4f61afd) SHA1(36e007275cce0565c50b150dba4c8df272cd4c2e), "Barcrest","Jackpot Gems Classic (Barcrest) (MPU4) (set 1)" ) M4JPGEMC_SET( 199?, m4jpgemc__a, m4jpgemc, "gtc01b.p1", 0x0000, 0x010000, CRC(e4e27c71) SHA1(b46da3f00134d3a2f17ceb35529adb598c75ee4e), "Barcrest","Jackpot Gems Classic (Barcrest) (MPU4) (set 2)" ) @@ -1297,8 +1267,7 @@ M4JPGEMC_SET( 199?, m4jpgemc__w, m4jpgemc, "hge01y.p1", 0x0000, 0x010000 ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "jolly1.hex", 0x000000, 0x080000, CRC(de0edae5) SHA1(e3e21e28ae5e838bd6eacc7cf7b20204d7b0327d) ) \ - ROM_LOAD( "jolly2.hex", 0x080000, 0x080000, CRC(08ae81a2) SHA1(6459a694cd820f1a55b636f7c5c77674d3fe4bdb) ) \ - + ROM_LOAD( "jolly2.hex", 0x080000, 0x080000, CRC(08ae81a2) SHA1(6459a694cd820f1a55b636f7c5c77674d3fe4bdb) ) #define M4JOLGEM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1306,8 +1275,7 @@ M4JPGEMC_SET( 199?, m4jpgemc__w, m4jpgemc, "hge01y.p1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4JOLGEM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4JOLGEM_SET( 199?, m4jolgem, 0, "gem07s.p1", 0x0000, 0x020000, CRC(945ad0d2) SHA1(d636bc41a4f887d24affc0f5b644c5d5351cf0df), "Barcrest","Jolly Gems (Barcrest) (MPU4) (set 1)" ) M4JOLGEM_SET( 199?, m4jolgem__a, m4jolgem, "gem05s", 0x0000, 0x020000, CRC(b7ceafc2) SHA1(b66d846da5ff20df912d31695eaef146dbbe759e), "Barcrest","Jolly Gems (Barcrest) (MPU4) (set 2)" ) M4JOLGEM_SET( 199?, m4jolgem__b, m4jolgem, "gem06ad.p1", 0x0000, 0x020000, CRC(a3270974) SHA1(59992779415ff20b8589843510099b77c9b157fd), "Barcrest","Jolly Gems (Barcrest) (MPU4) (set 3)" ) @@ -1368,8 +1336,7 @@ M4JOLGEM_SET( 199?, m4jolgem__ap, m4jolgem, "jgs_xa_x.1_0", 0x0000, 0x020000 ROM_LOAD( "hi4snd.p1", 0x000000, 0x080000, CRC(066f262b) SHA1(fd48da486592740c68ee497396602199101711a6) ) \ ROM_LOAD( "hi4snd.p2", 0x080000, 0x080000, CRC(0ee89f6c) SHA1(7088149000efd1dcdf37aa9b88f7c6491184da24) ) \ ROM_REGION( 0x100000, "altmsm6376", 0 ) \ - ROM_LOAD( "httsnd.p1", 0x000000, 0x080000, CRC(1cfb12d2) SHA1(d909c7ee8ea10587a9a9251af943b0151d2c4a16) ) \ - + ROM_LOAD( "httsnd.p1", 0x000000, 0x080000, CRC(1cfb12d2) SHA1(d909c7ee8ea10587a9a9251af943b0151d2c4a16) ) #define M4HITTOP_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1377,8 +1344,7 @@ M4JOLGEM_SET( 199?, m4jolgem__ap, m4jolgem, "jgs_xa_x.1_0", 0x0000, 0x020000 ROM_LOAD( name, offset, length, hash ) \ M4HITTOP_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4HITTOP_SET( 199?, m4hittop, 0, "hi4s.p1", 0x0000, 0x010000, CRC(3a04ee7a) SHA1(d23e9da2c22f6983a855bc519597ea9cea84f2dd), "Barcrest","Hit The Top (Barcrest) (MPU4) (set 1)" ) M4HITTOP_SET( 199?, m4hittop__a, m4hittop, "chuad.p1", 0x0000, 0x010000, CRC(01d3b86c) SHA1(27af0e76661495d5b91ee6a53507f9a5d4e5ab85), "Barcrest","Hit The Top (Barcrest) (MPU4) (set 2)" ) @@ -1447,16 +1413,14 @@ M4HITTOP_SET( 199?, m4hittop__ax, m4hittop, "htty.p1", 0x0000, 0x010000 ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "m574.chr", 0x0000, 0x000048, CRC(cc4b7911) SHA1(9f8a96a1f8b0f9b33b852e93483ce5c684703349) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "cn4snd.p1", 0x0000, 0x080000, CRC(720011ce) SHA1(fa9108463131ea7e64525e080ac0eff2f6708db8) ) \ - + ROM_LOAD( "cn4snd.p1", 0x0000, 0x080000, CRC(720011ce) SHA1(fa9108463131ea7e64525e080ac0eff2f6708db8) ) #define M4NNWW_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4NNWW_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4NNWW_SET( 199?, m4nnww, 0, "nn5bd.p1", 0x0000, 0x010000, CRC(56cc9559) SHA1(53e109a579e422932dd25c52cf2beca51d3a53e3), "Barcrest","Nudge Nudge Wink Wink (Barcrest) (MPU4) (set 1)" ) M4NNWW_SET( 199?, m4nnww__a, m4nnww, "cf301s", 0x0000, 0x010000, CRC(1d8abf59) SHA1(81e47797baddd777fbbb1b1e044df1bfe3d49cb2), "Barcrest","Nudge Nudge Wink Wink (Barcrest) (MPU4) (set 2)" ) @@ -1528,16 +1492,14 @@ M4NNWW_SET( 199?, m4nnww__az, m4nnww, "wink2010", 0x0000, 0x010000, CRC(05 ROM_LOAD( "rft20.10_chr", 0x0000, 0x000010, CRC(87cdda8d) SHA1(3d17d42d5eaf5dcc04b856ec07689cab6183b12d) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "runsnd.p1", 0x000000, 0x080000, CRC(a37a3a6d) SHA1(b82c7e90508795a53b91d7dab7938abf07e8ab4c) ) \ - ROM_LOAD( "runsnd.p2", 0x080000, 0x080000, CRC(1c03046f) SHA1(5235b2f60f12cbee11fb5e54e1858a11a755f460) ) \ - + ROM_LOAD( "runsnd.p2", 0x080000, 0x080000, CRC(1c03046f) SHA1(5235b2f60f12cbee11fb5e54e1858a11a755f460) ) #define M4RFYM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RFYM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RFYM_SET( 199?, m4rfym, 0, "rund.p1", 0x0000, 0x010000, CRC(2be2a66d) SHA1(a66d74ccf1783912673cfcb6c1ae7fbb6d70ca0e), "Barcrest","Run For Your Money (Barcrest) (MPU4) (set 1)" ) M4RFYM_SET( 199?, m4rfym__a, m4rfym, "ap1ad.p1", 0x0000, 0x010000, CRC(d1adbf80) SHA1(08801f38b8ba5034fd83b53b6cfff864104525b4), "Barcrest","Run For Your Money (Barcrest) (MPU4) (set 2)" ) @@ -1615,16 +1577,14 @@ M4RFYM_SET( 199?, m4rfym__a5, m4rfym, "rfym5.8t", 0x0000, 0x010000, CRC(c6 ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "rgosnd.p1", 0x000000, 0x080000, CRC(d9345794) SHA1(4ed060fe61b3530e88ba9afea1fb69efed47c955) ) \ - ROM_LOAD( "rgosnd.p2", 0x080000, 0x080000, CRC(4656f94e) SHA1(2f276ced34a43bb7fc69304f519b913d699c3450) ) \ - + ROM_LOAD( "rgosnd.p2", 0x080000, 0x080000, CRC(4656f94e) SHA1(2f276ced34a43bb7fc69304f519b913d699c3450) ) #define M4READY_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4READY_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4READY_SET( 199?, m4ready, 0, "rgob.p1", 0x0000, 0x010000, CRC(43ac7b73) SHA1(994d6256432543e1353521359f8faaea671a7bea), "Barcrest","Ready Steady Go (Barcrest) (type 2) (MPU4) (set 1)" ) M4READY_SET( 199?, m4ready__a, m4ready, "cgo11ad.p1", 0x0000, 0x010000, CRC(9f8bbdaf) SHA1(210cdc9ce493edbf55d43a3127b10931e3ce2fee), "Barcrest","Ready Steady Go (Barcrest) (type 2) (MPU4) (set 2)" ) @@ -1702,16 +1662,14 @@ M4READY_SET( 199?, m4ready__a5, m4ready, "rgt10y.p1", 0x0000, 0x010000, CR ROM_LOAD( "mag7.chr", 0x0000, 0x000048, CRC(4835e911) SHA1(7171cdabf6cf76e09ea55b41f0f8a98b94032486) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "ma7snd1.bin", 0x000000, 0x080000, CRC(f0e31329) SHA1(60b94c3223c8863fe801b93f65ff65e94f3dec83) ) \ - ROM_LOAD( "ma7snd2.bin", 0x080000, 0x080000, CRC(12110d16) SHA1(fa93a263d1e3fa8b0b2f618f52e5145330f4315d) ) \ - + ROM_LOAD( "ma7snd2.bin", 0x080000, 0x080000, CRC(12110d16) SHA1(fa93a263d1e3fa8b0b2f618f52e5145330f4315d) ) #define M4MAG7S_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MAG7S_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4jackpot8per , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4jackpot8per , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4MAG7S_SET( 199?, m4mag7s, 0, "mas12y.p1", 0x0000, 0x020000, CRC(5f012d8e) SHA1(069b493285df9ac3639c43349245a77890333dcc), "Barcrest","Magnificent 7s (Barcrest) (MPU4) (set 1)" ) M4MAG7S_SET( 199?, m4mag7s__a, m4mag7s, "ma714s", 0x0000, 0x020000, CRC(9c1d4f97) SHA1(7875f044f992b313f4dfaae2e7b604baf16387a3), "Barcrest","Magnificent 7s (Barcrest) (MPU4) (set 2)" ) @@ -1779,16 +1737,14 @@ M4MAG7S_SET( 199?, m4mag7s__ax, m4mag7s, "m7_sja_c.2r1", 0x0000, 0x020000 #define M4MAKMNT_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "mamsnd.p1", 0x000000, 0x080000, CRC(8dc408e3) SHA1(48a9ffc5cf4fd04ed1320619ca915bbfa2406750) ) \ - ROM_LOAD( "mamsnd.p2", 0x080000, 0x080000, CRC(6034e17a) SHA1(11e044c87b5fc6461b0c6cfac5c419daee930d7b) ) \ - + ROM_LOAD( "mamsnd.p2", 0x080000, 0x080000, CRC(6034e17a) SHA1(11e044c87b5fc6461b0c6cfac5c419daee930d7b) ) #define M4MAKMNT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MAKMNT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4MAKMNT_SET( 199?, m4makmnt, 0, "mams.p1", 0x0000, 0x020000, CRC(af08e1e6) SHA1(c7e87d351f67592084d758ee53ba4d354bb28866), "Barcrest","Make A Mint (Barcrest) (MPU4) (set 1)" ) M4MAKMNT_SET( 199?, m4makmnt__a, m4makmnt, "mam04ad.p1", 0x0000, 0x020000, CRC(9b750bc7) SHA1(10a86f0a0d18ce0be502a9d36282f6b5eef0ece5), "Barcrest","Make A Mint (Barcrest) (MPU4) (set 2)" ) @@ -1853,8 +1809,7 @@ M4MAKMNT_SET( 199?, m4makmnt__as, m4makmnt, "ma_x6a_c.3_1", 0x0000, 0x010000 ROM_LOAD( "viva.chr", 0x0000, 0x000048, CRC(4662e1fb) SHA1(54074bcc67adedb3dc6df80bdc60e0222f934156) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "vivasnd1.bin", 0x000000, 0x080000, CRC(e7975c75) SHA1(407c3bcff29f4b6599de2c35d96f62c72a897bd1) ) \ - ROM_LOAD( "vivasnd2.bin", 0x080000, 0x080000, CRC(9f22f32d) SHA1(af64f6bde0b825d474c42c56f6e2253b28d4f90f) ) \ - + ROM_LOAD( "vivasnd2.bin", 0x080000, 0x080000, CRC(9f22f32d) SHA1(af64f6bde0b825d474c42c56f6e2253b28d4f90f) ) #define M4VIVAES_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1862,8 +1817,7 @@ M4MAKMNT_SET( 199?, m4makmnt__as, m4makmnt, "ma_x6a_c.3_1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4VIVAES_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4VIVAES_SET( 199?, m4vivaes, 0, "5p5vivaespana6-0.bin", 0x0000, 0x010000, CRC(adf02a7b) SHA1(2c61e175b920a67098503eb4d80b07b828c9f91d), "Barcrest","Viva Espana (Barcrest) (MPU4) (set 1)" ) M4VIVAES_SET( 199?, m4vivaes__a, m4vivaes, "ep8ad.p1", 0x0000, 0x010000, CRC(1591cc9b) SHA1(b7574b71955d7780f3f127670e458befad951383), "Barcrest","Viva Espana (Barcrest) (MPU4) (set 2)" ) @@ -1925,8 +1879,7 @@ M4VIVAES_SET( 199?, m4vivaes__ap, m4vivaes, "vesp_5.8", 0x0000, ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pbsnd1.hex", 0x000000, 0x080000, CRC(72a3331d) SHA1(b7475ba0ad86a6277e3d4f7b4311a98f3fc29802) ) \ - ROM_LOAD( "pbsnd2.hex", 0x080000, 0x080000, CRC(c2460eec) SHA1(7c62fbc69ffaa788bf3839e37a75a812a7b8caef) ) \ - + ROM_LOAD( "pbsnd2.hex", 0x080000, 0x080000, CRC(c2460eec) SHA1(7c62fbc69ffaa788bf3839e37a75a812a7b8caef) ) #define M4POTBLK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -1934,8 +1887,7 @@ M4VIVAES_SET( 199?, m4vivaes__ap, m4vivaes, "vesp_5.8", 0x0000, ROM_LOAD( name, offset, length, hash ) \ M4POTBLK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4POTBLK_SET( 199?, m4potblk, 0, "pbg16s.p1", 0x0000, 0x020000, CRC(36a1c679) SHA1(bf2eb5c2a07e61b7a2c0d8402b0e0583adfa22dc), "Barcrest","Pot Black (Barcrest) (MPU4) (set 1)" ) M4POTBLK_SET( 199?, m4potblk__a, m4potblk, "pb15g", 0x0000, 0x020000, CRC(650a54be) SHA1(80a5bb95857c911c1972f8be5bf794637cb02323), "Barcrest","Pot Black (Barcrest) (MPU4) (set 2)" ) @@ -2006,16 +1958,14 @@ M4POTBLK_SET( 199?, m4potblk__ax, m4potblk, "po_x6a_t.1_1", 0x0000, 0x020000 ROM_LOAD( "pyb.chr", 0x0000, 0x000048, CRC(663e9d8e) SHA1(08e898967d41fbc582c9bfdebb461ad51269089d) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pybsnd.p1", 0x000000, 0x080000, CRC(3a91784a) SHA1(7297ccec3264aa9f1e7b3a2841f5f8a1e4ca6c54) ) \ - ROM_LOAD( "pybsnd.p2", 0x080000, 0x080000, CRC(a82f0096) SHA1(45b6b5a2ae06b45add9cdbb9f5e6f834687b4902) ) \ - + ROM_LOAD( "pybsnd.p2", 0x080000, 0x080000, CRC(a82f0096) SHA1(45b6b5a2ae06b45add9cdbb9f5e6f834687b4902) ) #define M4PLACBT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PLACBT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4PLACBT_SET( 199?, m4placbt, 0, "pyb07s.p1", 0x0000, 0x020000, CRC(ad02705a) SHA1(027bcbbd828e4fd23831af9554d582857e6784e1), "Barcrest","Place Your Bets (Barcrest) (MPU4) (set 1)" ) @@ -2077,16 +2027,14 @@ M4PLACBT_SET( 199?, m4placbt__ao, m4placbt, "pyh06y.p1", 0x0000, 0x020000 ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "du91.chr", 0x0000, 0x000048, CRC(9724122d) SHA1(a41687eec84cad453c1a2a89317078f48ca0895f) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "c9s.hex", 0x0000, 0x080000, CRC(ae952e15) SHA1(a9eed61c3d65ded5e1faa67362f181393cb6339a) ) \ - + ROM_LOAD( "c9s.hex", 0x0000, 0x080000, CRC(ae952e15) SHA1(a9eed61c3d65ded5e1faa67362f181393cb6339a) ) #define M4C9_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4C9_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4C9_SET( 199?, m4c9, 0, "c9211.p1", 0x0000, 0x010000, CRC(44e5cc87) SHA1(36fca9493d36ee6988d02da1b4c575278c43748c), "Barcrest","Cloud Nine (Barcrest) (MPU4) (set 1)" ) M4C9_SET( 199?, m4c9__a, m4c9, "c915.hex", 0x0000, 0x010000, CRC(dabfa3f3) SHA1(f507c78e61cba74e9b776bebaf0cc4fa40b6de95), "Barcrest","Cloud Nine (Barcrest) (MPU4) (set 2)" ) @@ -2165,16 +2113,14 @@ M4C9_SET( 199?, m4c9__a3, m4c9, "c9o20d_1.1", 0x0000, 0x010000, CRC(047b2d ROM_LOAD( "tftsnd02.p2", 0x080000, 0x080000, CRC(0bdc1dc9) SHA1(909af8ff4d0e3e36e280e9553a73bb1dfdb62144) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "tfsnd1.hex", 0x000000, 0x080000, CRC(a5b623fa) SHA1(eb4d84a7d3977ddea42c4995dddaabace73e6f8a) ) \ - ROM_LOAD( "tfsnd2.hex", 0x080000, 0x080000, CRC(1275e528) SHA1(0c3c901cb2be1e84dba123677205108cf0388343) ) \ - + ROM_LOAD( "tfsnd2.hex", 0x080000, 0x080000, CRC(1275e528) SHA1(0c3c901cb2be1e84dba123677205108cf0388343) ) #define M4TUTFRT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TUTFRT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TUTFRT_SET( 199?, m4tutfrt, 0, "tft04s.p1", 0x0000, 0x010000, CRC(c20c3589) SHA1(55d1bc5d5f4ae14acafb36bd640faaf4ffccc6eb), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 1)" ) M4TUTFRT_SET( 199?, m4tutfrt__a, m4tutfrt, "ctuad.p1", 0x0000, 0x010000, CRC(0ec1661b) SHA1(162ddc30c341fd8eda8ce57a60edf06b4e39a24f), "Barcrest","Tutti Fruity (Barcrest) (MPU4) (set 2)" ) @@ -2251,16 +2197,14 @@ M4TUTFRT_SET( 199?, m4tutfrt__a5, m4tutfrt, "tui05___.1a3", 0x0000, ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cas1.hex", 0x000000, 0x080000, CRC(4711c483) SHA1(af1ceb317b7bb1c2d0c3f7a99049679c356e1860) ) \ - ROM_LOAD( "cas2.hex", 0x080000, 0x080000, CRC(26ec235c) SHA1(51de955e5def47b82ac8891d09dc0b0e5e19c01d) ) \ - + ROM_LOAD( "cas2.hex", 0x080000, 0x080000, CRC(26ec235c) SHA1(51de955e5def47b82ac8891d09dc0b0e5e19c01d) ) #define M4CASHAT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CASHAT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CASHAT_SET( 199?, m4cashat, 0, "csa12y.p1", 0x0000, 0x020000, CRC(0374584a) SHA1(446e1d122d5b38e4ee11d98a4235d7198d98b541), "Barcrest","Cash Attack (Barcrest) (MPU4) (set 1)" ) M4CASHAT_SET( 199?, m4cashat__a, m4cashat, "caa22ad.p1", 0x0000, 0x020000, CRC(b6274874) SHA1(7c2dc0f3e8e7bb76f3b90300141b320fa0ca39ac), "Barcrest","Cash Attack (Barcrest) (MPU4) (set 2)" ) @@ -2325,16 +2269,14 @@ M4CASHAT_SET( 199?, m4cashat__ar, m4cashat, "csa12s.p1", 0x0000, 0x02 ROM_REGION( 0x100000, "altmsm6376", 0 ) \ ROM_LOAD( "redhotroll10.bin", 0x0000, 0x080000, CRC(64513503) SHA1(4233492f3f6e7ad8459f1ab733727910d3b4bcf8) ) /* not a valid OKI rom? */ \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "rhrsnd1.hex", 0x0000, 0x080000, CRC(3e80f8bd) SHA1(2e3a195b49448da11cc0c089a8a9b462894c766b) ) \ - + ROM_LOAD( "rhrsnd1.hex", 0x0000, 0x080000, CRC(3e80f8bd) SHA1(2e3a195b49448da11cc0c089a8a9b462894c766b) ) #define M4RHR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RHR_SET( 199?, m4rhr, 0, "rhr15.hex", 0x0000, 0x010000, CRC(895ebbda) SHA1(f2117e743a30f3c9fc6af7fd7843bc333699db9d), "Barcrest","Red Hot Roll (Barcrest) (MPU4) (set 1)" ) M4RHR_SET( 199?, m4rhr__a, m4rhr, "cr4ad.p1", 0x0000, 0x010000, CRC(b99b3d14) SHA1(2ff68b33881e9b3c2db48c335ccbad783013084a), "Barcrest","Red Hot Roll (Barcrest) (MPU4) (set 2)" ) @@ -2409,16 +2351,14 @@ M4RHR_SET( 1991, m4rhr__a4, m4rhr, "rh8c.p1", 0x0000, 0x010000, CRC(e3 #define M4UUAW_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "uuasnd.p1", 0x00000, 0x080000, CRC(be1a1131) SHA1(b7f50d8db6b7d134757e0746e7d9faf9fd3a2c7e) ) \ - ROM_LOAD( "uuasnd.p2", 0x080000, 0x080000, CRC(c8492b3a) SHA1(d390e37f4a62869079bb38395a2e86a5ad24392f) ) \ - + ROM_LOAD( "uuasnd.p2", 0x080000, 0x080000, CRC(c8492b3a) SHA1(d390e37f4a62869079bb38395a2e86a5ad24392f) ) #define M4UUAW_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4UUAW_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4UUAW_SET( 199?, m4uuaw, 0, "uua21h.p1", 0x0000, 0x020000, CRC(199e6dae) SHA1(ecd95ba2c2255afbaa8df96d625a8bfc97e4d3bc), "Barcrest","Up Up and Away (Barcrest) (MPU4) (set 1)" ) @@ -2480,16 +2420,14 @@ M4UUAW_SET( 199?, m4uuaw__aq, m4uuaw, "uua22y.p1", 0x0000, 0x020000, CRC(88 #define M4RICHFM_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "rfamouss1.hex", 0x000000, 0x080000, CRC(b237c8b8) SHA1(b2322d68fe57cca0ed49b01ae0d3a0e93a623eac) ) \ - ROM_LOAD( "rfamouss2.hex", 0x080000, 0x080000, CRC(12c295d5) SHA1(0758354cfb5242b4ce3f5f25c3458d91f4b4a1ec) ) \ - + ROM_LOAD( "rfamouss2.hex", 0x080000, 0x080000, CRC(12c295d5) SHA1(0758354cfb5242b4ce3f5f25c3458d91f4b4a1ec) ) #define M4RICHFM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RICHFM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RICHFM_SET( 199?, m4richfm, 0, "rfts.p1", 0x0000, 0x010000, CRC(2a747164) SHA1(a4c8e160f09ebea4fca6dd32ff020d3f1a4f1a1c), "Barcrest","Rich & Famous (Barcrest) (MPU4) (set 1)" ) M4RICHFM_SET( 199?, m4richfm__a, m4richfm, "rafc.p1", 0x0000, 0x010000, CRC(d92f602f) SHA1(c93131138deb4018d499b9b45c07d4517c5072b7), "Barcrest","Rich & Famous (Barcrest) (MPU4) (set 2)" ) @@ -2526,16 +2464,14 @@ M4RICHFM_SET( 199?, m4richfm__3, m4richfm, "r&f55", 0x0000, 0x010000 #define M4NNWWC_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing, maybe the same as NNWW */ \ - + /* missing, maybe the same as NNWW */ #define M4NNWWC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4NNWWC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4NNWWC_SET( 199?, m4nnwwc, 0, "cn302c.p1", 0x0000, 0x010000, CRC(fd9de050) SHA1(14c80deba1396aa5be0a1d02964ecd4b946f2ee8), "Barcrest","Nudge Nudge Wink Wink Classic (Barcrest) (MPU4) (set 1)" ) M4NNWWC_SET( 199?, m4nnwwc__a, m4nnwwc, "cf302ad.p1", 0x0000, 0x010000, CRC(6c6aa0cd) SHA1(5a58a19c35b0b195f3b4e7a21f57ca61d45ec1fb), "Barcrest","Nudge Nudge Wink Wink Classic (Barcrest) (MPU4) (set 2)" ) M4NNWWC_SET( 199?, m4nnwwc__b, m4nnwwc, "cf302b.p1", 0x0000, 0x010000, CRC(9ca07939) SHA1(6eb0a5675bb803a11c4c874dc0516d94c48194b7), "Barcrest","Nudge Nudge Wink Wink Classic (Barcrest) (MPU4) (set 3)" ) @@ -2590,8 +2526,7 @@ M4NNWWC_SET( 199?, m4nnwwc__ad, m4nnwwc, "cl__xb_x.2_0", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4RHRC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RHRC_SET( 199?, m4rhrc, 0, "cld03ad.p1", 0x0000, 0x010000, CRC(821fde63) SHA1(61f77eeb01331e735cc8c736526d09371e6bdf56), "Barcrest","Red Hot Roll Classic (Barcrest) (MPU4) (set 1)" ) @@ -2637,16 +2572,14 @@ M4RHRC_SET( 199?, m4rhrc__aa, m4rhrc, "cr__x_dx.5_0", 0x0000, 0x010000, CR ROM_LOAD( "vizs.chr", 0x0000, 0x000048, CRC(2365ca6b) SHA1(b964420eb1df4065b2a6f3f934135d435b52af2b) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "vizsnd.p1", 0x000000, 0x080000, CRC(2b39a622) SHA1(77916650fe19f18025e10fb25de704f7bb733295) ) \ - ROM_LOAD( "vizsnd.p2", 0x080000, 0x080000, CRC(e309bede) SHA1(a4615436fcfd5f31293f887b8bc972f0d2d6b0cb) ) \ - + ROM_LOAD( "vizsnd.p2", 0x080000, 0x080000, CRC(e309bede) SHA1(a4615436fcfd5f31293f887b8bc972f0d2d6b0cb) ) #define M4VIZ_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VIZ_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4VIZ_SET( 199?, m4viz, 0, "viz208c", 0x0000, 0x010000, CRC(00a65029) SHA1(8dfb68d1a9f4cd00f239ed87a1d330ccb655c35b), "Barcrest","Viz (Barcrest) (MPU4) (set 1)" ) @@ -2682,16 +2615,14 @@ M4VIZ_SET( 199?, m4viz__w, m4viz, "viz_20_.8", 0x0000, 0x010000, CRC(b4fbc4 ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "tapsnd1.hex", 0x000000, 0x080000, CRC(8dc408e3) SHA1(48a9ffc5cf4fd04ed1320619ca915bbfa2406750) ) \ ROM_LOAD( "tapsnd2.hex", 0x080000, 0x080000, CRC(6034e17a) SHA1(11e044c87b5fc6461b0c6cfac5c419daee930d7b) ) \ - ROM_LOAD( "typkp2", 0x080000, 0x080000, CRC(753d9bc1) SHA1(c27c8b7cfba7ad67685f637ee3f68a3edb7986e7) ) /* alt copy of tapsnd2 */ \ - + ROM_LOAD( "typkp2", 0x080000, 0x080000, CRC(753d9bc1) SHA1(c27c8b7cfba7ad67685f637ee3f68a3edb7986e7) ) /* alt copy of tapsnd2 */ #define M4TAKEPK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TAKEPK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4TAKEPK_SET( 199?, m4takepk, 0, "tapy.p1", 0x0000, 0x020000, CRC(f21f6dc8) SHA1(d421bee2564d3aaa389c35601adc23ad3fda5aa0), "Barcrest","Take Your Pick (Barcrest) (MPU4) (set 1)" ) M4TAKEPK_SET( 199?, m4takepk__a, m4takepk, "tapad.p1", 0x0000, 0x020000, CRC(162448c4) SHA1(1f77d053fb5dfddeba1248e9e2a05536ab1bc66a), "Barcrest","Take Your Pick (Barcrest) (MPU4) (set 2)" ) @@ -2728,16 +2659,14 @@ M4TAKEPK_SET( 199?, m4takepk__1, m4takepk, "typ5p10p.bin", 0x0000, 0x010000 ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "otts.chr", 0x0000, 0x000048, CRC(2abec763) SHA1(307399724a994a5d0914a5d7e0931a5d94439a37) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "otnsnd.p1", 0x0000, 0x080000, CRC(d4f7ed82) SHA1(16e80bf0956f39a9e8e23384615a07594419db59) ) \ - + ROM_LOAD( "otnsnd.p1", 0x0000, 0x080000, CRC(d4f7ed82) SHA1(16e80bf0956f39a9e8e23384615a07594419db59) ) #define M4OVERMN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4OVERMN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4OVERMN_SET( 199?, m4overmn, 0, "otts.p1", 0x0000, 0x010000, CRC(6daf58a4) SHA1(e505a18b67dec54446e6d94a5d1c3bba13099619), "Barcrest","Over The Moon (Barcrest) (MPU4) (set 1)" ) M4OVERMN_SET( 199?, m4overmn__a, m4overmn, "ot8b.p1", 0x0000, 0x010000, CRC(243c7f7c) SHA1(24b9d2cce1af75811d1e625ac8df5b58356776dc), "Barcrest","Over The Moon (Barcrest) (MPU4) (set 2)" ) @@ -2788,16 +2717,14 @@ M4OVERMN_SET( 199?, m4overmn__8, m4overmn, "otuy.p1", 0x0000, 0x010000, CR ROM_LOAD( "luxorsnd2.hex", 0x080000, 0x080000, CRC(860178e6) SHA1(705b1b0ad62a1b594bb123aec3c2b571a6500ce8) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "luxor-snd1.bin", 0x000000, 0x080000, CRC(d09394e9) SHA1(d3cbdbaf048d829271a6c2846b16ceee7775d767) ) \ - ROM_LOAD( "luxor-snd2.bin", 0x080000, 0x080000, CRC(bc720cb9) SHA1(a83c25ecec602ba047dd21de2beec6cd7ac76cbe) ) \ - + ROM_LOAD( "luxor-snd2.bin", 0x080000, 0x080000, CRC(bc720cb9) SHA1(a83c25ecec602ba047dd21de2beec6cd7ac76cbe) ) #define M4LUXOR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LUXOR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4LUXOR_SET( 199?, m4luxor, 0, "luxor.rom", 0x0000, 0x010000, CRC(55277510) SHA1(9a866c36a398df52c54b554cd8085078c1f1954b), "Barcrest","Luxor (Barcrest) (MPU4) (set 1)" ) @@ -2834,16 +2761,14 @@ M4LUXOR_SET( 199?, m4luxor__z, m4luxor, "lxi10a__.1o1", 0x0000, 0x010000 ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "hijinx1.hex", 0x000000, 0x080000, CRC(8d5afedb) SHA1(6bf6dadddf8dd3672e3d05167ab9a0793c269176) ) \ - ROM_LOAD( "hijinx2.hex", 0x080000, 0x080000, CRC(696c8a92) SHA1(d54a1020fea80bacb678bc8bd6b7d4d0854af603) ) \ - + ROM_LOAD( "hijinx2.hex", 0x080000, 0x080000, CRC(696c8a92) SHA1(d54a1020fea80bacb678bc8bd6b7d4d0854af603) ) #define M4HIJINX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4HIJINX_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4HIJINX_SET( 199?, m4hijinx, 0, "jnx10y.p1", 0x0000, 0x020000, CRC(792b3bae) SHA1(d30aecce42953f1ec49753cc2d1df00ad9bd088f), "Barcrest","Hi Jinx (Barcrest) (MPU4) (set 1)" ) M4HIJINX_SET( 199?, m4hijinx__a, m4hijinx, "hij15g", 0x0000, 0x020000, CRC(73271cca) SHA1(8177e10e30386464a7e5a33dc3c02adbf4c93101), "Barcrest","Hi Jinx (Barcrest) (MPU4) (set 2)" ) @@ -2895,16 +2820,14 @@ M4HIJINX_SET( 199?, m4hijinx__ab, m4hijinx, "jnx10s.p1", 0x0000, 0x020000 ROM_LOAD( "cash lines 0.1 snd 1 9c3f.bin", 0x0000, 0x080000, CRC(1746f091) SHA1(d57fcaec3e3b0344671f2c984974bfdac50ec3d7) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cls1.hex", 0x000000, 0x080000, CRC(d6b5d862) SHA1(eab2ef2999229db7182896267cd83742b2390237) ) \ - ROM_LOAD( "cls2.hex", 0x080000, 0x080000, CRC(e42e674b) SHA1(1cda06425f3d4797ee0c4ff7426970150e5af4b6) ) \ - + ROM_LOAD( "cls2.hex", 0x080000, 0x080000, CRC(e42e674b) SHA1(1cda06425f3d4797ee0c4ff7426970150e5af4b6) ) #define M4CASHLN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CASHLN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CASHLN_SET( 199?, m4cashln, 0, "cls04s.p1", 0x0000, 0x020000, CRC(c8b7f355) SHA1(437324bf499ba49ecbb3854f5f787da5f575f7f5), "Barcrest","Cash Lines (Barcrest) (MPU4) (set 1)" ) M4CASHLN_SET( 199?, m4cashln__a, m4cashln, "cl15g", 0x0000, 0x020000, CRC(fdd5765d) SHA1(fee8ddc9b93934a5582d6730cfa26246191c22ff), "Barcrest","Cash Lines (Barcrest) (MPU4) (set 2)" ) @@ -2995,16 +2918,14 @@ M4CASHLN_SET( 199?, m4cashln__bj, m4cashln, "ncl11y.p1", 0x0000, 0x020000 #define M4LUCKLV_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "llvsnd.p1", 0x000000, 0x080000, CRC(36be26f3) SHA1(b1c66d3ebebd7eb18266bf6b30c4a4db7acdf10d) ) \ - ROM_LOAD( "llvsnd.p2", 0x080000, 0x080000, CRC(d5c2bb99) SHA1(e2096b8a33e89218d44200e87d1962790120a96c) ) \ - + ROM_LOAD( "llvsnd.p2", 0x080000, 0x080000, CRC(d5c2bb99) SHA1(e2096b8a33e89218d44200e87d1962790120a96c) ) #define M4LUCKLV_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LUCKLV_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4LUCKLV_SET( 199?, m4lucklv, 0, "llvs.p1", 0x0000, 0x010000, CRC(30727bc9) SHA1(c32112d0181f629540b31ce9959834111dbf7e0e), "Barcrest","Lucky Las Vegas (Barcrest) (MPU4) (set 1)" ) M4LUCKLV_SET( 199?, m4lucklv__a, m4lucklv, "ll3ad.p1", 0x0000, 0x010000, CRC(e79e7f98) SHA1(7b3a22978f2f5a0b6062f0330fef15ce0e91c010), "Barcrest","Lucky Las Vegas (Barcrest) (MPU4) (set 2)" ) @@ -3059,16 +2980,14 @@ M4LUCKLV_SET( 199?, m4lucklv__ai, m4lucklv, "llvr.p1", 0x0000, 0x010000, CR #define M4LUCKST_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "lssnd1.bin", 0x000000, 0x080000, CRC(401686bc) SHA1(ab62e6e097b0af2f68ae7f8f686f00cede5ec3aa) ) \ - ROM_LOAD( "lssnd2.bin", 0x080000, 0x080000, CRC(d9e0c0db) SHA1(3eba5b19ca98d23a94edf2be27ccefaa0e526a56) ) \ - + ROM_LOAD( "lssnd2.bin", 0x080000, 0x080000, CRC(d9e0c0db) SHA1(3eba5b19ca98d23a94edf2be27ccefaa0e526a56) ) #define M4LUCKST_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LUCKST_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4LUCKST_SET( 199?, m4luckst, 0, "lss06s.p1", 0x0000, 0x020000, CRC(b6a69478) SHA1(6b05b7f9af94a83adfdff328d4132f72a1dfb19f), "Barcrest","Lucky Strike (Barcrest) (MPU4) (set 1)" ) M4LUCKST_SET( 199?, m4luckst__a, m4luckst, "ls15g", 0x0000, 0x020000, CRC(b942ac91) SHA1(e77b2acd07cac9b747731f9e0637112fc6bf94c7), "Barcrest","Lucky Strike (Barcrest) (MPU4) (set 2)" ) @@ -3133,16 +3052,14 @@ M4LUCKST_SET( 199?, m4luckst__aw, m4luckst, "ls__xa_x.1_1", 0x0000, #define M4TENTEN_EXTRA_ROMS \ ROM_REGION( 0x080000, "msm6376", 0 ) \ - ROM_LOAD( "tttsnd01.p1", 0x0000, 0x080000, CRC(5518474c) SHA1(0b7e98e33f62d80882f2b0b4af0c9056f1ffb78d) ) \ - + ROM_LOAD( "tttsnd01.p1", 0x0000, 0x080000, CRC(5518474c) SHA1(0b7e98e33f62d80882f2b0b4af0c9056f1ffb78d) ) #define M4TENTEN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TENTEN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TENTEN_SET( 199?, m4tenten, 0, "t2002s.p1", 0x0000, 0x010000, CRC(6cd9fa10) SHA1(8efe36e3fc5b709fa4363194634686d62b5d6609), "Barcrest","10 X 10 (Barcrest) (MPU4) (set 1)" ) M4TENTEN_SET( 199?, m4tenten__a, m4tenten, "n2503ad.p1", 0x0000, 0x010000, CRC(c84150e6) SHA1(8f143c26c6026a413bdd65ca148d78dead1d2474), "Barcrest","10 X 10 (Barcrest) (MPU4) (set 2)" ) @@ -3215,16 +3132,14 @@ M4TENTEN_SET( 199?, m4tenten__a2, m4tenten, "tst01y.p1", 0x0000, 0x010000 #define M4ANDYFH_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "afhsnd1.bin", 0x000000, 0x080000, CRC(ce0b1890) SHA1(224d05f936a1b6f84ad682c282c557e87ad8931f) ) \ - ROM_LOAD( "afhsnd2.bin", 0x080000, 0x080000, CRC(8a4dda7b) SHA1(ee77295609ff646212faa207e56acb2440d859b8) ) \ - + ROM_LOAD( "afhsnd2.bin", 0x080000, 0x080000, CRC(8a4dda7b) SHA1(ee77295609ff646212faa207e56acb2440d859b8) ) #define M4ANDYFH_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ANDYFH_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -3303,16 +3218,14 @@ M4ANDYFH_SET( 199?, m4andyfh__a4, m4andyfh, "cauy.p1", 0x0000, 0x010000 ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "blds1.hex", 0x000000, 0x080000, CRC(9cc07f5f) SHA1(e25295eb304624ed77d98d7e974363214c2c2cd1) ) \ - ROM_LOAD( "blds2.hex", 0x080000, 0x080000, CRC(949bee73) SHA1(9ea2001a4d91236708dc948b4e1cac9978095945) ) \ - + ROM_LOAD( "blds2.hex", 0x080000, 0x080000, CRC(949bee73) SHA1(9ea2001a4d91236708dc948b4e1cac9978095945) ) #define M4BDASH_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BDASH_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4BDASH_SET( 199?, m4bdash, 0, "bls01s.p1", 0x0000, 0x020000, CRC(4e4f403b) SHA1(f040568af530cf0ff060199f98b00e476191da22), "Barcrest","Boulder Dash (Barcrest) (MPU4) (set 1)" ) @@ -3389,16 +3302,14 @@ M4BDASH_SET( 199?, m4bdash__a4, m4bdash, "bo__xb_x.2_1", 0x0000, 0x020000, CR #define M4PRZDTY_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pdusnd.p2", 0x000000, 0x080000, CRC(a5829cec) SHA1(eb65c86125350a7f384f9033f6a217284b6ff3d1) ) \ - ROM_LOAD( "pdusnd.p1", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) \ - + ROM_LOAD( "pdusnd.p1", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) #define M4PRZDTY_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZDTY_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZDTY_SET( 199?, m4przdty, 0, "pdus.p1", 0x0000, 0x010000, CRC(eaa2ae08) SHA1(a4cef3ee8c005fb717625699260d24ef6a368824), "Barcrest","Prize Duty Free (Barcrest) (MPU4) (set 1)" ) M4PRZDTY_SET( 199?, m4przdty__a, m4przdty, "pd8ad.p1", 0x0000, 0x010000, CRC(ff2bde9d) SHA1(6f75d1c4f8b136ad9dbfd6c0182dbe0f54f856a9), "Barcrest","Prize Duty Free (Barcrest) (MPU4) (set 2)" ) @@ -3421,16 +3332,14 @@ M4PRZDTY_SET( 199?, m4przdty__p, m4przdty, "pduy.p1", 0x0000, 0x010000, CR #define M4PRZMON_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing */ \ - + /* missing */ #define M4PRZMON_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZMON_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZMON_SET( 199?, m4przmon, 0, "fp8ad.p1", 0x0000, 0x010000, CRC(9c1c443a) SHA1(58e45501c33d0fd8ecca7e7bc40fef60ebb519e9), "Barcrest","Prize Money (Barcrest) (MPU4) (set 1)" ) @@ -3465,8 +3374,7 @@ M4PRZMON_SET( 199?, m4przmon__1, m4przmon, "mti10___.4o1", 0x0000, 0x010000 #define M4PRZHR_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "prlsnd.p1", 0x0000, 0x080000, CRC(d60181ea) SHA1(4ca872e50d59dc96e90ade8cac24ebbab8a3f397) ) \ - + ROM_LOAD( "prlsnd.p1", 0x0000, 0x080000, CRC(d60181ea) SHA1(4ca872e50d59dc96e90ade8cac24ebbab8a3f397) ) #define M4PRZHR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -3474,8 +3382,7 @@ M4PRZMON_SET( 199?, m4przmon__1, m4przmon, "mti10___.4o1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4PRZHR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZHR_SET( 199?, m4przhr, 0, "prly.p1", 0x0000, 0x010000, CRC(feeac121) SHA1(e01f32fb4cdfbe61fdcd89749a33185ac0410720), "Barcrest","Prize High Roller (Barcrest) (MPU4) (set 1)" ) M4PRZHR_SET( 199?, m4przhr__a, m4przhr, "pr3ad.p1", 0x0000, 0x010000, CRC(8b047599) SHA1(fd2f21c2ed3e5cb4e4ace7ffa620131a1897cf92), "Barcrest","Prize High Roller (Barcrest) (MPU4) (set 2)" ) @@ -3500,8 +3407,7 @@ M4PRZHR_SET( 199?, m4przhr__p, m4przhr, "prls.p1", 0x0000, 0x010000, CRC(8c ROM_REGION( 0x100000, "altmsm6376", 0 ) \ ROM_LOAD( "c95snd.p1", 0x080000, 0x080000, CRC(ae952e15) SHA1(a9eed61c3d65ded5e1faa67362f181393cb6339a) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "c25snd.p1", 0x000000, 0x080000, CRC(cd8f4ee0) SHA1(a7b9ae93b3a3d231a8239fff12689ec2084ce0c1) ) \ - + ROM_LOAD( "c25snd.p1", 0x000000, 0x080000, CRC(cd8f4ee0) SHA1(a7b9ae93b3a3d231a8239fff12689ec2084ce0c1) ) #define M4GCLUE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -3509,8 +3415,7 @@ M4PRZHR_SET( 199?, m4przhr__p, m4przhr, "prls.p1", 0x0000, 0x010000, CRC(8c ROM_LOAD( name, offset, length, hash ) \ M4GCLUE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4GCLUE_SET( 199?, m4gclue, 0, "c2002ad.p1", 0x0000, 0x010000, CRC(39507216) SHA1(dc49d9cea63cd5e88e4076bfca3aae88521056be), "Barcrest","Give Us A Clue (Barcrest) (MPU4) (set 1)" ) M4GCLUE_SET( 199?, m4gclue__a, m4gclue, "c2002b.p1", 0x0000, 0x010000, CRC(1a552423) SHA1(3025c7a8f98817a8b0233c7682452d5d6df081c5), "Barcrest","Give Us A Clue (Barcrest) (MPU4) (set 2)" ) @@ -3542,16 +3447,14 @@ M4GCLUE_SET( 199?, m4gclue__w, m4gclue, "c2504y.p1", 0x0000, 0x010000, CR ROM_LOAD( "lasv.chr", 0x0000, 0x000048, CRC(49ec2385) SHA1(1204c532897acc953867691124fc0b700c7aed47) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "uvssnd.p1", 0x000000, 0x080000, CRC(04a47007) SHA1(cfe1f4aa9d29c784b2034c2daa09b8bd7181562e) ) \ - ROM_LOAD( "uvssnd.p2", 0x080000, 0x080000, CRC(3b35d824) SHA1(e4007d5d13898ed0f91cd270c75b5df8cc62e003) ) \ - + ROM_LOAD( "uvssnd.p2", 0x080000, 0x080000, CRC(3b35d824) SHA1(e4007d5d13898ed0f91cd270c75b5df8cc62e003) ) #define M4VEGAST_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VEGAST_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4VEGAST_SET( 199?, m4vegast, 0, "uvsad.p1", 0x0000, 0x020000, CRC(f26d7fa8) SHA1(bb37be4a189bd38bd71afd836e94a55f9ef84ad4), "Barcrest","Vegas Strip (Barcrest) (MPU4) (set 1)" ) M4VEGAST_SET( 199?, m4vegast__a, m4vegast, "uvsb.p1", 0x0000, 0x020000, CRC(32e017ff) SHA1(3e8aa863b85164ee9d535244bafb82b14ee19528), "Barcrest","Vegas Strip (Barcrest) (MPU4) (set 2)" ) @@ -3585,16 +3488,14 @@ M4VEGAST_SET( 199?, m4vegast__x, m4vegast, "vstr2010", 0x0000, 0x020000 ROM_LOAD( "hotrod.chr", 0x0000, 0x000048, CRC(a76dc7d3) SHA1(43010dab862a98ec2a8f8444bf1411902ba03c63) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "rodsnd.p1", 0x000000, 0x080000, CRC(bfdafedc) SHA1(6acc838ec046d44e7faa727b48925379aa42883d) ) \ - ROM_LOAD( "rodsnd.p2", 0x080000, 0x080000, CRC(a01e1e67) SHA1(4f86e0bb9bf4c1a4d0190eddfe7dd5bb89c519a2) ) \ - + ROM_LOAD( "rodsnd.p2", 0x080000, 0x080000, CRC(a01e1e67) SHA1(4f86e0bb9bf4c1a4d0190eddfe7dd5bb89c519a2) ) #define M4HOTROD_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4HOTROD_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4HOTROD_SET( 199?, m4hotrod, 0, "rodk.p1", 0x0000, 0x010000, CRC(298d85ff) SHA1(3c9374be1f6b5e58a1b9004f74f3a33d0fff4214), "Barcrest","Hot Rod (Barcrest) (MPU4) (set 1)" ) M4HOTROD_SET( 199?, m4hotrod__a, m4hotrod, "hot rod 5p 4 p1 (27512)", 0x0000, 0x010000, CRC(b6212af8) SHA1(9453c4424244895b3ad15d5fba45fe8822e7ff2b), "Barcrest","Hot Rod (Barcrest) (MPU4) (set 2)" ) @@ -3624,16 +3525,14 @@ M4HOTROD_SET( 199?, m4hotrod__v, m4hotrod, "hrod_20_.8", 0x00 #define M4BUC_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "buccsnd1.bin", 0x000000, 0x080000, CRC(b671fd7b) SHA1(8123d1ef9d5e2cc8783a78137540e6f13e5e2304) ) \ - ROM_LOAD( "buccsnd2.bin", 0x080000, 0x080000, CRC(66966b41) SHA1(87e2058f39ef1b19c35e63d55e62e2034fd24c0d) ) \ - + ROM_LOAD( "buccsnd2.bin", 0x080000, 0x080000, CRC(66966b41) SHA1(87e2058f39ef1b19c35e63d55e62e2034fd24c0d) ) #define M4BUC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BUC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4BUC_SET( 199?, m4buc, 0, "buccaneer5-15sw.bin", 0x000000, 0x020000, CRC(9b92d1f6) SHA1(d374fe966a1b039c971f278ab1113640e7629233), "Barcrest","Buccaneer (Barcrest) (MPU4) (set 1)" ) @@ -3706,8 +3605,7 @@ M4BUC_SET( 199?, m4buc__az, m4buc, "br_sjwb_.1_1", 0x000000, 0x020000, ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4HYPVIP_SET( 199?, m4hypvip, 0, "5p4hypervyper.bin", 0x0000, 0x010000, CRC(51ac9288) SHA1(1580079b6e710506ab03e1d8a89af65cd06cedd2), "Barcrest","Hyper Viper (Barcrest) (MPU4) (set 1)" ) M4HYPVIP_SET( 199?, m4hypvip__a, m4hypvip, "h.viper10p610m.bin", 0x0000, 0x010000, CRC(104b0c48) SHA1(ab4cdb596a0cfb877ed1b6bf801e4a759b53971f), "Barcrest","Hyper Viper (Barcrest) (MPU4) (set 2)" ) @@ -3740,16 +3638,14 @@ M4HYPVIP_SET( 199?, m4hypvip__v, m4hypvip, "hypv_20_.4", 0x0000, ROM_LOAD( "cjesnd.p2", 0x080000, 0x080000, CRC(3dcb7c38) SHA1(3c0e91f4d2ea9e6b25a01702c6f6fdc7cc2e0b65) ) \ ROM_LOAD( "jewelp2", 0x080000, 0x080000, CRC(84996453) SHA1(74fe377545503f1b8da9b8998514811f0c1c037c) ) /* alt cje */ \ ROM_LOAD( "cjhsnd.p1", 0x000000, 0x080000, CRC(4add4eca) SHA1(98dc644d3f3d67e764c215bd26ae010e4b23c738) ) \ - ROM_LOAD( "cjhsnd.p2", 0x080000, 0x080000, CRC(5eec51f0) SHA1(834d9d13f79a61c51db9df067064f64a15c956a9) ) \ - + ROM_LOAD( "cjhsnd.p2", 0x080000, 0x080000, CRC(5eec51f0) SHA1(834d9d13f79a61c51db9df067064f64a15c956a9) ) #define M4JWLCWN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4JWLCWN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4JWLCWN_SET( 199?, m4jwlcwn, 0, "cje0.8", 0x0000, 0x020000, CRC(2074bf61) SHA1(d84201fb7d2590b16816e0369e89789d02088a6d), "Barcrest","Jewel In the Crown (Barcrest) (MPU4) (set 1)" ) @@ -3791,16 +3687,14 @@ M4JWLCWN_SET( 199?, m4jwlcwn__6, m4jwlcwn, "jc_xx__c.3_1", 0x0000, 0x020000 #define M4BAGTEL_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "bgtsnd.p1", 0x000000, 0x080000, CRC(40a68dd1) SHA1(d70cf436dca242d49cd3bd39d3f6484a30968d0d) ) \ - ROM_LOAD( "bgtsnd.p2", 0x080000, 0x080000, CRC(90961429) SHA1(6390e575d030f6d2953ee8460876c50fe48026f8) ) \ - + ROM_LOAD( "bgtsnd.p2", 0x080000, 0x080000, CRC(90961429) SHA1(6390e575d030f6d2953ee8460876c50fe48026f8) ) #define M4BAGTEL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BAGTEL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4BAGTEL_SET( 199?, m4bagtel, 0, "bgt05s.p1", 0x0000, 0x010000, CRC(ddf1c7dc) SHA1(a786e5e04538ce498493795fc4054bb5de57ffd2), "Barcrest","Bagatelle (Barcrest) (MPU4) (set 1)" ) M4BAGTEL_SET( 199?, m4bagtel__a, m4bagtel, "bg201c.p1", 0x0000, 0x010000, CRC(ee9bf501) SHA1(5c6ee55cfac5bb92695b412fe56f4c843dcae424), "Barcrest","Bagatelle (Barcrest) (MPU4) (set 2)" ) @@ -3852,8 +3746,7 @@ M4BAGTEL_SET( 199?, m4bagtel__ag, m4bagtel, "el310y.p1", 0x0000, 0x010000 #define M4PRZWTA_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pwnsnd.p1", 0x000000, 0x080000, CRC(c0f5e160) SHA1(eff218a36912fe599e9d73a96b49e75335bba272) ) \ - ROM_LOAD( "pwnsnd.p2", 0x080000, 0x080000, CRC(d81dfc8f) SHA1(5fcfcba836080b5752911d69dfe650614acbf845) ) \ - + ROM_LOAD( "pwnsnd.p2", 0x080000, 0x080000, CRC(d81dfc8f) SHA1(5fcfcba836080b5752911d69dfe650614acbf845) ) #define M4PRZWTA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -3861,8 +3754,7 @@ M4BAGTEL_SET( 199?, m4bagtel__ag, m4bagtel, "el310y.p1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4PRZWTA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4PRZWTA_SET( 199?, m4przwta, 0, "pwnr.p1", 0x0000, 0x020000, CRC(cf619ad2) SHA1(3eeccccb304afd5faf2563e0e65f8123e463d363), "Barcrest","Prize Winner Takes All (Barcrest) (MPU4) (set 1)" ) M4PRZWTA_SET( 199?, m4przwta__a, m4przwta, "pw8ad.p1", 0x0000, 0x020000, CRC(71257e43) SHA1(1db17aa1fc684873511a46e5e7421b459040d0cc), "Barcrest","Prize Winner Takes All (Barcrest) (MPU4) (set 2)" ) @@ -3885,16 +3777,14 @@ M4PRZWTA_SET( 199?, m4przwta__p, m4przwta, "pwns.p1", 0x0000, 0x020000, CR #define M4BERSER_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "bessnd.p1", 0x0000, 0x080000, CRC(4eb15200) SHA1(1997a304df5219153418369bd8cc4fd169fb4bd4) ) \ - + ROM_LOAD( "bessnd.p1", 0x0000, 0x080000, CRC(4eb15200) SHA1(1997a304df5219153418369bd8cc4fd169fb4bd4) ) #define M4BERSER_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BERSER_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4BERSER_SET( 199?, m4berser, 0, "bess.p1", 0x0000, 0x010000, CRC(b95bafbe) SHA1(034c80ef5fd0a12fad918c9b01bafb9a99c2e991), "Barcrest","Berserk (Barcrest) (MPU4) (set 1)" ) @@ -3931,16 +3821,14 @@ M4BERSER_SET( 199?, m4berser__1, m4berser, "be_05a_4.1_1", 0x0000, 0x010000 #define M4VIVESS_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing */ \ - + /* missing */ #define M4VIVESS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4VIVESS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4VIVESS_SET( 199?, m4vivess, 0, "se8s.p1", 0x0000, 0x010000, CRC(d5c261de) SHA1(5f70944ffe03109ad16f162370fd3653d131034d), "Barcrest","Viva Espana Showcase (Barcrest) (MPU4) (set 1)" ) M4VIVESS_SET( 199?, m4vivess__a, m4vivess, "se8ad.p1", 0x0000, 0x010000, CRC(4f799dfe) SHA1(e85108ab0aad92a64eabf5c7562068caf22f8d5b), "Barcrest","Viva Espana Showcase (Barcrest) (MPU4) (set 2)" ) @@ -3962,16 +3850,14 @@ M4VIVESS_SET( 199?, m4vivess__p, m4vivess, "sesy.p1", 0x0000, 0x010000, CR #define M4TTDIA_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "tdasnd.p1", 0x000000, 0x080000, CRC(6e0bf4ab) SHA1(0cbcdc11d2d64a5fda2cf40bdde850f5c7b56d12) ) \ - ROM_LOAD( "tdasnd.p2", 0x080000, 0x080000, CRC(66cc2f87) SHA1(6d8af6090b2ab29039aa89a125512190e7e34a03) ) \ - + ROM_LOAD( "tdasnd.p2", 0x080000, 0x080000, CRC(66cc2f87) SHA1(6d8af6090b2ab29039aa89a125512190e7e34a03) ) #define M4TTDIA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TTDIA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4TTDIA_SET( 199?, m4ttdia, 0, "tda04s.p1", 0x0000, 0x020000, CRC(1240642e) SHA1(7eaf02d5c00707a0a6d98d247c293cad1ca87108), "Barcrest","Ten Ten Do It Again (Barcrest) (MPU4) (set 1)" ) @@ -3994,16 +3880,14 @@ M4TTDIA_SET( 199?, m4ttdia__m, m4ttdia, "tda04y.p1", 0x0000, 0x020000, CR #define M4PRZVE_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pessnd.p1", 0x000000, 0x080000, CRC(e7975c75) SHA1(407c3bcff29f4b6599de2c35d96f62c72a897bd1) ) \ - ROM_LOAD( "pessnd.p2", 0x080000, 0x080000, CRC(9f22f32d) SHA1(af64f6bde0b825d474c42c56f6e2253b28d4f90f) ) \ - + ROM_LOAD( "pessnd.p2", 0x080000, 0x080000, CRC(9f22f32d) SHA1(af64f6bde0b825d474c42c56f6e2253b28d4f90f) ) #define M4PRZVE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZVE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZVE_SET( 199?, m4przve, 0, "pess.p1", 0x0000, 0x010000, CRC(d8e79833) SHA1(f68fd1bd057a353832c7de3e2818906ab2b844b7), "Barcrest","Prize Viva Esapana (Barcrest) (MPU4) (set 1)" ) M4PRZVE_SET( 199?, m4przve__a, m4przve, "pe8ad.p1", 0x0000, 0x010000, CRC(3a81422e) SHA1(bb77365ed7bc7c2cd9e1cfe6e266c6edfd3562a3), "Barcrest","Prize Viva Esapana (Barcrest) (MPU4) (set 2)" ) @@ -4026,16 +3910,14 @@ M4PRZVE_SET( 199?, m4przve__p, m4przve, "pesy.p1", 0x0000, 0x010000, CRC(fb #define M4SHOCM_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing */ \ - + /* missing */ #define M4SHOCM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SHOCM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4SHOCM_SET( 199?, m4shocm, 0, "scms.p1", 0x0000, 0x020000, CRC(8cb17f49) SHA1(6c67d5d65567ba3677f51f9c636e1f8e253111de), "Barcrest","Showcase Crystal Maze (Barcrest) (MPU4) (set 1)" ) M4SHOCM_SET( 199?, m4shocm__a, m4shocm, "scmad.p1", 0x0000, 0x020000, CRC(0960b887) SHA1(02b029760d141664a7c5860a29b158d8c2dec4e7), "Barcrest","Showcase Crystal Maze (Barcrest) (MPU4) (set 2)" ) @@ -4053,16 +3935,14 @@ M4SHOCM_SET( 199?, m4shocm__j, m4shocm, "scmk.p1", 0x0000, 0x020000, CRC(83 #define M4ACTBNK_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "actsnd.p1", 0x000000, 0x080000, CRC(34777fea) SHA1(be784e73586719219ae5c1a3841f0e44edb6b497) ) \ - ROM_LOAD( "actsnd.p2", 0x080000, 0x080000, CRC(2e832d40) SHA1(622b2c9694714446dbf67beb67d03af97d14ece7) ) \ - + ROM_LOAD( "actsnd.p2", 0x080000, 0x080000, CRC(2e832d40) SHA1(622b2c9694714446dbf67beb67d03af97d14ece7) ) #define M4ACTBNK_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ACTBNK_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4ACTBNK_SET( 199?, m4actbnk, 0, "acts.p1", 0x0000, 0x010000, CRC(49a9007c) SHA1(b205270e53264c3d8cb009a5780cacba1ce2e2a8), "Barcrest","Action Bank (Barcrest) (MPU4) (set 1)" ) M4ACTBNK_SET( 199?, m4actbnk__a, m4actbnk, "actb.p1", 0x0000, 0x010000, CRC(1429708e) SHA1(8b3ecb443e5920ccec80695a142cb1eb9596b1c1), "Barcrest","Action Bank (Barcrest) (MPU4) (set 2)" ) @@ -4081,8 +3961,7 @@ M4ACTBNK_SET( 199?, m4actbnk__i, m4actbnk, "actad.p1", 0x0000, 0x010000, CR ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4ADDRC_SET( 199?, m4addrc, 0, "add05_101", 0x0000, 0x010000, CRC(4b3fb104) SHA1(9dba619019a476ce317122a3553965b279c684ba), "Barcrest","Adders & Ladders Classic (Barcrest) (MPU4) (set 1)" ) M4ADDRC_SET( 199?, m4addrc__a, m4addrc, "add10_101", 0x0000, 0x010000, CRC(af8f8b4e) SHA1(712c33ed0f425dc10b79780b0cfce0ac5768e2d5), "Barcrest","Adders & Ladders Classic (Barcrest) (MPU4) (set 2)" ) @@ -4101,16 +3980,14 @@ M4ADDRC_SET( 199?, m4addrc__n, m4addrc, "nik56c", #define M4ADDRCC_EXTRA_ROMS \ ROM_REGION( 0x48, "fakechr", 0 ) \ - ROM_LOAD( "aal.chr", 0x0000, 0x000048, CRC(bb48409f) SHA1(adefde520104b8c3815260ee136460ddf3e9e4b2) ) \ - + ROM_LOAD( "aal.chr", 0x0000, 0x000048, CRC(bb48409f) SHA1(adefde520104b8c3815260ee136460ddf3e9e4b2) ) #define M4ADDRCC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ADDRCC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4ADDRCC_SET( 199?, m4addrcc, 0, "adcd.p1", 0x0000, 0x010000, CRC(47e41c9a) SHA1(546aaaa5765b3bc91eeb9bf5a979ed68a2e72da8), "Barcrest","Adders & Ladders Classic Club (Barcrest) (MPU4) (set 1)" ) @@ -4125,16 +4002,14 @@ M4ADDRCC_SET( 199?, m4addrcc__d, m4addrcc, "adrscfm", 0x0000, 0x010000, CRC ROM_LOAD( "tri98.chr", 0x0000, 0x000048, CRC(8a4532a8) SHA1(c128fd513bbcba68a1c75a11e09a54ba1d23d6f4) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cd2snd.p1", 0x000000, 0x080000, CRC(65a2dc92) SHA1(2c55a858ab17325189bed1974daf708c380541de) ) \ - ROM_LOAD( "cd2snd.p2", 0x080000, 0x080000, CRC(b1bb4678) SHA1(8e8ab0a8d1b3e70dcb56d071193fdb5f34af7d14) ) \ - + ROM_LOAD( "cd2snd.p2", 0x080000, 0x080000, CRC(b1bb4678) SHA1(8e8ab0a8d1b3e70dcb56d071193fdb5f34af7d14) ) #define M4CRDOME_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CRDOME_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CRDOME_SET( 199?, m4crdome, 0, "cd212k.p1", 0x0000, 0x020000, CRC(673b10a1) SHA1(996ade8193f448970beea2c5b81d9f27c05f162f), "Barcrest","Crystal Dome (Barcrest) (MPU4) (set 1)" ) M4CRDOME_SET( 199?, m4crdome__a, m4crdome, "cd212c.p1", 0x0000, 0x020000, CRC(1ab605e5) SHA1(03327b2fac9d3d2891dc5950aa89ac4947c7b444), "Barcrest","Crystal Dome (Barcrest) (MPU4) (set 2)" ) @@ -4160,16 +4035,14 @@ M4CRDOME_SET( 199?, m4crdome__n, m4crdome, "cdome8ac", 0x0000, 0x020000 ROM_LOAD( "rokmsnd1", 0x000000, 0x080000, CRC(b51e5d7d) SHA1(71f36f866583d592d029cba47901cbfd17631b06) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "roksnd.p1", 0x000000, 0x080000, CRC(462a690e) SHA1(5a82f63a9d03c89c8fdb0ead1fc40e480aedd787) ) \ - ROM_LOAD( "roksnd.p2", 0x080000, 0x080000, CRC(37786d14) SHA1(d6dc2d3dbe54ca943092938500d72081153b5a34) ) \ - + ROM_LOAD( "roksnd.p2", 0x080000, 0x080000, CRC(37786d14) SHA1(d6dc2d3dbe54ca943092938500d72081153b5a34) ) #define M4ROCKMN_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ROCKMN_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4ROCKMN_SET( 199?, m4rockmn, 0, "rok06c.p1", 0x0000, 0x020000, CRC(8e3a628f) SHA1(3bedb095af710f0b6376a5d99c072f7b3d3de0af), "Barcrest","Rocket Money (Barcrest) (MPU4) (set 1)" ) @@ -4191,16 +4064,14 @@ M4ROCKMN_SET( 199?, m4rockmn__k, m4rockmn, "rok06y.p1", 0x0000, 0x020000 ROM_LOAD( "m574.chr", 0x0000, 0x000048, CRC(cc4b7911) SHA1(9f8a96a1f8b0f9b33b852e93483ce5c684703349) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "madh1.bin", 0x000000, 0x080000, CRC(2b2af5dd) SHA1(eec0808bf724a055ece3c964d8a43cc5f837a3bd) ) \ - ROM_LOAD( "madh2.bin", 0x080000, 0x080000, CRC(487d8e1d) SHA1(89e01a153d17564eba112d882b686c91b6c3aecc) ) \ - + ROM_LOAD( "madh2.bin", 0x080000, 0x080000, CRC(487d8e1d) SHA1(89e01a153d17564eba112d882b686c91b6c3aecc) ) #define M4MADHSE_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4MADHSE_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4MADHSE_SET( 199?, m4madhse, 0, "mh502y.p1", 0x0000, 0x010000, CRC(3ec1955a) SHA1(6939e6f5d749249825c41df8e05957450eaf1007), "Barcrest","Mad House (Barcrest) (MPU4) (set 1)" ) @@ -4234,16 +4105,14 @@ M4MADHSE_SET( 199?, m4madhse__0, m4madhse, "mhts.p1", 0x0000, 0x010000 #define M4NHTT_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "nhtsnd01.p1", 0x0000, 0x080000, CRC(2d1d93c6) SHA1(80a8d131bafdb74d20d1ca5cbe2219ee4df0b675) ) \ - + ROM_LOAD( "nhtsnd01.p1", 0x0000, 0x080000, CRC(2d1d93c6) SHA1(80a8d131bafdb74d20d1ca5cbe2219ee4df0b675) ) #define M4NHTT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4NHTT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4NHTT_SET( 199?, m4nhtt, 0, "nht01b.p1", 0x0000, 0x010000, CRC(8201a051) SHA1(a87550c0cdc0b14a30e8814bfef939eb5cf414f8), "Barcrest","New Hit the Top (Barcrest) (MPU4) (set 1)" ) M4NHTT_SET( 199?, m4nhtt__a, m4nhtt, "nht01ad.p1", 0x0000, 0x010000, CRC(a5c6ce9a) SHA1(f21dcc1a70fa45637f236aede9c6fa2e962af8f5), "Barcrest","New Hit the Top (Barcrest) (MPU4) (set 2)" ) @@ -4260,16 +4129,14 @@ M4NHTT_SET( 199?, m4nhtt__j, m4nhtt, "nht01y.p1", 0x0000, 0x010000, CRC(54 #define M4PRZFRT_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ - ROM_LOAD( "pfrsnd.p1", 0x0000, 0x080000, CRC(71d1af20) SHA1(d87d61c561acbe9cb3dec18d8decf5e970efa272) ) \ - + ROM_LOAD( "pfrsnd.p1", 0x0000, 0x080000, CRC(71d1af20) SHA1(d87d61c561acbe9cb3dec18d8decf5e970efa272) ) #define M4PRZFRT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZFRT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -4290,16 +4157,14 @@ M4PRZFRT_SET( 199?, m4przfrt__l, m4przfrt, "pfr03o.p1", 0x0000, 0x010000 #define M4TUTCL_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? in other set? */ \ - + /* missing? in other set? */ #define M4TUTCL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TUTCL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TUTCL_SET( 199?, m4tutcl, 0, "f2u01ad.p1", 0x0000, 0x010000, CRC(65537552) SHA1(b0a761dcc6e0a9f01cfb934b570356ca67fdd099), "Barcrest","Tutti Fruity Classic (Barcrest) (MPU4) (set 1)" ) M4TUTCL_SET( 199?, m4tutcl__a, m4tutcl, "f2u01b.p1", 0x0000, 0x010000, CRC(2cae37df) SHA1(5aed985476b7b747a99a4046b846ee4a359776af), "Barcrest","Tutti Fruity Classic (Barcrest) (MPU4) (set 2)" ) @@ -4318,16 +4183,14 @@ M4TUTCL_SET( 199?, m4tutcl__k, m4tutcl, "f2u01y.p1", 0x0000, 0x010000, CR #define M4PRZMNS_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "s&fpmsnd.p1", 0x000000, 0x080000, CRC(e5bfc522) SHA1(38c8430f539d38a51a3d7fb846b625ae2080e930) ) \ - ROM_LOAD( "s&fpmsnd.p2", 0x080000, 0x080000, CRC(e14803ab) SHA1(41d501f61f202df2dbd2ac13c40a32fff6afc861) ) \ - + ROM_LOAD( "s&fpmsnd.p2", 0x080000, 0x080000, CRC(e14803ab) SHA1(41d501f61f202df2dbd2ac13c40a32fff6afc861) ) #define M4PRZMNS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZMNS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZMNS_SET( 199?, m4przmns, 0, "spmy.p1", 0x0000, 0x010000, CRC(2b27b2a0) SHA1(07950616da39e39d19452859390d3eaad89ea377), "Barcrest","Prize Money Showcase (Barcrest) (MPU4) (set 1)" ) @@ -4348,16 +4211,14 @@ M4PRZMNS_SET( 199?, m4przmns__n, m4przmns, "spms.p1", 0x0000, 0x010000, CR #define M4PRZRF_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4PRZRF_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZRF_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4PRZRF_SET( 199?, m4przrf, 0, "pr8ad.p1", 0x0000, 0x020000, CRC(ebada7c9) SHA1(4a1e2f746116c23f87b53d25bd8b11322962306f), "Barcrest","Prize Rich And Famous (Barcrest) (MPU4) (set 1)" ) M4PRZRF_SET( 199?, m4przrf__a, m4przrf, "pr8b.p1", 0x0000, 0x020000, CRC(4a6448b6) SHA1(061dbc1603fff0cb60e02acdf21881047b2b7d43), "Barcrest","Prize Rich And Famous (Barcrest) (MPU4) (set 2)" ) @@ -4373,16 +4234,14 @@ M4PRZRF_SET( 199?, m4przrf__j, m4przrf, "pr8y.p1", 0x0000, 0x020000, CRC(87 #define M4PRZRFM_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4PRZRFM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4PRZRFM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZRFM_SET( 199?, m4przrfm, 0, "prub.p1", 0x0000, 0x010000, CRC(748f220f) SHA1(5d729057d521fa656375610e424cfd4088f6ea02), "Barcrest","Prize Run For Your Money (Barcrest) (MPU4) (set 1)" ) @@ -4408,8 +4267,7 @@ M4PRZRFM_SET( 199?, m4przrfm__o, m4przrfm, "rm8y.p1", 0x0000, 0x010000 ROM_LOAD( "pwos.chr", 0x0000, 0x000048, CRC(352b86c4) SHA1(59c26a1948ffd6ecea08d8ca8e62735ec9732c0f) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "pwo.s1", 0x000000, 0x080000, CRC(1dbd8a33) SHA1(37bd71688475591232422eb0841e23aff58e3800) ) \ - ROM_LOAD( "pwo.s2", 0x080000, 0x080000, CRC(6c7badef) SHA1(416c36fe2b4253bf7944b3ba412561bd0d21cbe5) ) \ - + ROM_LOAD( "pwo.s2", 0x080000, 0x080000, CRC(6c7badef) SHA1(416c36fe2b4253bf7944b3ba412561bd0d21cbe5) ) #define M4PRZWO_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4417,8 +4275,7 @@ M4PRZRFM_SET( 199?, m4przrfm__o, m4przrfm, "rm8y.p1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4PRZWO_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZWO_SET( 199?, m4przwo, 0, "pwo206ac", 0x0000, 0x010000, CRC(b9dd88e7) SHA1(4c60e7a28b538ff2483839fc66600037ccd99440), "Barcrest","Prize What's On (Barcrest) (MPU4) (set 1)" ) M4PRZWO_SET( 199?, m4przwo__a, m4przwo, "pwob.p1", 0x0000, 0x010000, CRC(9e9f65d7) SHA1(69d28a1e08d2bde1a9c4d55555478808546ad4f0), "Barcrest","Prize What's On (Barcrest) (MPU4) (set 2)" ) @@ -4434,8 +4291,7 @@ M4PRZWO_SET( 199?, m4przwo__f, m4przwo, "pwoy.p1", 0x0000, 0x010000, CR ROM_LOAD( "rh.chr", 0x0000, 0x000048, CRC(5522383a) SHA1(4413b1d68500f21f10e7cff6b2d3de7258b1b614) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "2rhsnd02.p1", 0x000000, 0x080000, CRC(0f4630dc) SHA1(7235e53c74e113230a683de33763023e95090d39) ) \ - ROM_LOAD( "2rhsnd02.p2", 0x080000, 0x080000, CRC(c2d0540a) SHA1(160080b350d41b95a0c129f9189222d79734e7d0) ) \ - + ROM_LOAD( "2rhsnd02.p2", 0x080000, 0x080000, CRC(c2d0540a) SHA1(160080b350d41b95a0c129f9189222d79734e7d0) ) #define M4RHOG2_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4443,8 +4299,7 @@ M4PRZWO_SET( 199?, m4przwo__f, m4przwo, "pwoy.p1", 0x0000, 0x010000, CR ROM_LOAD( name, offset, length, hash ) \ M4RHOG2_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4RHOG2_SET( 199?, m4rhog2, 0, "2rh06c.p1", 0x0000, 0x020000, CRC(62c312bc) SHA1(6b02345c97b130deabad58a238ba9045161b5a80), "Barcrest","Road Hog 2 - I'm Back (Barcrest) (MPU4) (set 1)" ) @@ -4468,8 +4323,7 @@ M4RHOG2_SET( 199?, m4rhog2__m, m4rhog2, "2rh06y.p1", 0x0000, 0x020000, CR ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -4496,8 +4350,7 @@ M4SUPHV_SET( 199?, m4suphv__p, m4suphv, "hvi10___.3n3", 0x0000, 0x010000 #define M4SHODF_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "sdfsnd.p1", 0x000000, 0x080000, CRC(a5829cec) SHA1(eb65c86125350a7f384f9033f6a217284b6ff3d1) ) \ - ROM_LOAD( "sdfsnd.p2", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) \ - + ROM_LOAD( "sdfsnd.p2", 0x080000, 0x080000, CRC(1e5d8407) SHA1(64ee6eba3fb7700a06b89a1e0489a0cd54bb89fd) ) #define M4SHODF_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4505,8 +4358,7 @@ M4SUPHV_SET( 199?, m4suphv__p, m4suphv, "hvi10___.3n3", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4SHODF_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -4530,8 +4382,7 @@ M4SHODF_SET( 199?, m4shodf__l, m4shodf, "sdfy.p1", 0x0000, 0x010000, CRC(db ROM_LOAD( "clu14s.chr", 0x0000, 0x000048, CRC(be933239) SHA1(52dbcbbcbfe25b6f8c186ce9af67b533c8da9a88) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "clusnd.p1", 0x000000, 0x080000, CRC(9c1042ba) SHA1(e4630bbcb3fe2f7d133275892eaf58c12402c610) ) \ - ROM_LOAD( "clusnd.p2", 0x080000, 0x080000, CRC(b4b28b80) SHA1(a40b6801740d64e54c5c1738d69737ab9f4cf950) ) \ - + ROM_LOAD( "clusnd.p2", 0x080000, 0x080000, CRC(b4b28b80) SHA1(a40b6801740d64e54c5c1738d69737ab9f4cf950) ) #define M4LUCKSC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4539,8 +4390,7 @@ M4SHODF_SET( 199?, m4shodf__l, m4shodf, "sdfy.p1", 0x0000, 0x010000, CRC(db ROM_LOAD( name, offset, length, hash ) \ M4LUCKSC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4LUCKSC_SET( 199?, m4lucksc, 0, "clu14d.p1", 0x0000, 0x020000, CRC(7a64199f) SHA1(62c7c8a4475a8005a1f969550d0717c9cc44bada), "Barcrest","Lucky Strike Club (Barcrest) (MPU4) (set 1)" ) M4LUCKSC_SET( 199?, m4lucksc__a, m4lucksc, "clu14f.p1", 0x0000, 0x020000, CRC(07e90cdb) SHA1(5d4bf7f6f84f2890a0119de898f01e3e99bfbb7f), "Barcrest","Lucky Strike Club (Barcrest) (MPU4) (set 2)" ) @@ -4560,8 +4410,7 @@ M4LUCKSC_SET( 199?, m4lucksc__l, m4lucksc, "lsc_.1_1", 0x0000, 0x020000 #define M4PRZLUX_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "plxsnd.p1", 0x000000, 0x080000, CRC(0e682b6f) SHA1(459a7ca216c47af58c03c15d6ef1f9aa7489eba0) ) \ - ROM_LOAD( "plxsnd.p2", 0x080000, 0x080000, CRC(3ef95a7f) SHA1(9c918769fbf0e687f27e431d934e2327df9ed3bb) ) \ - + ROM_LOAD( "plxsnd.p2", 0x080000, 0x080000, CRC(3ef95a7f) SHA1(9c918769fbf0e687f27e431d934e2327df9ed3bb) ) #define M4PRZLUX_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4569,8 +4418,7 @@ M4LUCKSC_SET( 199?, m4lucksc__l, m4lucksc, "lsc_.1_1", 0x0000, 0x020000 ROM_LOAD( name, offset, length, hash ) \ M4PRZLUX_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4PRZLUX_SET( 199?, m4przlux, 0, "plxs.p1", 0x0000, 0x010000, CRC(0aea0339) SHA1(28da52924fe2bf00799ef466143103e08399f5f5), "Barcrest","Prize Luxor (Barcrest) (MPU4) (set 1)" ) M4PRZLUX_SET( 199?, m4przlux__a, m4przlux, "plxad.p1", 0x0000, 0x010000, CRC(e52ddf4f) SHA1(ec3f198fb6658cadd45046ef7586f9178f95d814), "Barcrest","Prize Luxor (Barcrest) (MPU4) (set 2)" ) @@ -4583,8 +4431,7 @@ M4PRZLUX_SET( 199?, m4przlux__f, m4przlux, "plxy.p1", 0x0000, 0x010000, CR #define M4TOPDOG_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "topdogsnd.bin", 0x0000, 0x080000, CRC(a29047c6) SHA1(5956674e6b895bd46b99f4d04d5797b53ccc6668) ) \ - + ROM_LOAD( "topdogsnd.bin", 0x0000, 0x080000, CRC(a29047c6) SHA1(5956674e6b895bd46b99f4d04d5797b53ccc6668) ) #define M4TOPDOG_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4592,8 +4439,7 @@ M4PRZLUX_SET( 199?, m4przlux__f, m4przlux, "plxy.p1", 0x0000, 0x010000, CR ROM_LOAD( name, offset, length, hash ) \ M4TOPDOG_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TOPDOG_SET( 199?, m4topdog, 0, "td_20_b4.7_1", 0x0000, 0x010000, CRC(fe864f25) SHA1(b9f97aaf0425b4987b5bfa0b793e9226fdffe58f), "Barcrest / Bwb","Top Dog (Barcrest) (MPU4) (set 1)" ) M4TOPDOG_SET( 199?, m4topdog__a, m4topdog, "td_20_bc.7_1", 0x0000, 0x010000, CRC(3af18a9f) SHA1(0db7427d934363d021265fcac811505867f20d47), "Barcrest / Bwb","Top Dog (Barcrest) (MPU4) (set 2)" ) @@ -4626,8 +4472,7 @@ M4TOPDOG_SET( 199?, m4topdog__z, m4topdog, "td_30btc.1_1", 0x0000, 0x010000 #define M4KINGQ_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "kingsnqueenssnd.bin", 0x0000, 0x080000, CRC(31d722d4) SHA1(efb7079a1036cad8d9c08106f97c70a248b31898) ) \ - ROM_LOAD( "ee______.1_2", 0x0000, 0x080000, CRC(13012f48) SHA1(392b3bcf6f8e3e01082087637f9d378302d046c4) ) \ - + ROM_LOAD( "ee______.1_2", 0x0000, 0x080000, CRC(13012f48) SHA1(392b3bcf6f8e3e01082087637f9d378302d046c4) ) #define M4KINGQ_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4635,8 +4480,7 @@ M4TOPDOG_SET( 199?, m4topdog__z, m4topdog, "td_30btc.1_1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4KINGQ_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4KINGQ_SET( 199?, m4kingq, 0, "ee_05a_4.2_1", 0x0000, 0x010000, CRC(8dd842b6) SHA1(1c1bcaae355ceee4d7b1572b0fa1a8b23a8afdbf), "Barcrest / Bwb","Kings & Queens (Barcrest) (MPU4) (set 1)" ) M4KINGQ_SET( 199?, m4kingq__a, m4kingq, "ee_05a__.2_1", 0x0000, 0x010000, CRC(36aa5fb9) SHA1(b4aaf647713e33e79be7927e5eeef240d3beedf7), "Barcrest / Bwb","Kings & Queens (Barcrest) (MPU4) (set 2)" ) @@ -4662,8 +4506,7 @@ M4KINGQ_SET( 199?, m4kingq__t, m4kingq, "knq2pprg.bin", 0x0000, 0x010000, CR #define M4KINGQC_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "knqsnd.bin", 0x0000, 0x080000, CRC(13012f48) SHA1(392b3bcf6f8e3e01082087637f9d378302d046c4) ) \ - ROM_LOAD( "cn______.5_a", 0x0000, 0x080000, CRC(7f82f113) SHA1(98851f8820cb39b45d477151982c80fc91b15e56) ) \ - + ROM_LOAD( "cn______.5_a", 0x0000, 0x080000, CRC(7f82f113) SHA1(98851f8820cb39b45d477151982c80fc91b15e56) ) #define M4KINGQC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4671,8 +4514,7 @@ M4KINGQ_SET( 199?, m4kingq__t, m4kingq, "knq2pprg.bin", 0x0000, 0x010000, CR ROM_LOAD( name, offset, length, hash ) \ M4KINGQC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4KINGQC_SET( 199?, m4kingqc, 0, "cn_20_b4.6_1", 0x0000, 0x010000, CRC(22d0b20c) SHA1(a7a4f60017cf62247339c9b23420d29845657895), "Barcrest / Bwb","Kings & Queens Classic (Barcrest) (MPU4) (set 1)" ) M4KINGQC_SET( 199?, m4kingqc__a, m4kingqc, "cn_20_bc.3_1", 0x0000, 0x010000, CRC(dfb0eb80) SHA1(ad973125681db0aae8ef1cf57b1c280e7f0e5803), "Barcrest / Bwb","Kings & Queens Classic (Barcrest) (MPU4) (set 2)" ) @@ -4711,8 +4553,7 @@ M4KINGQC_SET( 199?, m4kingqc__5, m4kingqc, "cn_30btc.1_1", 0x0000, 0x010000 ROM_LOAD( "ctp13s.chr", 0x0000, 0x000048, CRC(6b8772a9) SHA1(8b92686e675b00d2c2541dd7b8055c3145283bec) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "ctpsnd02.p1", 0x000000, 0x080000, CRC(6fdd5051) SHA1(3f713314b303d6e1f78e3ca050bed7a45f43d5b3) ) \ - ROM_LOAD( "ctpsnd02.p2", 0x080000, 0x080000, CRC(994bfb3a) SHA1(3cebfbbe77c4bbb5fb73e6d9b23f721b07c6435e) ) \ - + ROM_LOAD( "ctpsnd02.p2", 0x080000, 0x080000, CRC(994bfb3a) SHA1(3cebfbbe77c4bbb5fb73e6d9b23f721b07c6435e) ) #define M4TYPCL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4720,8 +4561,7 @@ M4KINGQC_SET( 199?, m4kingqc__5, m4kingqc, "cn_30btc.1_1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4TYPCL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4TYPCL_SET( 199?, m4typcl, 0, "ctp12s.p1", 0x0000, 0x020000, CRC(5f0bbd2a) SHA1(ba1fa09ea7b4713a99b2033bdbbf6b15f973dcca), "Barcrest","Take Your Pick Club (Barcrest) (MPU4) (set 1)" ) M4TYPCL_SET( 199?, m4typcl__a, m4typcl, "ctp13d.p1", 0x0000, 0x020000, CRC(a0f081b9) SHA1(794bba6ed86c3f332165c4b3224315256c939926), "Barcrest","Take Your Pick Club (Barcrest) (MPU4) (set 2)" ) @@ -4735,16 +4575,14 @@ M4TYPCL_SET( 199?, m4typcl__d, m4typcl, "ntp02.p1", 0x0000, 0x020000, CR ROM_LOAD( "abt18s.chr", 0x0000, 0x000048, CRC(68007536) SHA1(72f7a76a1ba1c8ac94de425892780ffe78269513) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "abtsnd.p1", 0x000000, 0x080000, CRC(0ba1e73a) SHA1(dde70b1bf973b023c45afb8d3191325514b96e47) ) \ - ROM_LOAD( "abtsnd.p2", 0x080000, 0x080000, CRC(dcfa85f2) SHA1(30e8467841309a4840824ec89f82044489c94ac5) ) \ - + ROM_LOAD( "abtsnd.p2", 0x080000, 0x080000, CRC(dcfa85f2) SHA1(30e8467841309a4840824ec89f82044489c94ac5) ) #define M4ANDYBT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4ANDYBT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4ANDYBT_SET( 199?, m4andybt, 0, "abt18d.p1", 0x0000, 0x020000, CRC(77874578) SHA1(455964614b67af14f5baa5883e1076e986de9e9c), "Barcrest","Andy's Big Time Club (Barcrest) (MPU4) (set 1)" ) M4ANDYBT_SET( 199?, m4andybt__a, m4andybt, "abt18f.p1", 0x0000, 0x020000, CRC(cdd756af) SHA1(b1bb851ad2a2ba631e13509a476fe60cb8a24e69), "Barcrest","Andy's Big Time Club (Barcrest) (MPU4) (set 2)" ) @@ -4754,8 +4592,7 @@ M4ANDYBT_SET( 199?, m4andybt__c, m4andybt, "abt1.5", 0x0000, 0x020000 #define M4THESTR_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "thestreaksnd.bin", 0x0000, 0x080000, CRC(fdbd0f88) SHA1(8d0eaa9aa8d505affeb8bd12d7cb13337aa2e2c2) ) \ - + ROM_LOAD( "thestreaksnd.bin", 0x0000, 0x080000, CRC(fdbd0f88) SHA1(8d0eaa9aa8d505affeb8bd12d7cb13337aa2e2c2) ) #define M4THESTR_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4763,8 +4600,7 @@ M4ANDYBT_SET( 199?, m4andybt__c, m4andybt, "abt1.5", 0x0000, 0x020000 ROM_LOAD( name, offset, length, hash ) \ M4THESTR_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4THESTR_SET( 199?, m4thestr, 0, "thestreakbin", 0x0000, 0x010000, CRC(cb79f9e5) SHA1(6cbdc5327e81b51f1060fd91efa3d061b9748b49), "Barcrest / Bwb","The Streak (Barcrest) (MPU4) (set 1)" ) M4THESTR_SET( 199?, m4thestr__a, m4thestr, "ts_20_b4.3_1", 0x0000, 0x010000, CRC(17726c7c) SHA1(193b572b9f859f1018f1be398b35a5103622faf8), "Barcrest / Bwb","The Streak (Barcrest) (MPU4) (set 2)" ) @@ -4796,8 +4632,7 @@ M4THESTR_SET( 199?, m4thestr__y, m4thestr, "ts_39b_c.1_1", 0x0000, 0x010000 #define M4CPYCAT_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", 0 ) \ - ROM_LOAD( "copycatsnd.bin", 0x0000, 0x080000, CRC(cd27a3ce) SHA1(d061fae0ef8584d2e349e91e53f41718128c61e2) ) \ - + ROM_LOAD( "copycatsnd.bin", 0x0000, 0x080000, CRC(cd27a3ce) SHA1(d061fae0ef8584d2e349e91e53f41718128c61e2) ) #define M4CPYCAT_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ @@ -4805,8 +4640,7 @@ M4THESTR_SET( 199?, m4thestr__y, m4thestr, "ts_39b_c.1_1", 0x0000, 0x010000 ROM_LOAD( name, offset, length, hash ) \ M4CPYCAT_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4CPYCAT_SET( 199?, m4cpycat, 0, "co_20_bc.1_1", 0x0000, 0x010000, CRC(c9d3cdc1) SHA1(28265b0f95a8829efc4e346269a7af17a6abe345), "Barcrest / Bwb","Copy Cat (Barcrest) (MPU4) (set 1)" ) M4CPYCAT_SET( 199?, m4cpycat__a, m4cpycat, "co_20_dc.1_1", 0x0000, 0x010000, CRC(c6552f9a) SHA1(ae7ad183d2cd89bc9748dcbb3ea26832bed30009), "Barcrest / Bwb","Copy Cat (Barcrest) (MPU4) (set 2)" ) @@ -4850,8 +4684,7 @@ M4CPYCAT_SET( 199?, m4cpycat__8, m4cpycat, "co_30btc.2_1", 0x0000, 0x010000 ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ ROM_END \ - GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod2 ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4HYPCLB_SET( 199?, m4hypclb, 0, "hpcd.p1", 0x0000, 0x010000, CRC(7fac8944) SHA1(32f0f16ef6c4b99fe70464341a1ce226f6221122), "Barcrest","Hyper Viper Club (Barcrest) (MPU4) (set 1)" ) M4HYPCLB_SET( 199?, m4hypclb__a, m4hypclb, "hpcf.p1", 0x0000, 0x010000, CRC(2931a558) SHA1(2f7fe541edc502738dd6603435deaef1cb26a1e2), "Barcrest","Hyper Viper Club (Barcrest) (MPU4) (set 2)" ) @@ -4862,16 +4695,14 @@ M4HYPCLB_SET( 199?, m4hypclb__c, m4hypclb, "hpcs.p1", 0x0000, 0x010000, CR #define M4BNKROL_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cbrsnd.p1", 0x000000, 0x080000, CRC(3524418a) SHA1(85cf286d9cf97cc9009c0283d632fef2a19f5de2) ) \ - ROM_LOAD( "cbrsnd.p2", 0x080000, 0x080000, CRC(a53796a3) SHA1(f094f40cc93ea445922a9c5412aa355b7d21b1f4) ) \ - + ROM_LOAD( "cbrsnd.p2", 0x080000, 0x080000, CRC(a53796a3) SHA1(f094f40cc93ea445922a9c5412aa355b7d21b1f4) ) #define M4BNKROL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4BNKROL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4BNKROL_SET( 199?, m4bnkrol, 0, "cbr05s.p1", 0x0000, 0x020000, CRC(a8b53a0d) SHA1(661ab61aa8f427b92fdee02539f19e5dd2243da7), "Barcrest","Bank Roller Club (Barcrest) (MPU4) (set 1)" ) @@ -4884,16 +4715,14 @@ M4BNKROL_SET( 199?, m4bnkrol__e, m4bnkrol, "cbr05f.p1", 0x0000, 0x020000, C #define M4TIC_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4TIC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TIC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TIC_SET( 199?, m4tic, 0, "tt_20a__.2_1", 0x0000, 0x010000, CRC(b923ac0d) SHA1(1237962af43c2c3f4ed0ad5bed21f24decfeae02), "Barcrest / Bwb","Tic Tac Toe (Barcrest) (MPU4) (set 1)" ) M4TIC_SET( 199?, m4tic__a, m4tic, "tt_20a_c.1_1", 0x0000, 0x010000, CRC(18a68ea0) SHA1(37783121ff5540e264d89069101d991acb66b982), "Barcrest / Bwb","Tic Tac Toe (Barcrest) (MPU4) (set 2)" ) M4TIC_SET( 199?, m4tic__b, m4tic, "tt_20b__.2_1", 0x0000, 0x010000, CRC(b5eb86ab) SHA1(99ddb80941c67bd271e22af17405457d32676484), "Barcrest / Bwb","Tic Tac Toe (Barcrest) (MPU4) (set 3)" ) @@ -4919,16 +4748,14 @@ M4TIC_SET( 199?, m4tic__s, m4tic, "tti20___.2_1", 0x0000, 0x010000, CRC(91054b ROM_LOAD( "m462.chr", 0x0000, 0x000048, CRC(ab59f1aa) SHA1(04a7deac039bc9bc15ec07b8a4ba3bce6f4d5103) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "rhrcs1.hex", 0x000000, 0x080000, CRC(7e265003) SHA1(3800ddfbdde07bf0af5db5cbe05a85425297fa4a) ) \ - ROM_LOAD( "rhrcs2.hex", 0x080000, 0x080000, CRC(39843d40) SHA1(7c8efcce4ed4ed53e681680bb33869f14f662609) ) \ - + ROM_LOAD( "rhrcs2.hex", 0x080000, 0x080000, CRC(39843d40) SHA1(7c8efcce4ed4ed53e681680bb33869f14f662609) ) #define M4RHRCL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHRCL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RHRCL_SET( 199?, m4rhrcl, 0, "rhrc.hex", 0x0000, 0x010000, CRC(e4b89d53) SHA1(fc222d56cdba2891048726d6e6ecd8a4028ba8ba), "Barcrest","Red Hot Roll Club (Barcrest) (MPU4) (set 1)" ) M4RHRCL_SET( 199?, m4rhrcl__a, m4rhrcl, "rh2d.p1", 0x0000, 0x010000, CRC(b55a01c3) SHA1(8c94c2ca509ac7631528df78e82fb39b5f579c45), "Barcrest","Red Hot Roll Club (Barcrest) (MPU4) (set 2)" ) @@ -4940,16 +4767,14 @@ M4RHRCL_SET( 199?, m4rhrcl__c, m4rhrcl, "rh2s.p1", 0x0000, 0x010000, CRC(aa ROM_LOAD( "rhc.chr", 0x0000, 0x000048, CRC(6ceab6b0) SHA1(04f4238ea3fcf944c97bc11031e456b851ebe917) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "rhc.s1", 0x000000, 0x080000, CRC(8840737f) SHA1(eb4a4bedfdba1b33fa74b9c2000c0d09a4cca5d7) ) \ - ROM_LOAD( "rhc.s2", 0x080000, 0x080000, CRC(04eaa2da) SHA1(2c23bde76f6a9406b0cb30246ce8805b5181047f) ) \ - + ROM_LOAD( "rhc.s2", 0x080000, 0x080000, CRC(04eaa2da) SHA1(2c23bde76f6a9406b0cb30246ce8805b5181047f) ) #define M4RHOGC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHOGC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4RHOGC_SET( 199?, m4rhogc, 0, "rhcf.p1", 0x0000, 0x010000, CRC(0b726e87) SHA1(12c334e7dd712b9e19e8241b1a8e278ff84110d4), "Barcrest","Road Hog Club (Barcrest) (MPU4) (set 1)" ) @@ -4961,16 +4786,14 @@ M4RHOGC_SET( 199?, m4rhogc__b, m4rhogc, "rhcd.p1", 0x0000, 0x010000, CRC(7a7 ROM_LOAD( "006s.chr", 0x0000, 0x000048, CRC(ee3d06eb) SHA1(570a715e71d4184e4df02b7e5b68fee70e03aeb0) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "006snd.p1", 0x000000, 0x080000, CRC(44afef7d) SHA1(d8a4b6dc04e0f337db6d3b5322d066ae5f5bda41) ) \ - ROM_LOAD( "006snd.p2", 0x080000, 0x080000, CRC(5f3c7cf8) SHA1(500f8fb07ef344d44c062f8d01878df1c917bcfc) ) \ - + ROM_LOAD( "006snd.p2", 0x080000, 0x080000, CRC(5f3c7cf8) SHA1(500f8fb07ef344d44c062f8d01878df1c917bcfc) ) #define M4GB006_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4GB006_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -4982,16 +4805,14 @@ M4GB006_SET( 199?, m4gb006__c, m4gb006, "bond20_11", 0x0000, 0x010000, CR #define M4GBUST_EXTRA_ROMS \ ROM_REGION( 0x800000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4GBUST_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4GBUST_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -5025,16 +4846,14 @@ M4GBUST_SET( 199?, m4gbust__w, m4gbust, "ghostbusters 2p.bin", 0x0000, 0x01 #define M4CSHENC_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", 0 ) \ ROM_LOAD( "cesnd.p1", 0x000000, 0x080000, CRC(2a10dc1a) SHA1(f6803f6e1fee2b58fe4831f59ddc08ec02792823) ) \ - ROM_LOAD( "cesnd.p2", 0x080000, 0x080000, CRC(6f0b75c0) SHA1(33898d75a1e51b49950d7843069066d17c4736c5) ) \ - + ROM_LOAD( "cesnd.p2", 0x080000, 0x080000, CRC(6f0b75c0) SHA1(33898d75a1e51b49950d7843069066d17c4736c5) ) #define M4CSHENC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CSHENC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CSHENC_SET( 199?, m4cshenc, 0, "ca_sj__c.5_1", 0x0000, 0x020000, CRC(d9131b39) SHA1(4af89a7bc10de1406f401bede41e1bc452dbb159), "Bwb / Barcrest","Cash Encounters (Barcrest) (MPU4) (set 1)" ) M4CSHENC_SET( 199?, m4cshenc__a, m4cshenc, "ca_sj_bc.5_1", 0x0000, 0x020000, CRC(30d1fb6d) SHA1(f845bef4ad7f2f48077eed74840916e87abb24b2), "Bwb / Barcrest","Cash Encounters (Barcrest) (MPU4) (set 2)" ) @@ -5047,16 +4866,14 @@ M4CSHENC_SET( 199?, m4cshenc__d, m4cshenc, "ca_sjb_c.5_1", 0x0000, 0x020000 #define M4LVLCL_EXTRA_ROMS \ ROM_REGION( 0x180000, "msm6376", ROMREGION_ERASE00 ) \ - /* missing? */ \ - + /* missing? */ #define M4LVLCL_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4LVLCL_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4LVLCL_SET( 199?, m4lvlcl, 0, "ll__x__x.1_1", 0x0000, 0x010000, CRC(1ef1c5b4) SHA1(455c147f158f8a36a9add9b984abc22af78258cf), "Bwb / Barcrest","Lucky Las Vegas Classic (Barcrest) (MPU4) (set 1)" ) @@ -5076,16 +4893,14 @@ M4LVLCL_SET( 199?, m4lvlcl__f, m4lvlcl, "ll__xgdx.3_1", 0x0000, 0x010000, CR ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "rh___snd.1_1", 0x000000, 0x080000, CRC(ceebd8f4) SHA1(fe9f62034aae7d2ec097d80dc471a7fd27ddec8a) ) \ ROM_LOAD( "rh___snd.1_2", 0x080000, 0x080000, CRC(1f24cfb6) SHA1(cf1dc9d2a1c1cfb8718c89e245e9bf375fef8bfd) ) \ - ROM_LOAD( "rh___snd.1_3", 0x100000, 0x080000, CRC(726958d8) SHA1(6373765b80971dd7ff5c8eaeee83966335db4d27) ) \ - + ROM_LOAD( "rh___snd.1_3", 0x100000, 0x080000, CRC(726958d8) SHA1(6373765b80971dd7ff5c8eaeee83966335db4d27) ) #define M4RHS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4RHS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4RHS_SET( 199?, m4rhs, 0, "rh_sj___.4s1", 0x0000, 0x020000, CRC(be6179cd) SHA1(8aefffdffb25bc4dd7d083c7027be746181c2ff9), "Bwb / Barcrest","Rocky Horror Show (Barcrest) (MPU4) (set 1)" ) @@ -5108,16 +4923,14 @@ M4RHS_SET( 199?, m4rhs__l, m4rhs, "rocky15t", 0x0000, 0x020000, CRC(3fbad6 ROM_LOAD( "oad.chr", 0x0000, 0x000048, CRC(910b09db) SHA1(d54399660b1bf1a89712b25292ac99b740442e5c) ) \ ROM_REGION( 0x200000, "msm6376", 0 ) \ ROM_LOAD( "oadsnd1.bin", 0x000000, 0x080000, CRC(b9a9b49b) SHA1(261e939da031768e2a2b5b171cbba55c87d1a758) ) \ - ROM_LOAD( "oadsnd2.bin", 0x080000, 0x080000, CRC(94e34646) SHA1(8787d6757e4ed86417aafac0e042091189974d3b) ) \ - + ROM_LOAD( "oadsnd2.bin", 0x080000, 0x080000, CRC(94e34646) SHA1(8787d6757e4ed86417aafac0e042091189974d3b) ) #define M4OADRAC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4OADRAC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4OADRAC_SET( 199?, m4oadrac, 0, "dr__x__x.2_0", 0x0000, 0x020000, CRC(4ca65bd9) SHA1(deb0a7d3596647210061b69a10fc6cdfc066538e), "Bwb / Barcrest","Ooh Aah Dracula (Barcrest) (MPU4) (set 1)" ) @@ -5134,16 +4947,14 @@ M4OADRAC_SET( 199?, m4oadrac__h, m4oadrac, "dri_xa_x.2_0", 0x0000, 0x020000 #define M4TICCLA_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "ct______.5_a", 0x0000, 0x080000, CRC(9a936f50) SHA1(f3f66d6093a939220d24aee985e210cdfd214db4) ) \ - + ROM_LOAD( "ct______.5_a", 0x0000, 0x080000, CRC(9a936f50) SHA1(f3f66d6093a939220d24aee985e210cdfd214db4) ) #define M4TICCLA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TICCLA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) @@ -5178,16 +4989,14 @@ M4TICCLA_SET( 199?, m4ticcla__0, m4ticcla, "ct_30btc.2_1", 0x0000, 0x010000 #define M4TICGLC_EXTRA_ROMS \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "ct______.5_a", 0x0000, 0x080000, CRC(9a936f50) SHA1(f3f66d6093a939220d24aee985e210cdfd214db4) ) \ - + ROM_LOAD( "ct______.5_a", 0x0000, 0x080000, CRC(9a936f50) SHA1(f3f66d6093a939220d24aee985e210cdfd214db4) ) #define M4TICGLC_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4TICGLC_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4TICGLC_SET( 199?, m4ticglc, 0, "tg_25a_c.3_1", 0x0000, 0x010000, CRC(44b2b6b0) SHA1(c2caadd68659bd474df534101e3bc13b15a43694), "Bwb / Barcrest","Tic Tac Toe Gold (Barcrest) (MPU4) (set 1)" ) M4TICGLC_SET( 199?, m4ticglc__a, m4ticglc, "tg_30_dc.4_1", 0x0000, 0x010000, CRC(19c0fb1e) SHA1(955da095df56f28ace6839c9b6df5669f576730c), "Bwb / Barcrest","Tic Tac Toe Gold (Barcrest) (MPU4) (set 2)" ) @@ -5199,16 +5008,14 @@ M4TICGLC_SET( 199?, m4ticglc__d, m4ticglc, "tg_30bgc.4_1", 0x0000, 0x010000 ROM_REGION( 0x48, "fakechr", 0 ) \ ROM_LOAD( "ssbwb.chr", 0x0000, 0x000048, CRC(910b09db) SHA1(d54399660b1bf1a89712b25292ac99b740442e5c) ) \ ROM_REGION( 0x200000, "msm6376", 0 ) \ - ROM_LOAD( "css_____.1_1", 0x0000, 0x080000, CRC(e738fa1e) SHA1(7a1125320e0d488729aec66e658d418b96228fd0) ) \ - + ROM_LOAD( "css_____.1_1", 0x0000, 0x080000, CRC(e738fa1e) SHA1(7a1125320e0d488729aec66e658d418b96228fd0) ) #define M4SSCLAS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SSCLAS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring ,ROT0,company,title,GAME_FLAGS ) M4SSCLAS_SET( 199?, m4ssclas, 0, "cs__x__x.6_0", 0x0000, 0x010000, CRC(3230284d) SHA1(bca3b4c43859ed424956c4119fa6a91a2e7d6eec), "Bwb / Barcrest","Super Streak Classic (Barcrest) (MPU4) (set 1)" ) @@ -5227,16 +5034,14 @@ M4SSCLAS_SET( 199?, m4ssclas__f, m4ssclas, "supst20.15", 0x0000, 0x010000 #define M4SQUID_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "squidsnd.p1", 0x000000, 0x080000, CRC(44cebe30) SHA1(a93f64897b4ba333d044649f28fa5dd68d3d2e94) ) \ - ROM_LOAD( "squidsnd.p2", 0x080000, 0x080000, CRC(d2a1b073) SHA1(d4931f18d369e89492fe72a7a1c511c8d3c23a71) ) \ - + ROM_LOAD( "squidsnd.p2", 0x080000, 0x080000, CRC(d2a1b073) SHA1(d4931f18d369e89492fe72a7a1c511c8d3c23a71) ) #define M4SQUID_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4SQUID_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4SQUID_SET( 199?, m4squid, 0, "squidsin.bin", 0x0000, 0x020000, CRC(be369b43) SHA1(e5c7b7a858b264db2f8f726396ddeb42004d7cb9), "Bwb / Barcrest","Squids In (Barcrest) (MPU4) (set 1)" ) M4SQUID_SET( 199?, m4squid__a, m4squid, "sq__x_dx.2_0", 0x0000, 0x020000, CRC(2eb6c814) SHA1(070ad5cb36220daf98043f175cf67d4d584c3d01), "Bwb / Barcrest","Squids In (Barcrest) (MPU4) (set 2)" ) @@ -5248,16 +5053,14 @@ M4SQUID_SET( 199?, m4squid__c, m4squid, "sq__xb_x.2_0", 0x0000, 0x020000, CR ROM_LOAD( "m407.chr", 0x0000, 0x000048, CRC(fa693a0d) SHA1(601afba4a6efe8334ecc2cadfee99273a9818c1c) ) \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cala1.hex", 0x0000, 0x080000, CRC(c9768f65) SHA1(a8f2946fdba640033da0e21d4e18293b3fc004bf) ) \ - ROM_LOAD( "cala2.hex", 0x0000, 0x080000, CRC(56bd2950) SHA1(b109c726514c3ee04c1bbdf5f518f60dfd0375a8) ) \ - + ROM_LOAD( "cala2.hex", 0x0000, 0x080000, CRC(56bd2950) SHA1(b109c726514c3ee04c1bbdf5f518f60dfd0375a8) ) #define M4CALAMA_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4CALAMA_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4CALAMA_SET( 199?, m4calama, 0, "cac03s.p1", 0x0000, 0x020000, CRC(edc97795) SHA1(58fb91809c7f475fbceacfc1c3bda41b86dff54b), "Bwb / Barcrest","Calamari Club (Barcrest) (MPU4) (set 1)" ) M4CALAMA_SET( 199?, m4calama__a, m4calama, "ca301d.p1", 0x0000, 0x020000, CRC(9a220126) SHA1(d5b12955bb336f8233ed3f892e23a14ba755a511), "Bwb / Barcrest","Calamari Club (Barcrest) (MPU4) (set 2)" ) @@ -5275,16 +5078,14 @@ M4CALAMA_SET( 199?, m4calama__j, m4calama, "bca04.p1", 0x0000, 0x020000 #define M4COSCAS_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cc___snd.1_1", 0x000000, 0x080000, CRC(d858f238) SHA1(92a3dfacde8bfa8705e91fab5bb627f9b34ad2dc) ) \ - ROM_LOAD( "cc___snd.1_2", 0x080000, 0x080000, CRC(bab1bd8e) SHA1(c703d0e24c0a522ebf79895049e85f5471f7d7e9) ) \ - + ROM_LOAD( "cc___snd.1_2", 0x080000, 0x080000, CRC(bab1bd8e) SHA1(c703d0e24c0a522ebf79895049e85f5471f7d7e9) ) #define M4COSCAS_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4COSCAS_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4COSCAS_SET( 199?, m4coscas, 0, "cc_sj__c.3r1", 0x0000, 0x020000, CRC(44b940a6) SHA1(7e621873fcf6460f654e35cc74552e86b6253ddb), "Bwb / Barcrest","Cosmic Casino (Barcrest) (MPU4) (set 1)" ) M4COSCAS_SET( 199?, m4coscas__a, m4coscas, "cosm15g", 0x0000, 0x020000, CRC(edd01d55) SHA1(49246fa1e12ceb3297f35616cdc1cf62472a379f), "Bwb / Barcrest","Cosmic Casino (Barcrest) (MPU4) (set 2)" ) @@ -5314,16 +5115,14 @@ M4COSCAS_SET( 199?, m4coscas__v, m4coscas, "cc_sjwbc.3r1", 0x0000, #define M4DBLDM_EXTRA_ROMS \ ROM_REGION( 0x100000, "msm6376", 0 ) \ ROM_LOAD( "cddsnd.p1", 0x000000, 0x080000, CRC(e1833e31) SHA1(1486e5afab347d6dee1543a55d1193b7db3c89d7) ) \ - ROM_LOAD( "cddsnd.p2", 0x080000, 0x080000, CRC(fd33ed2a) SHA1(f68ffadde40f88e7954d4a98bcd7ff023841b55b) ) \ - + ROM_LOAD( "cddsnd.p2", 0x080000, 0x080000, CRC(fd33ed2a) SHA1(f68ffadde40f88e7954d4a98bcd7ff023841b55b) ) #define M4DBLDM_SET(year, setname,parent,name,offset,length,hash,company,title) \ ROM_START( setname ) \ ROM_REGION( length, "maincpu", 0 ) \ ROM_LOAD( name, offset, length, hash ) \ M4DBLDM_EXTRA_ROMS \ ROM_END \ - GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) \ - + GAME(year, setname, parent ,mod4oki ,mpu4 , mpu4_state,m4_showstring_big ,ROT0,company,title,GAME_FLAGS ) M4DBLDM_SET( 199?, m4dbldm, 0, "cdd05s.p1", 0x0000, 0x020000, CRC(fc14771f) SHA1(f418af9fed331560195a694f20ef2fea27ed04b0), "Barcrest","Double Diamond Club (Barcrest) (MPU4) (set 1)" ) M4DBLDM_SET( 199?, m4dbldm__a, m4dbldm, "cdd05d.p1", 0x0000, 0x020000, CRC(fc1c5e90) SHA1(c756d2ac725168af5396c8ef7550db9087a50937), "Barcrest","Double Diamond Club (Barcrest) (MPU4) (set 2)" ) diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c index cce70763000..4d115d58392 100644 --- a/src/mame/drivers/mpu4vid.c +++ b/src/mame/drivers/mpu4vid.c @@ -222,7 +222,6 @@ public: m_vid_vidram(*this, "vid_vidram"), m_vid_mainram(*this, "vid_mainram") { - } optional_device m_scn2674; @@ -519,7 +518,6 @@ static const gfx_layout mpu4_vid_char_16x16_layout = UINT32 mpu4vid_state::screen_update_mpu4_vid(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); m_scn2674->scn2574_draw(machine(), bitmap, cliprect, m_vid_mainram ); @@ -1502,7 +1500,6 @@ ADDRESS_MAP_END TIMER_DEVICE_CALLBACK_MEMBER(mpu4vid_state::scanline_timer_callback) { - m_scn2674->scn2674_do_scanline(machine(), param); } diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 50944184ea6..485abfd2271 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -102,7 +102,6 @@ READ8_MEMBER(mrflea_state::mrflea_io_r) READ8_MEMBER(mrflea_state::mrflea_main_status_r) { - /* 0x01: main CPU command pending 0x08: io cpu ready */ return m_status ^ 0x08; @@ -110,7 +109,6 @@ READ8_MEMBER(mrflea_state::mrflea_main_status_r) READ8_MEMBER(mrflea_state::mrflea_io_status_r) { - /* 0x08: IO CPU command pending 0x01: main cpu ready */ return m_status ^ 0x01; @@ -329,7 +327,6 @@ static const ay8910_interface mrflea_ay8910_interface_1 = void mrflea_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); @@ -342,7 +339,6 @@ void mrflea_state::machine_start() void mrflea_state::machine_reset() { - m_gfx_bank = 0; m_io = 0; m_main = 0; diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 987af1fb75e..f57bb136a7b 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -432,7 +432,6 @@ static const msm5232_interface msm5232_config = void msisaac_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); /* video */ @@ -453,7 +452,6 @@ void msisaac_state::machine_start() void msisaac_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER(ta7630); /* video */ diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index c43a6924949..474f0675e39 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -48,7 +48,6 @@ behavior we use . WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w) { - m_regs2[offset] = data; //popmessage ("Regs2 %04x, %04x, %04x, %04x", m_regs2[0], m_regs2[1], m_regs2[2], m_regs2[3]); @@ -390,7 +389,6 @@ GFXDECODE_END void mugsmash_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); } diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index cf1a5fd7270..8d008f2c375 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -269,7 +269,6 @@ TILE_GET_INFO_MEMBER(multfish_state::get_multfish_reel_tile_info) void multfish_state::video_start() { - memset(m_vid,0x00,sizeof(m_vid)); save_item(NAME(m_vid)); @@ -308,7 +307,6 @@ UINT32 multfish_state::screen_update_multfish(screen_device &screen, bitmap_ind1 WRITE8_MEMBER(multfish_state::multfish_vid_w) { - m_vid[offset]=data; // 0x0000 - 0x1fff is normal tilemap @@ -374,7 +372,6 @@ WRITE8_MEMBER(multfish_state::multfish_timekeeper_w) READ8_MEMBER(multfish_state::bankedram_r) { - if ((m_rambk & 0x80) == 0x00) { return timekeeper_r(machine().device("m48t35"), space, offset + 0x2000*(m_rambk & 0x03)); @@ -388,7 +385,6 @@ READ8_MEMBER(multfish_state::bankedram_r) WRITE8_MEMBER(multfish_state::bankedram_w) { - if ((m_rambk & 0x80) == 0x00) { timekeeper_w(machine().device("m48t35"), space, offset + 0x2000*(m_rambk & 0x03), data); @@ -401,7 +397,6 @@ WRITE8_MEMBER(multfish_state::bankedram_w) WRITE8_MEMBER(multfish_state::multfish_rambank_w) { - m_rambk = data; } @@ -415,7 +410,6 @@ READ8_MEMBER(multfish_state::ray_r) CUSTOM_INPUT_MEMBER(multfish_state::multfish_hopper_r) { - if ( m_hopper_motor != 0 ) { m_hopper++; @@ -634,7 +628,6 @@ DRIVER_INIT_MEMBER(multfish_state,island2l) } DRIVER_INIT_MEMBER(multfish_state,keksl) { - m_xor_palette = 0x41f3; m_xor_paltype = 1; lottery_decode(machine(), 0xdd, 0xaa, 0x22, 0x55, 0x2cac0); @@ -659,7 +652,6 @@ DRIVER_INIT_MEMBER(multfish_state,sweetl2l) } DRIVER_INIT_MEMBER(multfish_state,gnomel) { - m_xor_palette = 0x49ff; m_xor_paltype = 1; lottery_decode(machine(), 0xcc, 0x22, 0x33, 0x66, 0x14940); @@ -1064,7 +1056,6 @@ GFXDECODE_END void multfish_state::machine_start() { - save_item(NAME(m_disp_enable)); save_item(NAME(m_rambk)); save_item(NAME(m_hopper_motor)); @@ -1073,7 +1064,6 @@ void multfish_state::machine_start() void multfish_state::machine_reset() { - membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base(), 0x4000); membank("bank1")->set_entry(0); diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index a5b9789a1cd..6d4ed50ce38 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -1403,7 +1403,6 @@ DRIVER_INIT_MEMBER(multigam_state,multigmt) memcpy(buf, rom, size); for (i = 0; i < size; i++) { - addr = BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,8,11,12,10,9,7,6,5,4,3,2,1,0); rom[i] = buf[addr]; } diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index 62c2911b6ec..b0082c8c82b 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -43,7 +43,6 @@ WRITE8_MEMBER(munchmo_state::mnchmobl_nmi_enable_w) /* trusted thru schematics, NMI and IRQ triggers at vblank, at the same time (!) */ INTERRUPT_GEN_MEMBER(munchmo_state::mnchmobl_vblank_irq) { - if (m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); @@ -52,13 +51,11 @@ INTERRUPT_GEN_MEMBER(munchmo_state::mnchmobl_vblank_irq) INTERRUPT_GEN_MEMBER(munchmo_state::mnchmobl_sound_irq) { - device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } WRITE8_MEMBER(munchmo_state::mnchmobl_soundlatch_w) { - soundlatch_byte_w(space, 0, data); m_audiocpu->set_input_line(0, HOLD_LINE ); } @@ -306,7 +303,6 @@ GFXDECODE_END void munchmo_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -317,7 +313,6 @@ void munchmo_state::machine_start() void munchmo_state::machine_reset() { - m_palette_bank = 0; m_flipscreen = 0; m_nmi_enable = 0; diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index 8bc0add4c67..60a47fa8391 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -92,7 +92,6 @@ ADDRESS_MAP_END void murogmbl_state::video_start() { - } UINT32 murogmbl_state::screen_update_murogmbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 0fe289367a2..7a49c386908 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -111,28 +111,24 @@ public: WRITE16_MEMBER(mwarr_state::bg_videoram_w) { - COMBINE_DATA(&m_bg_videoram[offset]); m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(mwarr_state::mlow_videoram_w) { - COMBINE_DATA(&m_mlow_videoram[offset]); m_mlow_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(mwarr_state::mhigh_videoram_w) { - COMBINE_DATA(&m_mhigh_videoram[offset]); m_mhigh_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(mwarr_state::tx_videoram_w) { - COMBINE_DATA(&m_tx_videoram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } @@ -145,7 +141,6 @@ WRITE16_MEMBER(mwarr_state::oki1_bank_w) WRITE16_MEMBER(mwarr_state::sprites_commands_w) { - if (m_which) { int i; @@ -393,7 +388,6 @@ TILE_GET_INFO_MEMBER(mwarr_state::get_tx_tile_info) void mwarr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); m_mlow_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); m_mhigh_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mwarr_state::get_mhigh_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); @@ -543,13 +537,11 @@ UINT32 mwarr_state::screen_update_mwarr(screen_device &screen, bitmap_ind16 &bit void mwarr_state::machine_start() { - save_item(NAME(m_which)); } void mwarr_state::machine_reset() { - m_which = 0; } diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c index 31a3d0460e9..ac9deaff1f6 100644 --- a/src/mame/drivers/mystston.c +++ b/src/mame/drivers/mystston.c @@ -72,7 +72,6 @@ INPUT_CHANGED_MEMBER(mystston_state::coin_inserted) WRITE8_MEMBER(mystston_state::mystston_ay8910_select_w) { - /* bit 5 goes to 8910 #0 BDIR pin */ if (((*m_ay8910_select & 0x20) == 0x20) && ((data & 0x20) == 0x00)) { diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c index 813c20748c7..46a1d76ebc6 100644 --- a/src/mame/drivers/n8080.c +++ b/src/mame/drivers/n8080.c @@ -469,7 +469,6 @@ static I8085_CONFIG( n8080_cpu_config ) MACHINE_START_MEMBER(n8080_state,n8080) { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_shift_data)); @@ -498,7 +497,6 @@ MACHINE_START_MEMBER(n8080_state,helifire) MACHINE_RESET_MEMBER(n8080_state,n8080) { - m_shift_data = 0; m_shift_bits = 0; m_inte = 0; @@ -506,7 +504,6 @@ MACHINE_RESET_MEMBER(n8080_state,n8080) MACHINE_RESET_MEMBER(n8080_state,spacefev) { - MACHINE_RESET_CALL_MEMBER(n8080); MACHINE_RESET_CALL_MEMBER(spacefev_sound); @@ -516,7 +513,6 @@ MACHINE_RESET_MEMBER(n8080_state,spacefev) MACHINE_RESET_MEMBER(n8080_state,sheriff) { - MACHINE_RESET_CALL_MEMBER(n8080); MACHINE_RESET_CALL_MEMBER(sheriff_sound); @@ -526,7 +522,6 @@ MACHINE_RESET_MEMBER(n8080_state,sheriff) MACHINE_RESET_MEMBER(n8080_state,helifire) { - MACHINE_RESET_CALL_MEMBER(n8080); MACHINE_RESET_CALL_MEMBER(helifire_sound); diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index 97d097c2408..4078d4431e7 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -361,7 +361,6 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, WRITE32_MEMBER(namcos11_state::keycus_w) { - verboselog( machine(), 1, "keycus_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); COMBINE_DATA( &m_keycus[ offset ] ); } @@ -653,7 +652,6 @@ WRITE32_MEMBER(namcos11_state::bankswitch_rom32_w) WRITE32_MEMBER(namcos11_state::bankswitch_rom64_upper_w) { - verboselog( machine(), 2, "bankswitch_rom64_upper_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); if( ACCESSING_BITS_0_15 ) @@ -856,7 +854,6 @@ ADDRESS_MAP_END READ16_MEMBER(namcos11_state::c76_speedup_r) { - if ((space.device().safe_pc() == 0xc153) && (!(m_su_83 & 0xff00))) { space.device().execute().spin_until_interrupt(); @@ -867,7 +864,6 @@ READ16_MEMBER(namcos11_state::c76_speedup_r) WRITE16_MEMBER(namcos11_state::c76_speedup_w) { - COMBINE_DATA(&m_su_83); } @@ -995,26 +991,22 @@ DRIVER_INIT_MEMBER(namcos11_state,ptblank2ua) MACHINE_RESET_MEMBER(namcos11_state,namcos11) { - memset( m_keycus, 0, m_keycus_size ); } TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_irq0_cb) { - m_mcu->set_input_line(M37710_LINE_IRQ0, HOLD_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_irq2_cb) { - m_mcu->set_input_line(M37710_LINE_IRQ2, HOLD_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_adc_cb) { - m_mcu->set_input_line(M37710_LINE_ADC, HOLD_LINE); } diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index c807fc63cbc..860d5d87fe0 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1113,21 +1113,18 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, WRITE32_MEMBER(namcos12_state::sharedram_w) { - verboselog( machine(), 1, "sharedram_w( %08x, %08x, %08x )\n", ( offset * 4 ), data, mem_mask ); COMBINE_DATA( &m_sharedram[ offset ] ); } READ32_MEMBER(namcos12_state::sharedram_r) { - verboselog( machine(), 1, "sharedram_r( %08x, %08x ) %08x\n", ( offset * 4 ), mem_mask, m_sharedram[ offset ] ); return m_sharedram[ offset ]; } WRITE16_MEMBER(namcos12_state::sharedram_sub_w) { - UINT16 *shared16 = reinterpret_cast(m_sharedram.target()); COMBINE_DATA(&shared16[BYTE_XOR_LE(offset)]); @@ -1135,7 +1132,6 @@ WRITE16_MEMBER(namcos12_state::sharedram_sub_w) READ16_MEMBER(namcos12_state::sharedram_sub_r) { - UINT16 *shared16 = reinterpret_cast(m_sharedram.target()); return shared16[BYTE_XOR_LE(offset)]; @@ -1143,7 +1139,6 @@ READ16_MEMBER(namcos12_state::sharedram_sub_r) WRITE32_MEMBER(namcos12_state::bankoffset_w) { - // Golgo 13 has different banking (maybe the keycus controls it?) if( strcmp( machine().system().name, "golgo13" ) == 0 || strcmp( machine().system().name, "g13knd" ) == 0 ) @@ -1169,7 +1164,6 @@ WRITE32_MEMBER(namcos12_state::bankoffset_w) WRITE32_MEMBER(namcos12_state::dmaoffset_w) { - if( ACCESSING_BITS_0_15 ) { m_n_dmaoffset = ( offset * 4 ) | ( data << 16 ); @@ -1273,7 +1267,6 @@ WRITE32_MEMBER(namcos12_state::system11gun_w) { if( ACCESSING_BITS_0_15 ) { - /* blowback 1 */ /* blowback 2 */ /* Note: output label has been changed for the Engrish Impaired ;-) */ @@ -1330,13 +1323,11 @@ WRITE32_MEMBER(namcos12_state::kcoff_w) WRITE32_MEMBER(namcos12_state::kcon_w) { - membank( "bank2" )->set_base( m_kcram ); } WRITE32_MEMBER(namcos12_state::tektagt_protection_1_w) { - // Second dma offset or protection ref values write m_n_tektagdmaoffset = data; if(m_ttt_cnt != 2) @@ -1351,7 +1342,6 @@ READ32_MEMBER(namcos12_state::tektagt_protection_1_r) WRITE32_MEMBER(namcos12_state::tektagt_protection_2_w) { - // Writes are 0 or rand(), only used as a "start prot value write" trigger m_ttt_cnt = 0; } @@ -1462,7 +1452,6 @@ READ8_MEMBER(namcos12_state::s12_mcu_p8_r) READ8_MEMBER(namcos12_state::s12_mcu_pa_r) { - return m_s12_porta; } @@ -1489,7 +1478,6 @@ READ8_MEMBER(namcos12_state::s12_mcu_rtc_r) READ8_MEMBER(namcos12_state::s12_mcu_portB_r) { - // golgo13 won't boot if this doesn't toggle every read m_s12_lastpB ^= 0x80; return m_s12_lastpB; @@ -1497,7 +1485,6 @@ READ8_MEMBER(namcos12_state::s12_mcu_portB_r) WRITE8_MEMBER(namcos12_state::s12_mcu_portB_w) { - // bit 7 = chip enable for the video settings controller if (data & 0x80) { diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 6703fecc915..c452a2244b1 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1084,8 +1084,7 @@ READ16_MEMBER(namcos21_state::NAMCO_C139_SCI_register_r){ return 0; } AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w) \ AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w) \ AM_RANGE(0xc00000, 0xcfffff) AM_READ(data2_r) /* Cyber Sled */ \ - AM_RANGE(0xd00000, 0xdfffff) AM_READ(data2_r) \ - + AM_RANGE(0xd00000, 0xdfffff) AM_READ(data2_r) static ADDRESS_MAP_START( namcos21_68k_master, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */ @@ -1422,8 +1421,7 @@ ADDRESS_MAP_END AM_RANGE(0x900000, 0x90ffff) AM_READWRITE(shareram1_r,shareram1_w) AM_SHARE("mpsharedram1") \ AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(namcos2_68k_dualportram_word_r,namcos2_68k_dualportram_word_w) \ AM_RANGE(0xb00000, 0xb03fff) AM_READWRITE(NAMCO_C139_SCI_buffer_r,NAMCO_C139_SCI_buffer_w) \ - AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w) \ - + AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w) static ADDRESS_MAP_START( driveyes_68k_master, AS_PROGRAM, 16, namcos21_state ) AM_RANGE(0x000000, 0x03ffff) AM_ROM diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index c1831e3eb87..c84cc617419 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2180,7 +2180,6 @@ WRITE32_MEMBER(namcos22_state::namcos22s_system_controller_w) */ INTERRUPT_GEN_MEMBER(namcos22_state::namcos22s_interrupt) { - if (nthbyte(m_system_controller, 0x00) & 7) { // vblank irq diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index fe7fa82e51c..1397194f34e 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -2495,7 +2495,6 @@ INPUT_PORTS_END MACHINE_RESET_MEMBER(dc_state,naomi) { - dc_state::machine_reset(); aica_set_ram_base(machine().device("aica"), dc_sound_ram, 8*1024*1024); } @@ -2884,14 +2883,12 @@ Region byte encoding is as follows: ROM_SYSTEM_BIOS( 8, "bios8", "epr-23607b (USA)" ) \ ROM_LOAD16_WORD_SWAP_BIOS( 8, "epr-23607b.bin", 0x000000, 0x200000, CRC(f308c5e9) SHA1(5470ab1cee6afecbd8ca8cf40f8fbe4ec2cb1471) ) \ ROM_SYSTEM_BIOS( 9, "bios9", "epr-23607 (USA)" ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 9, "epr-23607.bin", 0x000000, 0x200000, CRC(2b55add2) SHA1(547de5f97d3183c8cd069c4fa3c09f13d8b637d9) ) \ - + ROM_LOAD16_WORD_SWAP_BIOS( 9, "epr-23607.bin", 0x000000, 0x200000, CRC(2b55add2) SHA1(547de5f97d3183c8cd069c4fa3c09f13d8b637d9) ) /* First half is BIOS, second half is game settings and is blanked/reprogrammed by the BIOS as necessary */ #define AW_BIOS \ ROM_REGION( 0x200000, "awflash", 0) \ ROM_SYSTEM_BIOS( 0, "bios0", "Atomiswave BIOS" ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 0, "bios.ic23_l", 0x000000, 0x010000, BAD_DUMP CRC(e5693ce3) SHA1(1bde3ed87af64b0f675ebd47f12a53e1fc5709c1) ) /* Might be bad.. especially. bytes 0x0000, 0x6000, 0x8000 which gave different reads */ \ - + ROM_LOAD16_WORD_SWAP_BIOS( 0, "bios.ic23_l", 0x000000, 0x010000, BAD_DUMP CRC(e5693ce3) SHA1(1bde3ed87af64b0f675ebd47f12a53e1fc5709c1) ) /* Might be bad.. especially. bytes 0x0000, 0x6000, 0x8000 which gave different reads */ /* default EEPROM values, same works for all games */ #define NAOMI_DEFAULT_EEPROM \ ROM_REGION16_BE( 0x80, "main_eeprom", 0 ) \ diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 1f4b8606fdd..d5d164fef60 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -131,7 +131,6 @@ READ8_MEMBER(nbmj9195_state::tmpz84c011_pio_r) (!strcmp(machine().system().name, "imekura")) || (!strcmp(machine().system().name, "mjegolf"))) { - switch (offset) { case 0: /* PA_0 */ @@ -312,7 +311,6 @@ WRITE8_MEMBER(nbmj9195_state::tmpz84c011_pio_w) (!strcmp(machine().system().name, "mscoutm")) || (!strcmp(machine().system().name, "mjegolf"))) { - switch (offset) { case 0: /* PA_0 */ diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index f1656407b76..c2d92fe09bd 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -58,14 +58,12 @@ So this is the correct behavior of real hardware, not an emulation bug. INTERRUPT_GEN_MEMBER(nemesis_state::nemesis_interrupt) { - if (m_irq_on) device.execute().set_input_line(1, HOLD_LINE); } INTERRUPT_GEN_MEMBER(nemesis_state::blkpnthr_interrupt) { - if (m_irq_on) device.execute().set_input_line(2, HOLD_LINE); } @@ -1509,7 +1507,6 @@ static const k007232_interface k007232_config = void nemesis_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_vlm = machine().device("vlm"); @@ -1529,7 +1526,6 @@ void nemesis_state::machine_start() void nemesis_state::machine_reset() { - m_irq_on = 0; m_irq1_on = 0; m_irq2_on = 0; diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index d435d9cd104..4e74d079e79 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -775,24 +775,21 @@ ROM_LOAD( "sm1.sm1", 0x00000, 0x20000, CRC(94416d67) SHA1(42f9d7ddd6c0931fd64226a60dc73602b2819dcf) ) \ ROM_REGION( 0x90000, "audiocpu", ROMREGION_ERASEFF ) \ ROM_REGION( 0x80000, "audiocrypt", 0 ) \ - ROM_LOAD( name, 0x00000, 0x20000, hash ) \ - + ROM_LOAD( name, 0x00000, 0x20000, hash ) #define NEO_BIOS_AUDIO_ENCRYPTED_256K(name, hash) \ NEOGEO_BIOS \ ROM_REGION( 0x20000, "audiobios", 0 ) \ ROM_LOAD( "sm1.sm1", 0x00000, 0x20000, CRC(94416d67) SHA1(42f9d7ddd6c0931fd64226a60dc73602b2819dcf) ) \ ROM_REGION( 0x90000, "audiocpu", ROMREGION_ERASEFF ) \ ROM_REGION( 0x80000, "audiocrypt", 0 ) \ - ROM_LOAD( name, 0x00000, 0x40000, hash ) \ - + ROM_LOAD( name, 0x00000, 0x40000, hash ) #define NEO_BIOS_AUDIO_ENCRYPTED_512K(name, hash) \ NEOGEO_BIOS \ ROM_REGION( 0x20000, "audiobios", 0 ) \ ROM_LOAD( "sm1.sm1", 0x00000, 0x20000, CRC(94416d67) SHA1(42f9d7ddd6c0931fd64226a60dc73602b2819dcf) ) \ ROM_REGION( 0x90000, "audiocpu", ROMREGION_ERASEFF ) \ ROM_REGION( 0x80000, "audiocrypt", 0 ) \ - ROM_LOAD( name, 0x00000, 0x80000, hash ) \ - + ROM_LOAD( name, 0x00000, 0x80000, hash ) #define NO_DELTAT_REGION diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index d680f7ce211..9b78fd94a19 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -270,7 +270,6 @@ void neogeo_acknowledge_interrupt( running_machine &machine, UINT16 data ) TIMER_CALLBACK_MEMBER(neogeo_state::display_position_interrupt_callback) { - if (LOG_VIDEO_SYSTEM) logerror("--- Scanline @ %d,%d\n", machine().primary_screen->vpos(), machine().primary_screen->hpos()); if (m_display_position_interrupt_control & IRQ2CTRL_ENABLE) @@ -291,7 +290,6 @@ TIMER_CALLBACK_MEMBER(neogeo_state::display_position_interrupt_callback) TIMER_CALLBACK_MEMBER(neogeo_state::display_position_vblank_callback) { - if (m_display_position_interrupt_control & IRQ2CTRL_AUTOLOAD_VBLANK) { if (LOG_VIDEO_SYSTEM) logerror("AUTOLOAD_VBLANK "); @@ -305,7 +303,6 @@ TIMER_CALLBACK_MEMBER(neogeo_state::display_position_vblank_callback) TIMER_CALLBACK_MEMBER(neogeo_state::vblank_interrupt_callback) { - if (LOG_VIDEO_SYSTEM) logerror("+++ VBLANK @ %d,%d\n", machine().primary_screen->vpos(), machine().primary_screen->hpos()); /* add a timer tick to the pd4990a */ @@ -492,7 +489,6 @@ static void set_save_ram_unlock( running_machine &machine, UINT8 data ) WRITE16_MEMBER(neogeo_state::save_ram_w) { - if (m_save_ram_unlocked) COMBINE_DATA(&m_save_ram[offset]); } @@ -601,7 +597,6 @@ READ8_MEMBER(neogeo_state::audio_command_r) WRITE8_MEMBER(neogeo_state::audio_result_w) { - if (LOG_CPU_COMM && (m_audio_result != data)) logerror(" AUD CPU PC %04x: audio_result_w %02x\n", space.device().safe_pc(), data); m_audio_result = data; @@ -699,7 +694,6 @@ void neogeo_main_cpu_banking_init( running_machine &machine ) if (state->m_is_cartsys) { - /* set initial main CPU bank */ if (machine.root_device().memregion("maincpu")->bytes() > 0x100000) neogeo_set_main_cpu_bank_address(mainspace, 0x100000); @@ -1037,7 +1031,6 @@ void neogeo_postload(running_machine &machine) void neogeo_state::machine_start() { - /* configure NVRAM */ machine().device("saveram")->set_base(m_save_ram, 0x10000); diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index a06772fc3ec..e07d08e4b5f 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -148,7 +148,6 @@ WRITE16_MEMBER(neoprint_state::neoprint_calendar_w) READ8_MEMBER(neoprint_state::neoprint_unk_r) { - /* ---x ---- tested in irq routine, odd/even field number? */ /* ---- xx-- one of these two must be high */ /* ---- --xx checked right before entering into attract mode, presumably printer/camera related */ @@ -210,8 +209,6 @@ READ8_MEMBER(neoprint_state::audio_command_r) WRITE8_MEMBER(neoprint_state::audio_result_w) { - - //if (LOG_CPU_COMM && (m_audio_result != data)) logerror(" AUD CPU PC %04x: audio_result_w %02x\n", space.device().safe_pc(), data); m_audio_result = data; diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c index e6dcaa31e47..7a92952c930 100644 --- a/src/mame/drivers/neptunp2.c +++ b/src/mame/drivers/neptunp2.c @@ -35,7 +35,6 @@ protected: void neptunp2_state::video_start() { - } UINT32 neptunp2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c index 559eb997d81..801ceb82cc8 100644 --- a/src/mame/drivers/news.c +++ b/src/mame/drivers/news.c @@ -115,13 +115,11 @@ GFXDECODE_END void news_state::machine_start() { - save_item(NAME(m_bgpic)); } void news_state::machine_reset() { - m_bgpic = 0; } diff --git a/src/mame/drivers/nexus3d.c b/src/mame/drivers/nexus3d.c index dd6e66eac84..f7316cf9e52 100644 --- a/src/mame/drivers/nexus3d.c +++ b/src/mame/drivers/nexus3d.c @@ -73,7 +73,6 @@ void nexus3d_flash_reset(running_machine& machine) READ8_MEMBER(nexus3d_state::n3d_flash_r) { - if (m_last_flash_cmd==0x70) return 0xe0; if (m_last_flash_cmd==0x00) @@ -181,7 +180,6 @@ INPUT_PORTS_END void nexus3d_state::video_start() { - } UINT32 nexus3d_state::screen_update_nexus3d(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 1eb75045567..7f773ffd3c6 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -92,7 +92,6 @@ READ8_MEMBER(nightgal_state::blitter_status_r) void nightgal_state::video_start() { - save_item(NAME(m_blit_buffer)); } @@ -330,7 +329,6 @@ WRITE8_MEMBER(nightgal_state::nsc_latch_w) READ8_MEMBER(nightgal_state::nsc_latch_r) { - return m_z80_latch; } @@ -377,7 +375,6 @@ WRITE8_MEMBER(nightgal_state::royalqn_blitter_2_w) READ8_MEMBER(nightgal_state::royalqn_nsc_blit_r) { - if(offset == 2) m_subcpu->set_input_line(0, CLEAR_LINE ); @@ -386,13 +383,11 @@ READ8_MEMBER(nightgal_state::royalqn_nsc_blit_r) READ8_MEMBER(nightgal_state::royalqn_comm_r) { - return (m_comms_ram[offset] & 0x80) | (0x7f); //bits 6-0 are undefined, presumably open bus } WRITE8_MEMBER(nightgal_state::royalqn_comm_w) { - m_comms_ram[offset] = data & 0x80; } @@ -835,7 +830,6 @@ static const ay8910_interface ay8910_config = void nightgal_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); @@ -851,7 +845,6 @@ void nightgal_state::machine_start() void nightgal_state::machine_reset() { - m_nsc_latch = 0; m_z80_latch = 0; m_mux_data = 0; diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index be262d45c5a..470b196a063 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -337,7 +337,6 @@ static void parse_control( running_machine &machine ) /* assumes Z80 sandwiche WRITE16_MEMBER(ninjaw_state::cpua_ctrl_w) { - if ((data &0xff00) && ((data &0xff) == 0)) data = data >> 8; m_cpua_ctrl = data; @@ -360,14 +359,12 @@ static void reset_sound_region( running_machine &machine ) WRITE8_MEMBER(ninjaw_state::sound_bankswitch_w) { - m_banknum = data & 7; reset_sound_region(machine()); } WRITE16_MEMBER(ninjaw_state::ninjaw_sound_w) { - if (offset == 0) tc0140syt_port_w(m_tc0140syt, space, 0, data & 0xff); else if (offset == 1) @@ -381,7 +378,6 @@ WRITE16_MEMBER(ninjaw_state::ninjaw_sound_w) READ16_MEMBER(ninjaw_state::ninjaw_sound_r) { - if (offset == 1) return ((tc0140syt_comm_r(m_tc0140syt, space, 0) & 0xff)); else @@ -412,7 +408,6 @@ WRITE8_MEMBER(ninjaw_state::ninjaw_pancontrol) WRITE16_MEMBER(ninjaw_state::tc0100scn_triple_screen_w) { - tc0100scn_word_w(m_tc0100scn_1, space, offset, data, mem_mask); tc0100scn_word_w(m_tc0100scn_2, space, offset, data, mem_mask); tc0100scn_word_w(m_tc0100scn_3, space, offset, data, mem_mask); @@ -802,7 +797,6 @@ static void ninjaw_postload(running_machine &machine) void ninjaw_state::machine_start() { - membank("bank10")->configure_entries(0, 8, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 8a3ea6c457d..8f1cfd50059 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -294,7 +294,6 @@ WRITE16_MEMBER(nmg5_state::bg_videoram_w) WRITE16_MEMBER(nmg5_state::nmg5_soundlatch_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -314,7 +313,6 @@ WRITE16_MEMBER(nmg5_state::prot_w) WRITE16_MEMBER(nmg5_state::gfx_bank_w) { - if (m_gfx_bank != (data & 3)) { m_gfx_bank = data & 3; @@ -324,7 +322,6 @@ WRITE16_MEMBER(nmg5_state::gfx_bank_w) WRITE16_MEMBER(nmg5_state::priority_reg_w) { - m_priority_reg = data & 7; if (m_priority_reg == 4 || m_priority_reg == 5 || m_priority_reg == 6) @@ -847,7 +844,6 @@ TILE_GET_INFO_MEMBER(nmg5_state::bg_get_tile_info){ SET_TILE_INFO_MEMBER(0, m_bg void nmg5_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmg5_state::bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nmg5_state::fg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap->set_transparent_pen(0); @@ -887,7 +883,6 @@ static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap ) UINT32 nmg5_state::screen_update_nmg5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrolly(0, m_scroll_ram[3] + 9); m_bg_tilemap->set_scrollx(0, m_scroll_ram[2] + 3); m_fg_tilemap->set_scrolly(0, m_scroll_ram[1] + 9); @@ -986,7 +981,6 @@ static const ym3812_interface ym3812_intf = void nmg5_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_soundcpu = machine().device("soundcpu"); @@ -997,7 +991,6 @@ void nmg5_state::machine_start() void nmg5_state::machine_reset() { - /* some games don't set the priority register so it should be hard-coded to a normal layout */ m_priority_reg = 7; diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index fedba287ff3..733f06ec862 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -515,8 +515,7 @@ life,but the game looks pretty much hard without it. m_mainram[(_offs_+2-0x10)/2] = 0x4ef9;/*JMP*/\ m_mainram[(_offs_+4-0x10)/2] = 0x0000;/*HI-DWORD*/\ m_mainram[(_offs_+6-0x10)/2] = _pc_; /*LO-DWORD*/\ - } \ - + } #define PROT_INPUT(_offs_,_protvalue_,_protinput_,_input_) \ if(m_mainram[_offs_] == _protvalue_) \ { \ @@ -4543,7 +4542,6 @@ DRIVER_INIT_MEMBER(nmk16_state,ssmissin) DRIVER_INIT_MEMBER(nmk16_state,bjtwin) { - /* Patch rom to enable test mode */ /* 008F54: 33F9 0008 0000 000F FFFC move.w $80000.l, $ffffc.l diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index 1d9af293416..633cb2a6052 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -138,7 +138,6 @@ UINT32 nsmpoker_state::screen_update_nsmpoker(screen_device &screen, bitmap_ind1 void nsmpoker_state::palette_init() { - } diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 7ed818879e9..da720b42380 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -626,7 +626,6 @@ ADDRESS_MAP_END void nss_state::machine_start() { - MACHINE_START_CALL_LEGACY(snes); m_is_nss = 1; @@ -827,7 +826,6 @@ INTERRUPT_GEN_MEMBER(nss_state::nss_vblank_irq) void nss_state::machine_reset() { - MACHINE_RESET_CALL_LEGACY( snes ); /* start with both CPUs disabled */ diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index a33510b82c9..6c590317448 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -302,7 +302,6 @@ WRITE8_MEMBER(nycaptor_state::nmi_enable_w) WRITE8_MEMBER(nycaptor_state::unk_w) { - } static const ay8910_interface ay8910_config = @@ -422,7 +421,6 @@ READ8_MEMBER(nycaptor_state::cyclshtg_mcu_r) WRITE8_MEMBER(nycaptor_state::cyclshtg_mcu_w) { - } READ8_MEMBER(nycaptor_state::cyclshtg_mcu_status_r1) @@ -764,7 +762,6 @@ GFXDECODE_END void nycaptor_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_subcpu = machine().device("sub"); @@ -797,7 +794,6 @@ void nycaptor_state::machine_start() void nycaptor_state::machine_reset() { - MACHINE_RESET_CALL_MEMBER(ta7630); m_generic_control_reg = 0; diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 55c4ce1d874..d860f4f2be9 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -173,7 +173,6 @@ WRITE_LINE_MEMBER(nyny_state::main_cpu_firq) INTERRUPT_GEN_MEMBER(nyny_state::update_pia_1) { - /* update the different PIA pins from the input ports */ /* CA1 - copy of PA0 (COIN1) */ @@ -221,7 +220,6 @@ WRITE8_MEMBER(nyny_state::pia_2_port_a_w) WRITE8_MEMBER(nyny_state::pia_2_port_b_w) { - /* bits 0-3 go to bits 8-11 of the star delay counter */ m_star_delay_counter = (m_star_delay_counter & 0x00ff) | ((data & 0x0f) << 8); @@ -448,7 +446,6 @@ static const mc6845_interface mc6845_intf = WRITE8_MEMBER(nyny_state::audio_1_command_w) { - soundlatch_byte_w(space, 0, data); m_audiocpu->set_input_line(M6800_IRQ_LINE, HOLD_LINE); } @@ -456,7 +453,6 @@ WRITE8_MEMBER(nyny_state::audio_1_command_w) WRITE8_MEMBER(nyny_state::audio_1_answer_w) { - soundlatch3_byte_w(space, 0, data); m_maincpu->set_input_line(M6809_IRQ_LINE, HOLD_LINE); } @@ -501,7 +497,6 @@ static const ay8910_interface ay8910_64_interface = WRITE8_MEMBER(nyny_state::audio_2_command_w) { - soundlatch2_byte_w(space, 0, (data & 0x60) >> 5); m_audiocpu2->execute().set_input_line(M6800_IRQ_LINE, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE); } @@ -528,7 +523,6 @@ READ8_MEMBER(nyny_state::nyny_pia_1_2_r) WRITE8_MEMBER(nyny_state::nyny_pia_1_2_w) { - /* the address bits are directly connected to the chip selects */ if (BIT(offset, 2)) m_pia1->write(space, offset & 0x03, data); if (BIT(offset, 3)) m_pia2->write_alt(space, offset & 0x03, data); @@ -677,7 +671,6 @@ INPUT_PORTS_END void nyny_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_audiocpu2 = machine().device("audio2"); @@ -695,7 +688,6 @@ void nyny_state::machine_start() void nyny_state::machine_reset() { - m_flipscreen = 0; m_star_enable = 0; m_star_delay_counter = 0; diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c index 11ebf98561a..05a893f4993 100644 --- a/src/mame/drivers/offtwall.c +++ b/src/mame/drivers/offtwall.c @@ -140,7 +140,6 @@ WRITE16_MEMBER(offtwall_state::io_latch_w) READ16_MEMBER(offtwall_state::bankswitch_r) { - /* this is the table lookup; the bank is determined by the address that was requested */ m_bank_offset = (offset & 3) * 0x1000; logerror("Bankswitch index %d -> %04X\n", offset, m_bank_offset); @@ -151,7 +150,6 @@ READ16_MEMBER(offtwall_state::bankswitch_r) READ16_MEMBER(offtwall_state::bankrom_r) { - /* this is the banked ROM read */ logerror("%06X: %04X\n", space.device().safe_pcbase(), offset); @@ -476,7 +474,6 @@ ROM_END DRIVER_INIT_MEMBER(offtwall_state,offtwall) { - atarijsa_init(machine(), "260010", 0x0040); /* install son-of-slapstic workarounds */ @@ -488,7 +485,6 @@ DRIVER_INIT_MEMBER(offtwall_state,offtwall) DRIVER_INIT_MEMBER(offtwall_state,offtwalc) { - atarijsa_init(machine(), "260010", 0x0040); /* install son-of-slapstic workarounds */ diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index 7c95147b51b..5768cd180f8 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -19,7 +19,6 @@ Notes: WRITE16_MEMBER(ohmygod_state::ohmygod_ctrl_w) { - if (ACCESSING_BITS_0_7) { UINT8 *rom = memregion("oki")->base(); @@ -295,7 +294,6 @@ GFXDECODE_END void ohmygod_state::machine_start() { - save_item(NAME(m_spritebank)); save_item(NAME(m_scrollx)); save_item(NAME(m_scrolly)); diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index d52987000c2..535562b66e8 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -46,7 +46,6 @@ WRITE8_MEMBER(ojankohs_state::ojankohs_rombank_w) WRITE8_MEMBER(ojankohs_state::ojankoy_rombank_w) { - membank("bank1")->set_entry(data & 0x1f); m_adpcm_reset = BIT(data, 5); @@ -94,7 +93,6 @@ static void ojankohs_adpcm_int( device_t *device ) WRITE8_MEMBER(ojankohs_state::ojankoc_ctrl_w) { - membank("bank1")->set_entry(data & 0x0f); m_adpcm_reset = BIT(data, 4); @@ -791,7 +789,6 @@ static const msm5205_interface msm5205_config = MACHINE_START_MEMBER(ojankohs_state,common) { - m_maincpu = machine().device("maincpu"); m_msm = machine().device("msm"); @@ -836,7 +833,6 @@ MACHINE_START_MEMBER(ojankohs_state,ojankoc) void ojankohs_state::machine_reset() { - m_portselect = 0; m_adpcm_reset = 0; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index f7a77c0f63a..cc45fad657d 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -423,13 +423,11 @@ GFXDECODE_END void olibochu_state::machine_start() { - save_item(NAME(m_cmd)); } void olibochu_state::machine_reset() { - m_cmd = 0; } diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 60635ccfddc..375b74e523a 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -64,7 +64,6 @@ READ16_MEMBER(oneshot_state::oneshot_in0_word_r) READ16_MEMBER(oneshot_state::oneshot_gun_x_p1_r) { - /* shots must be in a different location to register */ m_p1_wobble ^= 1; @@ -78,7 +77,6 @@ READ16_MEMBER(oneshot_state::oneshot_gun_y_p1_r) READ16_MEMBER(oneshot_state::oneshot_gun_x_p2_r) { - /* shots must be in a different location to register */ m_p2_wobble ^= 1; @@ -342,7 +340,6 @@ static const ym3812_interface ym3812_config = void oneshot_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -357,7 +354,6 @@ void oneshot_state::machine_start() void oneshot_state::machine_reset() { - m_gun_x_p1 = 0; m_gun_y_p1 = 0; m_gun_x_p2 = 0; diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index acf61775f41..8e16a796eb8 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -428,7 +428,6 @@ ADDRESS_MAP_END void opwolf_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_pc080sn = machine().device("pc080sn"); @@ -447,7 +446,6 @@ void opwolf_state::machine_start() MACHINE_RESET_MEMBER(opwolf_state,opwolf) { - m_adpcm_b[0] = m_adpcm_b[1] = 0; m_adpcm_c[0] = m_adpcm_c[1] = 0; m_adpcm_pos[0] = m_adpcm_pos[1] = 0; diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 7032fe6e86a..19a820b86a4 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -271,7 +271,6 @@ GFXDECODE_END void orbit_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_misc_flags)); diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 42f3be74e06..1d4aad15009 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -225,14 +225,12 @@ WRITE8_MEMBER(othello_state::ack_w) WRITE8_MEMBER(othello_state::ay_address_w) { - if (m_ay_select & 1) ay8910_address_w(m_ay1, space, 0, data); if (m_ay_select & 2) ay8910_address_w(m_ay2, space, 0, data); } WRITE8_MEMBER(othello_state::ay_data_w) { - if (m_ay_select & 1) ay8910_data_w(m_ay1, space, 0, data); if (m_ay_select & 2) ay8910_data_w(m_ay2, space, 0, data); } @@ -274,7 +272,6 @@ WRITE8_MEMBER(othello_state::n7751_rom_control_w) case 3: m_sound_addr &= 0xfff; { - if (!BIT(data, 0)) m_sound_addr |= 0x0000; if (!BIT(data, 1)) m_sound_addr |= 0x1000; if (!BIT(data, 2)) m_sound_addr |= 0x2000; @@ -384,7 +381,6 @@ static const mc6845_interface h46505_intf = void othello_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_mc6845 = machine().device("crtc"); m_n7751 = machine().device("n7751"); @@ -401,7 +397,6 @@ void othello_state::machine_start() void othello_state::machine_reset() { - m_tile_bank = 0; m_ay_select = 0; m_ack_data = 0; diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c index 706f4103535..0d8606d29f7 100644 --- a/src/mame/drivers/othldrby.c +++ b/src/mame/drivers/othldrby.c @@ -220,7 +220,6 @@ GFXDECODE_END void othldrby_state::machine_start() { - save_item(NAME(m_toggle)); save_item(NAME(m_vram_addr)); save_item(NAME(m_vreg_addr)); @@ -229,7 +228,6 @@ void othldrby_state::machine_start() void othldrby_state::machine_reset() { - m_toggle = 0xff; m_vram_addr = 0; m_vreg_addr = 0; diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 35cafaaa254..1953dadc924 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -258,7 +258,6 @@ static void update_irq( running_machine &machine ) WRITE16_MEMBER(othunder_state::irq_ack_w) { - switch (offset) { case 0: @@ -275,14 +274,12 @@ WRITE16_MEMBER(othunder_state::irq_ack_w) INTERRUPT_GEN_MEMBER(othunder_state::vblank_interrupt) { - m_vblank_irq = 1; update_irq(machine()); } TIMER_CALLBACK_MEMBER(othunder_state::ad_interrupt) { - m_ad_irq = 1; update_irq(machine()); } @@ -309,7 +306,6 @@ static const eeprom_interface eeprom_intf = WRITE16_MEMBER(othunder_state::othunder_tc0220ioc_w) { - if (ACCESSING_BITS_0_7) { switch (offset) @@ -350,7 +346,6 @@ WRITE16_MEMBER(othunder_state::othunder_tc0220ioc_w) READ16_MEMBER(othunder_state::othunder_tc0220ioc_r) { - switch (offset) { case 0x03: @@ -670,7 +665,6 @@ static const tc0140syt_interface othunder_tc0140syt_intf = void othunder_state::machine_start() { - membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); @@ -696,7 +690,6 @@ void othunder_state::machine_start() void othunder_state::machine_reset() { - m_vblank_irq = 0; m_ad_irq = 0; m_banknum = 0; diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index 451c0e8a0bb..1018b113275 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -88,7 +88,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(overdriv_state::overdriv_cpuA_scanline) INTERRUPT_GEN_MEMBER(overdriv_state::cpuB_interrupt) { - if (k053246_is_irq_enabled(m_k053246)) device.execute().set_input_line(4, HOLD_LINE); } @@ -96,7 +95,6 @@ INTERRUPT_GEN_MEMBER(overdriv_state::cpuB_interrupt) WRITE16_MEMBER(overdriv_state::cpuA_ctrl_w) { - if (ACCESSING_BITS_0_7) { /* bit 0 probably enables the second 68000 */ @@ -281,7 +279,6 @@ static const k051316_interface overdriv_k051316_intf_2 = void overdriv_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_subcpu = machine().device("sub"); @@ -300,7 +297,6 @@ void overdriv_state::machine_start() void overdriv_state::machine_reset() { - m_cpuB_ctrl = 0; m_sprite_colorbase = 0; m_zoom_colorbase[0] = 0; diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index f7cb8f8ef51..af07cb4db69 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -114,8 +114,6 @@ WRITE8_MEMBER(pachifev_state::controls_w) { if(!data) { - - /*end of input read*/ m_power=0; m_max_power=m_input_power; @@ -305,7 +303,6 @@ static const msm5205_interface msm5205_config = void pachifev_state::machine_reset() { - m_power=0; m_max_power=0; m_input_power=0; @@ -358,7 +355,6 @@ static TMS9928A_INTERFACE(pachifev_tms9928a_interface) void pachifev_state::machine_start() { - save_item(NAME(m_power)); save_item(NAME(m_max_power)); save_item(NAME(m_input_power)); diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c index b0d46835918..48e69d66694 100644 --- a/src/mame/drivers/pacland.c +++ b/src/mame/drivers/pacland.c @@ -398,14 +398,12 @@ static const namco_interface namco_config = INTERRUPT_GEN_MEMBER(pacland_state::main_vblank_irq) { - if(m_main_irq_mask) machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(pacland_state::mcu_vblank_irq) { - if(m_mcu_irq_mask) machine().device("mcu")->execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 762eb09b39b..18819909e2f 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -401,14 +401,12 @@ MACHINE_RESET_MEMBER(pacman_state,superabc) INTERRUPT_GEN_MEMBER(pacman_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } INTERRUPT_GEN_MEMBER(pacman_state::vblank_nmi) { - if(m_irq_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -676,7 +674,6 @@ WRITE8_MEMBER(pacman_state::bigbucks_bank_w) READ8_MEMBER(pacman_state::bigbucks_question_r) { - UINT8 *question = memregion("user1")->base(); UINT8 ret; @@ -6193,7 +6190,6 @@ READ8_MEMBER(pacman_state::cannonbp_protection_r) DRIVER_INIT_MEMBER(pacman_state,cannonbp) { - /* extra memory */ m_maincpu->space(AS_PROGRAM).install_ram(0x4800, 0x4bff); diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 528b56d323f..5893aa5065a 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -37,14 +37,12 @@ Boards: INTERRUPT_GEN_MEMBER(pandoras_state::pandoras_master_interrupt) { - if (m_irq_enable_a) device.execute().set_input_line(M6809_IRQ_LINE, HOLD_LINE); } INTERRUPT_GEN_MEMBER(pandoras_state::pandoras_slave_interrupt) { - if (m_irq_enable_b) device.execute().set_input_line(M6809_IRQ_LINE, HOLD_LINE); } @@ -87,7 +85,6 @@ WRITE8_MEMBER(pandoras_state::pandoras_int_control_w) WRITE8_MEMBER(pandoras_state::pandoras_cpua_irqtrigger_w) { - if (!m_firq_old_data_a && data) m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); @@ -96,7 +93,6 @@ WRITE8_MEMBER(pandoras_state::pandoras_cpua_irqtrigger_w) WRITE8_MEMBER(pandoras_state::pandoras_cpub_irqtrigger_w) { - if (!m_firq_old_data_b && data) m_subcpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE); @@ -110,7 +106,6 @@ WRITE8_MEMBER(pandoras_state::pandoras_i8039_irqtrigger_w) WRITE8_MEMBER(pandoras_state::i8039_irqen_and_status_w) { - /* bit 7 enables IRQ */ if ((data & 0x80) == 0) m_mcu->set_input_line(0, CLEAR_LINE); @@ -292,7 +287,6 @@ GFXDECODE_END void pandoras_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); m_audiocpu = machine().device("audiocpu"); @@ -307,7 +301,6 @@ void pandoras_state::machine_start() void pandoras_state::machine_reset() { - m_firq_old_data_a = 0; m_firq_old_data_b = 0; m_irq_enable_a = 0; diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 318ea8898d4..8c6e9df3721 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -217,7 +217,6 @@ TILE_GET_INFO_MEMBER(panicr_state::get_txttile_info) void panicr_state::video_start() { - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(panicr_state::get_bgtile_info),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); m_infotilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(panicr_state::get_infotile_info),this),TILEMAP_SCAN_ROWS,16,16,1024,16 ); // 3 more bitplanes, contains collision and priority data diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 316688a9077..727648bce3d 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -125,8 +125,7 @@ WRITE8_MEMBER(paradise_state::torus_coin_counter_w) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* ROM (banked) */ \ AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paradise_vram_2_w) AM_SHARE("vram_2") /* Background */ \ AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(paradise_vram_1_w) AM_SHARE("vram_1") /* Midground */ \ - AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(paradise_vram_0_w) AM_SHARE("vram_0") /* Foreground */ \ - + AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(paradise_vram_0_w) AM_SHARE("vram_0") /* Foreground */ static ADDRESS_MAP_START( paradise_map, AS_PROGRAM, 8, paradise_state ) STANDARD_MAP @@ -684,7 +683,6 @@ void paradise_state::machine_start() void paradise_state::machine_reset() { - m_palbank = 0; m_priority = 0; @@ -694,7 +692,6 @@ void paradise_state::machine_reset() INTERRUPT_GEN_MEMBER(paradise_state::paradise_irq) { - if (irq_count<300) irq_count++; else diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 119ab5d3c27..6d0f1ff11c9 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -27,7 +27,6 @@ INTERRUPT_GEN_MEMBER(parodius_state::parodius_interrupt) READ8_MEMBER(parodius_state::bankedram_r) { - if (m_videobank & 0x01) { if (m_videobank & 0x04) @@ -41,7 +40,6 @@ READ8_MEMBER(parodius_state::bankedram_r) WRITE8_MEMBER(parodius_state::bankedram_w) { - if (m_videobank & 0x01) { if (m_videobank & 0x04) @@ -55,7 +53,6 @@ WRITE8_MEMBER(parodius_state::bankedram_w) READ8_MEMBER(parodius_state::parodius_052109_053245_r) { - if (m_videobank & 0x02) return k053245_r(m_k053245, space, offset); else @@ -64,7 +61,6 @@ READ8_MEMBER(parodius_state::parodius_052109_053245_r) WRITE8_MEMBER(parodius_state::parodius_052109_053245_w) { - if (m_videobank & 0x02) k053245_w(m_k053245, space, offset, data); else @@ -73,7 +69,6 @@ WRITE8_MEMBER(parodius_state::parodius_052109_053245_w) WRITE8_MEMBER(parodius_state::parodius_videobank_w) { - if (m_videobank & 0xf8) logerror("%04x: videobank = %02x\n",space.device().safe_pc(),data); @@ -85,7 +80,6 @@ WRITE8_MEMBER(parodius_state::parodius_videobank_w) WRITE8_MEMBER(parodius_state::parodius_3fc0_w) { - if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",space.device().safe_pc(),data); @@ -128,7 +122,6 @@ TIMER_CALLBACK_MEMBER(parodius_state::nmi_callback) WRITE8_MEMBER(parodius_state::sound_arm_nmi_w) { - m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); machine().scheduler().timer_set(attotime::from_usec(50), timer_expired_delegate(FUNC(parodius_state::nmi_callback),this)); /* kludge until the K053260 is emulated correctly */ } diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index b315bc74248..67267279b5f 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -115,7 +115,6 @@ public: WRITE16_MEMBER(pasha2_state::pasha2_misc_w) { - if (offset) { if (data & 0x0800) @@ -173,7 +172,6 @@ WRITE16_MEMBER(pasha2_state::bitmap_0_w) WRITE16_MEMBER(pasha2_state::bitmap_1_w) { - // handle overlapping pixels without writing them switch (mem_mask) { @@ -345,7 +343,6 @@ INPUT_PORTS_END void pasha2_state::video_start() { - save_item(NAME(m_bitmap0)); save_item(NAME(m_bitmap1)); } @@ -400,14 +397,12 @@ UINT32 pasha2_state::screen_update_pasha2(screen_device &screen, bitmap_ind16 &b void pasha2_state::machine_start() { - save_item(NAME(m_old_bank)); save_item(NAME(m_vbuffer)); } void pasha2_state::machine_reset() { - m_old_bank = -1; m_vbuffer = 0; } @@ -472,7 +467,6 @@ ROM_END READ16_MEMBER(pasha2_state::pasha2_speedup_r) { - if(space.device().safe_pc() == 0x8302) space.device().execute().spin_until_interrupt(); diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 143cdee2af8..f6006aa1a4f 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -78,7 +78,6 @@ WRITE8_MEMBER(pbaction_state::pbaction_sh_command_w) WRITE8_MEMBER(pbaction_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -257,7 +256,6 @@ INTERRUPT_GEN_MEMBER(pbaction_state::pbaction_interrupt) void pbaction_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -266,13 +264,11 @@ void pbaction_state::machine_start() void pbaction_state::machine_reset() { - m_scroll = 0; } INTERRUPT_GEN_MEMBER(pbaction_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -464,7 +460,6 @@ ROM_END READ8_MEMBER(pbaction_state::pbactio3_prot_kludge_r) { - /* on startup, the game expect this location to NOT act as RAM */ if (space.device().safe_pc() == 0xab80) return 0; diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c index 2b58413f629..deb9f77443d 100644 --- a/src/mame/drivers/pcat_dyn.c +++ b/src/mame/drivers/pcat_dyn.c @@ -134,7 +134,6 @@ static const struct kbdc8042_interface at8042 = void pcat_dyn_state::machine_start() { - machine().device("maincpu")->execute().set_irq_acknowledge_callback(pcat_irq_callback); init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, pcat_dyn_set_keyb_int); kbdc8042_init(machine(), &at8042); diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index b188270d77b..d247c0748c2 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -327,7 +327,6 @@ READ8_MEMBER(pcxt_state::port_c_r) /* The Korean Tetris uses it as a regular buzzer,probably the sound is all in there...*/ WRITE8_MEMBER(pcxt_state::port_b_w) { - /* PPI controller port B*/ pit8253_gate2_w(m_pit8253, BIT(data, 0)); pcxt_speaker_set_spkrdata( machine(), data & 0x02 ); @@ -412,7 +411,6 @@ WRITE8_MEMBER(pcxt_state::fdc765_data_w) WRITE8_MEMBER(pcxt_state::drive_selection_w) { - /* TODO: properly hook-up upd765 FDC there */ pic8259_ir6_w(machine().device("pic8259_1"), 1); } @@ -588,7 +586,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(pcxt_state::tetriskr_bg_bank_w) { - m_bg_bank = (data & 0x0f) ^ 8; } diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c index efa4098bc0a..eddc4c55439 100644 --- a/src/mame/drivers/pengadvb.c +++ b/src/mame/drivers/pengadvb.c @@ -251,7 +251,6 @@ static void pengadvb_postload(running_machine &machine) void pengadvb_state::machine_start() { - state_save_register_global_pointer(machine(), m_main_mem, 0x4000); state_save_register_global(machine(), m_mem_map); state_save_register_global_array(machine(), m_mem_banks); @@ -260,7 +259,6 @@ void pengadvb_state::machine_start() void pengadvb_state::machine_reset() { - m_mem_map = 0; m_mem_banks[0] = m_mem_banks[1] = m_mem_banks[2] = m_mem_banks[3] = 0; mem_map_banks(machine()); diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index 59b1df66f0b..0c1f1afd02f 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -117,8 +117,6 @@ WRITE8_MEMBER(pengo_state::pengo_coin_counter_w) WRITE8_MEMBER(pengo_state::irq_mask_w) { - - m_irq_mask = data & 1; } @@ -372,7 +370,6 @@ static const namco_interface namco_config = INTERRUPT_GEN_MEMBER(pengo_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/peyper.c b/src/mame/drivers/peyper.c index 7420900f4b5..54473f40206 100644 --- a/src/mame/drivers/peyper.c +++ b/src/mame/drivers/peyper.c @@ -31,7 +31,6 @@ READ8_MEMBER(peyper_state::sw_r) WRITE8_MEMBER(peyper_state::col_w) { - if (data==0x90) display_block = 0; } diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 125ec3aa5c9..58132dcf6a9 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -557,14 +557,11 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 0, "v2", "PGM Bios V2" ) \ ROM_LOAD16_WORD_SWAP_BIOS( 0, "pgm_p02s.u20", 0x00000, 0x020000, CRC(78c15fa2) SHA1(885a6558e022602cc6f482ac9667ba9f61e75092) ) /* Version 2 (Label: IGS | PGM P02S | 1P0792D1 | J992438 )*/ \ ROM_SYSTEM_BIOS( 1, "v1", "PGM Bios V1" ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 1, "pgm_p01s.u20", 0x00000, 0x020000, CRC(e42b166e) SHA1(2a9df9ec746b14b74fae48b1a438da14973702ea) ) /* Version 1 */ \ - + ROM_LOAD16_WORD_SWAP_BIOS( 1, "pgm_p01s.u20", 0x00000, 0x020000, CRC(e42b166e) SHA1(2a9df9ec746b14b74fae48b1a438da14973702ea) ) /* Version 1 */ #define PGM_AUDIO_BIOS \ - ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) \ - + ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) #define PGM_VIDEO_BIOS \ - ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) \ - + ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) /* The Bios - NOT A GAME */ ROM_START( pgm ) ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */ diff --git a/src/mame/drivers/pgm2.c b/src/mame/drivers/pgm2.c index efebf88f440..f6a042022c6 100644 --- a/src/mame/drivers/pgm2.c +++ b/src/mame/drivers/pgm2.c @@ -54,22 +54,18 @@ UINT32 pgm2_state::screen_update_pgm2(screen_device &screen, bitmap_ind16 &bitma void pgm2_state::screen_eof_pgm2(screen_device &screen, bool state) { - } void pgm2_state::video_start() { - } void pgm2_state::machine_start() { - } void pgm2_state::machine_reset() { - } static const gfx_layout tiles8x8_layout = diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index 3da2148922d..f17a3ec9b5f 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -166,7 +166,6 @@ const address_space_config *janshi_vdp_device::memory_space_config(address_space void pinkiri8_state::video_start() { - } /* @@ -229,7 +228,6 @@ UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind1 count2=0; for (i=0x00;i<0x40;i+=2) { - printf("%02x, ", m_janshi_widthflags[i+1]); count2++; @@ -286,7 +284,6 @@ UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind1 for(i=(0x1000/4)-4;i>=0;i--) { - /* vram 1 (video map 0xfc2000) tttt tttt | 00tt tttt | cccc c000 | xxxx xxxx | @@ -1224,7 +1221,6 @@ READ8_MEMBER(pinkiri8_state::ronjan_prot_r) WRITE8_MEMBER(pinkiri8_state::ronjan_prot_w) { - if(data == 0) { m_prot_index = 0; diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index c2749a6064c..06ada74f7b4 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -590,7 +590,6 @@ static const ym2610_interface ym2610_config = MACHINE_START_MEMBER(fromance_state,pipedrm) { - m_subcpu = machine().device("sub"); /* initialize main Z80 bank */ @@ -879,7 +878,6 @@ ROM_END DRIVER_INIT_MEMBER(fromance_state,pipedrm) { - /* sprite RAM lives at the end of palette RAM */ m_spriteram.set_target(&m_generic_paletteram_8[0xc00], 0x400); machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0xcc00, 0xcfff, m_spriteram); diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index cc2388f88bd..ed505974023 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -316,7 +316,6 @@ static const deco16ic_interface pktgaldx_deco16ic_tilegen1_intf = void pktgaldx_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_deco_tilegen1 = machine().device("tilegen1"); diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c index e9389d60c90..398e8e93fd6 100644 --- a/src/mame/drivers/playch10.c +++ b/src/mame/drivers/playch10.c @@ -657,7 +657,6 @@ static GFXDECODE_START( playch10 ) GFXDECODE_END INTERRUPT_GEN_MEMBER(playch10_state::playch10_interrupt){ - /* LS161A, Sheet 1 - bottom left of Z80 */ if ( !m_pc10_dog_di && !m_pc10_nmi_enable ) { device.execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE ); @@ -739,8 +738,7 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 0, "dual", "Dual Monitor Version" ) \ ROM_LOAD_BIOS( 0, "pch1-c.8t", 0x00000, 0x4000, CRC(d52fa07a) SHA1(55cabf52ae10c050c2229081a80b9fe5454ab8c5) ) \ ROM_SYSTEM_BIOS( 1, "single", "Single Monitor Version" ) \ - ROM_LOAD_BIOS( 1, "pck1-c.8t", 0x00000, 0x4000, CRC(503ee8b1) SHA1(3bd20bc71cac742d1b8c1430a6426d0a19db7ad0) ) \ - + ROM_LOAD_BIOS( 1, "pck1-c.8t", 0x00000, 0x4000, CRC(503ee8b1) SHA1(3bd20bc71cac742d1b8c1430a6426d0a19db7ad0) ) #define BIOS_GFX \ ROM_REGION( 0x6000, "gfx1", 0 ) \ ROM_LOAD( "pch1-c.8p", 0x00000, 0x2000, CRC(30c15e23) SHA1(69166afdb2fe827c7f1919cdf4197caccbd961fa) ) \ diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 888addc8fd9..64a1c217b69 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -82,7 +82,6 @@ static const eeprom_interface eeprom_intf = WRITE16_MEMBER(playmark_state::wbeachvl_coin_eeprom_w) { - if (ACCESSING_BITS_0_7) { /* bits 0-3 are coin counters? (only 0 used?) */ @@ -100,7 +99,6 @@ WRITE16_MEMBER(playmark_state::wbeachvl_coin_eeprom_w) WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w) { - if (ACCESSING_BITS_0_7) { coin_counter_w(machine(), 0,data & 0x20); @@ -119,7 +117,6 @@ WRITE16_MEMBER(playmark_state::hrdtimes_coin_w) WRITE16_MEMBER(playmark_state::playmark_snd_command_w) { - if (ACCESSING_BITS_0_7) { m_snd_command = (data & 0xff); @@ -148,7 +145,6 @@ READ8_MEMBER(playmark_state::playmark_snd_command_r) READ8_MEMBER(playmark_state::playmark_snd_flag_r) { - if (m_snd_flag) { m_snd_flag = 0; @@ -1028,7 +1024,6 @@ GFXDECODE_END MACHINE_START_MEMBER(playmark_state,playmark) { - m_oki = machine().device("oki"); m_eeprom = machine().device("eeprom"); @@ -1049,7 +1044,6 @@ MACHINE_START_MEMBER(playmark_state,playmark) MACHINE_RESET_MEMBER(playmark_state,playmark) { - m_bgscrollx = 0; m_bgscrolly = 0; m_bg_enable = 0; diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index d8be1786b2e..26999b8436d 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -207,7 +207,6 @@ READ32_MEMBER(polygonet_state::dsp_host_interface_r) WRITE32_MEMBER(polygonet_state::shared_ram_write) { - COMBINE_DATA(&m_shared_ram[offset]) ; if (mem_mask == 0xffff0000) @@ -725,7 +724,6 @@ INPUT_PORTS_END /**********************************************************************************/ DRIVER_INIT_MEMBER(polygonet_state,polygonet) { - /* Set default bankswitch */ m_cur_sound_region = 2; reset_sound_region(machine()); diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index fb65c69eef3..04a9592c033 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -322,7 +322,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(pntnpuzl_state::coin_inserted) { - /* TODO: change this! */ if(newval) generic_pulse_irq_line(m_maincpu, (UINT8)(FPTR)param, 1); diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c index 535d678db16..97533086fbe 100644 --- a/src/mame/drivers/polyplay.c +++ b/src/mame/drivers/polyplay.c @@ -126,7 +126,6 @@ INTERRUPT_GEN_MEMBER(polyplay_state::periodic_interrupt) INTERRUPT_GEN_MEMBER(polyplay_state::coin_interrupt) { - if (ioport("INPUT")->read() & 0x80) m_last = 0; else diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c index 3868899d73e..da9dadf147a 100644 --- a/src/mame/drivers/pong.c +++ b/src/mame/drivers/pong.c @@ -579,7 +579,6 @@ private: void pong_state::machine_start() { - m_bitmap = auto_bitmap_rgb32_alloc(machine(),H_TOTAL * HRES_MULT,V_TOTAL); m_maincpu->setup().register_callback("sound_cb", net_output_delegate(&pong_state::sound_cb, "pong_state::sound_cb", this)); @@ -607,7 +606,6 @@ UINT32 pong_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, c INPUT_CHANGED_MEMBER(pong_state::input_changed) { - static const double NE555_R = RES_K(5); static const double PRE_R = RES_R(470); diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c index bcb9fe7e04e..2adca048b7a 100644 --- a/src/mame/drivers/pooyan.c +++ b/src/mame/drivers/pooyan.c @@ -26,7 +26,6 @@ INTERRUPT_GEN_MEMBER(pooyan_state::pooyan_interrupt) { - if (m_irq_enable) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -34,7 +33,6 @@ INTERRUPT_GEN_MEMBER(pooyan_state::pooyan_interrupt) WRITE8_MEMBER(pooyan_state::irq_enable_w) { - m_irq_enable = data & 1; if (!m_irq_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); @@ -174,7 +172,6 @@ GFXDECODE_END void pooyan_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_irq_enable)); diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c index 27c981cda54..e1f26ce3d54 100644 --- a/src/mame/drivers/popobear.c +++ b/src/mame/drivers/popobear.c @@ -101,7 +101,6 @@ public: void popobear_state::video_start() { - } static void draw_layer(running_machine &machine, bitmap_ind16 &bitmap,const rectangle &cliprect, UINT8 layer_n) @@ -260,7 +259,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re UINT32 popobear_state::screen_update_popobear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); //popmessage("%04x",m_vregs[0/2]); diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c index 712620487e2..e4e5f3a4b90 100644 --- a/src/mame/drivers/popper.c +++ b/src/mame/drivers/popper.c @@ -146,7 +146,6 @@ READ8_MEMBER(popper_state::popper_soundcpu_nmi_r) WRITE8_MEMBER(popper_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -312,7 +311,6 @@ GFXDECODE_END void popper_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_flipscreen)); @@ -322,7 +320,6 @@ void popper_state::machine_start() void popper_state::machine_reset() { - m_flipscreen = 0; m_e002 = 0; m_gfx_bank = 0; @@ -330,7 +327,6 @@ void popper_state::machine_reset() INTERRUPT_GEN_MEMBER(popper_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/potgoldu.c b/src/mame/drivers/potgoldu.c index a477f62d491..449664c8001 100644 --- a/src/mame/drivers/potgoldu.c +++ b/src/mame/drivers/potgoldu.c @@ -41,18 +41,15 @@ public: void potgold_state::video_start() { - } static void scanline_update(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms34010_display_params *params) { - } void potgold_state::machine_reset() { - } diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index 50d28ac65af..77d7525590b 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -418,7 +418,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const VIDEO_START_MEMBER(playmark_state,powerbal) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::powerbal_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_xoffset = -20; @@ -428,7 +427,6 @@ VIDEO_START_MEMBER(playmark_state,powerbal) UINT32 playmark_state::screen_update_powerbal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; @@ -469,13 +467,11 @@ GFXDECODE_END MACHINE_START_MEMBER(playmark_state,powerbal) { - save_item(NAME(m_tilebank)); } MACHINE_RESET_MEMBER(playmark_state,powerbal) { - m_tilebank = 0; } @@ -676,14 +672,12 @@ ROM_END DRIVER_INIT_MEMBER(playmark_state,powerbal) { - m_bg_yoffset = 16; m_yoffset = -8; } DRIVER_INIT_MEMBER(playmark_state,magicstk) { - m_bg_yoffset = 0; m_yoffset = -5; } diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c index 2a87159133e..1cc82c9f828 100644 --- a/src/mame/drivers/proconn.c +++ b/src/mame/drivers/proconn.c @@ -313,7 +313,6 @@ static Z80CTC_INTERFACE( ctc_intf ) WRITE16_MEMBER(proconn_state::serial_transmit) { - //Don't like the look of this, should be a clock somewhere // if (offset == 0) // m_vfd->write_char( data ); @@ -697,8 +696,7 @@ ROM_END #define pr_batls_sound \ ROM_REGION( 0x80000, "snd", 0 )\ ROM_LOAD( "080snd1.bin", 0x0000, 0x020000, CRC(011170ab) SHA1(60a174c09261c2ee230c4194d918173b41f267de) )\ - ROM_LOAD( "080snd2.bin", 0x020000, 0x020000, CRC(9189793b) SHA1(b47a3c214eb01595581f1e9d18c154560ee02ca1) )\ - + ROM_LOAD( "080snd2.bin", 0x020000, 0x020000, CRC(9189793b) SHA1(b47a3c214eb01595581f1e9d18c154560ee02ca1) ) ROM_START( pr_batls ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "batt72c", 0x0000, 0x010000, CRC(6c6ab1f1) SHA1(6e0663fcdfa1948d9d74b6df388d09fed73f0ed2) ) @@ -758,8 +756,7 @@ ROM_END #define pr_bulls_sound \ ROM_REGION( 0x80000, "snd", 0 )\ ROM_LOAD( "010snd1 316e.bin" , 0x0000, 0x020000, CRC(5e3cfdc6) SHA1(32db10e7bacc6a4728d8821e77789cf146e2a277) )\ - ROM_LOAD( "010snd2 9e9a.bin" , 0x0000, 0x020000, CRC(496a9d51) SHA1(703631d3cb2e3c7fa676cb5a31903bf39ee6c44f) )\ - + ROM_LOAD( "010snd2 9e9a.bin" , 0x0000, 0x020000, CRC(496a9d51) SHA1(703631d3cb2e3c7fa676cb5a31903bf39ee6c44f) ) ROM_START( pr_bulls ) ROM_REGION( 0x80000, "maincpu", 0 ) @@ -834,8 +831,7 @@ ROM_END #define pr_chico_sound\ ROM_REGION( 0x80000, "snd", 0 )\ ROM_LOAD( "006snd1.000", 0x0000, 0x020000, CRC(f906857a) SHA1(cfa47a3e887e6788c577d31bb567f7fbaaf0bbf3) )\ - ROM_LOAD( "006snd2.000", 0x0000, 0x020000, CRC(8445d0ef) SHA1(fd2ecc96f74e99e8f5ea7c7772fbd451ce52e889) )\ - + ROM_LOAD( "006snd2.000", 0x0000, 0x020000, CRC(8445d0ef) SHA1(fd2ecc96f74e99e8f5ea7c7772fbd451ce52e889) ) ROM_START( pr_chico ) ROM_REGION( 0x80000, "maincpu", 0 ) ROM_LOAD( "006a20pn.810", 0x0000, 0x010000, CRC(c4b491b7) SHA1(7629857cf6f1f69fb9ccf82a290a491cf695d373) ) diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c index 4352f8f441b..b4af68261ea 100644 --- a/src/mame/drivers/psattack.c +++ b/src/mame/drivers/psattack.c @@ -113,17 +113,14 @@ ADDRESS_MAP_END void psattack_state::machine_start() { - } void psattack_state::machine_reset() { - } void psattack_state::video_start() { - } @@ -134,12 +131,10 @@ UINT32 psattack_state::screen_update_psattack(screen_device &screen, bitmap_ind1 void psattack_state::screen_eof_psattack(screen_device &screen, bool state) { - } INTERRUPT_GEN_MEMBER(psattack_state::psattack_interrupt) { - } static INPUT_PORTS_START(psattack) @@ -221,7 +216,6 @@ ROM_END DRIVER_INIT_MEMBER(psattack_state,psattack) { - } GAME( 2004, psattack, 0, psattack, psattack, psattack_state, psattack, ROT0, "Uniana", "P's Attack", GAME_IS_SKELETON ) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 2b80ec29bda..3fa51d1905a 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -187,7 +187,6 @@ static const UINT8 s1945j_table[256] = { WRITE32_MEMBER(psikyo_state::s1945_mcu_w) { - // Accesses are always bytes, so resolve it int suboff; @@ -258,7 +257,6 @@ WRITE32_MEMBER(psikyo_state::s1945_mcu_w) READ32_MEMBER(psikyo_state::s1945_mcu_r) { - switch (offset) { case 0: @@ -1014,7 +1012,6 @@ GFXDECODE_END void psikyo_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_soundlatch)); @@ -1026,7 +1023,6 @@ void psikyo_state::machine_start() void psikyo_state::machine_reset() { - m_soundlatch = 0; m_z80_nmi = 0; m_mcu_status = 0; @@ -1797,7 +1793,6 @@ ROM_END DRIVER_INIT_MEMBER(psikyo_state,sngkace) { - { UINT8 *RAM = memregion("ymsnd")->base(); int len = memregion("ymsnd")->bytes(); @@ -1862,7 +1857,6 @@ static void s1945_mcu_init( running_machine &machine ) DRIVER_INIT_MEMBER(psikyo_state,tengai) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this)); @@ -1884,7 +1878,6 @@ DRIVER_INIT_MEMBER(psikyo_state,tengai) DRIVER_INIT_MEMBER(psikyo_state,gunbird) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this)); @@ -1901,7 +1894,6 @@ DRIVER_INIT_MEMBER(psikyo_state,gunbird) DRIVER_INIT_MEMBER(psikyo_state,s1945) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this)); @@ -1923,7 +1915,6 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945) DRIVER_INIT_MEMBER(psikyo_state,s1945a) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this)); @@ -1945,7 +1936,6 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945a) DRIVER_INIT_MEMBER(psikyo_state,s1945j) { - /* input ports*/ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this)); @@ -1967,7 +1957,6 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945j) DRIVER_INIT_MEMBER(psikyo_state,s1945jn) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this)); @@ -1983,7 +1972,6 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945jn) DRIVER_INIT_MEMBER(psikyo_state,s1945bl) { - /* input ports */ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this)); diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 44eb6bb9aad..51d2e0858a2 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -254,7 +254,6 @@ WRITE32_MEMBER(psikyo4_state::ps4_bgpen_2_dword_w) WRITE32_MEMBER(psikyo4_state::ps4_screen1_brt_w) { - if (ACCESSING_BITS_0_7) { /* Need separate brightness for both screens if displaying together */ @@ -284,7 +283,6 @@ WRITE32_MEMBER(psikyo4_state::ps4_screen1_brt_w) WRITE32_MEMBER(psikyo4_state::ps4_screen2_brt_w) { - if (ACCESSING_BITS_0_7) { /* Need separate brightness for both screens if displaying together */ @@ -662,7 +660,6 @@ static const ymf278b_interface ymf278b_config = void psikyo4_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_oldbrt1)); @@ -671,7 +668,6 @@ void psikyo4_state::machine_start() void psikyo4_state::machine_reset() { - m_oldbrt1 = -1; m_oldbrt2 = -1; } diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 3949be838fb..4af294fbe9b 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -796,7 +796,6 @@ static const ymf278b_interface ymf278b_config = void psikyosh_state::machine_start() { - m_maincpu = machine().device("maincpu"); membank("bank2")->configure_entries(0, 0x1000, memregion("gfx1")->base(), 0x20000); diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index 62222fd4baf..9ab1aef3cfa 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -344,7 +344,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(punchout_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -930,7 +929,6 @@ void punchout_state::machine_reset() INTERRUPT_GEN_MEMBER(punchout_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 1021724a3a9..ef3efb76a0b 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -49,7 +49,6 @@ WRITE16_MEMBER(pushman_state::pushman_control_w) READ16_MEMBER(pushman_state::pushman_68705_r) { - if (offset == 0) return m_latch; @@ -66,7 +65,6 @@ READ16_MEMBER(pushman_state::pushman_68705_r) WRITE16_MEMBER(pushman_state::pushman_68705_w) { - if (ACCESSING_BITS_8_15) m_shared_ram[2 * offset] = data >> 8; if (ACCESSING_BITS_0_7) @@ -83,7 +81,6 @@ WRITE16_MEMBER(pushman_state::pushman_68705_w) /* ElSemi - Bouncing balls protection. */ READ16_MEMBER(pushman_state::bballs_68705_r) { - if (offset == 0) return m_latch; if (offset == 3 && m_new_latch) @@ -99,7 +96,6 @@ READ16_MEMBER(pushman_state::bballs_68705_r) WRITE16_MEMBER(pushman_state::bballs_68705_w) { - if (ACCESSING_BITS_8_15) m_shared_ram[2 * offset] = data >> 8; if (ACCESSING_BITS_0_7) @@ -132,7 +128,6 @@ READ8_MEMBER(pushman_state::pushman_68000_r) WRITE8_MEMBER(pushman_state::pushman_68000_w) { - if (offset == 2 && (m_shared_ram[2] & 2) == 0 && data & 2) { m_latch = (m_shared_ram[1] << 8) | m_shared_ram[0]; @@ -402,7 +397,6 @@ static const ym2203_interface ym2203_config = void pushman_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_mcu = machine().device("mcu"); @@ -415,7 +409,6 @@ void pushman_state::machine_start() MACHINE_RESET_MEMBER(pushman_state,pushman) { - m_latch = 0; m_new_latch = 0; m_control[0] = 0; @@ -468,7 +461,6 @@ MACHINE_CONFIG_END MACHINE_RESET_MEMBER(pushman_state,bballs) { - MACHINE_RESET_CALL_MEMBER(pushman); m_latch = 0x400; diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 948e72beaec..051cc982557 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -84,7 +84,6 @@ TILE_GET_INFO_MEMBER(pzletime_state::get_txt_tile_info) void pzletime_state::video_start() { - m_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pzletime_state::get_mid_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 16); m_txt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pzletime_state::get_txt_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -176,7 +175,6 @@ WRITE16_MEMBER(pzletime_state::eeprom_w) WRITE16_MEMBER(pzletime_state::ticket_w) { - if (ACCESSING_BITS_0_7) m_ticket = data & 1; } @@ -309,13 +307,11 @@ void pzletime_state::palette_init() void pzletime_state::machine_start() { - save_item(NAME(m_ticket)); } void pzletime_state::machine_reset() { - m_ticket = 0; } diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 4047dcf5048..0f59360f2cd 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -53,7 +53,6 @@ CUSTOM_INPUT_MEMBER(qdrmfgp_state::battery_sensor_r) WRITE16_MEMBER(qdrmfgp_state::gp_control_w) { - /* bit 0 enable irq 1 (sound) */ /* bit 1 enable irq 2 (not used) */ /* bit 2 enable irq 3 (vblank) */ @@ -86,7 +85,6 @@ WRITE16_MEMBER(qdrmfgp_state::gp_control_w) WRITE16_MEMBER(qdrmfgp_state::gp2_control_w) { - /* bit 2 enable irq 3 (sound) */ /* bit 3 enable irq 4 (vblank) */ /* bit 4 enable irq 5 (hdd) */ diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index 05caeba0855..d10cd7ebe97 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -56,7 +56,6 @@ WRITE8_MEMBER(quasar_state::io_page_select_w) WRITE8_MEMBER(quasar_state::quasar_video_w) { - switch (m_page) { case 0: m_video_ram[offset] = data; break; @@ -303,7 +302,6 @@ static const s2636_interface s2636_2_config = MACHINE_START_MEMBER(quasar_state,quasar) { - MACHINE_START_CALL_MEMBER(cvs); /* register state save */ @@ -314,7 +312,6 @@ MACHINE_START_MEMBER(quasar_state,quasar) MACHINE_RESET_MEMBER(quasar_state,quasar) { - MACHINE_RESET_CALL_MEMBER(cvs); m_effectcontrol = 0; diff --git a/src/mame/drivers/quizshow.c b/src/mame/drivers/quizshow.c index ceba1b0b660..b1a2e732dbb 100644 --- a/src/mame/drivers/quizshow.c +++ b/src/mame/drivers/quizshow.c @@ -151,7 +151,6 @@ WRITE8_MEMBER(quizshow_state::quizshow_lamps3_w) WRITE8_MEMBER(quizshow_state::quizshow_tape_control_w) { - // d2: enable user category select (changes tape head position) output_set_lamp_value(10, data >> 2 & 1); m_category_enable = (data & 0xc) == 0xc; @@ -366,7 +365,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(quizshow_state::quizshow_clock_timer_cb) void quizshow_state::machine_reset() { - m_category_enable = 0; m_tape_head_pos = 0; } diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index b98238902a4..d83c10b79f9 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -283,7 +283,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r while( source>=finish ) { - xpos = (source[0]&0x00000fff); ypos = (source[0]&0x0fff0000)>>16; diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index f2296dd41b7..edcded488e2 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -575,7 +575,6 @@ encryption method! The technique is a combination of a XOR table plus bit-swapping */ static void common_decrypt(running_machine &machine) { - UINT16 *RAM = (UINT16 *)machine.root_device().memregion("maincpu")->base(); int i; diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 37961b9db3f..b965bf2bbb2 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -331,7 +331,6 @@ Stephh's notes (based on the game M68000 code and some tests) : WRITE16_MEMBER(rbisland_state::jumping_sound_w) { - if (ACCESSING_BITS_0_7) { m_jumping_latch = data & 0xff; /*M68000 writes .b to $400007*/ @@ -645,7 +644,6 @@ static const tc0140syt_interface rbisland_tc0140syt_intf = void rbisland_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_pc080sn = machine().device("pc080sn"); diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index ffea9830094..6c2a17b459c 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -206,7 +206,6 @@ TODO: WRITE8_MEMBER(rallyx_state::rallyx_interrupt_vector_w) { - m_maincpu->set_input_line_vector(0, data); m_maincpu->set_input_line(0, CLEAR_LINE); } @@ -214,7 +213,6 @@ WRITE8_MEMBER(rallyx_state::rallyx_interrupt_vector_w) WRITE8_MEMBER(rallyx_state::rallyx_bang_w) { - if (data == 0 && m_last_bang != 0) m_samples->start(0, 0); @@ -873,7 +871,6 @@ static const samples_interface rallyx_samples_interface = MACHINE_START_MEMBER(rallyx_state,rallyx) { - m_maincpu = machine().device("maincpu"); m_samples = machine().device("samples"); @@ -883,21 +880,18 @@ MACHINE_START_MEMBER(rallyx_state,rallyx) MACHINE_RESET_MEMBER(rallyx_state,rallyx) { - m_last_bang = 0; m_stars_enable = 0; } INTERRUPT_GEN_MEMBER(rallyx_state::rallyx_vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(rallyx_state::jungler_vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 29150678c8e..1ce9904cd25 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -365,7 +365,6 @@ void rastan_state::machine_start() void rastan_state::machine_reset() { - m_sprite_ctrl = 0; m_sprites_flipscreen = 0; m_adpcm_pos = 0; diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c index 6370d8e944a..21efdd1317a 100644 --- a/src/mame/drivers/rastersp.c +++ b/src/mame/drivers/rastersp.c @@ -550,7 +550,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( rastersp_state::tms_tx_timer ) TIMER_DEVICE_CALLBACK_MEMBER( rastersp_state::tms_timer1 ) { - } @@ -646,7 +645,6 @@ WRITE32_MEMBER( rastersp_state::dsp_unk_w ) WRITE32_MEMBER( rastersp_state::dsp_486_int_w ) { - update_irq(IRQ_DSP, ASSERT_LINE); } diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 4523e253569..0d85bba4448 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -124,7 +124,6 @@ void rcorsair_state::video_start() UINT32 rcorsair_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - return 0; } diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 97298edbbfb..3fd83b92945 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -326,7 +326,6 @@ GFXDECODE_END MACHINE_START_MEMBER(ladybug_state,redclash) { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_star_speed)); @@ -340,7 +339,6 @@ MACHINE_START_MEMBER(ladybug_state,redclash) MACHINE_RESET_MEMBER(ladybug_state,redclash) { - m_star_speed = 0; m_gfxbank = 0; m_stars_enable = 0; diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c index 0e7777b98b3..70c63cc4be3 100644 --- a/src/mame/drivers/retofinv.c +++ b/src/mame/drivers/retofinv.c @@ -330,14 +330,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(retofinv_state::main_vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } INTERRUPT_GEN_MEMBER(retofinv_state::sub_vblank_irq) { - if(m_sub_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index 634e08bb85a..9cb66d7e775 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -85,7 +85,6 @@ ADDRESS_MAP_END CUSTOM_INPUT_MEMBER(rgum_state::rgum_heartbeat_r) { - m_hbeat ^= 1; return m_hbeat; diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c index a73fd60123f..96400b15236 100644 --- a/src/mame/drivers/rltennis.c +++ b/src/mame/drivers/rltennis.c @@ -71,7 +71,6 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected. READ16_MEMBER(rltennis_state::rlt_io_r) { - return (ioport("P1" )->read()&0x1fff) | (m_unk_counter<<13); /* top 3 bits controls smaple address update */ } @@ -132,7 +131,6 @@ INPUT_PORTS_END TIMER_CALLBACK_MEMBER(rltennis_state::sample_player) { - if((m_dac_counter&0x7ff) == 0x7ff) /* reload top address bits */ { m_sample_rom_offset_1=(( m_data740000 >> m_offset_shift ) & 0xff )<<11; diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index a40bc239cb4..3e4603d0a7c 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -251,7 +251,6 @@ void rockrage_state::machine_start() void rockrage_state::machine_reset() { - m_vreg = 0; m_layer_colorbase[0] = 0x00; m_layer_colorbase[1] = 0x10; diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index 69b9a265b0a..4c0493787de 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -32,7 +32,6 @@ WRITE8_MEMBER(rocnrope_state::rocnrope_interrupt_vector_w) WRITE8_MEMBER(rocnrope_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -188,7 +187,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(rocnrope_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 1a8bf9dcb30..49d0c675e38 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -117,7 +117,6 @@ READ16_MEMBER(rohga_state::rohga_irq_ack_r) { - m_maincpu->set_input_line(6, CLEAR_LINE); return 0; } diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index 9b549c7b02a..11fc8613c8f 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -41,7 +41,6 @@ WRITE8_MEMBER(rollerg_state::rollerg_0010_w) READ8_MEMBER(rollerg_state::rollerg_k051316_r) { - if (m_readzoomroms) return k051316_rom_r(m_k051316, space, offset); else @@ -265,7 +264,6 @@ void rollerg_state::machine_start() void rollerg_state::machine_reset() { - konami_configure_set_lines(machine().device("maincpu"), rollerg_banking); m_readzoomroms = 0; diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index ab73ef18dee..9c6f6fc7c2f 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -24,13 +24,11 @@ WRITE8_MEMBER(rollrace_state::ra_fake_d800_w) WRITE8_MEMBER(rollrace_state::nmi_mask_w) { - m_nmi_mask = data & 1; } WRITE8_MEMBER(rollrace_state::sound_nmi_mask_w) { - m_sound_nmi_mask = data & 1; } @@ -210,14 +208,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(rollrace_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq) { - if(m_sound_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 0b99c7e943d..4518d5ab85b 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -3353,7 +3353,6 @@ MACHINE_CONFIG_END INTERRUPT_GEN_MEMBER(royalmah_state::mjtensin_interrupt) { - m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); // vblank } diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 5f312ebf969..7b610e49b11 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -110,7 +110,6 @@ READ16_MEMBER(rungun_state::rng_sysregs_r) WRITE16_MEMBER(rungun_state::rng_sysregs_w) { - COMBINE_DATA(m_sysreg + offset); switch (offset) @@ -157,14 +156,12 @@ WRITE16_MEMBER(rungun_state::sound_cmd2_w) WRITE16_MEMBER(rungun_state::sound_irq_w) { - if (ACCESSING_BITS_8_15) m_audiocpu->set_input_line(0, HOLD_LINE); } READ16_MEMBER(rungun_state::sound_status_msb_r) { - if (ACCESSING_BITS_8_15) return(m_sound_status << 8); @@ -173,7 +170,6 @@ READ16_MEMBER(rungun_state::sound_status_msb_r) INTERRUPT_GEN_MEMBER(rungun_state::rng_interrupt) { - if (m_sysreg[0x0c / 2] & 0x09) device.execute().set_input_line(M68K_IRQ_5, ASSERT_LINE); } @@ -216,7 +212,6 @@ WRITE8_MEMBER(rungun_state::sound_status_w) WRITE8_MEMBER(rungun_state::z80ctrl_w) { - m_z80_control = data; membank("bank2")->set_entry(data & 0x07); @@ -227,7 +222,6 @@ WRITE8_MEMBER(rungun_state::z80ctrl_w) INTERRUPT_GEN_MEMBER(rungun_state::audio_interrupt) { - if (m_z80_control & 0x80) return; @@ -382,7 +376,6 @@ void rungun_state::machine_start() void rungun_state::machine_reset() { - machine().device("k054539_1")->init_flags(k054539_device::REVERSE_STEREO); memset(m_sysreg, 0, 0x20); diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c index d533af624c2..7340b595997 100644 --- a/src/mame/drivers/s11.c +++ b/src/mame/drivers/s11.c @@ -202,7 +202,6 @@ WRITE_LINE_MEMBER( s11_state::pia_irq ) WRITE8_MEMBER( s11_state::sol3_w ) { - } WRITE8_MEMBER( s11_state::sound_w ) diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 8c2230922a9..34c1f1f6724 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -90,7 +90,6 @@ public: WRITE8_MEMBER(safarir_state::ram_w) { - if (m_ram_bank) m_ram_2[offset] = data; else @@ -102,14 +101,12 @@ WRITE8_MEMBER(safarir_state::ram_w) READ8_MEMBER(safarir_state::ram_r) { - return m_ram_bank ? m_ram_2[offset] : m_ram_1[offset]; } WRITE8_MEMBER(safarir_state::ram_bank_w) { - m_ram_bank = data & 0x01; machine().tilemap().mark_all_dirty(); @@ -193,7 +190,6 @@ TILE_GET_INFO_MEMBER(safarir_state::get_fg_tile_info) void safarir_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(safarir_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(safarir_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -203,7 +199,6 @@ void safarir_state::video_start() UINT32 safarir_state::screen_update_safarir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, *m_bg_scroll); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -317,7 +312,6 @@ MACHINE_CONFIG_END void safarir_state::machine_start() { - m_ram_1 = auto_alloc_array(machine(), UINT8, m_ram.bytes()); m_ram_2 = auto_alloc_array(machine(), UINT8, m_ram.bytes()); m_port_last = 0; diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 06587b462a0..cc8a0e7461f 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -183,7 +183,6 @@ void sandscrp_state::screen_eof_sandscrp(screen_device &screen, bool state) /* Reads the cause of the interrupt */ READ16_MEMBER(sandscrp_state::sandscrp_irq_cause_r) { - return ( m_sprite_irq ? 0x08 : 0 ) | ( m_unknown_irq ? 0x10 : 0 ) | ( m_vblank_irq ? 0x20 : 0 ) ; @@ -193,7 +192,6 @@ READ16_MEMBER(sandscrp_state::sandscrp_irq_cause_r) /* Clear the cause of the interrupt */ WRITE16_MEMBER(sandscrp_state::sandscrp_irq_cause_w) { - if (ACCESSING_BITS_0_7) { // m_sprite_flipx = data & 1; @@ -225,14 +223,12 @@ WRITE16_MEMBER(sandscrp_state::sandscrp_coin_counter_w) READ16_MEMBER(sandscrp_state::sandscrp_latchstatus_word_r) { - return (m_latch1_full ? 0x80 : 0) | (m_latch2_full ? 0x40 : 0) ; } WRITE16_MEMBER(sandscrp_state::sandscrp_latchstatus_word_w) { - if (ACCESSING_BITS_0_7) { m_latch1_full = data & 0x80; @@ -242,14 +238,12 @@ WRITE16_MEMBER(sandscrp_state::sandscrp_latchstatus_word_w) READ16_MEMBER(sandscrp_state::sandscrp_soundlatch_word_r) { - m_latch2_full = 0; return soundlatch2_byte_r(space,0); } WRITE16_MEMBER(sandscrp_state::sandscrp_soundlatch_word_w) { - if (ACCESSING_BITS_0_7) { m_latch1_full = 1; @@ -301,21 +295,18 @@ WRITE8_MEMBER(sandscrp_state::sandscrp_bankswitch_w) READ8_MEMBER(sandscrp_state::sandscrp_latchstatus_r) { - return (m_latch2_full ? 0x80 : 0) | // swapped!? (m_latch1_full ? 0x40 : 0) ; } READ8_MEMBER(sandscrp_state::sandscrp_soundlatch_r) { - m_latch1_full = 0; return soundlatch_byte_r(space,0); } WRITE8_MEMBER(sandscrp_state::sandscrp_soundlatch_w) { - m_latch2_full = 1; soundlatch2_byte_w(space,0,data); } diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c index 338840425c5..bf281c94e9f 100644 --- a/src/mame/drivers/saturn.c +++ b/src/mame/drivers/saturn.c @@ -1939,7 +1939,6 @@ READ32_MEMBER(saturn_state::saturn_null_ram_r) WRITE32_MEMBER(saturn_state::saturn_null_ram_w) { - } READ32_MEMBER(saturn_state::saturn_cart_dram0_r) diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c index cc86cfd98c3..0b8c4bb408a 100644 --- a/src/mame/drivers/sbasketb.c +++ b/src/mame/drivers/sbasketb.c @@ -62,7 +62,6 @@ WRITE8_MEMBER(sbasketb_state::sbasketb_coin_counter_w) WRITE8_MEMBER(sbasketb_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -178,7 +177,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(sbasketb_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 4fb5dc64ead..2758f1d006d 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -120,7 +120,6 @@ WRITE8_MEMBER(sbowling_state::sbw_videoram_w) UINT32 sbowling_state::screen_update_sbowling(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0x18, cliprect); m_sb_tilemap->draw(bitmap, cliprect, 0, 0); copybitmap_trans(bitmap, *m_tmpbitmap, 0, 0, 0, 0, cliprect, m_color_prom_address); @@ -129,19 +128,16 @@ UINT32 sbowling_state::screen_update_sbowling(screen_device &screen, bitmap_ind1 void sbowling_state::video_start() { - m_tmpbitmap = auto_bitmap_ind16_alloc(machine(),32*8,32*8); m_sb_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbowling_state::get_sb_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } WRITE8_MEMBER(sbowling_state::pix_shift_w) { - m_pix_sh = data; } WRITE8_MEMBER(sbowling_state::pix_data_w) { - m_pix[0] = m_pix[1]; m_pix[1] = data; } @@ -215,7 +211,6 @@ WRITE8_MEMBER(sbowling_state::graph_control_w) READ8_MEMBER(sbowling_state::controls_r) { - if (m_sbw_system & 2) return ioport("TRACKY")->read(); else diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c index 62cc23fb412..c7f8af23175 100644 --- a/src/mame/drivers/scotrsht.c +++ b/src/mame/drivers/scotrsht.c @@ -41,14 +41,12 @@ Stephh's notes (based on the game M6502 code and some tests) : WRITE8_MEMBER(scotrsht_state::ctrl_w) { - m_irq_enable = data & 0x02; flip_screen_set(data & 0x08); } INTERRUPT_GEN_MEMBER(scotrsht_state::scotrsht_interrupt) { - if (m_irq_enable) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index 4409503ae0d..8e874c767e0 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -235,7 +235,6 @@ GFXDECODE_END MACHINE_START_MEMBER(scregg_state,scregg) { - m_maincpu = machine().device("maincpu"); m_audiocpu = NULL; @@ -247,7 +246,6 @@ MACHINE_START_MEMBER(scregg_state,scregg) MACHINE_RESET_MEMBER(scregg_state,scregg) { - m_btime_palette = 0; m_bnj_scroll1 = 0; m_bnj_scroll2 = 0; diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 06831055783..f55f8ded075 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -104,7 +104,6 @@ static void recompute_palette_tables( running_machine &machine ); MACHINE_START_MEMBER(segac2_state,segac2) { - state_save_register_global_array(machine(), m_misc_io_data); state_save_register_global(machine(), m_prot_write_buf); state_save_register_global(machine(), m_prot_read_buf); diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 29e2ee347f6..bb0bf3b1e4e 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -1465,7 +1465,6 @@ DRIVER_INIT_MEMBER(segag80r_state,astrob) DRIVER_INIT_MEMBER(segag80r_state,005) { - /* configure the 315-0070 security chip */ m_decrypt = segag80_security(70); diff --git a/src/mame/drivers/segajw.c b/src/mame/drivers/segajw.c index 123ab68b80f..7beb2bfb71b 100644 --- a/src/mame/drivers/segajw.c +++ b/src/mame/drivers/segajw.c @@ -49,7 +49,6 @@ protected: void segajw_state::video_start() { - } UINT32 segajw_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) @@ -84,7 +83,6 @@ void segajw_state::machine_reset() void segajw_state::palette_init() { - } static MACHINE_CONFIG_START( segajw, segajw_state ) diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 17e84c65545..77e84cad17e 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -123,7 +123,6 @@ UINT32 segald_state::screen_update_astron(screen_device &screen, bitmap_rgb32 &b /* READS */ READ8_MEMBER(segald_state::astron_DISC_read) { - if (m_nmi_enable) m_ldv1000_input_latch = m_laserdisc->status_r(); @@ -134,21 +133,18 @@ READ8_MEMBER(segald_state::astron_DISC_read) READ8_MEMBER(segald_state::astron_OUT_read) { - logerror("OUT read (0x%04x) @ 0x%04x [0x%x]\n", m_out_ram[offset], offset, space.device().safe_pc()); return m_out_ram[offset]; } READ8_MEMBER(segald_state::astron_OBJ_read) { - logerror("OBJ read (0x%04x) @ 0x%04x [0x%x]\n", m_obj_ram[offset], offset, space.device().safe_pc()); return m_obj_ram[offset]; } READ8_MEMBER(segald_state::astron_COLOR_read) { - logerror("COLOR read (0x%04x) @ 0x%04x [0x%x]\n", m_color_ram[offset], offset, space.device().safe_pc()); return m_color_ram[offset]; } @@ -157,7 +153,6 @@ READ8_MEMBER(segald_state::astron_COLOR_read) /* WRITES */ WRITE8_MEMBER(segald_state::astron_DISC_write) { - logerror("DISC write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, space.device().safe_pc()); m_ldv1000_output_latch = data; @@ -168,7 +163,6 @@ WRITE8_MEMBER(segald_state::astron_DISC_write) WRITE8_MEMBER(segald_state::astron_OUT_write) { - logerror("OUT write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, space.device().safe_pc()); switch(offset) @@ -205,7 +199,6 @@ WRITE8_MEMBER(segald_state::astron_OUT_write) WRITE8_MEMBER(segald_state::astron_OBJ_write) { - m_obj_ram[offset] = data; logerror("OBJ write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, space.device().safe_pc()); } @@ -235,7 +228,6 @@ WRITE8_MEMBER(segald_state::astron_COLOR_write) WRITE8_MEMBER(segald_state::astron_FIX_write) { - m_fix_ram[offset] = data; /* logerror("FIX write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, space.device().safe_pc()); */ } diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index c63fe473462..0d7f0bb2204 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -7225,8 +7225,7 @@ DRIVER_INIT_MEMBER(isgsm_state,tetrbx) ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASE00 ) \ ROM_REGION( 0x60000, "gfx1", ROMREGION_ERASE00 ) \ ROM_REGION16_BE( 0x200000, "sprites", ROMREGION_ERASE00 ) \ - ROM_REGION( 0x40000, "soundcpu", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x40000, "soundcpu", ROMREGION_ERASE00 ) ROM_START( isgsm ) ISGSM_BIOS diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 3a51b90a4f3..284f7bf53b5 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -2022,7 +2022,6 @@ READ32_MEMBER(seibuspi_state::ejanhs_speedup_r) READ32_MEMBER(seibuspi_state::rf2_speedup_r) { - /* rdft22kc */ if (space.device().safe_pc()==0x0203926) space.device().execute().spin_until_interrupt(); // idle diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c index 3bce0517910..80e68c2bf2b 100644 --- a/src/mame/drivers/seicross.c +++ b/src/mame/drivers/seicross.c @@ -83,13 +83,11 @@ void seicross_state::machine_reset() READ8_MEMBER(seicross_state::friskyt_portB_r) { - return (m_portb & 0x9f) | (ioport("DEBUG")->read_safe(0) & 0x60); } WRITE8_MEMBER(seicross_state::friskyt_portB_w) { - //logerror("PC %04x: 8910 port B = %02x\n", space.device().safe_pc(), data); /* bit 0 is IRQ enable */ m_irq_mask = data & 1; @@ -390,7 +388,6 @@ static const ay8910_interface ay8910_config = INTERRUPT_GEN_MEMBER(seicross_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c index 4dd07da4565..deb1f0f350e 100644 --- a/src/mame/drivers/senjyo.c +++ b/src/mame/drivers/senjyo.c @@ -84,7 +84,6 @@ I/O read/write void senjyo_state::machine_reset() { - /* we must avoid generating interrupts for the first few frames otherwise */ /* Senjyo locks up. There must be an interrupt enable port somewhere, */ /* or maybe interrupts are genenrated by the CTC. */ @@ -94,7 +93,6 @@ void senjyo_state::machine_reset() INTERRUPT_GEN_MEMBER(senjyo_state::senjyo_interrupt) { - if (m_int_delay_kludge == 0) device.execute().set_input_line(0, HOLD_LINE); else m_int_delay_kludge--; } @@ -911,13 +909,11 @@ ROM_END DRIVER_INIT_MEMBER(senjyo_state,starforc) { - m_is_senjyo = 0; m_scrollhack = 1; } DRIVER_INIT_MEMBER(senjyo_state,starfore) { - /* encrypted CPU */ suprloco_decode(machine(), "maincpu"); @@ -927,7 +923,6 @@ DRIVER_INIT_MEMBER(senjyo_state,starfore) DRIVER_INIT_MEMBER(senjyo_state,starfora) { - /* encrypted CPU */ yamato_decode(machine(), "maincpu"); @@ -937,7 +932,6 @@ DRIVER_INIT_MEMBER(senjyo_state,starfora) DRIVER_INIT_MEMBER(senjyo_state,senjyo) { - m_is_senjyo = 1; m_scrollhack = 0; } diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 3ee586501ad..ae2bb2d82fe 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -1518,7 +1518,6 @@ static const ym3438_interface utoukond_ym3438_intf = READ16_MEMBER(seta_state::sharedram_68000_r) { - return ((UINT16)m_sharedram[offset]) & 0xff; } @@ -1546,7 +1545,6 @@ WRITE16_MEMBER(seta_state::sub_ctrl_w) case 0/2: // bit 0: reset sub cpu? if (ACCESSING_BITS_0_7) { - if ( !(m_sub_ctrl_data & 1) && (data & 1) ) machine().device("sub")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); m_sub_ctrl_data = data; @@ -1926,7 +1924,6 @@ READ16_MEMBER(seta_state::zombraid_gun_r)// Serial interface // Bit 0 is clock, 1 is data, 2 is reset WRITE16_MEMBER(seta_state::zombraid_gun_w) { - if(data&4) { m_gun_bit_count = 0; return; } // Reset if((data&1) == m_gun_old_clock) return; // No change @@ -2761,13 +2758,11 @@ ADDRESS_MAP_END READ8_MEMBER(seta_state::wiggie_soundlatch_r) { - return m_wiggie_soundlatch; } WRITE16_MEMBER(seta_state::wiggie_soundlatch_w) { - m_wiggie_soundlatch = data >> 8; machine().device("audiocpu")->execute().set_input_line(0, HOLD_LINE); } @@ -2943,7 +2938,6 @@ READ16_MEMBER(seta_state::inttoote_dsw_r) READ16_MEMBER(seta_state::inttoote_key_r) { - switch( *m_inttoote_key_select ) { case 0x08: return ioport("BET0")->read(); @@ -2959,7 +2953,6 @@ READ16_MEMBER(seta_state::inttoote_key_r) READ16_MEMBER(seta_state::inttoote_700000_r) { - return m_inttoote_700000[offset] & 0x3f; } @@ -3000,7 +2993,6 @@ ADDRESS_MAP_END READ16_MEMBER(seta_state::jockeyc_mux_r) { - switch( m_jockeyc_key_select ) { case 0x08: return ioport("BET0")->read(); @@ -3015,7 +3007,6 @@ READ16_MEMBER(seta_state::jockeyc_mux_r) WRITE16_MEMBER(seta_state::jockeyc_mux_w) { - /* other bits used too */ m_jockeyc_key_select = data & 0xf8; } @@ -10694,7 +10685,6 @@ READ16_MEMBER(seta_state::twineagl_debug_r) /* 2000F8 = A3 enables it, 2000F8 = 00 disables? see downtown too */ READ16_MEMBER(seta_state::twineagl_200100_r) { - // protection check at boot logerror("%04x: twineagl_200100_r %d\n",space.device().safe_pc(),offset); return m_twineagl_xram[offset]; diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 9602f325694..cb89ff278da 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -220,7 +220,6 @@ ADDRESS_MAP_END READ16_MEMBER(seta2_state::mj4simai_p1_r) { - switch (m_keyboard_row) { case 0x01: return ioport("P1_KEY0")->read(); @@ -234,7 +233,6 @@ READ16_MEMBER(seta2_state::mj4simai_p1_r) READ16_MEMBER(seta2_state::mj4simai_p2_r) { - switch (m_keyboard_row) { case 0x01: return ioport("P2_KEY0")->read(); @@ -248,7 +246,6 @@ READ16_MEMBER(seta2_state::mj4simai_p2_r) WRITE16_MEMBER(seta2_state::mj4simai_keyboard_w) { - if (ACCESSING_BITS_0_7) m_keyboard_row = data & 0xff; } @@ -555,13 +552,11 @@ enum { WRITE32_MEMBER(seta2_state::coldfire_regs_w) { - COMBINE_DATA( &m_coldfire_regs[offset] ); } READ32_MEMBER(seta2_state::coldfire_regs_r) { - switch( offset ) { case CF_MBSR: @@ -715,7 +710,6 @@ static void funcube_debug_outputs(running_machine &machine) WRITE8_MEMBER(seta2_state::funcube_leds_w) { - *m_funcube_leds = data; set_led_status( machine(), 0, (~data) & 0x01 ); // win lamp (red) @@ -732,14 +726,12 @@ WRITE8_MEMBER(seta2_state::funcube_leds_w) READ8_MEMBER(seta2_state::funcube_outputs_r) { - // Bits 1,2,3 read return *m_funcube_outputs; } WRITE8_MEMBER(seta2_state::funcube_outputs_w) { - *m_funcube_outputs = data; // Bits 0,1,3 written @@ -2178,7 +2170,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta2_state::funcube_interrupt) INTERRUPT_GEN_MEMBER(seta2_state::funcube_sub_timer_irq) { - if ( m_funcube_serial_count ) { device.execute().set_input_line(H8_SCI_1_RX, HOLD_LINE); diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 46460e8109d..54cff69427c 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -41,7 +41,6 @@ WRITE16_MEMBER(sf_state::sf_coin_w) WRITE16_MEMBER(sf_state::soundcmd_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, offset, data & 0xff); @@ -804,7 +803,6 @@ static const msm5205_interface msm5205_config = void sf_state::machine_start() { - /* devices */ m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -816,7 +814,6 @@ void sf_state::machine_start() void sf_state::machine_reset() { - m_sf_active = 0; m_bgscroll = 0; m_fgscroll = 0; diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index ac4b3639265..a6c232ffb54 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -1062,7 +1062,6 @@ static void sfbonus_draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, UINT32 sfbonus_state::screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int globalyscroll = (m_vregs[2] | m_vregs[3]<<8); int globalxscroll = (m_vregs[0] | m_vregs[1]<<8); UINT8* front_rowscroll = &m_videoram[0x200]; @@ -5848,7 +5847,6 @@ DRIVER_INIT_MEMBER(sfbonus_state,sfbonus_common) printf("X %02x %02x %02x %02x %02x %02x %02x %02x\n", ROM[0x50], ROM[0x51], ROM[0x52], ROM[0x53], ROM[0x54], ROM[0x55],ROM[0x56],ROM[0x57]); { - int x; int y; for (y = 0; y < 0x8; y++) @@ -5889,7 +5887,6 @@ void sfbonus_state::sfbonus_bitswap( UINT8 xor6, UINT8 b60, UINT8 b61, UINT8 b62, UINT8 b63, UINT8 b64, UINT8 b65, UINT8 b66,UINT8 b67, UINT8 xor7, UINT8 b70, UINT8 b71, UINT8 b72, UINT8 b73, UINT8 b74, UINT8 b75, UINT8 b76,UINT8 b77 ) { - int i; UINT8 *ROM = machine().root_device().memregion("maincpu")->base(); diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c index 04f4092d52c..68c7159b8a9 100644 --- a/src/mame/drivers/sfcbox.c +++ b/src/mame/drivers/sfcbox.c @@ -256,7 +256,6 @@ READ8_MEMBER( sfcbox_state::port_83_r ) WRITE8_MEMBER( sfcbox_state::port_83_w ) { - } WRITE8_MEMBER( sfcbox_state::snes_map_0_w ) @@ -470,7 +469,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(sfcbox_state,sfcbox) { - MACHINE_START_CALL_LEGACY(snes); m_is_sfcbox = 1; @@ -478,7 +476,6 @@ MACHINE_START_MEMBER(sfcbox_state,sfcbox) MACHINE_RESET_MEMBER(sfcbox_state,sfcbox) { - MACHINE_RESET_CALL_LEGACY( snes ); /* start with both CPUs disabled */ @@ -524,8 +521,7 @@ MACHINE_CONFIG_END ROM_REGION( 0x10000, "krom", 0 ) \ ROM_LOAD( "krom1.ic1", 0x00000, 0x10000, CRC(c9010002) SHA1(f4c74086a83b728b1c1af3a021a60efa80eff5a4) ) \ ROM_REGION( 0x100000, "user3", 0 ) \ - ROM_LOAD( "atrom-4s-0.rom5", 0x00000, 0x80000, CRC(ad3ec05c) SHA1(a3d336db585fe02a37c323422d9db6a33fd489a6) ) \ - + ROM_LOAD( "atrom-4s-0.rom5", 0x00000, 0x80000, CRC(ad3ec05c) SHA1(a3d336db585fe02a37c323422d9db6a33fd489a6) ) ROM_START( sfcbox ) SFCBOX_BIOS diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index dd65af211f8..cb8b9cd6247 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -282,7 +282,6 @@ WRITE16_MEMBER(shadfrce_state::shadfrce_irq_ack_w) WRITE16_MEMBER(shadfrce_state::shadfrce_irq_w) { - m_irqs_enable = data & 1; /* maybe, it's set/unset inside every trap instruction which is executed */ m_video_enable = data & 8; /* probably */ @@ -303,7 +302,6 @@ WRITE16_MEMBER(shadfrce_state::shadfrce_irq_w) WRITE16_MEMBER(shadfrce_state::shadfrce_scanline_w) { - m_raster_scanline = data; /* guess, 0 is always written */ } diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 7ee71dba5f7..78527f4ce96 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -260,7 +260,6 @@ WRITE8_MEMBER(shougi_state::shougi_mcu_halt_on_w) WRITE8_MEMBER(shougi_state::nmi_disable_and_clear_line_w) { - m_nmi_enabled = 0; /* disable NMIs */ /* NMI lines are tied together on both CPUs and connected to the LS74 /Q output */ @@ -270,13 +269,11 @@ WRITE8_MEMBER(shougi_state::nmi_disable_and_clear_line_w) WRITE8_MEMBER(shougi_state::nmi_enable_w) { - m_nmi_enabled = 1; /* enable NMIs */ } INTERRUPT_GEN_MEMBER(shougi_state::shougi_vblank_nmi) { - if ( m_nmi_enabled == 1 ) { /* NMI lines are tied together on both CPUs and connected to the LS74 /Q output */ diff --git a/src/mame/drivers/shtzone.c b/src/mame/drivers/shtzone.c index 419e4279bc1..9ebe02db017 100644 --- a/src/mame/drivers/shtzone.c +++ b/src/mame/drivers/shtzone.c @@ -73,23 +73,19 @@ INPUT_PORTS_END void shtzone_state::machine_start() { - } void shtzone_state::machine_reset() { - } void shtzone_state::video_start() { - } UINT32 shtzone_state::screen_update_shtzone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - return 0; } diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c index a357cd63d00..ea7d1869580 100644 --- a/src/mame/drivers/sigmab52.c +++ b/src/mame/drivers/sigmab52.c @@ -163,7 +163,6 @@ public: void sigmab52_state::video_start() { - } @@ -191,7 +190,6 @@ UINT32 sigmab52_state::screen_update_jwildb52(screen_device &screen, bitmap_ind1 { for (x = 0; x < (hd63484_regs_r(hd63484, space, 0xca/2, 0xffff) & 0x0fff) * 4; x += 4) { - src = hd63484_ram_r(hd63484, space, b & (HD63484_RAM_SIZE - 1), 0xffff); bitmap.pix16(y, x ) = ((src & 0x000f) >> 0) << 0; @@ -238,7 +236,6 @@ if (!machine().input().code_pressed(KEYCODE_O)) void sigmab52_state::palette_init() { - } diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 5f453829e50..a93be0807c8 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -311,7 +311,6 @@ MACHINE_CONFIG_END ***************************************************************************/ DRIVER_INIT_MEMBER(silkroad_state,silkroad) { - /* why? rom04.bin looks like a bad dump, but it seems not since it was verified as correct... problem with the original which the gfx hardware didn't care about? Ideally it should be checked against a different PCB */ diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c index dbe3d338a16..d5b9006aa44 100644 --- a/src/mame/drivers/silvmil.c +++ b/src/mame/drivers/silvmil.c @@ -31,8 +31,6 @@ public: m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram") { - - } /* memory pointers */ @@ -151,7 +149,6 @@ void silvmil_state::video_start() UINT32 silvmil_state::screen_update_silvmil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_layer->draw(bitmap, cliprect, 0, 0); m_fg_layer->draw(bitmap, cliprect, 0, 0); machine().device("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400); @@ -277,7 +274,6 @@ GFXDECODE_END void silvmil_state::machine_start() { - } void silvmil_state::machine_reset() diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index 8eecca4e2ac..0bb51097cb3 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -260,7 +260,6 @@ TIMER_CALLBACK_MEMBER(simpsons_state::dmaend_callback) INTERRUPT_GEN_MEMBER(simpsons_state::simpsons_irq) { - if (k053246_is_irq_enabled(m_k053246)) { simpsons_objdma(machine()); diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c index 52630f4bdc5..db996eada86 100644 --- a/src/mame/drivers/skeetsht.c +++ b/src/mame/drivers/skeetsht.c @@ -53,7 +53,6 @@ public: void skeetsht_state::machine_reset() { - m_ay = machine().device("aysnd"); m_tms = machine().device("tms"); } @@ -121,7 +120,6 @@ static void skeetsht_tms_irq(device_t *device, int state) WRITE8_MEMBER(skeetsht_state::tms_w) { - if ((offset & 1) == 0) m_lastdataw = data; else @@ -130,7 +128,6 @@ WRITE8_MEMBER(skeetsht_state::tms_w) READ8_MEMBER(skeetsht_state::tms_r) { - if ((offset & 1) == 0) m_lastdatar = tms34010_host_r(m_tms, offset >> 1); @@ -146,13 +143,11 @@ READ8_MEMBER(skeetsht_state::tms_r) READ8_MEMBER(skeetsht_state::hc11_porta_r) { - return m_porta_latch; } WRITE8_MEMBER(skeetsht_state::hc11_porta_w) { - if (!(data & 0x8) && (m_porta_latch & 8)) m_ay_sel = m_porta_latch & 0x10; @@ -161,7 +156,6 @@ WRITE8_MEMBER(skeetsht_state::hc11_porta_w) WRITE8_MEMBER(skeetsht_state::ay8910_w) { - if (m_ay_sel) ay8910_data_w(m_ay, space, 0, data); else diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index 0997f38f7a5..e89e9ea4612 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -513,7 +513,6 @@ static const tms34010_config tms_config = void skimaxx_state::machine_reset() { - } /************************************* diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index f9c3e13247d..3a1f4a87ea7 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -77,14 +77,12 @@ TILE_GET_INFO_MEMBER(skyarmy_state::get_skyarmy_tile_info) WRITE8_MEMBER(skyarmy_state::skyarmy_videoram_w) { - m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(skyarmy_state::skyarmy_colorram_w) { - m_colorram[offset] = data; m_tilemap->mark_tile_dirty(offset); } @@ -120,7 +118,6 @@ void skyarmy_state::palette_init() void skyarmy_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skyarmy_state::get_skyarmy_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tilemap->set_scroll_cols(32); } @@ -158,14 +155,12 @@ UINT32 skyarmy_state::screen_update_skyarmy(screen_device &screen, bitmap_ind16 INTERRUPT_GEN_MEMBER(skyarmy_state::skyarmy_nmi_source) { - if(m_nmi) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } WRITE8_MEMBER(skyarmy_state::nmi_enable_w) { - m_nmi=data & 1; } diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index d30af224770..754e6f34d25 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -213,14 +213,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(skyfox_state::skyfox_interrupt) { - /* Scroll the bg */ m_bg_pos += (m_bg_ctrl >> 1) & 0x7; // maybe.. } void skyfox_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_bg_pos)); @@ -229,7 +227,6 @@ void skyfox_state::machine_start() void skyfox_state::machine_reset() { - m_bg_pos = 0; m_bg_ctrl = 0; } diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index 67b141bd9e8..a20ef5bd17d 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -424,7 +424,6 @@ static const namco_interface namco_config = INTERRUPT_GEN_MEMBER(skykid_state::main_vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } @@ -432,7 +431,6 @@ INTERRUPT_GEN_MEMBER(skykid_state::main_vblank_irq) INTERRUPT_GEN_MEMBER(skykid_state::mcu_vblank_irq) { - if(m_mcu_irq_mask) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index 5f7c1a6a9a9..8e6742cae64 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -163,7 +163,6 @@ TILE_GET_INFO_MEMBER(skylncr_state::get_reel_4_tile_info) void skylncr_state::video_start() { - m_tmap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 0x40, 0x20 ); m_reel_1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skylncr_state::get_reel_1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 64, 8 ); @@ -263,7 +262,6 @@ WRITE8_MEMBER(skylncr_state::reeltileshigh_4_w) WRITE8_MEMBER(skylncr_state::skylncr_paletteram_w) { - if (offset == 0) { m_color = data; @@ -287,7 +285,6 @@ WRITE8_MEMBER(skylncr_state::skylncr_paletteram_w) WRITE8_MEMBER(skylncr_state::skylncr_paletteram2_w) { - if (offset == 0) { m_color2 = data; diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index a457c912910..bfe37692fbd 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -49,21 +49,18 @@ READ8_MEMBER(skyraid_state::skyraid_port_0_r) WRITE8_MEMBER(skyraid_state::skyraid_range_w) { - m_analog_range = data & 0x3f; } WRITE8_MEMBER(skyraid_state::skyraid_offset_w) { - m_analog_offset = data & 0x3f; } WRITE8_MEMBER(skyraid_state::skyraid_scroll_w) { - m_scroll = data; } diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index a311f04ea81..b06226b607c 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -736,7 +736,6 @@ static const ay8910_interface ay8910_interface_2 = INTERRUPT_GEN_MEMBER(slapfght_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index dd6533ad9ae..7911cdefbdc 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -521,7 +521,6 @@ static const tc0140syt_interface slapshot_tc0140syt_intf = void slapshot_state::machine_start() { - membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 56d70a7dfdb..21b5dab4d74 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -143,7 +143,6 @@ static void plot_pixel_pal(running_machine &machine, int x, int y, int addr) WRITE16_MEMBER(sliver_state::fifo_data_w) { - if (m_tmp_counter < 8) { COMBINE_DATA(&m_tempbuf[m_tmp_counter]); @@ -199,7 +198,6 @@ static void blit_gfx(running_machine &machine) WRITE16_MEMBER(sliver_state::fifo_clear_w) { - m_bitmap_fg.fill(0); m_fptr=0; m_tmp_counter=0; @@ -213,7 +211,6 @@ WRITE16_MEMBER(sliver_state::fifo_flush_w) WRITE16_MEMBER(sliver_state::jpeg1_w) { - COMBINE_DATA(&m_jpeg1); } @@ -233,7 +230,6 @@ static void render_jpeg(running_machine &machine) /* Access libJPEG */ { - struct jpeg_decompress_struct cinfo; struct jpeg_error_mgr jerr; JSAMPARRAY buffer; @@ -276,7 +272,6 @@ static void render_jpeg(running_machine &machine) WRITE16_MEMBER(sliver_state::jpeg2_w) { - COMBINE_DATA(&m_jpeg2); render_jpeg(machine()); @@ -285,13 +280,11 @@ WRITE16_MEMBER(sliver_state::jpeg2_w) WRITE16_MEMBER(sliver_state::io_offset_w) { - COMBINE_DATA(&m_io_offset); } WRITE16_MEMBER(sliver_state::io_data_w) { - if (m_io_offset < IO_SIZE) { int tmpx, tmpy; @@ -369,14 +362,12 @@ ADDRESS_MAP_END void sliver_state::video_start() { - machine().primary_screen->register_screen_bitmap(m_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_bitmap_fg); } UINT32 sliver_state::screen_update_sliver(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - copybitmap (bitmap, m_bitmap_bg, 0, 0, 0, 0, cliprect); copybitmap_trans(bitmap, m_bitmap_fg, 0, 0, 0, 0, cliprect, 0); return 0; diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index fbf454c6ab9..c5cfe2838b9 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -316,7 +316,6 @@ enum WRITE8_MEMBER(snk_state::marvins_soundlatch_w) { - m_marvins_sound_busy_flag = 1; soundlatch_byte_w(space, offset, data); machine().device("audiocpu")->execute().set_input_line(0, HOLD_LINE); @@ -324,14 +323,12 @@ WRITE8_MEMBER(snk_state::marvins_soundlatch_w) READ8_MEMBER(snk_state::marvins_soundlatch_r) { - m_marvins_sound_busy_flag = 0; return soundlatch_byte_r(space, 0); } CUSTOM_INPUT_MEMBER(snk_state::marvins_sound_busy) { - return m_marvins_sound_busy_flag; } @@ -345,7 +342,6 @@ READ8_MEMBER(snk_state::marvins_sound_nmi_ack_r) TIMER_CALLBACK_MEMBER(snk_state::sgladiat_sndirq_update_callback) { - switch(param) { case CMDIRQ_BUSY_ASSERT: @@ -415,7 +411,6 @@ READ8_MEMBER(snk_state::sgladiat_sound_irq_ack_r) TIMER_CALLBACK_MEMBER(snk_state::sndirq_update_callback) { - switch(param) { case YM1IRQ_ASSERT: @@ -496,7 +491,6 @@ WRITE8_MEMBER(snk_state::snk_soundlatch_w) CUSTOM_INPUT_MEMBER(snk_state::snk_sound_busy) { - return (m_sound_status & 4) ? 1 : 0; } @@ -504,7 +498,6 @@ CUSTOM_INPUT_MEMBER(snk_state::snk_sound_busy) READ8_MEMBER(snk_state::snk_sound_status_r) { - return m_sound_status; } @@ -797,19 +790,16 @@ WRITE8_MEMBER(snk_state::tdfever_coin_counter_w) WRITE8_MEMBER(snk_state::countryc_trackball_w) { - m_countryc_trackball = data & 1; } CUSTOM_INPUT_MEMBER(snk_state::countryc_trackball_x) { - return ioport(m_countryc_trackball ? "TRACKBALLX2" : "TRACKBALLX1")->read(); } CUSTOM_INPUT_MEMBER(snk_state::countryc_trackball_y) { - return ioport(m_countryc_trackball ? "TRACKBALLY2" : "TRACKBALLY1")->read(); } @@ -2185,8 +2175,7 @@ static INPUT_PORTS_START( tnk3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY - PORT_BIT( 0xf0, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(15) PORT_KEYDELTA(1) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE PORT_FULL_TURN_COUNT(12) \ - + PORT_BIT( 0xf0, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(12) PORT_WRAPS PORT_SENSITIVITY(15) PORT_KEYDELTA(1) PORT_CODE_DEC(KEYCODE_Z) PORT_CODE_INC(KEYCODE_X) PORT_REVERSE PORT_FULL_TURN_COUNT(12) PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c index dcc5c1c0261..eb94a576864 100644 --- a/src/mame/drivers/snk6502.c +++ b/src/mame/drivers/snk6502.c @@ -324,7 +324,6 @@ CUSTOM_INPUT_MEMBER(snk6502_state::snk6502_music0_r) CUSTOM_INPUT_MEMBER(snk6502_state::sasuke_count_r) { - return (m_sasuke_counter >> 4); } @@ -740,7 +739,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(snk6502_state::satansat_interrupt) { - if(m_irq_mask) device.execute().set_input_line(M6502_IRQ_LINE, HOLD_LINE); /* one IRQ per frame */ } diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 1a3f1588ba5..700d804e55e 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -51,13 +51,11 @@ Notes: READ16_MEMBER(snk68_state::sound_status_r) { - return (m_sound_status << 8); } WRITE8_MEMBER(snk68_state::sound_status_w) { - m_sound_status = data; } diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c index 95287ce5ba7..a9a92d77a1b 100644 --- a/src/mame/drivers/solomon.c +++ b/src/mame/drivers/solomon.c @@ -40,7 +40,6 @@ READ8_MEMBER(solomon_state::solomon_0xe603_r) WRITE8_MEMBER(solomon_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -195,7 +194,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(solomon_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c index 115b4aba063..eca7f1b7b65 100644 --- a/src/mame/drivers/sonson.c +++ b/src/mame/drivers/sonson.c @@ -227,7 +227,6 @@ GFXDECODE_END void sonson_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_last_irq)); @@ -235,7 +234,6 @@ void sonson_state::machine_start() void sonson_state::machine_reset() { - m_last_irq = 0; } diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c index e38d082457f..de794ab8caa 100644 --- a/src/mame/drivers/spcforce.c +++ b/src/mame/drivers/spcforce.c @@ -41,13 +41,11 @@ TODO: WRITE8_MEMBER(spcforce_state::spcforce_SN76496_latch_w) { - m_sn76496_latch = data; } READ8_MEMBER(spcforce_state::spcforce_SN76496_select_r) { - if (~m_sn76496_select & 0x40) return m_sn1->ready_r(); if (~m_sn76496_select & 0x20) return m_sn2->ready_r(); if (~m_sn76496_select & 0x10) return m_sn3->ready_r(); @@ -58,7 +56,6 @@ READ8_MEMBER(spcforce_state::spcforce_SN76496_select_r) WRITE8_MEMBER(spcforce_state::spcforce_SN76496_select_w) { - m_sn76496_select = data; if (~data & 0x40) m_sn1->write(space, 0, m_sn76496_latch); @@ -81,7 +78,6 @@ WRITE8_MEMBER(spcforce_state::spcforce_soundtrigger_w) WRITE8_MEMBER(spcforce_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -255,7 +251,6 @@ static const sn76496_config psg_intf = INTERRUPT_GEN_MEMBER(spcforce_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(3, HOLD_LINE); } diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c index 15a40ddfa85..1f6ec782cb5 100644 --- a/src/mame/drivers/speedatk.c +++ b/src/mame/drivers/speedatk.c @@ -106,7 +106,6 @@ static UINT8 iox_key_matrix_calc(running_machine &machine, UINT8 p_side) READ8_MEMBER(speedatk_state::key_matrix_r) { - if(m_coin_impulse > 0) { m_coin_impulse--; @@ -141,14 +140,12 @@ READ8_MEMBER(speedatk_state::key_matrix_r) WRITE8_MEMBER(speedatk_state::key_matrix_w) { - m_mux_data = data; } /* Key matrix status,used for coin settings and I don't know what else... */ READ8_MEMBER(speedatk_state::key_matrix_status_r) { - /* bit 0: busy flag,active low */ return (m_km_status & 0xfe) | 1; } @@ -166,7 +163,6 @@ a1 */ WRITE8_MEMBER(speedatk_state::key_matrix_status_w) { - m_km_status = data; if((m_km_status & 0xf0) == 0x80) //coinage setting command m_coin_settings = m_km_status & 0xf; @@ -303,7 +299,6 @@ static const mc6845_interface mc6845_intf = WRITE8_MEMBER(speedatk_state::speedatk_output_w) { - m_flip_scr = data & 0x80; if((data & 0x7f) != 0x7f) diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index 5944b238bab..c1fff51554e 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -107,7 +107,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(splash_state::splash_adpcm_data_w) { - m_adpcm_data = data; } @@ -133,7 +132,6 @@ ADDRESS_MAP_END READ16_MEMBER(splash_state::roldfrog_bombs_r) { - m_ret ^= 0x100; return m_ret; } @@ -293,7 +291,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(splash_state,funystrp) { - m_adpcm_data = 0; m_ret = 0x100; } @@ -486,7 +483,6 @@ static const msm5205_interface splash_msm5205_interface = MACHINE_RESET_MEMBER(splash_state,splash) { - m_adpcm_data = 0; m_ret = 0x100; } @@ -999,14 +995,12 @@ ROM_END DRIVER_INIT_MEMBER(splash_state,splash) { - m_bitmap_type = 0; m_sprite_attr2_shift = 8; } DRIVER_INIT_MEMBER(splash_state,splash10) { - m_bitmap_type = 0; m_sprite_attr2_shift = 0; } diff --git a/src/mame/drivers/splus.c b/src/mame/drivers/splus.c index 48f036ea997..10d55e2ec3e 100644 --- a/src/mame/drivers/splus.c +++ b/src/mame/drivers/splus.c @@ -140,7 +140,6 @@ static const i2cmem_interface i2cmem_interface = WRITE8_MEMBER(splus_state::splus_io_w) { - // P1.0 = Reel 1 Controller // P1.1 = Reel 2 Controller // P1.2 = Reel 3 Controller @@ -153,7 +152,6 @@ WRITE8_MEMBER(splus_state::splus_io_w) // Process Port 1 if (offset == 1 && ((data & 0x1f) != 0x00)) { - // Unknown Bit 7 m_p1_unknown = (~data & 0x80); @@ -191,14 +189,12 @@ WRITE8_MEMBER(splus_state::splus_io_w) WRITE8_MEMBER(splus_state::splus_load_pulse_w) { - // UINT8 out = 0; // out = ((~m_io_port[1] & 0xf0)>>4); // Output Bank } WRITE8_MEMBER(splus_state::splus_serial_w) { - UINT8 out = 0; out = ((~m_io_port[1] & 0xe0)>>5); // Output Bank @@ -340,7 +336,6 @@ WRITE8_MEMBER(splus_state::splus_serial_w) WRITE8_MEMBER(splus_state::splus_7seg_w) { - static const UINT8 ls48_map[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 }; UINT8 seg; @@ -373,7 +368,6 @@ WRITE8_MEMBER(splus_state::i2c_nvram_w) READ8_MEMBER(splus_state::splus_serial_r) { - UINT8 coin_out = 0x00; UINT8 coin_optics = 0x00; UINT8 door_optics = 0x00; @@ -520,7 +514,6 @@ READ8_MEMBER(splus_state::splus_m_reel_ram_r) READ8_MEMBER(splus_state::splus_io_r) { - if (offset == 3) return m_io_port[offset] & 0xf3; // Ignore Int0 and Int1, or machine will loop forever waiting else @@ -579,7 +572,6 @@ READ8_MEMBER(splus_state::splus_reel_optics_r) DRIVER_INIT_MEMBER(splus_state,splus) { - UINT8 *reel_data = memregion( "reeldata" )->base(); // Load Reel Data diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 7b8d957e5f2..6328c60ad58 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -64,7 +64,6 @@ public: WRITE8_MEMBER(spoker_state::bg_tile_w) { - m_bg_tile_ram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -83,21 +82,18 @@ TILE_GET_INFO_MEMBER(spoker_state::get_fg_tile_info) WRITE8_MEMBER(spoker_state::fg_tile_w) { - m_fg_tile_ram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(spoker_state::fg_color_w) { - m_fg_color_ram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } void spoker_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spoker_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 32, 128, 8); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spoker_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 128, 32); m_fg_tilemap->set_transparent_pen(0); @@ -105,7 +101,6 @@ void spoker_state::video_start() UINT32 spoker_state::screen_update_spoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -131,7 +126,6 @@ static void show_out(UINT8 *out) WRITE8_MEMBER(spoker_state::spoker_nmi_and_coins_w) { - if ((data) & (0x22)) { logerror("PC %06X: nmi_and_coins = %02x\n",space.device().safe_pc(),data); @@ -156,7 +150,6 @@ WRITE8_MEMBER(spoker_state::spoker_nmi_and_coins_w) WRITE8_MEMBER(spoker_state::spoker_video_and_leds_w) { - set_led_status(machine(), 4, data & 0x01); // start? set_led_status(machine(), 5, data & 0x04); // l_bet? @@ -169,7 +162,6 @@ WRITE8_MEMBER(spoker_state::spoker_video_and_leds_w) WRITE8_MEMBER(spoker_state::spoker_leds_w) { - set_led_status(machine(), 0, data & 0x01); // stop_1 set_led_status(machine(), 1, data & 0x02); // stop_2 set_led_status(machine(), 2, data & 0x04); // stop_3 @@ -182,7 +174,6 @@ WRITE8_MEMBER(spoker_state::spoker_leds_w) WRITE8_MEMBER(spoker_state::spoker_magic_w) { - m_igs_magic[offset] = data; if (offset == 0) @@ -201,7 +192,6 @@ WRITE8_MEMBER(spoker_state::spoker_magic_w) READ8_MEMBER(spoker_state::spoker_magic_r) { - switch(m_igs_magic[0]) { case 0x00: @@ -514,7 +504,6 @@ GFXDECODE_END void spoker_state::machine_reset() { - m_nmi_ack = 0; m_hopper = 0; m_video_enable = 1; @@ -522,7 +511,6 @@ void spoker_state::machine_reset() INTERRUPT_GEN_MEMBER(spoker_state::spoker_interrupt) { - device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index fba8c37c366..812428e7366 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -134,27 +134,23 @@ TILE_GET_INFO_MEMBER(spool99_state::get_spool99_tile_info) void spool99_state::video_start() { - m_sc0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(spool99_state::get_spool99_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 spool99_state::screen_update_spool99(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_sc0_tilemap->draw(bitmap, cliprect, 0,0); return 0; } WRITE8_MEMBER(spool99_state::spool99_vram_w) { - m_vram[offset] = data; m_sc0_tilemap->mark_tile_dirty(offset/2); } WRITE8_MEMBER(spool99_state::spool99_cram_w) { - m_cram[offset] = data; m_sc0_tilemap->mark_tile_dirty(offset/2); } @@ -423,7 +419,6 @@ ROM_END DRIVER_INIT_MEMBER(spool99_state,spool99) { - UINT8 *ROM = memregion("maincpu")->base(); // vram = auto_alloc_array(machine(), UINT8, 0x2000); memcpy(m_main, ROM, 0x100); diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index f13555782a0..69f6b63c6c6 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -263,14 +263,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(sprcros2_state::sprcros2_m_interrupt) INTERRUPT_GEN_MEMBER(sprcros2_state::sprcros2_s_interrupt) { - if(m_s_port3&0x01) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } void sprcros2_state::machine_start() { - save_item(NAME(m_port7)); save_item(NAME(m_s_port3)); } diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 5f391127376..6c722fc1b23 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -28,14 +28,12 @@ INTERRUPT_GEN_MEMBER(spy_state::spy_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) device.execute().set_input_line(0, HOLD_LINE); } READ8_MEMBER(spy_state::spy_bankedram1_r) { - if (m_rambank & 1) { return m_generic_paletteram_8[offset]; @@ -59,7 +57,6 @@ READ8_MEMBER(spy_state::spy_bankedram1_r) WRITE8_MEMBER(spy_state::spy_bankedram1_w) { - if (m_rambank & 1) { paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space,offset,data); @@ -248,7 +245,6 @@ static void spy_collision( running_machine &machine ) WRITE8_MEMBER(spy_state::spy_3f90_w) { - /********************************************************************* * * Signals, from schematic: @@ -351,7 +347,6 @@ WRITE8_MEMBER(spy_state::sound_bank_w) READ8_MEMBER(spy_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -367,7 +362,6 @@ READ8_MEMBER(spy_state::k052109_051960_r) WRITE8_MEMBER(spy_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -519,7 +513,6 @@ void spy_state::machine_start() void spy_state::machine_reset() { - m_rambank = 0; m_pmcbank = 0; m_video_enable = 0; diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 5cc44a0a719..e56bfb573c8 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -223,31 +223,26 @@ UINT32 srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bit READ32_MEMBER(srmp5_state::srmp5_palette_r) { - return m_palram[offset]; } WRITE32_MEMBER(srmp5_state::srmp5_palette_w) { - COMBINE_DATA(&m_palram[offset]); palette_set_color(machine(), offset, MAKE_RGB(data << 3 & 0xFF, data >> 2 & 0xFF, data >> 7 & 0xFF)); } WRITE32_MEMBER(srmp5_state::bank_w) { - COMBINE_DATA(&m_databank); } READ32_MEMBER(srmp5_state::tileram_r) { - return m_tileram[offset]; } WRITE32_MEMBER(srmp5_state::tileram_w) { - m_tileram[offset] = data & 0xFFFF; //lower 16bit only #ifdef DEBUG_CHAR m_tileduty[offset >> 6] = 1; @@ -256,13 +251,11 @@ WRITE32_MEMBER(srmp5_state::tileram_w) READ32_MEMBER(srmp5_state::spr_r) { - return m_sprram[offset]; } WRITE32_MEMBER(srmp5_state::spr_w) { - m_sprram[offset] = data & 0xFFFF; //lower 16bit only } @@ -278,7 +271,6 @@ READ32_MEMBER(srmp5_state::data_r) WRITE32_MEMBER(srmp5_state::input_select_w) { - m_input_select = data & 0x0F; } @@ -308,14 +300,12 @@ READ32_MEMBER(srmp5_state::srmp5_inputs_r) //almost all cmds are sound related WRITE32_MEMBER(srmp5_state::cmd1_w) { - m_cmd1 = data & 0xFF; logerror("cmd1_w %08X\n", data); } WRITE32_MEMBER(srmp5_state::cmd2_w) { - m_cmd2 = data & 0xFF; m_cmd_stat = 5; logerror("cmd2_w %08X\n", data); @@ -323,20 +313,17 @@ WRITE32_MEMBER(srmp5_state::cmd2_w) READ32_MEMBER(srmp5_state::cmd_stat32_r) { - return m_cmd_stat; } READ32_MEMBER(srmp5_state::srmp5_vidregs_r) { - logerror("vidregs read %08X %08X\n", offset << 2, m_vidregs[offset]); return m_vidregs[offset]; } WRITE32_MEMBER(srmp5_state::srmp5_vidregs_w) { - COMBINE_DATA(&m_vidregs[offset]); if(offset != 0x10C / 4) logerror("vidregs write %08X %08X\n", offset << 2, m_vidregs[offset]); @@ -389,20 +376,17 @@ ADDRESS_MAP_END READ8_MEMBER(srmp5_state::cmd1_r) { - m_cmd_stat = 0; return m_cmd1; } READ8_MEMBER(srmp5_state::cmd2_r) { - return m_cmd2; } READ8_MEMBER(srmp5_state::cmd_stat8_r) { - return m_cmd_stat; } diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 4da3b557374..244ce9c954c 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -157,7 +157,6 @@ static void update_palette(running_machine &machine) void srmp6_state::video_start() { - m_tileram = auto_alloc_array_clear(machine(), UINT16, 0x100000*16/2); m_dmaram.allocate(0x100/2); m_sprram_old = auto_alloc_array_clear(machine(), UINT16, 0x80000/2); @@ -206,7 +205,6 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit /* Main spritelist is 0x0000 - 0x1fff in spriteram, sublists follow */ while (mainlist_offset<0x2000/2) { - UINT16 *sprite_sublist = &m_sprram_old[sprite_list[mainlist_offset+1]<<3]; UINT16 sublist_length=sprite_list[mainlist_offset+0]&0x7fff; //+1 ? INT16 global_x,global_y, flip_x, flip_y; @@ -262,7 +260,6 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit { for(yw=0;ywread(); @@ -328,10 +323,8 @@ READ16_MEMBER(srmp6_state::srmp6_inputs_r) WRITE16_MEMBER(srmp6_state::video_regs_w) { - switch(offset) { - case 0x5e/2: // bank switch, used by ROM check { const UINT8 *rom = memregion("nile")->base(); @@ -369,7 +362,6 @@ WRITE16_MEMBER(srmp6_state::video_regs_w) READ16_MEMBER(srmp6_state::video_regs_r) { - logerror("video_regs_r (PC=%06X): %04x\n", space.device().safe_pcbase(), offset*2); return m_video_regs[offset]; } @@ -487,13 +479,11 @@ WRITE16_MEMBER(srmp6_state::srmp6_dma_w) /* if tileram is actually bigger than the mapped area, how do we access the rest? */ READ16_MEMBER(srmp6_state::tileram_r) { - return m_chrram[offset]; } WRITE16_MEMBER(srmp6_state::tileram_w) { - //UINT16 tmp; COMBINE_DATA(&m_chrram[offset]); diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c index 1bbedac36f3..da3b36e77b7 100644 --- a/src/mame/drivers/sshot.c +++ b/src/mame/drivers/sshot.c @@ -190,7 +190,6 @@ public: TILE_GET_INFO_MEMBER(supershot_state::get_supershot_text_tile_info) { - UINT8 code = m_videoram[tile_index]; SET_TILE_INFO_MEMBER(0, code, 0, 0); } @@ -208,7 +207,6 @@ UINT32 supershot_state::screen_update_supershot(screen_device &screen, bitmap_in WRITE8_MEMBER(supershot_state::supershot_vidram_w) { - m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 0aa71b6d81f..4ccee55786e 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -311,7 +311,6 @@ WRITE8_MEMBER(ssingles_state::ssingles_colorram_w) void ssingles_state::video_start() { - { int i; for(i=0;i= 0x40) { if (data == 0xfe) { @@ -442,13 +441,11 @@ READ8_MEMBER(sslam_state::playmark_snd_command_r) WRITE8_MEMBER(sslam_state::playmark_oki_w) { - m_oki_command = data; } WRITE8_MEMBER(sslam_state::playmark_snd_control_w) { - m_oki_control = data; if (data & 3) @@ -930,7 +927,6 @@ DRIVER_INIT_MEMBER(sslam_state,sslam) DRIVER_INIT_MEMBER(sslam_state,powerbls) { - save_item(NAME(m_oki_control)); save_item(NAME(m_oki_command)); save_item(NAME(m_oki_bank)); diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c index ace16b002fb..5e56e5c347e 100644 --- a/src/mame/drivers/ssozumo.c +++ b/src/mame/drivers/ssozumo.c @@ -42,7 +42,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(ssozumo_state::sound_nmi_mask_w) { - m_sound_nmi_mask = data & 1; } @@ -182,7 +181,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(ssozumo_state::sound_timer_irq) { - if(m_sound_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 91c3b2ece93..699e50e6796 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -133,7 +133,6 @@ UINT32 sstrangr_state::screen_update_sstrngr2(screen_device &screen, bitmap_rgb3 WRITE8_MEMBER(sstrangr_state::port_w) { - m_flip_screen = data & 0x20; } diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 75a42a086c2..55b1814df5c 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -228,7 +228,6 @@ WRITE16_MEMBER(ssv_state::ssv_irq_ack_w) */ WRITE16_MEMBER(ssv_state::ssv_irq_enable_w) { - COMBINE_DATA(&m_irq_enable); } @@ -345,13 +344,11 @@ ADDRESS_MAP_END READ16_MEMBER(ssv_state::dsp_dr_r) { - return m_dsp->snesdsp_read(true); } WRITE16_MEMBER(ssv_state::dsp_dr_w) { - m_dsp->snesdsp_write(true, data); } @@ -421,8 +418,7 @@ READ16_MEMBER(ssv_state::fake_r){ return ssv_scroll[offset]; } AM_RANGE(0x240000, 0x240071) AM_WRITE(ssv_irq_ack_w ) /* IRQ Ack */ \ AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w) /* IRQ En */ \ AM_RANGE(0x300000, 0x30007f) AM_DEVREADWRITE8_LEGACY("ensoniq", es5506_r, es5506_w, 0x00ff) /* Sound */ \ - AM_RANGE(_ROM, 0xffffff) AM_ROMBANK("bank1") /* ROM */ \ - + AM_RANGE(_ROM, 0xffffff) AM_ROMBANK("bank1") /* ROM */ /*************************************************************************** Drift Out '94 ***************************************************************************/ @@ -606,13 +602,11 @@ ADDRESS_MAP_END READ16_MEMBER(ssv_state::ssv_mainram_r) { - return m_mainram[offset]; } WRITE16_MEMBER(ssv_state::ssv_mainram_w) { - COMBINE_DATA(&m_mainram[offset]); } @@ -743,7 +737,6 @@ READ16_MEMBER(ssv_state::sxyreact_ballswitch_r) READ16_MEMBER(ssv_state::sxyreact_dial_r) { - return ((m_sxyreact_serial >> 1) & 0x80); } @@ -752,7 +745,6 @@ WRITE16_MEMBER(ssv_state::sxyreact_dial_w) { if (ACCESSING_BITS_0_7) { - if (data & 0x20) m_sxyreact_serial = ioport("PADDLE")->read_safe(0) & 0xff; @@ -817,7 +809,6 @@ ADDRESS_MAP_END READ32_MEMBER(ssv_state::latch32_r) { - if(!offset) m_latches[2]&=~2; return m_latches[offset]; @@ -825,7 +816,6 @@ READ32_MEMBER(ssv_state::latch32_r) WRITE32_MEMBER(ssv_state::latch32_w) { - if(!offset) m_latches[2]|=1; COMBINE_DATA(&m_latches[offset]); @@ -834,7 +824,6 @@ WRITE32_MEMBER(ssv_state::latch32_w) READ16_MEMBER(ssv_state::latch16_r) { - if(!offset) m_latches[2]&=~1; return m_latches[offset]; @@ -842,7 +831,6 @@ READ16_MEMBER(ssv_state::latch16_r) WRITE16_MEMBER(ssv_state::latch16_w) { - if(!offset) m_latches[2]|=2; m_latches[offset]=data; @@ -894,7 +882,6 @@ WRITE16_MEMBER(ssv_state::eaglshot_gfxrom_w) READ16_MEMBER(ssv_state::eaglshot_trackball_r) { - switch(m_trackball_select) { case 0x60: return (ioport("TRACKX")->read() >> 8) & 0xff; @@ -918,13 +905,11 @@ WRITE16_MEMBER(ssv_state::eaglshot_trackball_w) READ16_MEMBER(ssv_state::eaglshot_gfxram_r) { - return m_eaglshot_gfxram[offset + (m_scroll[0x76/2] & 0xf) * 0x40000/2]; } WRITE16_MEMBER(ssv_state::eaglshot_gfxram_w) { - offset += (m_scroll[0x76/2] & 0xf) * 0x40000/2; COMBINE_DATA(&m_eaglshot_gfxram[offset]); machine().gfx[0]->mark_dirty(offset / (16*8/2)); diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index 5fe51c68919..599b9561e75 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -70,7 +70,6 @@ READ8_MEMBER(st0016_state::mux_r) WRITE8_MEMBER(st0016_state::mux_select_w) { - mux_port=data; } diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c index 17b5f2ba807..ab9d37f6630 100644 --- a/src/mame/drivers/stactics.c +++ b/src/mame/drivers/stactics.c @@ -55,7 +55,6 @@ Verify Color PROM resistor values (Last 8 colors) CUSTOM_INPUT_MEMBER(stactics_state::get_motor_not_ready) { - /* if the motor is self-centering, but not centered yet */ return ((*m_motor_on & 0x01) == 0) && ((m_horiz_pos != 0) || (m_vert_pos != 0)); @@ -64,14 +63,12 @@ CUSTOM_INPUT_MEMBER(stactics_state::get_motor_not_ready) READ8_MEMBER(stactics_state::vert_pos_r) { - return 0x70 - m_vert_pos; } READ8_MEMBER(stactics_state::horiz_pos_r) { - return m_horiz_pos + 0x88; } @@ -153,7 +150,6 @@ WRITE8_MEMBER(stactics_state::stactics_coin_lockout_w) INTERRUPT_GEN_MEMBER(stactics_state::stactics_interrupt) { - move_motor(machine(), this); device.execute().set_input_line(0, HOLD_LINE); @@ -283,7 +279,6 @@ INPUT_PORTS_END void stactics_state::machine_start() { - m_vert_pos = 0; m_horiz_pos = 0; *m_motor_on = 0; diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index 7f4ae62eb0e..9ec34ecb4c8 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -363,13 +363,11 @@ ROM_END DRIVER_INIT_MEMBER(stlforce_state,stlforce) { - m_sprxoffs = 0; } DRIVER_INIT_MEMBER(stlforce_state,twinbrat) { - m_sprxoffs = 9; } diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c index 5bfaf5c5ecc..9924cd71e2e 100644 --- a/src/mame/drivers/strnskil.c +++ b/src/mame/drivers/strnskil.c @@ -26,7 +26,6 @@ Notes: READ8_MEMBER(strnskil_state::strnskil_d800_r) { - /* bit0: interrupt type?, bit1: CPU2 busack? */ return (m_irq_source); diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 5adf3fa0ec5..8d63e943aed 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -138,7 +138,6 @@ READ8_MEMBER(saturn_state::magzun_ioga_r) WRITE8_MEMBER(saturn_state::magzun_ioga_w) { - switch(offset) { case 0x13: m_serial_tx = (data << 8) | (m_serial_tx & 0xff); break; @@ -181,7 +180,6 @@ READ8_MEMBER(saturn_state::stvmp_ioga_r) WRITE8_MEMBER(saturn_state::stvmp_ioga_w) { - switch(offset) { case 0x09: m_mux_data = data ^ 0xff; break; @@ -208,7 +206,6 @@ READ32_MEMBER(saturn_state::stv_ioga_r32) WRITE32_MEMBER(saturn_state::stv_ioga_w32) { - if(ACCESSING_BITS_16_23) stv_ioga_w(space,offset*4+1,data >> 16); if(ACCESSING_BITS_0_7) @@ -366,7 +363,6 @@ DRIVER_INIT_MEMBER(saturn_state,critcrsh) READ32_MEMBER(saturn_state::magzun_hef_hack_r) { - if(space.device().safe_pc()==0x604bf20) return 0x00000001; //HWEF if(space.device().safe_pc()==0x604bfbe) return 0x00000002; //HREF @@ -376,7 +372,6 @@ READ32_MEMBER(saturn_state::magzun_hef_hack_r) READ32_MEMBER(saturn_state::magzun_rx_hack_r) { - if(space.device().safe_pc()==0x604c006) return 0x40; return m_workram_h[0x0ff3b4/4]; @@ -491,7 +486,6 @@ CPU0: Aids Screen DRIVER_INIT_MEMBER(saturn_state,puyosun) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6021cf0); sh2drc_add_pcflush(machine().device("slave"), 0x60236fe); @@ -514,7 +508,6 @@ CPU0 Data East Logo: DRIVER_INIT_MEMBER(saturn_state,mausuke) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x60461A0); DRIVER_INIT_CALL(stv); @@ -525,7 +518,6 @@ DRIVER_INIT_MEMBER(saturn_state,mausuke) DRIVER_INIT_MEMBER(saturn_state,cottonbm) { - // sh2drc_add_pcflush(machine().device("maincpu"), 0x6030ee2); // sh2drc_add_pcflush(machine().device("slave"), 0x6032b52); @@ -536,7 +528,6 @@ DRIVER_INIT_MEMBER(saturn_state,cottonbm) DRIVER_INIT_MEMBER(saturn_state,cotton2) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6031c7a); sh2drc_add_pcflush(machine().device("slave"), 0x60338ea); @@ -575,7 +566,6 @@ DRIVER_INIT_MEMBER(saturn_state,diehard) DRIVER_INIT_MEMBER(saturn_state,fhboxers) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x60041c2); sh2drc_add_pcflush(machine().device("maincpu"), 0x600bb0a); sh2drc_add_pcflush(machine().device("maincpu"), 0x600b31e); @@ -587,7 +577,6 @@ DRIVER_INIT_MEMBER(saturn_state,fhboxers) DRIVER_INIT_MEMBER(saturn_state,groovef) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6005e7c); sh2drc_add_pcflush(machine().device("maincpu"), 0x6005e86); sh2drc_add_pcflush(machine().device("maincpu"), 0x60a4970); @@ -602,7 +591,6 @@ DRIVER_INIT_MEMBER(saturn_state,groovef) DRIVER_INIT_MEMBER(saturn_state,danchih) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6028b28); sh2drc_add_pcflush(machine().device("maincpu"), 0x6028c8e); sh2drc_add_pcflush(machine().device("slave"), 0x602ae26); @@ -614,7 +602,6 @@ DRIVER_INIT_MEMBER(saturn_state,danchih) DRIVER_INIT_MEMBER(saturn_state,danchiq) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6028b28); sh2drc_add_pcflush(machine().device("maincpu"), 0x6028c8e); sh2drc_add_pcflush(machine().device("slave"), 0x602ae26); @@ -652,7 +639,6 @@ bp 6001d22 (60ffef0) READ32_MEMBER(saturn_state::astrass_hack_r) { - if(space.device().safe_pc() == 0x60011ba) return 0x00000000; return m_workram_h[0x000770/4]; @@ -672,7 +658,6 @@ DRIVER_INIT_MEMBER(saturn_state,astrass) DRIVER_INIT_MEMBER(saturn_state,thunt) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x602A024); sh2drc_add_pcflush(machine().device("maincpu"), 0x6013EEA); sh2drc_add_pcflush(machine().device("slave"), 0x602AAF8); @@ -684,7 +669,6 @@ DRIVER_INIT_MEMBER(saturn_state,thunt) DRIVER_INIT_MEMBER(saturn_state,sandor) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x602a0f8); sh2drc_add_pcflush(machine().device("maincpu"), 0x6013fbe); sh2drc_add_pcflush(machine().device("slave"), 0x602abcc); @@ -695,7 +679,6 @@ DRIVER_INIT_MEMBER(saturn_state,sandor) DRIVER_INIT_MEMBER(saturn_state,grdforce) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6041e32); sh2drc_add_pcflush(machine().device("slave"), 0x6043aa2); @@ -706,7 +689,6 @@ DRIVER_INIT_MEMBER(saturn_state,grdforce) DRIVER_INIT_MEMBER(saturn_state,batmanfr) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x60121c0); sh2drc_add_pcflush(machine().device("slave"), 0x60125bc); @@ -718,7 +700,6 @@ DRIVER_INIT_MEMBER(saturn_state,batmanfr) DRIVER_INIT_MEMBER(saturn_state,colmns97) { - sh2drc_add_pcflush(machine().device("slave"), 0x60298a2); DRIVER_INIT_CALL(stv); @@ -728,7 +709,6 @@ DRIVER_INIT_MEMBER(saturn_state,colmns97) DRIVER_INIT_MEMBER(saturn_state,winterht) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6098aea); sh2drc_add_pcflush(machine().device("slave"), 0x609ae4e); @@ -739,7 +719,6 @@ DRIVER_INIT_MEMBER(saturn_state,winterht) DRIVER_INIT_MEMBER(saturn_state,seabass) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x602cbfa); sh2drc_add_pcflush(machine().device("slave"), 0x60321ee); @@ -750,7 +729,6 @@ DRIVER_INIT_MEMBER(saturn_state,seabass) DRIVER_INIT_MEMBER(saturn_state,vfremix) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x602c30c); sh2drc_add_pcflush(machine().device("slave"), 0x604c332); @@ -761,7 +739,6 @@ DRIVER_INIT_MEMBER(saturn_state,vfremix) DRIVER_INIT_MEMBER(saturn_state,sss) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6026398); sh2drc_add_pcflush(machine().device("slave"), 0x6028cd6); @@ -774,7 +751,6 @@ DRIVER_INIT_MEMBER(saturn_state,sss) DRIVER_INIT_MEMBER(saturn_state,othellos) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x602bcbe); sh2drc_add_pcflush(machine().device("slave"), 0x602d92e); @@ -785,7 +761,6 @@ DRIVER_INIT_MEMBER(saturn_state,othellos) DRIVER_INIT_MEMBER(saturn_state,sasissu) { - sh2drc_add_pcflush(machine().device("slave"), 0x60710be); DRIVER_INIT_CALL(stv); @@ -810,7 +785,6 @@ DRIVER_INIT_MEMBER(saturn_state,suikoenb) DRIVER_INIT_MEMBER(saturn_state,sokyugrt) { - DRIVER_INIT_CALL(stv); m_minit_boost_timeslice = m_sinit_boost_timeslice = attotime::from_usec(50); @@ -818,7 +792,6 @@ DRIVER_INIT_MEMBER(saturn_state,sokyugrt) DRIVER_INIT_MEMBER(saturn_state,znpwfv) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6012ec2); sh2drc_add_pcflush(machine().device("slave"), 0x60175a6); @@ -828,7 +801,6 @@ DRIVER_INIT_MEMBER(saturn_state,znpwfv) DRIVER_INIT_MEMBER(saturn_state,twcup98) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x605edde); sh2drc_add_pcflush(machine().device("slave"), 0x6062bca); @@ -840,7 +812,6 @@ DRIVER_INIT_MEMBER(saturn_state,twcup98) DRIVER_INIT_MEMBER(saturn_state,smleague) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6063bf4); sh2drc_add_pcflush(machine().device("slave"), 0x6062bca); @@ -853,7 +824,6 @@ DRIVER_INIT_MEMBER(saturn_state,smleague) DRIVER_INIT_MEMBER(saturn_state,finlarch) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6064d60); DRIVER_INIT_CALL(stv); @@ -865,7 +835,6 @@ DRIVER_INIT_MEMBER(saturn_state,finlarch) DRIVER_INIT_MEMBER(saturn_state,maruchan) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x601ba46); sh2drc_add_pcflush(machine().device("slave"), 0x601ba46); @@ -876,7 +845,6 @@ DRIVER_INIT_MEMBER(saturn_state,maruchan) DRIVER_INIT_MEMBER(saturn_state,pblbeach) { - //sh2drc_add_pcflush(machine().device("maincpu"), 0x605eb78); DRIVER_INIT_CALL(stv); @@ -894,7 +862,6 @@ DRIVER_INIT_MEMBER(saturn_state,shanhigw) DRIVER_INIT_MEMBER(saturn_state,elandore) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x604eac0); sh2drc_add_pcflush(machine().device("slave"), 0x605340a); @@ -906,7 +873,6 @@ DRIVER_INIT_MEMBER(saturn_state,elandore) DRIVER_INIT_MEMBER(saturn_state,rsgun) { - sh2drc_add_pcflush(machine().device("maincpu"), 0x6034d04); sh2drc_add_pcflush(machine().device("slave"), 0x6036152); @@ -1000,8 +966,7 @@ ROM_LOAD16_WORD_SWAP_BIOS( x, "saturn.bin", 0x000000, 0x080000, CRC(653ff2d8) SH ROM_REGION( 0x080000, "slave", 0 ) /* SH2 code */ \ ROM_COPY( "maincpu",0,0,0x080000) \ \ - ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ \ - + ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ ROM_START( stvbios ) STV_BIOS diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c index 44d93645c01..6b40f05861e 100644 --- a/src/mame/drivers/su2000.c +++ b/src/mame/drivers/su2000.c @@ -180,7 +180,6 @@ WRITE_LINE_MEMBER(su2000_state::su2000_pic8259_1_set_int_line) READ8_MEMBER(su2000_state::get_slave_ack) { - if (offset == 2) { // IRQ = 2 @@ -281,7 +280,6 @@ void su2000_state::machine_start() void su2000_state::machine_reset() { - } diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index d3e1304ce1d..f77468675ce 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -253,7 +253,6 @@ WRITE8_MEMBER(sub_state::subm_to_sound_w) WRITE8_MEMBER(sub_state::nmi_mask_w) { - m_nmi_en = data & 1; } @@ -421,7 +420,6 @@ void sub_state::palette_init() INTERRUPT_GEN_MEMBER(sub_state::subm_sound_irq) { - if(m_nmi_en) machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index d66bfac8a68..1eaa82d9f97 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -62,7 +62,6 @@ enum vram_t // Layers struct layer_t { - UINT8 *videorams[2]; UINT8 *scrollrams[2]; diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c index 416c883dc9f..b70dd17f2a1 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -293,7 +293,6 @@ GFXDECODE_END void summit_state::palette_init() { - } static MACHINE_CONFIG_START( summit, summit_state ) diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 8aa316fed13..857449f9edc 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -321,7 +321,6 @@ static const deco16ic_interface supbtime_deco16ic_tilegen1_intf = void supbtime_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c index 28bfa30caff..6c805e2e576 100644 --- a/src/mame/drivers/superchs.c +++ b/src/mame/drivers/superchs.c @@ -119,7 +119,6 @@ READ32_MEMBER(superchs_state::superchs_input_r) WRITE32_MEMBER(superchs_state::superchs_input_w) { - #if 0 { char t[64]; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index f557e994200..83864a5924b 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -64,13 +64,11 @@ TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) void superdq_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(superdq_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 superdq_state::screen_update_superdq(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; @@ -126,7 +124,6 @@ void superdq_state::palette_init() void superdq_state::machine_reset() { - m_ld_in_latch = 0; m_ld_out_latch = 0xff; m_color_bank = 0; @@ -134,7 +131,6 @@ void superdq_state::machine_reset() INTERRUPT_GEN_MEMBER(superdq_state::superdq_vblank) { - /* status is read when the STATUS line from the laserdisc toggles (600usec after the vblank). We could set up a timer to do that, but this works as well */ @@ -149,7 +145,6 @@ INTERRUPT_GEN_MEMBER(superdq_state::superdq_vblank) WRITE8_MEMBER(superdq_state::superdq_videoram_w) { - m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } @@ -185,13 +180,11 @@ WRITE8_MEMBER(superdq_state::superdq_io_w) READ8_MEMBER(superdq_state::superdq_ld_r) { - return m_ld_in_latch; } WRITE8_MEMBER(superdq_state::superdq_ld_w) { - m_ld_out_latch = data; } diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index ad9ae21f001..4259a497ff0 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -487,7 +487,6 @@ WRITE8_MEMBER(superqix_state::pbillian_z80_mcu_w) READ8_MEMBER(superqix_state::pbillian_from_mcu_r) { - switch (m_from_z80) { case 0x01: @@ -981,14 +980,12 @@ static const ay8910_interface bootleg_ay8910_interface_2 = INTERRUPT_GEN_MEMBER(superqix_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(superqix_state::sqix_timer_irq) { - if (m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 15c7c23e876..c45e3b782fd 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -208,7 +208,6 @@ void supertnk_state::video_start() WRITE8_MEMBER(supertnk_state::supertnk_videoram_w) { - if (m_bitplane_select > 2) { m_videoram[0][offset] = 0; @@ -235,14 +234,12 @@ READ8_MEMBER(supertnk_state::supertnk_videoram_r) WRITE8_MEMBER(supertnk_state::supertnk_bitplane_select_0_w) { - m_bitplane_select = (m_bitplane_select & 0x02) | ((data << 0) & 0x01); } WRITE8_MEMBER(supertnk_state::supertnk_bitplane_select_1_w) { - m_bitplane_select = (m_bitplane_select & 0x01) | ((data << 1) & 0x02); } diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c index 253cd6b6dfb..47f853023dd 100644 --- a/src/mame/drivers/superwng.c +++ b/src/mame/drivers/superwng.c @@ -117,7 +117,6 @@ void superwng_state::video_start() UINT32 superwng_state::screen_update_superwng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); rectangle tmp = cliprect; @@ -208,7 +207,6 @@ WRITE8_MEMBER(superwng_state::superwng_nmi_enable_w) INTERRUPT_GEN_MEMBER(superwng_state::superwng_nmi_interrupt) { - if (BIT(m_nmi_enable, 0)) nmi_line_pulse(device); } @@ -428,7 +426,6 @@ GFXDECODE_END void superwng_state::machine_start() { - save_item(NAME(m_tile_bank)); save_item(NAME(m_sound_byte)); save_item(NAME(m_nmi_enable)); @@ -436,7 +433,6 @@ void superwng_state::machine_start() void superwng_state::machine_reset() { - m_sound_byte = 0; m_nmi_enable = 0; } diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 1f783f92adb..9412997b397 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -85,7 +85,6 @@ TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) void suprgolf_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprgolf_state::get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32 ); m_paletteram = auto_alloc_array(machine(), UINT8, 0x1000); m_bg_vram = auto_alloc_array(machine(), UINT8, 0x2000*0x20); @@ -141,7 +140,6 @@ UINT32 suprgolf_state::screen_update_suprgolf(screen_device &screen, bitmap_ind1 READ8_MEMBER(suprgolf_state::suprgolf_videoram_r) { - if (m_palette_switch) return m_paletteram[offset]; else @@ -150,7 +148,6 @@ READ8_MEMBER(suprgolf_state::suprgolf_videoram_r) WRITE8_MEMBER(suprgolf_state::suprgolf_videoram_w) { - if(m_palette_switch) { int r,g,b,datax; @@ -173,13 +170,11 @@ WRITE8_MEMBER(suprgolf_state::suprgolf_videoram_w) READ8_MEMBER(suprgolf_state::suprgolf_vregs_r) { - return m_vreg_bank; } WRITE8_MEMBER(suprgolf_state::suprgolf_vregs_w) { - //printf("%02x\n",data); //bits 0,1,2 and probably 3 controls the background vram banking @@ -195,7 +190,6 @@ WRITE8_MEMBER(suprgolf_state::suprgolf_vregs_w) READ8_MEMBER(suprgolf_state::suprgolf_bg_vram_r) { - return m_bg_vram[offset+m_bg_bank*0x2000]; } @@ -246,19 +240,16 @@ WRITE8_MEMBER(suprgolf_state::suprgolf_bg_vram_w) WRITE8_MEMBER(suprgolf_state::suprgolf_pen_w) { - m_vreg_pen = data; } WRITE8_MEMBER(suprgolf_state::adpcm_data_w) { - m_msm5205next = data; } READ8_MEMBER(suprgolf_state::rom_bank_select_r) { - return m_rom_bank; } @@ -482,7 +473,6 @@ GFXDECODE_END void suprgolf_state::machine_reset() { - m_msm_nmi_mask = 0; } diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index 258d1e4a4ed..edcc4e3a97b 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -296,7 +296,6 @@ static const k053936_interface suprslam_k053936_intf = void suprslam_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); m_k053936 = machine().device("k053936"); @@ -307,7 +306,6 @@ void suprslam_state::machine_start() void suprslam_state::machine_reset() { - m_screen_bank = 0; m_bg_bank = 0; m_pending_command = 0; diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index 307fc6efb1a..0deac277088 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -26,7 +26,6 @@ INTERRUPT_GEN_MEMBER(surpratk_state::surpratk_interrupt) READ8_MEMBER(surpratk_state::bankedram_r) { - if (m_videobank & 0x02) { if (m_videobank & 0x04) @@ -42,7 +41,6 @@ READ8_MEMBER(surpratk_state::bankedram_r) WRITE8_MEMBER(surpratk_state::bankedram_w) { - if (m_videobank & 0x02) { if (m_videobank & 0x04) @@ -58,7 +56,6 @@ WRITE8_MEMBER(surpratk_state::bankedram_w) WRITE8_MEMBER(surpratk_state::surpratk_videobank_w) { - logerror("%04x: videobank = %02x\n",space.device().safe_pc(),data); /* bit 0 = select 053245 at 0000-07ff */ /* bit 1 = select palette at 0000-07ff */ @@ -68,7 +65,6 @@ WRITE8_MEMBER(surpratk_state::surpratk_videobank_w) WRITE8_MEMBER(surpratk_state::surpratk_5fc0_w) { - if ((data & 0xf4) != 0x10) logerror("%04x: 3fc0 = %02x\n",space.device().safe_pc(),data); diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 8ff61fd2cf3..6e5201fa25e 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -110,7 +110,6 @@ INTERRUPT_GEN_MEMBER(segas1x_bootleg_state::sys16_interrupt) WRITE16_MEMBER(segas1x_bootleg_state::sound_command_nmi_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -148,7 +147,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(segas1x_bootleg_state::sound_command_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -158,7 +156,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::sound_command_w) WRITE16_MEMBER(segas1x_bootleg_state::sys16_coinctrl_w) { - if (ACCESSING_BITS_0_7) { m_coinctrl = data & 0xff; @@ -286,7 +283,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(segas1x_bootleg_state::sys16_tilebank_w) { - if (ACCESSING_BITS_0_7) { switch (offset & 1) @@ -381,7 +377,6 @@ static const msm5205_interface tturfbl_msm5205_interface = READ8_MEMBER(segas1x_bootleg_state::tturfbl_soundbank_r) { - if (m_soundbank_ptr) return m_soundbank_ptr[offset & 0x3fff]; return 0x80; @@ -664,28 +659,24 @@ static void datsu_set_pages( running_machine &machine ) WRITE16_MEMBER(segas1x_bootleg_state::datsu_page0_w) { - COMBINE_DATA(&m_datsu_page[0]); datsu_set_pages(machine()); } WRITE16_MEMBER(segas1x_bootleg_state::datsu_page1_w) { - COMBINE_DATA(&m_datsu_page[1]); datsu_set_pages(machine()); } WRITE16_MEMBER(segas1x_bootleg_state::datsu_page2_w) { - COMBINE_DATA(&m_datsu_page[2]); datsu_set_pages(machine()); } WRITE16_MEMBER(segas1x_bootleg_state::datsu_page3_w) { - COMBINE_DATA(&m_datsu_page[3]); datsu_set_pages(machine()); } @@ -868,7 +859,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(segas1x_bootleg_state::eswat_tilebank0_w) { - if (ACCESSING_BITS_0_7) { m_eswat_tilebank0 = data & 0xff; @@ -933,7 +923,6 @@ ADDRESS_MAP_END READ16_MEMBER(segas1x_bootleg_state::beautyb_unkx_r) { - m_beautyb_unkx++; m_beautyb_unkx &= 0x7f; return m_beautyb_unkx; @@ -1002,7 +991,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(segas1x_bootleg_state::sys18_refreshenable_w) { - if (ACCESSING_BITS_0_7) { m_refreshenable = data & 0x02; @@ -1011,7 +999,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys18_refreshenable_w) WRITE16_MEMBER(segas1x_bootleg_state::sys18_tilebank_w) { - if (ACCESSING_BITS_0_7) { m_tile_bank0 = (data >> 0) & 0x0f; @@ -1021,7 +1008,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys18_tilebank_w) READ8_MEMBER(segas1x_bootleg_state::system18_bank_r) { - if (m_sound_bank != NULL) return m_sound_bank[offset]; @@ -1105,7 +1091,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(segas1x_bootleg_state::sound_command_irq_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, 0, data & 0xff); @@ -1196,7 +1181,6 @@ static const msm5205_interface shdancbl_msm5205_interface = READ8_MEMBER(segas1x_bootleg_state::shdancbl_soundbank_r) { - if (m_soundbank_ptr) return m_soundbank_ptr[offset & 0x3fff]; return 0xff; @@ -3236,7 +3220,6 @@ ROM_END DRIVER_INIT_MEMBER(segas1x_bootleg_state,common) { - m_bg1_trans = 0; m_splittab_bg_x = 0; m_splittab_bg_y = 0; @@ -3262,7 +3245,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,common) /* Sys16A */ DRIVER_INIT_MEMBER(segas1x_bootleg_state,shinobl) { - DRIVER_INIT_CALL(common); m_spritebank_type = 1; @@ -3270,7 +3252,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,shinobl) DRIVER_INIT_MEMBER(segas1x_bootleg_state,passsht) { - DRIVER_INIT_CALL(common); m_spritebank_type = 1; @@ -3279,7 +3260,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,passsht) DRIVER_INIT_MEMBER(segas1x_bootleg_state,wb3bbl) { - DRIVER_INIT_CALL(common); m_spritebank_type = 1; @@ -3359,7 +3339,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,bayrouteb2) DRIVER_INIT_MEMBER(segas1x_bootleg_state,goldnaxeb2) { - DRIVER_INIT_CALL(common); m_spritebank_type = 1; @@ -3381,7 +3360,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,dduxbl) DRIVER_INIT_MEMBER(segas1x_bootleg_state,eswatbl) { - DRIVER_INIT_CALL(common); //m_splittab_fg_x = &sys16_textram[0x0f80]; @@ -3390,7 +3368,6 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,eswatbl) DRIVER_INIT_MEMBER(segas1x_bootleg_state,fpointbl) { - DRIVER_INIT_CALL(common); //sys16_video_config(fpoint_update_proc, -0xb8, NULL); diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c index 592a5f65a54..350587c49fa 100644 --- a/src/mame/drivers/tagteam.c +++ b/src/mame/drivers/tagteam.c @@ -57,7 +57,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(tagteam_state::sound_nmi_mask_w) { - m_sound_nmi_mask = data & 1; } @@ -197,7 +196,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(tagteam_state::sound_timer_irq) { - if(m_sound_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 58d6f402d35..73232e5581f 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -19,7 +19,6 @@ WRITE16_MEMBER(tail2nos_state::sound_command_w) { - if (ACCESSING_BITS_0_7) { soundlatch_byte_w(space, offset, data & 0xff); @@ -223,7 +222,6 @@ void tail2nos_state::machine_start() void tail2nos_state::machine_reset() { - /* point to the extra ROMs */ membank("bank1")->set_base(memregion("user1")->base()); membank("bank2")->set_base(memregion("user2")->base()); diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 516a00ccbd8..93d39bb3d49 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -410,7 +410,6 @@ READ16_MEMBER(taitob_state::eep_latch_r) WRITE16_MEMBER(taitob_state::eeprom_w) { - COMBINE_DATA(&m_eep_latch); if (ACCESSING_BITS_8_15) @@ -449,7 +448,6 @@ READ16_MEMBER(taitob_state::player_34_coin_ctrl_r) WRITE16_MEMBER(taitob_state::player_34_coin_ctrl_w) { - COMBINE_DATA(&m_coin_word); /* coin counters and lockout */ @@ -2004,7 +2002,6 @@ static const tc0140syt_interface taitob_tc0140syt_intf = void taitob_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_mb87078 = machine().device("mb87078"); @@ -2019,7 +2016,6 @@ void taitob_state::machine_start() void taitob_state::machine_reset() { - m_eep_latch = 0; m_coin_word = 0; } diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 5cee6d1e8d9..c4760ff0214 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -601,7 +601,6 @@ WRITE8_MEMBER(taitof2_state::sound_bankswitch_w) READ8_MEMBER(taitof2_state::driveout_sound_command_r) { - m_audiocpu->set_input_line(0, CLEAR_LINE); // logerror("sound IRQ OFF (sound command=%02x)\n", m_driveout_sound_latch); return m_driveout_sound_latch; @@ -626,7 +625,6 @@ WRITE8_MEMBER(taitof2_state::oki_bank_w) WRITE16_MEMBER(taitof2_state::driveout_sound_command_w) { - if (ACCESSING_BITS_8_15) { data >>= 8; @@ -661,7 +659,6 @@ WRITE16_MEMBER(taitof2_state::driveout_sound_command_w) WRITE16_MEMBER(taitof2_state::cchip2_word_w) { - logerror("cchip2_w pc: %06x offset %04x: %02x\n", space.device().safe_pc(), offset, data); COMBINE_DATA(&m_cchip2_ram[offset]); @@ -669,7 +666,6 @@ WRITE16_MEMBER(taitof2_state::cchip2_word_w) READ16_MEMBER(taitof2_state::cchip2_word_r) { - /* C-Chip ID */ if (offset == 0x401) return 0x01; @@ -3017,7 +3013,6 @@ static const tc0140syt_interface taitof2_tc0140syt_intf = MACHINE_START_MEMBER(taitof2_state,common) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu");; m_tc0100scn = machine().device("tc0100scn");; @@ -5341,7 +5336,6 @@ DRIVER_INIT_MEMBER(taitof2_state,finalb) DRIVER_INIT_MEMBER(taitof2_state,cameltry) { - m_last[0] = 0; m_last[1] = 0; @@ -5372,7 +5366,6 @@ DRIVER_INIT_MEMBER(taitof2_state,mjnquest) DRIVER_INIT_MEMBER(taitof2_state,driveout) { - m_driveout_sound_latch = 0; m_oki_bank = 0; m_nibble = 0; diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 2bef8b686e2..20c892b847a 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -142,7 +142,6 @@ static void state_register( running_machine &machine ) MACHINE_START_MEMBER(taitol_state,taito_l) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); @@ -354,7 +353,6 @@ READ8_MEMBER(taitol_state::irq_enable_r) WRITE8_MEMBER(taitol_state::rombankswitch_w) { - if (m_cur_rombank != data) { if (data > m_high) @@ -371,7 +369,6 @@ WRITE8_MEMBER(taitol_state::rombankswitch_w) WRITE8_MEMBER(taitol_state::rombank2switch_w) { - data &= 0xf; if (m_cur_rombank2 != data) @@ -401,7 +398,6 @@ READ8_MEMBER(taitol_state::rombank2switch_r) WRITE8_MEMBER(taitol_state::rambankswitch_w) { - if (m_cur_rambank[offset] != data) { m_cur_rambank[offset] = data; @@ -510,7 +506,6 @@ WRITE8_MEMBER(taitol_state::mcu_control_w) READ8_MEMBER(taitol_state::mcu_data_r) { - // logerror("mcu read (%04x) [%02x, %04x]\n", space.device().safe_pc(), last_data, last_data_adr); if (m_mcu_pos == m_mcu_reply_len) return 0; @@ -533,7 +528,6 @@ WRITE8_MEMBER(taitol_state::sound_w) READ8_MEMBER(taitol_state::mux_r) { - switch (m_mux_ctrl) { case 0: @@ -554,7 +548,6 @@ READ8_MEMBER(taitol_state::mux_r) WRITE8_MEMBER(taitol_state::mux_w) { - switch (m_mux_ctrl) { case 4: @@ -622,7 +615,6 @@ WRITE8_MEMBER(taitol_state::champwr_msm5205_volume_w) READ8_MEMBER(taitol_state::horshoes_tracky_reset_r) { - /* reset the trackball counter */ m_tracky = ioport("AN0")->read(); return 0; @@ -630,7 +622,6 @@ READ8_MEMBER(taitol_state::horshoes_tracky_reset_r) READ8_MEMBER(taitol_state::horshoes_trackx_reset_r) { - /* reset the trackball counter */ m_trackx = ioport("AN1")->read(); return 0; @@ -1767,7 +1758,6 @@ static void irqhandler( device_t *device, int irq ) WRITE8_MEMBER(taitol_state::portA_w) { - if (m_cur_bank != (data & 0x03)) { int bankaddress; diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c index 4249e17526b..3ffba879d68 100644 --- a/src/mame/drivers/taito_o.c +++ b/src/mame/drivers/taito_o.c @@ -243,7 +243,6 @@ static const tc0080vco_interface parentj_intf = void taitoo_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_tc0080vco = machine().device("tc0080vco"); } diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 2bacca00338..f76a34faabd 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -421,7 +421,6 @@ static void reset_sound_region(running_machine &machine) WRITE8_MEMBER(taitox_state::sound_bankswitch_w) { - m_banknum = (data - 1) & 3; reset_sound_region(machine()); } @@ -805,7 +804,6 @@ static const ym2610_interface ym2610_config = MACHINE_START_MEMBER(taitox_state,taitox) { - m_banknum = -1; save_item(NAME(m_banknum)); machine().save().register_postload(save_prepost_delegate(FUNC(reset_sound_region), &machine())); diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index e6362f4c53a..67611fb01e1 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -3033,7 +3033,6 @@ static void taitoz_postload(running_machine &machine) MACHINE_START_MEMBER(taitoz_state,bshark) { - m_maincpu = machine().device("maincpu"); m_subcpu = machine().device("sub"); m_audiocpu = machine().device("audiocpu"); @@ -3066,7 +3065,6 @@ MACHINE_START_MEMBER(taitoz_state,taitoz) MACHINE_RESET_MEMBER(taitoz_state,taitoz) { - m_banknum = -1; m_cpua_ctrl = 0xff; m_sci_int6 = 0; @@ -5146,7 +5144,6 @@ ROM_END DRIVER_INIT_MEMBER(taitoz_state,taitoz) { - machine().save().register_postload(save_prepost_delegate(FUNC(parse_cpu_control), &machine())); } diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index e201bcec17b..406f6088231 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -232,7 +232,6 @@ cpu #2 (PC=0000060E): unmapped memory word read from 0000683A & FFFF WRITE16_MEMBER(taitoair_state::system_control_w) { - if ((ACCESSING_BITS_0_7 == 0) && ACCESSING_BITS_8_15) data >>= 8; @@ -250,7 +249,6 @@ READ16_MEMBER(taitoair_state::lineram_r) WRITE16_MEMBER(taitoair_state::lineram_w) { - if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) m_line_ram[offset] = data; @@ -265,14 +263,12 @@ READ16_MEMBER(taitoair_state::dspram_r) WRITE16_MEMBER(taitoair_state::dspram_w) { - if (ACCESSING_BITS_8_15 && ACCESSING_BITS_0_7) m_dsp_ram[offset] = data; } READ16_MEMBER(taitoair_state::dsp_HOLD_signal_r) { - /* HOLD signal is active low */ // logerror("TMS32025:%04x Reading %01x level from HOLD signal\n", space.device().safe_pcbase(), m_dsp_hold_signal); @@ -383,7 +379,6 @@ static void reset_sound_region( running_machine &machine ) WRITE8_MEMBER(taitoair_state::sound_bankswitch_w) { - m_banknum = data & 3; reset_sound_region(machine()); } diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index 6654a0046b8..007efd3f1c6 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -1193,7 +1193,6 @@ INPUT_PORTS_END void taitojc_state::machine_reset() { - m_first_dsp_reset = 1; m_mcu_comm_main = 0; @@ -1320,7 +1319,6 @@ WRITE16_MEMBER(taitojc_state::dsp_idle_skip_w) DRIVER_INIT_MEMBER(taitojc_state,taitojc) { - m_polygon_fifo = auto_alloc_array(machine(), UINT16, TAITOJC_POLYGON_FIFO_SIZE); m_has_dsp_hack = 1; @@ -1330,7 +1328,6 @@ DRIVER_INIT_MEMBER(taitojc_state,taitojc) DRIVER_INIT_MEMBER(taitojc_state,dendego2) { - DRIVER_INIT_CALL(taitojc); machine().device("dsp")->memory().space(AS_DATA).install_readwrite_handler(0x7ff0, 0x7ff0, read16_delegate(FUNC(taitojc_state::dendego2_dsp_idle_skip_r),this), write16_delegate(FUNC(taitojc_state::dsp_idle_skip_w),this)); @@ -1338,7 +1335,6 @@ DRIVER_INIT_MEMBER(taitojc_state,dendego2) DRIVER_INIT_MEMBER(taitojc_state,dangcurv) { - DRIVER_INIT_CALL(taitojc); m_has_dsp_hack = 0; diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c index bd90d9f071e..30e71c6dece 100644 --- a/src/mame/drivers/taitopjc.c +++ b/src/mame/drivers/taitopjc.c @@ -88,7 +88,6 @@ public: void taitopjc_state::video_start() { - } UINT32 taitopjc_state::screen_update_taitopjc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c index 8722e26bba3..965f8c56a1f 100644 --- a/src/mame/drivers/taitotz.c +++ b/src/mame/drivers/taitotz.c @@ -659,7 +659,6 @@ static void taitotz_exit(running_machine &machine) void taitotz_state::video_start() { - int width = machine().primary_screen->width(); int height = machine().primary_screen->height(); @@ -1371,7 +1370,6 @@ void taitotz_renderer::render_displaylist(running_machine &machine, const rectan UINT32 taitotz_state::screen_update_taitotz(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(0x000000, cliprect); m_renderer->set_fb(&bitmap); m_renderer->render_displaylist(machine(), cliprect); @@ -1818,11 +1816,9 @@ WRITE64_MEMBER(taitotz_state::ieee1394_w) //logerror("ieee1394_w: %08X, %08X%08X, %08X%08X\n", offset, (UINT32)(data >> 32), (UINT32)(data), (UINT32)(mem_mask >> 32), (UINT32)(mem_mask)); if (ACCESSING_BITS_32_63) { - } if (ACCESSING_BITS_0_31) { - } } @@ -2530,7 +2526,6 @@ void taitotz_state::machine_reset() void taitotz_state::machine_start() { - /* set conservative DRC options */ ppcdrc_set_options(machine().device("maincpu"), PPCDRC_COMPATIBLE_OPTIONS); @@ -2629,7 +2624,6 @@ static const char RAIZPIN_HDD_SERIAL[] = // "691934013492 " DRIVER_INIT_MEMBER(taitotz_state,landhigh) { - init_taitotz_152(machine()); m_hdd_serial_number = LANDHIGH_HDD_SERIAL; @@ -2641,7 +2635,6 @@ DRIVER_INIT_MEMBER(taitotz_state,landhigh) DRIVER_INIT_MEMBER(taitotz_state,batlgear) { - init_taitotz_111a(machine()); // unknown, not used by BIOS 1.11a @@ -2654,7 +2647,6 @@ DRIVER_INIT_MEMBER(taitotz_state,batlgear) DRIVER_INIT_MEMBER(taitotz_state,batlgr2) { - init_taitotz_152(machine()); m_hdd_serial_number = BATLGR2_HDD_SERIAL; @@ -2666,7 +2658,6 @@ DRIVER_INIT_MEMBER(taitotz_state,batlgr2) DRIVER_INIT_MEMBER(taitotz_state,batlgr2a) { - init_taitotz_152(machine()); m_hdd_serial_number = BATLGR2A_HDD_SERIAL; @@ -2678,7 +2669,6 @@ DRIVER_INIT_MEMBER(taitotz_state,batlgr2a) DRIVER_INIT_MEMBER(taitotz_state,pwrshovl) { - init_taitotz_111a(machine()); // unknown, not used by BIOS 1.11a diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 03c60356777..7f0f1bacf26 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -318,7 +318,6 @@ void tankbust_state::machine_reset() INTERRUPT_GEN_MEMBER(tankbust_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/tapatune.c b/src/mame/drivers/tapatune.c index 70926c83758..4ddb32740f5 100644 --- a/src/mame/drivers/tapatune.c +++ b/src/mame/drivers/tapatune.c @@ -77,7 +77,6 @@ public: WRITE16_MEMBER(tapatune_state::palette_w) { - //logerror("Palette write: offset = %02x, data = %04x, mask = %04x\n", offset, data, mem_mask ); switch(offset) { @@ -94,7 +93,6 @@ WRITE16_MEMBER(tapatune_state::palette_w) READ16_MEMBER(tapatune_state::read_from_z80) { - //logerror("Reading data from Z80: index = %02x, data = %02x\n", m_z80_to_68k_index, m_z80_to_68k_data ); switch( offset ) @@ -108,7 +106,6 @@ READ16_MEMBER(tapatune_state::read_from_z80) WRITE16_MEMBER(tapatune_state::write_to_z80) { - switch( offset ) { case 0: diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index e3433692d65..af302ab8195 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -237,7 +237,6 @@ ROM_END DRIVER_INIT_MEMBER(tattack_state,tattack) { - UINT8 *rom = machine().root_device().memregion("maincpu")->base(); rom[0x1b4]=0; diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 7474a2d5311..2b8feb88e44 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -178,7 +178,6 @@ WRITE16_MEMBER(tetrisp2_state::rockn_soundvolume_w) WRITE16_MEMBER(tetrisp2_state::nndmseal_sound_bank_w) { - if (ACCESSING_BITS_0_7) { UINT8 *rom = memregion("okisource")->base(); diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 093e9dd3dd5..03f388bf66c 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -747,7 +747,6 @@ void thayers_state::machine_start() void thayers_state::machine_reset() { - m_laserdisc_data = 0; m_rx_bit = 0; diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index b07c518ad12..79da59cd1a6 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -228,7 +228,6 @@ WRITE8_MEMBER(thedeep_state::thedeep_to_main_w) WRITE8_MEMBER(thedeep_state::thedeep_p3_w) { - /* bit 0 0->1 transition IRQ0 to main */ if((!(m_mcu_p3_reg & 0x01)) && data & 0x01) m_maincpu->set_input_line(0, HOLD_LINE); @@ -438,7 +437,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedeep_state::thedeep_interrupt) INTERRUPT_GEN_MEMBER(thedeep_state::thedeep_mcu_irq) { - m_mcu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE); } diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index eed9db9157c..fab97968363 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -147,7 +147,6 @@ WRITE8_MEMBER(thepit_state::thepit_sound_enable_w) WRITE8_MEMBER(thepit_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -637,7 +636,6 @@ static const ay8910_interface ay8910_config = INTERRUPT_GEN_MEMBER(thepit_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c index 745f9b3b4d0..6e3f1cae032 100644 --- a/src/mame/drivers/thunderj.c +++ b/src/mame/drivers/thunderj.c @@ -76,7 +76,6 @@ READ16_MEMBER(thunderj_state::special_port2_r) WRITE16_MEMBER(thunderj_state::latch_w) { - /* reset extra CPU */ if (ACCESSING_BITS_0_7) { diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 8cc65660dbf..9c6db129245 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -27,7 +27,6 @@ static KONAMI_SETLINES_CALLBACK( thunderx_banking ); INTERRUPT_GEN_MEMBER(thunderx_state::scontra_interrupt) { - if (k052109_is_irq_enabled(m_k052109)) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } @@ -39,7 +38,6 @@ TIMER_CALLBACK_MEMBER(thunderx_state::thunderx_firq_callback) READ8_MEMBER(thunderx_state::scontra_bankedram_r) { - if (m_palette_selected) return m_generic_paletteram_8[offset]; else @@ -48,7 +46,6 @@ READ8_MEMBER(thunderx_state::scontra_bankedram_r) WRITE8_MEMBER(thunderx_state::scontra_bankedram_w) { - if (m_palette_selected) paletteram_xBBBBBGGGGGRRRRR_byte_be_w(space, offset, data); else @@ -57,7 +54,6 @@ WRITE8_MEMBER(thunderx_state::scontra_bankedram_w) READ8_MEMBER(thunderx_state::thunderx_bankedram_r) { - if (m_rambank & 0x01) return m_ram[offset]; else if (m_rambank & 0x10) @@ -79,7 +75,6 @@ READ8_MEMBER(thunderx_state::thunderx_bankedram_r) WRITE8_MEMBER(thunderx_state::thunderx_bankedram_w) { - if (m_rambank & 0x01) m_ram[offset] = data; else if (m_rambank & 0x10) @@ -294,7 +289,6 @@ READ8_MEMBER(thunderx_state::thunderx_1f98_r) WRITE8_MEMBER(thunderx_state::thunderx_1f98_w) { - // logerror("%04x: 1f98_w %02x\n", space.device().safe_pc(),data); /* bit 0 = enable char ROM reading through the video RAM */ @@ -371,7 +365,6 @@ WRITE8_MEMBER(thunderx_state::scontra_snd_bankswitch_w) READ8_MEMBER(thunderx_state::k052109_051960_r) { - if (k052109_get_rmrd_line(m_k052109) == CLEAR_LINE) { if (offset >= 0x3800 && offset < 0x3808) @@ -387,7 +380,6 @@ READ8_MEMBER(thunderx_state::k052109_051960_r) WRITE8_MEMBER(thunderx_state::k052109_051960_w) { - if (offset >= 0x3800 && offset < 0x3808) k051937_w(m_k051960, space, offset - 0x3800, data); else if (offset < 0x3c00) @@ -607,7 +599,6 @@ static const k051960_interface thunderx_k051960_intf = MACHINE_START_MEMBER(thunderx_state,scontra) { - m_generic_paletteram_8.allocate(0x800); m_maincpu = machine().device("maincpu"); @@ -640,7 +631,6 @@ MACHINE_START_MEMBER(thunderx_state,thunderx) MACHINE_RESET_MEMBER(thunderx_state,scontra) { - m_priority = 0; m_1f98_data = 0; m_palette_selected = 0; diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c index b6535f5fee9..79ec7c0ce84 100644 --- a/src/mame/drivers/timetrv.c +++ b/src/mame/drivers/timetrv.c @@ -51,7 +51,6 @@ public: void timetrv_state::video_start() { - } UINT32 timetrv_state::screen_update_timetrv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 2296b0dc7b5..1625b8a817f 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -917,7 +917,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(tmaster_state::tm3k_interrupt) static const duart68681_config tmaster_duart68681_config = { - duart_irq_handler, duart_tx, NULL, diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index 37c2be0ddbe..ba45da26aa3 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -517,7 +517,6 @@ WRITE32_MEMBER(tmmjprd_state::tmmjprd_eeprom_write) READ32_MEMBER(tmmjprd_state::tmmjprd_mux_r) { - m_system_in = ioport("SYSTEM")->read(); switch(m_mux_data) diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 690a9f1a16c..88b1070fe0f 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -647,7 +647,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(tmnt_state::ssriders_soundkludge_w) { - /* I think this is more than just a trigger */ m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); } diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index de0e6cdbfa2..d1ee888305c 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -369,7 +369,6 @@ To Do / Unknowns: MACHINE_START_MEMBER(toaplan2_state,toaplan2) { - m_main_cpu = machine().device("maincpu"); m_sub_cpu = machine().device("audiocpu"); @@ -392,7 +391,6 @@ static void toaplan2_reset(device_t *device) MACHINE_RESET_MEMBER(toaplan2_state,toaplan2) { - m_mcu_data = 0x00; // All games execute a RESET instruction on init, presumably to reset the sound CPU. @@ -404,7 +402,6 @@ MACHINE_RESET_MEMBER(toaplan2_state,toaplan2) MACHINE_RESET_MEMBER(toaplan2_state,ghox) { - MACHINE_RESET_CALL_MEMBER(toaplan2); m_old_p1_paddle_h = 0; m_old_p2_paddle_h = 0; @@ -413,14 +410,12 @@ MACHINE_RESET_MEMBER(toaplan2_state,ghox) DRIVER_INIT_MEMBER(toaplan2_state,dogyuun) { - m_v25_reset_line = 0x20; } DRIVER_INIT_MEMBER(toaplan2_state,fixeight) { - m_v25_reset_line = 0x08; } @@ -435,7 +430,6 @@ DRIVER_INIT_MEMBER(toaplan2_state,fixeightbl) DRIVER_INIT_MEMBER(toaplan2_state,vfive) { - m_v25_reset_line = 0x10; } @@ -474,7 +468,6 @@ DRIVER_INIT_MEMBER(toaplan2_state,batrider) DRIVER_INIT_MEMBER(toaplan2_state,bbakraid) { - m_sndirq_line = 2; } @@ -486,7 +479,6 @@ DRIVER_INIT_MEMBER(toaplan2_state,bbakraid) TIMER_CALLBACK_MEMBER(toaplan2_state::toaplan2_raise_irq) { - m_main_cpu->execute().set_input_line(param, HOLD_LINE); } @@ -582,7 +574,6 @@ WRITE16_MEMBER(toaplan2_state::toaplan2_v25_coin_word_w) if (ACCESSING_BITS_0_7) { - toaplan2_coin_w(space, offset, data & 0x0f); m_sub_cpu->execute().set_input_line(INPUT_LINE_RESET, (data & m_v25_reset_line) ? CLEAR_LINE : ASSERT_LINE); @@ -610,7 +601,6 @@ WRITE16_MEMBER(toaplan2_state::shippumd_coin_word_w) READ16_MEMBER(toaplan2_state::shared_ram_r) { - return m_shared_ram[offset]; } @@ -619,7 +609,6 @@ WRITE16_MEMBER(toaplan2_state::shared_ram_w) { if (ACCESSING_BITS_0_7) { - m_shared_ram[offset] = data; } } @@ -632,7 +621,6 @@ WRITE16_MEMBER(toaplan2_state::toaplan2_hd647180_cpu_w) if (ACCESSING_BITS_0_7) { - m_mcu_data = data & 0xff; logerror("PC:%08x Writing command (%04x) to secondary CPU shared port\n", space.device().safe_pcbase(), m_mcu_data); } @@ -641,7 +629,6 @@ WRITE16_MEMBER(toaplan2_state::toaplan2_hd647180_cpu_w) CUSTOM_INPUT_MEMBER(toaplan2_state::c2map_r) { - // For Teki Paki hardware // bit 4 high signifies secondary CPU is ready // bit 5 is tested low before V-Blank bit ??? @@ -747,7 +734,6 @@ WRITE16_MEMBER(toaplan2_state::ghox_shared_ram_w) { if (ACCESSING_BITS_0_7) { - m_shared_ram16[offset] = data & 0xff; } } @@ -755,7 +741,6 @@ WRITE16_MEMBER(toaplan2_state::ghox_shared_ram_w) WRITE16_MEMBER(toaplan2_state::fixeight_subcpu_ctrl_w) { - m_sub_cpu->execute().set_input_line(INPUT_LINE_RESET, (data & m_v25_reset_line) ? CLEAR_LINE : ASSERT_LINE); } @@ -864,7 +849,6 @@ WRITE16_MEMBER(toaplan2_state::bgaregga_soundlatch_w) { if (ACCESSING_BITS_0_7) { - soundlatch_byte_w(space, offset, data & 0xff); m_sub_cpu->execute().set_input_line(0, HOLD_LINE); } @@ -903,7 +887,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_z80_busreq_w) { if (ACCESSING_BITS_0_7) { - m_z80_busreq = (data & 0x01); // see batrider_z80_busack_r above } } @@ -922,7 +905,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_soundlatch_w) { if (ACCESSING_BITS_0_7) { - soundlatch_byte_w(space, offset, data & 0xff); m_sub_cpu->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -933,7 +915,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_soundlatch2_w) { if (ACCESSING_BITS_0_7) { - soundlatch2_byte_w(space, offset, data & 0xff); m_sub_cpu->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE); } @@ -949,7 +930,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_unknown_sound_w) WRITE16_MEMBER(toaplan2_state::batrider_clear_sndirq_w) { - // not sure whether this is correct // the 68K writes here during the sound IRQ handler, and nowhere else... m_main_cpu->execute().set_input_line(m_sndirq_line, CLEAR_LINE); @@ -958,7 +938,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_clear_sndirq_w) WRITE8_MEMBER(toaplan2_state::batrider_sndirq_w) { - // if batrider_clear_sndirq_w() is correct, should this be ASSERT_LINE? m_main_cpu->execute().set_input_line(m_sndirq_line, HOLD_LINE); } @@ -966,7 +945,6 @@ WRITE8_MEMBER(toaplan2_state::batrider_sndirq_w) WRITE8_MEMBER(toaplan2_state::batrider_clear_nmi_w) { - m_sub_cpu->execute().set_input_line(INPUT_LINE_NMI, CLEAR_LINE); } @@ -1007,7 +985,6 @@ READ16_MEMBER(toaplan2_state::bbakraid_eeprom_r) WRITE16_MEMBER(toaplan2_state::bbakraid_eeprom_w) { - if (data & ~0x001f) logerror("CPU #0 PC:%06X - Unknown EEPROM data being written %04X\n",space.device().safe_pc(),data); @@ -4177,8 +4154,7 @@ ROM_END ROM_REGION( 0x40000, "oki", 0 ) \ ROM_LOAD( "tp-026-2", 0x00000, 0x40000, CRC(85063f1f) SHA1(1bf4d77494de421c98f6273b9876e60d827a6826) ) \ ROM_REGION( 0x80, "eepromdumped", 0 ) \ - ROM_LOAD16_WORD_SWAP( "93c45.u21", 0x00, 0x80, CRC(40d75df0) SHA1(a22f1cc74ce9bc9bfe53f48f6a43ab60e921052b) )\ - + ROM_LOAD16_WORD_SWAP( "93c45.u21", 0x00, 0x80, CRC(40d75df0) SHA1(a22f1cc74ce9bc9bfe53f48f6a43ab60e921052b) ) // eeprom dumped can't be accepted by the code, but the values can't be a simple bad dump (not fixed bits and the values are present three times) // robiza's note: probably between sound cpu and EEPROM there's something that modify the values (PAL?) // we can get the eeprom with a value in [00004] address (1XXX dcba) -> then we need a different value in [00004] address (0XXX XXXX) diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 2590b5b2d03..e9c3a43509d 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -680,7 +680,6 @@ static void topspeed_postload(running_machine &machine) void topspeed_state::machine_start() { - membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); @@ -703,7 +702,6 @@ void topspeed_state::machine_start() void topspeed_state::machine_reset() { - m_cpua_ctrl = 0xff; m_ioc220_port = 0; m_banknum = -1; diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index 6ba7366fda1..dc7364fcbb0 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -425,7 +425,6 @@ INPUT_PORTS_END void toratora_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_pia_u1 = machine().device("pia_u1"); m_pia_u2 = machine().device("pia_u2"); @@ -438,7 +437,6 @@ void toratora_state::machine_start() void toratora_state::machine_reset() { - m_timer = 0xff; m_last = 0; m_clear_tv = 0; diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c index 4986fd8659e..abce71c9076 100644 --- a/src/mame/drivers/toypop.c +++ b/src/mame/drivers/toypop.c @@ -52,7 +52,6 @@ WRITE16_MEMBER(toypop_state::toypop_m68000_sharedram_w) READ8_MEMBER(toypop_state::toypop_main_interrupt_enable_r) { - m_main_irq_mask = 1; return 0; } @@ -121,7 +120,6 @@ INTERRUPT_GEN_MEMBER(toypop_state::toypop_main_vblank_irq) INTERRUPT_GEN_MEMBER(toypop_state::toypop_sound_timer_irq) { - if(m_sound_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } @@ -148,7 +146,6 @@ WRITE8_MEMBER(toypop_state::toypop_m68000_assert_w) void toypop_state::machine_reset() { - m_main_irq_mask = 0; machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE); diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c index 781d04d95f8..03a08da7fc7 100644 --- a/src/mame/drivers/tp84.c +++ b/src/mame/drivers/tp84.c @@ -169,7 +169,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(tp84_state::sub_irq_mask_w) { - m_sub_irq_mask = data & 1; } @@ -280,7 +279,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(tp84_state::sub_vblank_irq) { - if(m_sub_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index 113e359fc5e..78da3a45073 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -218,7 +218,6 @@ WRITE8_MEMBER(trackfld_state::questions_bank_w) WRITE8_MEMBER(trackfld_state::irq_mask_w) { - m_irq_mask = data & 1; } @@ -252,7 +251,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(trackfld_state::yieartf_nmi_mask_w) { - m_yieartf_nmi_mask = data & 1; } @@ -866,7 +864,6 @@ GFXDECODE_END MACHINE_START_MEMBER(trackfld_state,trackfld) { - /* video */ save_item(NAME(m_bg_bank)); save_item(NAME(m_sprite_bank1)); @@ -876,7 +873,6 @@ MACHINE_START_MEMBER(trackfld_state,trackfld) MACHINE_RESET_MEMBER(trackfld_state,trackfld) { - m_bg_bank = 0; m_sprite_bank1 = 0; m_sprite_bank2 = 0; @@ -885,14 +881,12 @@ MACHINE_RESET_MEMBER(trackfld_state,trackfld) INTERRUPT_GEN_MEMBER(trackfld_state::vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } INTERRUPT_GEN_MEMBER(trackfld_state::vblank_nmi) { - if(m_irq_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -953,7 +947,6 @@ MACHINE_CONFIG_END INTERRUPT_GEN_MEMBER(trackfld_state::yieartf_timer_irq) { - if (m_yieartf_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index c9927319541..ae2fa2fcacc 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -291,7 +291,6 @@ GFXDECODE_END void travrusa_state::machine_reset() { - m_scrollx[0] = 0; m_scrollx[1] = 0; } diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index 20f7298071f..6f67d2e69d1 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -431,7 +431,6 @@ READ64_MEMBER(triforce_state::gc_pi_r) WRITE64_MEMBER(triforce_state::gc_pi_w) { - } READ64_MEMBER(triforce_state::gc_exi_r) @@ -441,7 +440,6 @@ READ64_MEMBER(triforce_state::gc_exi_r) WRITE64_MEMBER(triforce_state::gc_exi_w) { - } static ADDRESS_MAP_START( gc_map, AS_PROGRAM, 64, triforce_state ) @@ -454,7 +452,6 @@ ADDRESS_MAP_END void triforce_state::video_start() { - } UINT32 triforce_state::screen_update_triforce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) @@ -559,8 +556,7 @@ MACHINE_CONFIG_END #define TRIFORCE_BIOS \ ROM_REGION( 0x200000, "maincpu", 0) \ ROM_SYSTEM_BIOS( 0, "bios0", "Triforce Bios" ) \ - ROM_LOAD16_WORD_SWAP_BIOS( 0, "triforce_bootrom.bin", 0x000000, 0x200000, CRC(d1883221) SHA1(c3cb7227e4dbc2af861e76d00cb59726105a2e4c) ) \ - + ROM_LOAD16_WORD_SWAP_BIOS( 0, "triforce_bootrom.bin", 0x000000, 0x200000, CRC(d1883221) SHA1(c3cb7227e4dbc2af861e76d00cb59726105a2e4c) ) ROM_START( triforce ) TRIFORCE_BIOS ROM_END diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index 867e26a5e10..8e3e65687c3 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -39,7 +39,6 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets. WRITE8_MEMBER(trucocl_state::irq_enable_w) { - m_irq_mask = (data & 1) ^ 1; } @@ -124,7 +123,6 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(trucocl_state::trucocl_interrupt) { - if(m_irq_mask) device.execute().set_input_line(0, HOLD_LINE); diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index b4eccfe072f..b214e973b01 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -92,7 +92,6 @@ public: WRITE8_MEMBER(trvmadns_state::trvmadns_banking_w) { - UINT8 *rom; int address = 0; diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index 426a8e82fcd..0d1443e9811 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -185,7 +185,6 @@ static const via6522_interface via_2_interface = MACHINE_START_MEMBER(gameplan_state,trvquest) { - m_maincpu = machine().device("maincpu"); /* register for save states */ @@ -197,7 +196,6 @@ MACHINE_START_MEMBER(gameplan_state,trvquest) MACHINE_RESET_MEMBER(gameplan_state,trvquest) { - m_video_x = 0; m_video_y = 0; m_video_command = 0; diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 405ec968ec1..479d2476643 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -820,7 +820,6 @@ READ8_MEMBER(tumbleb_state::prot_io_r) // probably not endian safe WRITE8_MEMBER(tumbleb_state::prot_io_w) { - switch (offset) { case 0x00: @@ -1946,7 +1945,6 @@ GFXDECODE_END MACHINE_START_MEMBER(tumbleb_state,tumbleb) { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_oki = machine().device("oki"); @@ -1962,7 +1960,6 @@ MACHINE_START_MEMBER(tumbleb_state,tumbleb) MACHINE_RESET_MEMBER(tumbleb_state,tumbleb) { - m_music_command = 0; m_music_bank = 0; m_music_is_playing = 0; @@ -2122,7 +2119,6 @@ MACHINE_CONFIG_END MACHINE_RESET_MEMBER(tumbleb_state,htchctch) { - /* copy protection data every reset */ UINT16 *PROTDATA = (UINT16*)memregion("user1")->base(); int i, len = memregion("user1")->bytes(); diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index cac399bd657..cbc16a6a055 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -285,7 +285,6 @@ static const deco16ic_interface tumblep_deco16ic_tilegen1_intf = void tumblep_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index f7d722e989b..5cbef2b1db9 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -63,7 +63,6 @@ INTERRUPT_GEN_MEMBER(tutankhm_state::tutankhm_interrupt) { - /* flip flops cause the interrupt to be signalled every other frame */ m_irq_toggle ^= 1; if (m_irq_toggle && m_irq_enable) @@ -73,7 +72,6 @@ INTERRUPT_GEN_MEMBER(tutankhm_state::tutankhm_interrupt) WRITE8_MEMBER(tutankhm_state::irq_enable_w) { - m_irq_enable = data & 1; if (!m_irq_enable) m_maincpu->set_input_line(0, CLEAR_LINE); @@ -195,7 +193,6 @@ INPUT_PORTS_END MACHINE_START_MEMBER(tutankhm_state,tutankhm) { - membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x1000); m_maincpu = machine().device("maincpu"); @@ -208,7 +205,6 @@ MACHINE_START_MEMBER(tutankhm_state,tutankhm) MACHINE_RESET_MEMBER(tutankhm_state,tutankhm) { - m_irq_toggle = 0; m_irq_enable = 0; m_flip_x = 0; diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c index 32753308016..5bedc0a6d00 100644 --- a/src/mame/drivers/twinkle.c +++ b/src/mame/drivers/twinkle.c @@ -438,8 +438,6 @@ static const UINT16 asciicharset[]= WRITE32_MEMBER(twinkle_state::twinkle_io_w) { - - if( ACCESSING_BITS_16_23 ) { m_io_offset = ( data >> 16 ) & 0xff; @@ -504,7 +502,6 @@ WRITE32_MEMBER(twinkle_state::twinkle_io_w) READ32_MEMBER(twinkle_state::twinkle_io_r) { - UINT32 data = 0; if( ACCESSING_BITS_0_7 ) @@ -596,8 +593,6 @@ WRITE32_MEMBER(twinkle_state::serial_w) WRITE32_MEMBER(twinkle_state::shared_psx_w) { - - if (mem_mask == 0xff) { m_spu_shared[offset*2] = data; @@ -616,7 +611,6 @@ WRITE32_MEMBER(twinkle_state::shared_psx_w) READ32_MEMBER(twinkle_state::shared_psx_r) { - UINT32 result; result = m_spu_shared[offset*2] | m_spu_shared[(offset*2)+1]<<16; @@ -695,8 +689,6 @@ WRITE16_MEMBER(twinkle_state::twinkle_ide_w) */ WRITE16_MEMBER(twinkle_state::twinkle_spu_ctrl_w) { - - if ((!(data & 0x0080)) && (m_spu_ctrl & 0x0080)) { space.device().execute().set_input_line(M68K_IRQ_1, CLEAR_LINE); @@ -733,8 +725,6 @@ WRITE16_MEMBER(twinkle_state::twinkle_waveram_w) READ16_MEMBER(twinkle_state::shared_68k_r) { - - // printf("shared_68k_r: @ %x, mask %x\n", offset, mem_mask); return m_spu_shared[offset]; @@ -742,8 +732,6 @@ READ16_MEMBER(twinkle_state::shared_68k_r) WRITE16_MEMBER(twinkle_state::shared_68k_w) { - - // printf("shared_68k_w: %x to %x, mask %x\n", data, offset, mem_mask); m_spu_shared[offset] = data & 0xff; diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index 53f51c775d3..85bd4afc7d4 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -25,7 +25,6 @@ WRITE16_MEMBER(ultraman_state::sound_cmd_w) WRITE16_MEMBER(ultraman_state::sound_irq_trigger_w) { - if (ACCESSING_BITS_0_7) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -192,7 +191,6 @@ static const k051316_interface ultraman_k051316_intf_2 = void ultraman_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_k051960 = machine().device("k051960"); @@ -207,7 +205,6 @@ void ultraman_state::machine_start() void ultraman_state::machine_reset() { - m_bank0 = -1; m_bank1 = -1; m_bank2 = -1; diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index ad65fb90056..e4c9ffb50ef 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -120,7 +120,6 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_3) void umipoker_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_0),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_1),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(umipoker_state::get_tile_info_2),this),TILEMAP_SCAN_ROWS,8,8,64,32); @@ -135,7 +134,6 @@ void umipoker_state::video_start() UINT32 umipoker_state::screen_update_umipoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap_0->set_scrolly(0, m_umipoker_scrolly[0]); m_tilemap_1->set_scrolly(0, m_umipoker_scrolly[1]); m_tilemap_2->set_scrolly(0, m_umipoker_scrolly[2]); @@ -160,7 +158,6 @@ READ8_MEMBER(umipoker_state::z80_rom_readback_r) READ8_MEMBER(umipoker_state::z80_shared_ram_r) { - machine().scheduler().synchronize(); // force resync return m_z80_wram[offset]; @@ -168,7 +165,6 @@ READ8_MEMBER(umipoker_state::z80_shared_ram_r) WRITE8_MEMBER(umipoker_state::z80_shared_ram_w) { - machine().scheduler().synchronize(); // force resync m_z80_wram[offset] = data; @@ -190,14 +186,12 @@ WRITE16_MEMBER(umipoker_state::umipoker_scrolly_3_w){ COMBINE_DATA(&m_umipoker_s WRITE16_MEMBER(umipoker_state::umipoker_vram_0_w) { - COMBINE_DATA(&m_vram_0[offset]); m_tilemap_0->mark_tile_dirty(offset >> 1); } WRITE16_MEMBER(umipoker_state::umipoker_vram_1_w) { - COMBINE_DATA(&m_vram_1[offset]); m_tilemap_1->mark_tile_dirty(offset >> 1); } @@ -205,14 +199,12 @@ WRITE16_MEMBER(umipoker_state::umipoker_vram_1_w) WRITE16_MEMBER(umipoker_state::umipoker_vram_2_w) { - COMBINE_DATA(&m_vram_2[offset]); m_tilemap_2->mark_tile_dirty(offset >> 1); } WRITE16_MEMBER(umipoker_state::umipoker_vram_3_w) { - COMBINE_DATA(&m_vram_3[offset]); m_tilemap_3->mark_tile_dirty(offset >> 1); } @@ -649,7 +641,6 @@ GFXDECODE_END void umipoker_state::machine_start() { - } void umipoker_state::machine_reset() diff --git a/src/mame/drivers/unkhorse.c b/src/mame/drivers/unkhorse.c index 6e223797276..216cb6b1243 100644 --- a/src/mame/drivers/unkhorse.c +++ b/src/mame/drivers/unkhorse.c @@ -59,7 +59,6 @@ void horse_state::palette_init() UINT32 horse_state::screen_update_horse(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - for (int y = cliprect.min_y; y <= cliprect.max_y; y++) { for (int x = 0; x < 32; x++) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 788e02cb7af..1e5dd8ed5dc 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -2438,7 +2438,6 @@ READ16_MEMBER(vamphalf_state::mrdig_speedup_r) READ16_MEMBER(vamphalf_state::dtfamily_speedup_r) { - int pc = space.device().safe_pc(); if (pc == 0x12fa6) @@ -2450,7 +2449,6 @@ READ16_MEMBER(vamphalf_state::dtfamily_speedup_r) READ16_MEMBER(vamphalf_state::toyland_speedup_r) { - if (space.device().safe_pc() == 0x130c2) space.device().execute().spin_until_interrupt(); diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index daf45c22f2f..f674dfa8035 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -22,7 +22,6 @@ WRITE16_MEMBER(vaportra_state::vaportra_sound_w) { - /* Force synchronisation between CPUs with fake timer */ machine().scheduler().synchronize(); soundlatch_byte_w(space, 0, data & 0xff); @@ -231,7 +230,6 @@ static const deco16ic_interface vaportra_deco16ic_tilegen2_intf = void vaportra_state::machine_start() { - m_maincpu = machine().device("maincpu"); m_audiocpu = machine().device("audiocpu"); m_deco_tilegen1 = machine().device("tilegen1"); @@ -242,7 +240,6 @@ void vaportra_state::machine_start() void vaportra_state::machine_reset() { - m_priority[0] = 0; m_priority[1] = 0; } diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c index e33c13ef1a7..268657dcebf 100644 --- a/src/mame/drivers/vastar.c +++ b/src/mame/drivers/vastar.c @@ -407,7 +407,6 @@ static const ay8910_interface ay8910_config = INTERRUPT_GEN_MEMBER(vastar_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index 8bf3b4a614f..fedfc56f0aa 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -157,7 +157,6 @@ WRITE8_MEMBER(vega_state::extern_w) switch((m_p2_data>>2)&7) /* 7442 = lines 2,3,4 - select device */ { - case 0: /* 00-03 */ { /* PPI 8255 /CS */ @@ -322,32 +321,26 @@ READ8_MEMBER(vega_state::extern_r) #if 0 case 3: /* 0c-0f */ { - - } break; case 4: /* 10-13 */ { - } break; case 5: /* 14-17 */ { - } break; case 6: /* 18-1b */ { - } break; case 7: /* 1c-1f */ { - } break; #endif @@ -492,7 +485,6 @@ void vega_state::palette_init() static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect) { { - UINT8 *map_lookup = state->memregion("tilemaps")->base(); int offset_y=state->m_tilemap_offset_y; @@ -504,8 +496,6 @@ static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16& { for(int yy=0;yy<8;yy++) { - - int x0=xx*32; int y0=yy*32; @@ -521,7 +511,6 @@ static void draw_tilemap(vega_state *state, screen_device& screen, bitmap_ind16& if(bank!=3) { - num+=bank*8; num*=8*4; @@ -565,7 +554,6 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma for(y=0;y<25;++y) for(x=0;x<40;++x) { - int character=m_txt_ram[idx]; //int color=BITSWAP8(color_lookup[character],7,6,5,4,0,1,2,3)>>1; int color=color_lookup[character]&0xf; @@ -592,7 +580,6 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma { for(int i=OBJ_0;imemory().space(AS_IO).install_read_bank(0x0100, 0xffff, "bank"); membank("qs1000:bank")->configure_entries(0, 8, memregion("qs1000:cpu")->base()+0x100, 0x10000); diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index d31ba59e3a9..eb770d967a8 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -150,7 +150,6 @@ READ8_MEMBER(vendetta_state::vendetta_K052109_r) WRITE8_MEMBER(vendetta_state::vendetta_K052109_w) { - // ************************************************************************************* // * Escape Kids uses 052109's mirrored Tilemap ROM bank selector, but only during * // * Tilemap MASK-ROM Test (0x1d80<->0x3d80, 0x1e00<->0x3e00, 0x1f00<->0x3f00) * @@ -182,7 +181,6 @@ static void vendetta_video_banking( running_machine &machine, int select ) WRITE8_MEMBER(vendetta_state::vendetta_5fe0_w) { - /* bit 0,1 coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 7231e0ca47d..5c2f1380093 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -63,7 +63,6 @@ TIMER_CALLBACK_MEMBER(videopin_state::interrupt_callback) void videopin_state::machine_reset() { - machine().scheduler().timer_set(machine().primary_screen->time_until_pos(32), timer_expired_delegate(FUNC(videopin_state::interrupt_callback),this), 32); /* both output latches are cleared on reset */ diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 53112f308dd..fa22eb9cf95 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -1439,7 +1439,6 @@ WRITE64_MEMBER(viper_state::cf_card_w) WRITE64_MEMBER(viper_state::unk2_w) { - if (ACCESSING_BITS_56_63) { m_cf_card_ide = 0; @@ -2099,8 +2098,7 @@ DRIVER_INIT_MEMBER(viper_state,vipercf) ROM_SYSTEM_BIOS(0, "bios0", "GM941B01 (01/15/01)") \ ROM_LOAD_BIOS(0, "941b01.u25", 0x00000, 0x40000, CRC(233e5159) SHA1(66ff268d5bf78fbfa48cdc3e1b08f8956cfd6cfb)) \ ROM_SYSTEM_BIOS(1, "bios1", "GM941A01 (03/10/00)") \ - ROM_LOAD_BIOS(1, "941a01.u25", 0x00000, 0x40000, CRC(df6f88d6) SHA1(2bc10e4fbec36573aa8b6878492d37665f074d87)) \ - + ROM_LOAD_BIOS(1, "941a01.u25", 0x00000, 0x40000, CRC(df6f88d6) SHA1(2bc10e4fbec36573aa8b6878492d37665f074d87)) ROM_START(kviper) VIPER_BIOS diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c index aa006058366..8de5a088cd3 100644 --- a/src/mame/drivers/vlc.c +++ b/src/mame/drivers/vlc.c @@ -301,7 +301,6 @@ static SCREEN_UPDATE_IND16( nevada ) /***************************************************************************/ static PALETTE_INIT( nevada ) { - // Palette init } @@ -692,7 +691,6 @@ static const duart68681_config nevada_duart40_68681_config = static MACHINE_RESET( nevada ) { - nevada_state *state = machine.driver_data(); state->m_duart18_68681 = machine.device( "duart18_68681" ); diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c index aff92d28d86..729c6267e20 100644 --- a/src/mame/drivers/volfied.c +++ b/src/mame/drivers/volfied.c @@ -233,7 +233,6 @@ static const ym2203_interface ym2203_config = void volfied_state::machine_start() { - volfied_cchip_init(machine()); m_maincpu = machine().device("maincpu"); diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index 5c74d2561f7..22b4b326227 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -116,7 +116,6 @@ WRITE8_MEMBER(warpspeed_state::warpspeed_hardware_w) TILE_GET_INFO_MEMBER(warpspeed_state::get_warpspeed_text_tile_info) { - UINT8 code = m_videoram[tile_index] & 0x3f; SET_TILE_INFO_MEMBER(0, code, 0, 0); } @@ -133,7 +132,6 @@ TILE_GET_INFO_MEMBER(warpspeed_state::get_warpspeed_starfield_tile_info) WRITE8_MEMBER(warpspeed_state::warpspeed_vidram_w) { - m_videoram[offset] = data; m_text_tilemap->mark_tile_dirty(offset); } @@ -211,7 +209,6 @@ static void warpspeed_draw_circles(bitmap_ind16 &bitmap, warpspeed_state *state) UINT32 warpspeed_state::screen_update_warpspeed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_starfield_tilemap->draw(bitmap, cliprect, 0, 0); warpspeed_draw_circles(bitmap, this); m_text_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index 3ddc4813ca4..af50099ae9f 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -141,7 +141,6 @@ TODO: /* Interrupt Gen */ INTERRUPT_GEN_MEMBER(warpwarp_state::vblank_irq) { - if(m_ball_on) device.execute().set_input_line(0, ASSERT_LINE); } diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index f6f4c1d76dc..53d73606223 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -172,14 +172,12 @@ static void reset_sound_region( running_machine &machine ) WRITE8_MEMBER(warriorb_state::sound_bankswitch_w) { - m_banknum = data & 7; reset_sound_region(machine()); } WRITE16_MEMBER(warriorb_state::warriorb_sound_w) { - if (offset == 0) tc0140syt_port_w(m_tc0140syt, space, 0, data & 0xff); else if (offset == 1) @@ -188,7 +186,6 @@ WRITE16_MEMBER(warriorb_state::warriorb_sound_w) READ16_MEMBER(warriorb_state::warriorb_sound_r) { - if (offset == 1) return ((tc0140syt_comm_r(m_tc0140syt, space, 0) & 0xff)); else @@ -217,7 +214,6 @@ WRITE8_MEMBER(warriorb_state::warriorb_pancontrol) WRITE16_MEMBER(warriorb_state::tc0100scn_dual_screen_w) { - tc0100scn_word_w(m_tc0100scn_1, space, offset, data, mem_mask); tc0100scn_word_w(m_tc0100scn_2, space, offset, data, mem_mask); } @@ -510,7 +506,6 @@ static const tc0140syt_interface warriorb_tc0140syt_intf = void warriorb_state::machine_start() { - membank("bank10")->configure_entries(0, 8, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); @@ -534,7 +529,6 @@ void warriorb_state::machine_start() void warriorb_state::machine_reset() { - m_banknum = 0; /**** mixer control enable ****/ diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 71c426aba1c..5a333fa5ffa 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -332,7 +332,6 @@ WRITE16_MEMBER(welltris_state::sound_command_w) { if (ACCESSING_BITS_0_7) { - m_pending_command = 1; soundlatch_byte_w(space, 0, data & 0xff); machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); @@ -346,7 +345,6 @@ CUSTOM_INPUT_MEMBER(welltris_state::pending_sound_r) WRITE8_MEMBER(welltris_state::pending_command_clear_w) { - m_pending_command = 0; } @@ -697,7 +695,6 @@ DRIVER_INIT_MEMBER(welltris_state,welltris) DRIVER_INIT_MEMBER(welltris_state,quiz18k) { - } diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 614ce902f89..d0be74a9fa9 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -426,7 +426,6 @@ static void parse_control(running_machine &machine) WRITE16_MEMBER(wgp_state::cpua_ctrl_w)/* assumes Z80 sandwiched between 68Ks */ { - if ((data &0xff00) && ((data &0xff) == 0)) data = data >> 8; /* for Wgp */ m_cpua_ctrl = data; @@ -616,7 +615,6 @@ WRITE8_MEMBER(wgp_state::sound_bankswitch_w) WRITE16_MEMBER(wgp_state::wgp_sound_w) { - if (offset == 0) tc0140syt_port_w(m_tc0140syt, space, 0, data & 0xff); else if (offset == 1) @@ -625,7 +623,6 @@ WRITE16_MEMBER(wgp_state::wgp_sound_w) READ16_MEMBER(wgp_state::wgp_sound_r) { - if (offset == 1) return ((tc0140syt_comm_r(m_tc0140syt, space, 0) & 0xff)); else @@ -940,7 +937,6 @@ void wgp_state::machine_reset() void wgp_state::machine_start() { - membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000); m_maincpu = machine().device("maincpu"); diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 956cd510376..dcc74c3a1a1 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -312,7 +312,6 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_scanline_cnt_w) WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) { - COMBINE_DATA(&m_blitter_data[offset]); if(!ACCESSING_BITS_8_15 && offset==0x6) //LSB only! @@ -381,7 +380,6 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) if(offset==0xf && data==0xffff) { - machine().device("maincpu")->execute().set_input_line(1, HOLD_LINE); { @@ -410,7 +408,6 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) if(page>=0x400000) /* src set to unav. page before direct write to the framebuffer */ { - m_direct_write_x0=dst_x0; m_direct_write_x1=dst_x1; m_direct_write_y0=dst_y0; @@ -421,17 +418,14 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) if(x_dst_step<0) { - if(dst_x0<=dst_x1) { - return; } } else { - if(dst_x0>=dst_x1) { return; @@ -448,7 +442,6 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) } else { - if(dst_y0>=dst_y1) { return; @@ -579,7 +572,6 @@ void wheelfir_state::video_start() UINT32 wheelfir_state::screen_update_wheelfir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); for(int y=0;y( "maincpu"); m_subcpu = machine().device( "subcpu"); m_screen = machine().device( "screen"); diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c index 9a02947ce84..b092a2c950f 100644 --- a/src/mame/drivers/wiping.c +++ b/src/mame/drivers/wiping.c @@ -59,13 +59,11 @@ WRITE8_MEMBER(wiping_state::subcpu_reset_w) WRITE8_MEMBER(wiping_state::main_irq_mask_w) { - m_main_irq_mask = data & 1; } WRITE8_MEMBER(wiping_state::sound_irq_mask_w) { - m_sound_irq_mask = data & 1; } @@ -264,14 +262,12 @@ GFXDECODE_END INTERRUPT_GEN_MEMBER(wiping_state::vblank_irq) { - if(m_main_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } INTERRUPT_GEN_MEMBER(wiping_state::sound_timer_irq) { - if(m_sound_irq_mask) device.execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index efe67e7486c..9c984227cf2 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -765,8 +765,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r int flipy=0; for(i=0;i<0x800;i+=0x20) { - - sx = state->m_sprite_ram[i+1]; if(sx!=0xF8) { tileno = (state->m_sprite_ram[i]<<2) | (( state->m_sprite_ram[i+0x800] & 0x07 ) << 10 ); diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index a32264ca421..b76c14340c2 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -216,7 +216,6 @@ WRITE8_MEMBER(wiz_state::wiz_coin_counter_w) WRITE8_MEMBER(wiz_state::wiz_main_nmi_mask_w) { - m_main_nmi_mask = data & 1; } @@ -252,7 +251,6 @@ ADDRESS_MAP_END WRITE8_MEMBER(wiz_state::wiz_sound_nmi_mask_w) { - m_sound_nmi_mask = data & 1; } @@ -702,14 +700,12 @@ void wiz_state::machine_reset() INTERRUPT_GEN_MEMBER(wiz_state::wiz_vblank_interrupt) { - if(m_main_nmi_mask & 1) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } INTERRUPT_GEN_MEMBER(wiz_state::wiz_sound_interrupt) { - if(m_sound_nmi_mask & 1) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/wms.c b/src/mame/drivers/wms.c index 9a655af15d1..607ab3cab1e 100644 --- a/src/mame/drivers/wms.c +++ b/src/mame/drivers/wms.c @@ -374,7 +374,6 @@ ROM_END DRIVER_INIT_MEMBER(wms_state,wms) { - } GAME( 200?, wms, 0, wms, wms, wms_state, wms, ROT0, "WMS", "WMS SetUp/Clear Chips (set 1)", GAME_IS_SKELETON ) diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 0178f002930..3ba0c0cb43d 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -194,7 +194,6 @@ ADDRESS_MAP_END WRITE16_MEMBER(wwfsstar_state::wwfsstar_scrollwrite) { - switch (offset) { case 0x00: @@ -272,7 +271,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(wwfsstar_state::wwfsstar_scanline) CUSTOM_INPUT_MEMBER(wwfsstar_state::wwfsstar_vblank_r) { - return m_vblank; } diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 9eb0e152ce9..0e6febf21bc 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -91,7 +91,6 @@ static const eeprom_interface eeprom_intf = /* A1, A5 and A6 don't go to the 053247. */ READ16_MEMBER(xexex_state::K053247_scattered_word_r) { - if (offset & 0x0031) return m_spriteram[offset]; else @@ -103,7 +102,6 @@ READ16_MEMBER(xexex_state::K053247_scattered_word_r) WRITE16_MEMBER(xexex_state::K053247_scattered_word_w) { - if (offset & 0x0031) COMBINE_DATA(m_spriteram + offset); else @@ -162,7 +160,6 @@ WRITE16_MEMBER(xexex_state::spriteram_mirror_w) READ16_MEMBER(xexex_state::xexex_waitskip_r) { - if (space.device().safe_pc() == 0x1158) { space.device().execute().spin_until_trigger(m_resume_trigger); @@ -206,7 +203,6 @@ WRITE16_MEMBER(xexex_state::control2_w) WRITE16_MEMBER(xexex_state::sound_cmd1_w) { - if(ACCESSING_BITS_0_7) { // anyone knows why 0x1a keeps lurking the sound queue in the world version??? @@ -257,7 +253,6 @@ static void ym_set_mixing(device_t *device, double left, double right) TIMER_CALLBACK_MEMBER(xexex_state::dmaend_callback) { - if (m_cur_control2 & 0x0040) { // foul-proof (CPU0 could be deactivated while we wait) @@ -670,7 +665,6 @@ ROM_END DRIVER_INIT_MEMBER(xexex_state,xexex) { - m_strip_0x1a = 0; if (!strcmp(machine().system().name, "xexex")) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 278793a34e6..31af62d0478 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -43,7 +43,6 @@ static const eeprom_interface eeprom_intf = WRITE16_MEMBER(xmen_state::eeprom_w) { - logerror("%06x: write %04x to 108000\n",space.device().safe_pc(),data); if (ACCESSING_BITS_0_7) { @@ -86,7 +85,6 @@ WRITE16_MEMBER(xmen_state::sound_irq_w) WRITE16_MEMBER(xmen_state::xmen_18fa00_w) { - if(ACCESSING_BITS_0_7) { /* bit 2 is interrupt enable */ diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index f96c615ebe9..7c5c122882f 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -643,7 +643,6 @@ static IRQ_CALLBACK(irq_callback) void xtom3d_state::machine_start() { - m_bios_ram = auto_alloc_array(machine(), UINT32, 0x10000/4); m_bios_ext1_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); m_bios_ext2_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c index 773dcf9d804..38edb6a0f44 100644 --- a/src/mame/drivers/xyonix.c +++ b/src/mame/drivers/xyonix.c @@ -125,7 +125,6 @@ READ8_MEMBER(xyonix_state::xyonix_io_r) WRITE8_MEMBER(xyonix_state::xyonix_io_w) { - //logerror ("xyonix_port_e0_w %02x - PC = %04x\n", data, space.device().safe_pc()); m_e0_data = data; } diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index c787f749713..58a053344e6 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -123,7 +123,6 @@ WRITE8_MEMBER(yiear_state::yiear_VLM5030_control_w) INTERRUPT_GEN_MEMBER(yiear_state::yiear_vblank_interrupt) { - if (m_yiear_irq_enable) device.execute().set_input_line(0, HOLD_LINE); } @@ -131,7 +130,6 @@ INTERRUPT_GEN_MEMBER(yiear_state::yiear_vblank_interrupt) INTERRUPT_GEN_MEMBER(yiear_state::yiear_nmi_interrupt) { - if (m_yiear_nmi_enable) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -263,13 +261,11 @@ GFXDECODE_END void yiear_state::machine_start() { - save_item(NAME(m_yiear_nmi_enable)); } void yiear_state::machine_reset() { - m_yiear_nmi_enable = 0; } diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index e9444afc6df..7a125d0030d 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -556,7 +556,6 @@ GFXDECODE_END void yunsun16_state::machine_start() { - m_audiocpu = machine().device("audiocpu"); save_item(NAME(m_sprites_scrolldx)); @@ -565,7 +564,6 @@ void yunsun16_state::machine_start() void yunsun16_state::machine_reset() { - m_sprites_scrolldx = -0x40; m_sprites_scrolldy = -0x0f; } diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index a066dde4f64..10bc93edfe9 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -486,7 +486,6 @@ void yunsung8_state::machine_start() void yunsung8_state::machine_reset() { - m_videobank = 0; m_layers_ctrl = 0; m_adpcm = 0; diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index 0c180d446b2..a377b6b2d42 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -122,7 +122,6 @@ WRITE8_MEMBER(zaccaria_state::zaccaria_port0a_w) WRITE8_MEMBER(zaccaria_state::zaccaria_port0b_w) { - /* bit 1 goes to 8910 #0 BDIR pin */ if ((m_last_port0b & 0x02) == 0x02 && (data & 0x02) == 0x00) { @@ -247,7 +246,6 @@ WRITE8_MEMBER(zaccaria_state::coin_w) WRITE8_MEMBER(zaccaria_state::nmi_mask_w) { - m_nmi_mask = data & 1; } @@ -571,7 +569,6 @@ static const tms5220_interface tms5220_config = INTERRUPT_GEN_MEMBER(zaccaria_state::vblank_irq) { - if(m_nmi_mask) device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index a08e9a8d5ae..e5e41b5dd27 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -299,7 +299,6 @@ INPUT_CHANGED_MEMBER(zaxxon_state::service_switch) INTERRUPT_GEN_MEMBER(zaxxon_state::vblank_int) { - if (m_int_enabled) device.execute().set_input_line(0, ASSERT_LINE); } @@ -322,7 +321,6 @@ WRITE8_MEMBER(zaxxon_state::int_enable_w) void zaxxon_state::machine_start() { - /* register for save states */ save_item(NAME(m_int_enabled)); save_item(NAME(m_coin_status)); @@ -339,7 +337,6 @@ void zaxxon_state::machine_start() READ8_MEMBER(zaxxon_state::razmataz_counter_r) { - /* this behavior is really unknown; however, the code is using this */ /* counter as a sort of timeout when talking to the sound board */ /* it needs to be increasing at a reasonable rate but not too fast */ @@ -390,7 +387,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_coin_counter_w) // the coin input, which then needs to be explicitly cleared by the game. WRITE8_MEMBER(zaxxon_state::zaxxon_coin_enable_w) { - m_coin_enable[offset] = data & 1; if (!m_coin_enable[offset]) m_coin_status[offset] = 0; @@ -408,7 +404,6 @@ INPUT_CHANGED_MEMBER(zaxxon_state::zaxxon_coin_inserted) CUSTOM_INPUT_MEMBER(zaxxon_state::zaxxon_coin_r) { - return m_coin_status[(int)(FPTR)param]; } diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index f843026f97d..172be35780b 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -1203,7 +1203,6 @@ READ32_MEMBER(zn_state::taitofx1b_sound_r) DRIVER_INIT_MEMBER(zn_state,coh1000tb) { - m_taitofx1_eeprom_size1 = 0x400; m_taitofx1_eeprom1 = auto_alloc_array( machine(), UINT8, m_taitofx1_eeprom_size1 ); m_taitofx1_eeprom_size2 = 0x200; m_taitofx1_eeprom2 = auto_alloc_array( machine(), UINT8, m_taitofx1_eeprom_size2 ); @@ -2025,7 +2024,6 @@ READ32_MEMBER(zn_state::nbajamex_80_r) DRIVER_INIT_MEMBER(zn_state,coh1000a) { - machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f1fffff, "bank1" ); machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fbfff00, 0x1fbfff03, write32_delegate(FUNC(zn_state::acpsx_00_w),this)); machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fbfff10, 0x1fbfff13, write32_delegate(FUNC(zn_state::acpsx_10_w),this)); diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c index b302da32ed5..93a5c4f852c 100644 --- a/src/mame/drivers/zodiack.c +++ b/src/mame/drivers/zodiack.c @@ -116,7 +116,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(zodiack_state::zodiack_scanline) INTERRUPT_GEN_MEMBER(zodiack_state::zodiack_sound_nmi_gen) { - if (m_sound_nmi_enabled) nmi_line_pulse(device); } diff --git a/src/mame/etc/template_device.c b/src/mame/etc/template_device.c index 15e35712566..050cc298a88 100644 --- a/src/mame/etc/template_device.c +++ b/src/mame/etc/template_device.c @@ -28,7 +28,6 @@ const device_type XXX = &device_creator; xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, XXX, "xxx", tag, owner, clock) { - } @@ -48,7 +47,6 @@ void xxx_device::device_validity_check(validity_checker &valid) const void xxx_device::device_start() { - } diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h index eb1bed5cf29..d42f97f5ea2 100644 --- a/src/mame/etc/template_device.h +++ b/src/mame/etc/template_device.h @@ -16,8 +16,7 @@ Template for skeleton device //************************************************************************** #define MCFG_XXX_ADD(_tag,_freq) \ - MCFG_DEVICE_ADD(_tag, XXX, _freq) \ - + MCFG_DEVICE_ADD(_tag, XXX, _freq) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/etc/template_driver.c b/src/mame/etc/template_driver.c index 6979803c049..e6609a40f8d 100644 --- a/src/mame/etc/template_driver.c +++ b/src/mame/etc/template_driver.c @@ -36,7 +36,6 @@ protected: void xxx_state::video_start() { - } UINT32 xxx_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index 1c2085a423e..9afff934613 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -528,75 +528,62 @@ INPUT_PORTS_EXTERN( sc4_base ); PORT_DIPSETTING( 0x0c, "35GBP" ) \ PORT_DIPSETTING( 0x0d, "70GBP" ) \ PORT_DIPSETTING( 0x0e, "14" ) \ - PORT_DIPSETTING( 0x0f, "15" ) \ - + PORT_DIPSETTING( 0x0f, "15" ) #define sc_ivply_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 95004313 4PLAY PR1227 */ \ - ROM_LOAD( "95004313.snd", 0x0000, 0x080000, CRC(28faed9e) SHA1(624d6cfcc97dd1950b5d908cde2e4d2eb6ea1dc6) ) \ - + ROM_LOAD( "95004313.snd", 0x0000, 0x080000, CRC(28faed9e) SHA1(624d6cfcc97dd1950b5d908cde2e4d2eb6ea1dc6) ) #define sc_plays_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891106.bin", 0x0000, 0x5000, CRC(1f616820) SHA1(c0b19d4243f250c3159564c65e9a2247e61e315f) ) \ ROM_LOAD( "95891107.bin", 0x0000, 0x5000, CRC(6af72c14) SHA1(4666e338fc629a32178f617c8536e7f11d703b14) ) \ ROM_LOAD( "95891108.bin", 0x0000, 0x5000, CRC(f44de048) SHA1(783ae2b12e8e548a90f626a2050968e3f38b6042) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* TEDL SOUNDS */ \ - ROM_LOAD( "95009013.bin", 0x0000, 0x0f3ee2, CRC(f324a590) SHA1(0533af3304100c99af5fdeba2773d92384101f43) ) \ - + ROM_LOAD( "95009013.bin", 0x0000, 0x0f3ee2, CRC(f324a590) SHA1(0533af3304100c99af5fdeba2773d92384101f43) ) #define sc_a40_others \ ROM_REGION( 0x1000000, "ymz", ROMREGION_ERASE00 ) /* AROU SOUNDS */ \ ROM_LOAD( "95008511.bin", 0x0000, 0x0ff5c3, CRC(6fac2014) SHA1(5b364406f7b5d8f4c54561e3977571e4a47273a0) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890123.bin", 0x0000, 0x5000, CRC(e3f5466e) SHA1(ae2f45f79d0113e651b8cf5f655a9ceb32a3ddaa) ) \ ROM_LOAD( "95890124.bin", 0x0000, 0x5000, CRC(9663025a) SHA1(097246412fd4084c1185d8dfd91e884abc5a3f8a) ) \ - ROM_LOAD( "95890125.bin", 0x0000, 0x5000, CRC(08d9ce06) SHA1(9087170d6c6edad735ab5a2abbc0a2191aabfd03) ) \ - + ROM_LOAD( "95890125.bin", 0x0000, 0x5000, CRC(08d9ce06) SHA1(9087170d6c6edad735ab5a2abbc0a2191aabfd03) ) #define sc_a40cl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* AROU SOUNDS */ \ - ROM_LOAD( "95008527.bin", 0x0000, 0x0ff5c3, CRC(6fac2014) SHA1(5b364406f7b5d8f4c54561e3977571e4a47273a0) ) \ - + ROM_LOAD( "95008527.bin", 0x0000, 0x0ff5c3, CRC(6fac2014) SHA1(5b364406f7b5d8f4c54561e3977571e4a47273a0) ) #define sc_acesh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* ACEHI SOUNDS */ \ - ROM_LOAD( "95008292.bin", 0x0000, 0x100000, CRC(1c238098) SHA1(e2e2cb52ea84a7dc5e557b61b3ee21bd5a063833) ) \ - + ROM_LOAD( "95008292.bin", 0x0000, 0x100000, CRC(1c238098) SHA1(e2e2cb52ea84a7dc5e557b61b3ee21bd5a063833) ) #define sc_adjb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3009 JIGGY BANK SOUNDS11 */ \ ROM_LOAD( "95008699.bin", 0x000000, 0x100000, CRC(6d49b54a) SHA1(d64caa1dae40c3bf536f8739d6995b589c7184b7) ) \ - ROM_LOAD( "95008700.bin", 0x100000, 0x100000, CRC(49c37b2a) SHA1(5a59a540becb8c83288ae3a15cfac069fd792e74) ) \ - + ROM_LOAD( "95008700.bin", 0x100000, 0x100000, CRC(49c37b2a) SHA1(5a59a540becb8c83288ae3a15cfac069fd792e74) ) #define sc_adsnt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1611 ANT AND DECS SOUNDS11 */ \ ROM_LOAD( "95008478.bin", 0x000000, 0x100000, CRC(d8aa3daf) SHA1(dafeb014f04179882921622df9b5c9917279bd02) ) \ - ROM_LOAD( "95008479.bin", 0x100000, 0x100000, CRC(f1ec9928) SHA1(cd2eb8115217c205f248564c9340353c84db2ac5) ) \ - + ROM_LOAD( "95008479.bin", 0x100000, 0x100000, CRC(f1ec9928) SHA1(cd2eb8115217c205f248564c9340353c84db2ac5) ) #define sc_adwta_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1940 ADSNT SHOWTIME SOUNDS11 */ \ ROM_LOAD( "95008656.bin", 0x000000, 0x100000, CRC(632a4cbb) SHA1(455e6242f5c5c1a0d84aadfdda33873e8e7b2418) ) \ - ROM_LOAD( "95008657.bin", 0x100000, 0x100000, CRC(aa68db50) SHA1(52ee314549fac989dd9ee494144ee3bbb99ee283) ) \ - + ROM_LOAD( "95008657.bin", 0x100000, 0x100000, CRC(aa68db50) SHA1(52ee314549fac989dd9ee494144ee3bbb99ee283) ) #define sc_aztec_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 95004286 AZTEC PR1155 */ \ - ROM_LOAD( "95004286.snd", 0x0000, 0x080000, CRC(20de4ebe) SHA1(0ea12d0c46f90efd8b040c2374d749fb7b15698e) ) \ - + ROM_LOAD( "95004286.snd", 0x0000, 0x080000, CRC(20de4ebe) SHA1(0ea12d0c46f90efd8b040c2374d749fb7b15698e) ) #define sc_bjob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR000053 BANKJOB 1 */ \ ROM_LOAD( "95009126.bin", 0x000000, 0x100000, CRC(55940c44) SHA1(e4f2f36ccf28446011e43f5c8a72fa9d15f72df0) ) \ - ROM_LOAD( "95009127.bin", 0x100000, 0x100000, CRC(0d3ee6d9) SHA1(a40bffaf631010d53ce9228758bbf5dba8423f6e) ) \ - + ROM_LOAD( "95009127.bin", 0x100000, 0x100000, CRC(0d3ee6d9) SHA1(a40bffaf631010d53ce9228758bbf5dba8423f6e) ) #define sc_bucc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3216 BUCKANEERS SOUNDS11 */ \ ROM_LOAD( "95008806.bin", 0x000000, 0x100000, CRC(16ee0143) SHA1(0890da3b2108ec67db1cc8ed2dc40f2eac2a5fbc) ) \ - ROM_LOAD( "95008807.bin", 0x100000, 0x100000, CRC(7141737f) SHA1(74607352f32df2a27f0724f243532c98ca315910) ) \ - + ROM_LOAD( "95008807.bin", 0x100000, 0x100000, CRC(7141737f) SHA1(74607352f32df2a27f0724f243532c98ca315910) ) #define sc_bunny_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* BUNN SOUNDS */ \ - ROM_LOAD( "95008907.bin", 0x0000, 0x08b8c3, CRC(2b4911fd) SHA1(7ccdb5e5accb548c10ef288fd901825505559866) ) \ - + ROM_LOAD( "95008907.bin", 0x0000, 0x08b8c3, CRC(2b4911fd) SHA1(7ccdb5e5accb548c10ef288fd901825505559866) ) #define sc_bantm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* BANTAM SOUNDS */ \ ROM_LOAD( "95008962.bin", 0x000000, 0x100000, CRC(3c10480f) SHA1(67c86228b6199e336beaa21b2982ce3cf5867ed1) ) \ @@ -604,120 +591,97 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890434.bin", 0x0000, 0x5000, CRC(37740955) SHA1(c7a9839a4f7f01c916b696a8baedf33d0c146fa3) ) \ ROM_LOAD( "95890435.bin", 0x0000, 0x5000, CRC(42e24d61) SHA1(dd915ccf979d61cdb0ff7598d35cdceb43d6d8e9) ) \ - ROM_LOAD( "95890436.bin", 0x0000, 0x5000, CRC(dc58813d) SHA1(9bad2c6cdacaa016f5239e578600f1ff03f1ed63) ) \ - + ROM_LOAD( "95890436.bin", 0x0000, 0x5000, CRC(dc58813d) SHA1(9bad2c6cdacaa016f5239e578600f1ff03f1ed63) ) #define sc_bar7_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1433 BAR SEVENS SOUNDS11 */ \ - ROM_LOAD( "95008409.bin", 0x0000, 0x080000, CRC(ec29c758) SHA1(ceb99fb6edcab5c5e1b0ec46d622ee0f2cdb20be) ) \ - + ROM_LOAD( "95008409.bin", 0x0000, 0x080000, CRC(ec29c758) SHA1(ceb99fb6edcab5c5e1b0ec46d622ee0f2cdb20be) ) #define PR1492_CAS_BAR_SEVENS_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1492 CAS BAR SEVENS SOUNDS11 */ \ - ROM_LOAD( "95008502.bin", 0x0000, 0x080000, CRC(d9bc2c75) SHA1(b9e637d47287a844a6ff1f0b1d1a34b48a806aad) ) \ - + ROM_LOAD( "95008502.bin", 0x0000, 0x080000, CRC(d9bc2c75) SHA1(b9e637d47287a844a6ff1f0b1d1a34b48a806aad) ) #define sc_batl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008541.bin", 0x000000, 0x100000, CRC(a739cba8) SHA1(b968cfa18c671aaf027909961a843fc01101d68a) ) \ - ROM_LOAD( "95008542.bin", 0x100000, 0x100000, CRC(686bb7cc) SHA1(4e809f2d1401030127d7afa853189c4fca9742e5) ) \ - + ROM_LOAD( "95008542.bin", 0x100000, 0x100000, CRC(686bb7cc) SHA1(4e809f2d1401030127d7afa853189c4fca9742e5) ) #define sc_bedcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008397.bin", 0x0000, 0x0fe1b3, CRC(d59cd40d) SHA1(585e42b66e691ab9a3df5bb7dae4368226861b04) ) \ - + ROM_LOAD( "95008397.bin", 0x0000, 0x0fe1b3, CRC(d59cd40d) SHA1(585e42b66e691ab9a3df5bb7dae4368226861b04) ) #define sc_bblas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008302", 0x0000, 0x0fea01, CRC(ef880aee) SHA1(00177f6a0bfe2006d8545834ea4fb22427be97c4) ) \ - + ROM_LOAD( "95008302", 0x0000, 0x0fea01, CRC(ef880aee) SHA1(00177f6a0bfe2006d8545834ea4fb22427be97c4) ) #define sc_bbust_others \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "95008050.bin", 0x0000, 0x0fc8a1, CRC(8f1a49b5) SHA1(9d75e7118c628b3665a31376a3e35797b7058f6b) ) \ - + ROM_LOAD( "95008050.bin", 0x0000, 0x0fc8a1, CRC(8f1a49b5) SHA1(9d75e7118c628b3665a31376a3e35797b7058f6b) ) #define sc_bobcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008967.bin", 0x0000, 0x0f64c6, CRC(cf1e1c59) SHA1(f7ccbc6ed20aed329c2a199a489686bb8e87edfb) ) \ - + ROM_LOAD( "95008967.bin", 0x0000, 0x0f64c6, CRC(cf1e1c59) SHA1(f7ccbc6ed20aed329c2a199a489686bb8e87edfb) ) #define sc_bonbx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008992.bin", 0x0000, 0x0aa536, CRC(aad10089) SHA1(d8a32f66432ee901be05435e8930d3897f4b4e33) ) /* BARX - right header, wrong sounds? */ \ - ROM_LOAD( "95009015.bin", 0x0000, 0x0b7821, CRC(8b6ca362) SHA1(4c50935b6d1038738ce631fbdc359416197b8c03) ) /* BARX - right header, wrong sounds? */ \ - + ROM_LOAD( "95009015.bin", 0x0000, 0x0b7821, CRC(8b6ca362) SHA1(4c50935b6d1038738ce631fbdc359416197b8c03) ) /* BARX - right header, wrong sounds? */ #define sc_brksp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008210.bin", 0x0000, 0x1aea2f, CRC(da15a50e) SHA1(2f068526992358789e5f2c347a5adf56a1bfde52) ) \ - + ROM_LOAD( "95008210.bin", 0x0000, 0x1aea2f, CRC(da15a50e) SHA1(2f068526992358789e5f2c347a5adf56a1bfde52) ) #define sc_bpfpb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008771.bin", 0x000000, 0x100000, CRC(121b6db2) SHA1(634f435635fcb08013729629fc8f56a4180c2034) ) \ - ROM_LOAD( "95008772.bin", 0x100000, 0x100000, CRC(c8813870) SHA1(5c4571a3ca9a06c49e80c5e10e9fd288de560324) ) \ - + ROM_LOAD( "95008772.bin", 0x100000, 0x100000, CRC(c8813870) SHA1(5c4571a3ca9a06c49e80c5e10e9fd288de560324) ) #define sc_bpb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008553.bin", 0x000000, 0x100000, CRC(f8019fb2) SHA1(aa5baed73538ebc6e39c6e35437b77a5cc22135e) ) \ - ROM_LOAD( "95008554.bin", 0x100000, 0x100000, CRC(8e00a011) SHA1(821686d96ee6fb45ab0b771934ce25ab7a230c0c) ) \ - + ROM_LOAD( "95008554.bin", 0x100000, 0x100000, CRC(8e00a011) SHA1(821686d96ee6fb45ab0b771934ce25ab7a230c0c) ) #define sc_bull_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008520.bin", 0x000000, 0x100000, CRC(ab418ce0) SHA1(39afbd449a21a31016acaffcfb4f6d684db300e7) ) \ - ROM_LOAD( "95008521.bin", 0x100000, 0x100000, CRC(7fd0f70c) SHA1(e6bf85b9e2528dac5811277ee89599e58e6358b0) ) \ - + ROM_LOAD( "95008521.bin", 0x100000, 0x100000, CRC(7fd0f70c) SHA1(e6bf85b9e2528dac5811277ee89599e58e6358b0) ) #define PR1743_CASINO_BULLSEYE_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008544.bin", 0x000000, 0x100000, CRC(19777f20) SHA1(da0cc08b00f9ab565a0e559761adbf7bcd7c327b) ) \ - + ROM_LOAD( "95008544.bin", 0x000000, 0x100000, CRC(19777f20) SHA1(da0cc08b00f9ab565a0e559761adbf7bcd7c327b) ) #define PR1758_BULLSEYE_TRIPLE_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008575.bin", 0x000000, 0x100000, CRC(715901d2) SHA1(a7d3d0c7b9fc3eefb0df372cdf0cae7abe8bd959) ) \ - + ROM_LOAD( "95008575.bin", 0x000000, 0x100000, CRC(715901d2) SHA1(a7d3d0c7b9fc3eefb0df372cdf0cae7abe8bd959) ) #define PR3318_BULLSEYE_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009116.bin", 0x000000, 0x100000, CRC(5a01e206) SHA1(38ee3706d9edb68d17c90bb627aa17b4f908d721) ) \ - ROM_LOAD( "95009117.bin", 0x100000, 0x100000, CRC(c3623829) SHA1(92b0cf89678023bb02394699e2e214389317ec6c) ) \ - + ROM_LOAD( "95009117.bin", 0x100000, 0x100000, CRC(c3623829) SHA1(92b0cf89678023bb02394699e2e214389317ec6c) ) #define sc_butch_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008604.bin", 0x000000, 0x100000, CRC(dede59e0) SHA1(de56b80d0a53fbb18acce2b907f48801e8fced12) ) \ - ROM_LOAD( "95008605.bin", 0x100000, 0x100000, CRC(3db1a818) SHA1(2c20d39dc0d7eb3996209a0b34afae3cd2eebbdc) ) \ - + ROM_LOAD( "95008605.bin", 0x100000, 0x100000, CRC(3db1a818) SHA1(2c20d39dc0d7eb3996209a0b34afae3cd2eebbdc) ) #define sc_cfact_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008508.bin", 0x000000, 0x100000, CRC(97d26d77) SHA1(828e3797184b39e1b8fd788253071f323f2d890e) ) \ - ROM_LOAD( "95008509.bin", 0x100000, 0x100000, CRC(8d1e1f36) SHA1(8976a74c050158fc63fbcbfbadd3f41fca187a24) ) \ - + ROM_LOAD( "95008509.bin", 0x100000, 0x100000, CRC(8d1e1f36) SHA1(8976a74c050158fc63fbcbfbadd3f41fca187a24) ) #define sc_ctit_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008762.bin", 0x000000, 0x100000, CRC(cf7fc030) SHA1(0c34d9b35eb6229ae48b27f2f88ff682b4601816) ) \ - ROM_LOAD( "95008763.bin", 0x100000, 0x100000, CRC(767b94d9) SHA1(5cac6831e54af03eea065143c04bda54f44fec7d) ) \ - + ROM_LOAD( "95008763.bin", 0x100000, 0x100000, CRC(767b94d9) SHA1(5cac6831e54af03eea065143c04bda54f44fec7d) ) #define sc_craid_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890715.bin", 0x0000, 0x5000, CRC(60af654b) SHA1(ec714992a41b154f534aac0a515e1ef490dad0db) ) \ ROM_LOAD( "95890716.bin", 0x0000, 0x5000, CRC(1539217f) SHA1(bc766636048c720ac5df55bbf643e2801536e58f) ) \ ROM_LOAD( "95890717.bin", 0x0000, 0x5000, CRC(8b83ed23) SHA1(43d56d728fbbb81c9e660e537746cd2aa01aadd1) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008851.bin", 0x0000, 0x0fa2fc, CRC(ec82c860) SHA1(7806065db24c13208c77009c64de91a3fb0f4311) ) \ - + ROM_LOAD( "95008851.bin", 0x0000, 0x0fa2fc, CRC(ec82c860) SHA1(7806065db24c13208c77009c64de91a3fb0f4311) ) #define sc_cvega_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008477.bin", 0x0000, 0x100000, CRC(74607f2f) SHA1(8ce25e6af2fa8b2b4acd794dd78511983d10f7f5) ) \ - + ROM_LOAD( "95008477.bin", 0x0000, 0x100000, CRC(74607f2f) SHA1(8ce25e6af2fa8b2b4acd794dd78511983d10f7f5) ) #define sc_chopc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008908.bin", 0x0000, 0x0fa18a, CRC(78e8e1cf) SHA1(0211fffcaab36d88610525c85efb5ea7835fb641) ) \ - + ROM_LOAD( "95008908.bin", 0x0000, 0x0fa18a, CRC(78e8e1cf) SHA1(0211fffcaab36d88610525c85efb5ea7835fb641) ) #define sc_cbar7_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891086.bin", 0x0000, 0x5000, CRC(64066892) SHA1(acdf17a6fec87c3094b4b363d5f5a21d58e6260a) ) \ ROM_LOAD( "95891087.bin", 0x0000, 0x5000, CRC(11902ca6) SHA1(2c7fbf5ec8f22cf1d29d7eb437b8e0403ebbfb13) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95009002.bin", 0x0000, 0x05dab2, CRC(7763eeea) SHA1(946ec95a75e3ffdba98c67d58162f7d2e456480e) ) \ - + ROM_LOAD( "95009002.bin", 0x0000, 0x05dab2, CRC(7763eeea) SHA1(946ec95a75e3ffdba98c67d58162f7d2e456480e) ) #define sc_clu70_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891124.bin", 0x0000, 0x5000, CRC(efb25e7e) SHA1(f1da25d6f6c2fe9953c0f95e889b845e65a1fe27) ) \ @@ -725,74 +689,61 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95891126.bin", 0x0000, 0x5000, CRC(049ed616) SHA1(2c29271dfebff92b3f537dd3cc89aea53decf978) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009017.bin", 0x000000, 0x100000, CRC(4df62a63) SHA1(1d3b7927683d45bf81c038527b57881a58657e21) ) \ - ROM_LOAD( "95009018.bin", 0x100000, 0x030022, CRC(90c95f34) SHA1(a63d52b7ec202f6757ed24251e542be2409ba2a9) ) \ - + ROM_LOAD( "95009018.bin", 0x100000, 0x030022, CRC(90c95f34) SHA1(a63d52b7ec202f6757ed24251e542be2409ba2a9) ) #define sc_clcas_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890486.bin", 0x0000, 0x5000, CRC(52bab0b5) SHA1(2144c1c9b980f6dbc1948e94c34fc2213fc5aa70) ) \ ROM_LOAD( "95890487.bin", 0x0000, 0x5000, CRC(4e6c4009) SHA1(44ae2ce42ff9b91174e214213ccf52c281827434) ) \ ROM_LOAD( "95890488.bin", 0x0000, 0x5000, CRC(8d366299) SHA1(1d0cd59dfb39ca3a78ae2398992a992d34b2e61a) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008985.bin", 0x0000, 0x0b57f9, CRC(63366697) SHA1(cdab5d0aa1bf738e4e326ed31f78f2a797bd8bd6) ) \ - + ROM_LOAD( "95008985.bin", 0x0000, 0x0b57f9, CRC(63366697) SHA1(cdab5d0aa1bf738e4e326ed31f78f2a797bd8bd6) ) #define sc_clnot_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009135.bin", 0x000000, 0x100000, CRC(af699e46) SHA1(e8f685847f4eb83a67074cae92ed59e96f37653b) ) \ - ROM_LOAD( "95009136.bin", 0x100000, 0x100000, CRC(cd1ea94c) SHA1(8010ba1490c656f870230611d15255db175a5a49) ) \ - + ROM_LOAD( "95009136.bin", 0x100000, 0x100000, CRC(cd1ea94c) SHA1(8010ba1490c656f870230611d15255db175a5a49) ) #define sc_clus_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890495.bin", 0x0000, 0x5000, CRC(a475b60f) SHA1(4f02f0e0c19be7378736d6d4707f7b4a3068be9b) ) \ ROM_LOAD( "95890496.bin", 0x0000, 0x5000, CRC(d1e3f23b) SHA1(6f9032c000bcc0cd61180193d85d0a4623026d14) ) \ ROM_LOAD( "95890497.bin", 0x0000, 0x5000, CRC(4f593e67) SHA1(3a4591ae8ca140dff54d5e74143359fbecc14bfc) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008988.bin", 0x0000, 0x0d23ea, CRC(b33581a0) SHA1(667bf4e499b50fd072313bad671ffcbd299fd97b) ) \ - + ROM_LOAD( "95008988.bin", 0x0000, 0x0d23ea, CRC(b33581a0) SHA1(667bf4e499b50fd072313bad671ffcbd299fd97b) ) #define PR3502_C_OF_M_TEN_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009031.bin", 0x000000, 0x100000, CRC(58ded502) SHA1(27c05614b03b51fe4a168b8c64535ec3ca9e85c1) ) \ - ROM_LOAD( "95009032.bin", 0x100000, 0x100000, CRC(e1eb711a) SHA1(f6c0c10992f2aacd6f9fadc4e15d8ad5ba5b4ed8) ) \ - + ROM_LOAD( "95009032.bin", 0x100000, 0x100000, CRC(e1eb711a) SHA1(f6c0c10992f2aacd6f9fadc4e15d8ad5ba5b4ed8) ) #define PR3317_COLOUR_OF_MONEY_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009124.bin", 0x000000, 0x100000, CRC(798d8d5a) SHA1(931bfca5d204c62fc834959d9babcd9488fc7f07) ) \ - ROM_LOAD( "95009125.bin", 0x100000, 0x100000, CRC(d6090812) SHA1(16ca4868725eff0cc4bd056d751dc7861c1e53a1) ) \ - + ROM_LOAD( "95009125.bin", 0x100000, 0x100000, CRC(d6090812) SHA1(16ca4868725eff0cc4bd056d751dc7861c1e53a1) ) #define sc_cfnc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009178.bin", 0x000000, 0x100000, CRC(eb938e0a) SHA1(978fa5554462d5d2cbf6a696c6c754318e950223) ) \ - ROM_LOAD( "95009179.bin", 0x100000, 0x100000, CRC(baf8b8b7) SHA1(43b967f3909270b99b563dab4bd1035079a5cb78) ) \ - + ROM_LOAD( "95009179.bin", 0x100000, 0x100000, CRC(baf8b8b7) SHA1(43b967f3909270b99b563dab4bd1035079a5cb78) ) #define sc_cfcp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009035.bin", 0x000000, 0x100000, CRC(8138c442) SHA1(ceaeb84a27d0e3eba8d3a9a7c76e86b4214178c9) ) \ - ROM_LOAD( "95009036.bin", 0x100000, 0x100000, CRC(757f44b9) SHA1(61fe15024f7c7f97f865b1b666a5f837a57446a5) ) \ - + ROM_LOAD( "95009036.bin", 0x100000, 0x100000, CRC(757f44b9) SHA1(61fe15024f7c7f97f865b1b666a5f837a57446a5) ) #define sc_cfpt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1359 CRAZY F PARTY SOUNDS11 */ \ ROM_LOAD( "95008348.bin", 0x000000, 0x100000, CRC(9c6db3d1) SHA1(f2f613326d0a8c0a1c2e1eea1e91ed34cd344f41) ) \ ROM_REGION( 0x400000, "others1", ROMREGION_ERASE00 ) /* PR1359 TB CRAZY F P SOUNDS11 (topbox rom?)*/ \ ROM_LOAD( "95008349.bin", 0x100000, 0x100000, CRC(6f7716a0) SHA1(75f8fbee605b96e36e8596068dd4570928a5a02d) ) \ ROM_REGION( 0x400000, "others2", ROMREGION_ERASE00 ) /* PR1359 TB CRAZY F P SOUNDS11 (alt topbox rom?) */ \ - ROM_LOAD( "95008363.bin", 0x000000, 0x100000, CRC(6d211d7b) SHA1(59dbb6201aa355a585253d17302e4f8ceed9a220) ) \ - + ROM_LOAD( "95008363.bin", 0x000000, 0x100000, CRC(6d211d7b) SHA1(59dbb6201aa355a585253d17302e4f8ceed9a220) ) #define sc_cknig_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009193.bin", 0x000000, 0x100000, CRC(6c3cb54b) SHA1(a140209d19f9cbd18ede08924b94718264ba4118) ) \ - ROM_LOAD( "95009194.bin", 0x100000, 0x100000, CRC(44229686) SHA1(eda0481282614e6bd82985486ef4eea0eb0ddccd) ) \ - + ROM_LOAD( "95009194.bin", 0x100000, 0x100000, CRC(44229686) SHA1(eda0481282614e6bd82985486ef4eea0eb0ddccd) ) #define sc_cpays_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008528.bin", 0x0000, 0x100000, CRC(eccde2dc) SHA1(83fc283269fea98ea1b2c0b846bb790bf84d3053) ) \ - + ROM_LOAD( "95008528.bin", 0x0000, 0x100000, CRC(eccde2dc) SHA1(83fc283269fea98ea1b2c0b846bb790bf84d3053) ) #define sc_canca \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004270.bin", 0x0000, 0x0d4379, CRC(c0db303d) SHA1(8929e4901d517e6063dc75ff40cbcd478bb0be8a) ) \ - + ROM_LOAD( "95004270.bin", 0x0000, 0x0d4379, CRC(c0db303d) SHA1(8929e4901d517e6063dc75ff40cbcd478bb0be8a) ) #define sc_carry_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008240.bin", 0x0000, 0x100000, CRC(7c693111) SHA1(6807d78d32e817babd4e1ed2c0b7313d7cc8ebc2) ) \ - + ROM_LOAD( "95008240.bin", 0x0000, 0x100000, CRC(7c693111) SHA1(6807d78d32e817babd4e1ed2c0b7313d7cc8ebc2) ) #define sc_cmous_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008439.bin", 0x0000, 0x0e94e0, CRC(9bcded46) SHA1(9f1b431ac010f2ab9a8d393b167ff81baf7f86a5) ) \ @@ -801,58 +752,46 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890396.bin", 0x0000, 0x5000, CRC(2d9efdff) SHA1(0b6642bb202092eb1ef8791a3a1f2b79ad1b5fff) ) \ ROM_LOAD( "95890397.bin", 0x0000, 0x5000, CRC(eec4df6f) SHA1(b4fd028f28fa43d54c6aaf6062ba79a37f232025) ) \ ROM_REGION( 0x400000, "others", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008947.bin", 0x0000, 0x0fc44b, CRC(457a86c3) SHA1(e36ba57a981bb0f8b581c4b8e1ddd6e55c24bf00) ) /* cash & mouse s16 sounds */ \ - + ROM_LOAD( "95008947.bin", 0x0000, 0x0fc44b, CRC(457a86c3) SHA1(e36ba57a981bb0f8b581c4b8e1ddd6e55c24bf00) ) /* cash & mouse s16 sounds */ #define sc_cnfr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004130.lo", 0x000000, 0x080000, CRC(223e2bd4) SHA1(f8e187cc74e524496c9e5b35260ac56b93e6e83b) ) \ - ROM_LOAD( "95004131.hi", 0x080000, 0x080000, CRC(3840ffd6) SHA1(d72901b08c11d1f5b16fdb1a8fe57625cc25bd44) ) \ - + ROM_LOAD( "95004131.hi", 0x080000, 0x080000, CRC(3840ffd6) SHA1(d72901b08c11d1f5b16fdb1a8fe57625cc25bd44) ) #define sc_cad_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008396.bin", 0x0000, 0x0ff641, CRC(f24c5ef6) SHA1(83395f64b79efbd4f3153e5d0a2d2b0d0183f857) ) \ - + ROM_LOAD( "95008396.bin", 0x0000, 0x0ff641, CRC(f24c5ef6) SHA1(83395f64b79efbd4f3153e5d0a2d2b0d0183f857) ) #define sc_cadcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008486.bin", 0x0000, 0x0ff641, CRC(05e8cba2) SHA1(7a99ab3f45588cff0e54a94ffd75df337cff7351) ) \ - + ROM_LOAD( "95008486.bin", 0x0000, 0x0ff641, CRC(05e8cba2) SHA1(7a99ab3f45588cff0e54a94ffd75df337cff7351) ) #define sc_clash_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008374.bin", 0x0000, 0x0feb46, CRC(47ea13e2) SHA1(f9b6e23b3857da5f1f364469c8d4deb4f8d836a6) ) \ - + ROM_LOAD( "95008374.bin", 0x0000, 0x0feb46, CRC(47ea13e2) SHA1(f9b6e23b3857da5f1f364469c8d4deb4f8d836a6) ) #define sc_cr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008245.bin", 0x0000, 0x0ffadf, CRC(6528bb5c) SHA1(d54e1f0a18dbbc91316d57be25e0cf5236e856e6) ) \ - + ROM_LOAD( "95008245.bin", 0x0000, 0x0ffadf, CRC(6528bb5c) SHA1(d54e1f0a18dbbc91316d57be25e0cf5236e856e6) ) #define sc_crcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008338.bin", 0x0000, 0x0ffadf, CRC(b26edbfe) SHA1(9f5c7a8e6781bad6448f767d19474bbad8024df5) ) \ - + ROM_LOAD( "95008338.bin", 0x0000, 0x0ffadf, CRC(b26edbfe) SHA1(9f5c7a8e6781bad6448f767d19474bbad8024df5) ) #define sc_cckey_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008425.bin", 0x0000, 0x100000, CRC(99bf2289) SHA1(596fe427dd7abf2779e12e3f20a5ba2eda553f2e) ) \ - + ROM_LOAD( "95008425.bin", 0x0000, 0x100000, CRC(99bf2289) SHA1(596fe427dd7abf2779e12e3f20a5ba2eda553f2e) ) #define sc_chub_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004109", 0x000000, 0x080000, CRC(2e3e2f6e) SHA1(217197bdbcd27271afce7809de7c49cca4ef3656) ) \ - ROM_LOAD( "95004110", 0x080000, 0x080000, CRC(29f3caef) SHA1(dddf38b3da4b9756103b32de4d5d12d612223298) ) \ - + ROM_LOAD( "95004110", 0x080000, 0x080000, CRC(29f3caef) SHA1(dddf38b3da4b9756103b32de4d5d12d612223298) ) #define sc_cla7_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004334.bin", 0x0000, 0x080000, CRC(bd8a3d25) SHA1(9dd5d124ce467293417575bf316dc1b371bc3169) ) \ - + ROM_LOAD( "95004334.bin", 0x0000, 0x080000, CRC(bd8a3d25) SHA1(9dd5d124ce467293417575bf316dc1b371bc3169) ) #define sc_clclo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008889.bin", 0x0000, 0x0edfec, CRC(fb894b4f) SHA1(60b3f28efda4ecb9f7804540291c8c3b8bead27a) ) \ - + ROM_LOAD( "95008889.bin", 0x0000, 0x0edfec, CRC(fb894b4f) SHA1(60b3f28efda4ecb9f7804540291c8c3b8bead27a) ) #define sc_colos_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004235.sn1", 0x000000, 0x080000, CRC(e543f4ab) SHA1(7d72f1392fbd43afe390d4f3059b06cd789528d4) ) \ - ROM_LOAD( "95004236.sn2", 0x080000, 0x080000, CRC(0f26a957) SHA1(b0949534d44dd22b6f676203f52fad978b36d04b) ) \ - + ROM_LOAD( "95004236.sn2", 0x080000, 0x080000, CRC(0f26a957) SHA1(b0949534d44dd22b6f676203f52fad978b36d04b) ) @@ -860,43 +799,36 @@ INPUT_PORTS_EXTERN( sc4_base ); #define sc_cccsh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004173", 0x000000, 0x080000, CRC(67970fed) SHA1(938414921a0956841ce4447471b7663f5c2c2d4f) ) \ - ROM_LOAD( "95004174", 0x080000, 0x080000, CRC(1f1dd01f) SHA1(6ed312c1e50056bf3cae156e595b26374d7d4816) ) \ - + ROM_LOAD( "95004174", 0x080000, 0x080000, CRC(1f1dd01f) SHA1(6ed312c1e50056bf3cae156e595b26374d7d4816) ) #define sc_ckx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008995.bin", 0x0000, 0x0931b3, CRC(e874bd15) SHA1(8adb32532dd053ca2c4e0987352013310ce197a0) ) \ - + ROM_LOAD( "95008995.bin", 0x0000, 0x0931b3, CRC(e874bd15) SHA1(8adb32532dd053ca2c4e0987352013310ce197a0) ) #define sc_chick_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008291.bin", 0x0000, 0x0b2877, CRC(8e9f53d4) SHA1(7c91e64d7214e1c08b0976f901713228bb64ee49) ) \ - + ROM_LOAD( "95008291.bin", 0x0000, 0x0b2877, CRC(8e9f53d4) SHA1(7c91e64d7214e1c08b0976f901713228bb64ee49) ) #define sc_cabin_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008902.bin", 0x0000, 0x0e7fd3, CRC(c7b0f675) SHA1(e19d4e65d73329a58b9cbc6828c7e0c287f2906a) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890306.bin", 0x0000, 0x5000, CRC(eff2e8d8) SHA1(0749d543bf760b2037330ade671c7ce7ed64b275) ) \ ROM_LOAD( "95890307.bin", 0x0000, 0x5000, CRC(9a64acec) SHA1(51c49e8d415d99e61fda99ade43bb925d99f3825) ) \ - ROM_LOAD( "95890308.bin", 0x0000, 0x5000, CRC(04de60b0) SHA1(cee280d9528f9e167be1c373e7a99f1f2f1bc1c0) ) \ - + ROM_LOAD( "95890308.bin", 0x0000, 0x5000, CRC(04de60b0) SHA1(cee280d9528f9e167be1c373e7a99f1f2f1bc1c0) ) #define sc_cari_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* CABC SOUNDS */ \ ROM_LOAD( "95008981.bin", 0x000000, 0x0ff245, CRC(3a888f98) SHA1(b113c17acda287200fdcd734a1b384879a5e7101) ) \ ROM_REGION( 0x5000, "pics", 0 ) /* do these belong to this, or the QPS game? */ \ ROM_LOAD( "95890474.bin", 0x0000, 0x5000, CRC(bcb54114) SHA1(0236171b34f3e47db9aa253f9605ff6bd21b1460) ) \ ROM_LOAD( "95890475.bin", 0x0000, 0x5000, CRC(c9230520) SHA1(5cf9c3d130f114dac633d696e0bf1bda94afb9ee) ) \ - ROM_LOAD( "95890476.bin", 0x0000, 0x5000, CRC(5799c97c) SHA1(5dab858e61815c04f874f231848c376d8fce1c3d) ) \ - + ROM_LOAD( "95890476.bin", 0x0000, 0x5000, CRC(5799c97c) SHA1(5dab858e61815c04f874f231848c376d8fce1c3d) ) #define sc_cariq_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* CARIBBEANSND */ \ ROM_LOAD( "97000070.bin", 0x000000, 0x0f8526, CRC(27ba6768) SHA1(708e836f3fc35fabd0a5c8dc9cd8e9327d7bcdc7) ) \ ROM_REGION( 0x400000, "others1", ROMREGION_ERASE00 ) /* CARIBBEANSND (same data?) */ \ ROM_LOAD( "caribbeancashsnd1.bin", 0x000000, 0x080000, CRC(89da9fc4) SHA1(d56364e2e71d03d7d8888966b64ff1fab4bfc3e9) ) \ - ROM_LOAD( "caribbeancashsnd2.bin", 0x080000, 0x080000, CRC(99d33f61) SHA1(7caf3b9540372900e90a7141f14383fe06936a2e) ) \ - + ROM_LOAD( "caribbeancashsnd2.bin", 0x080000, 0x080000, CRC(99d33f61) SHA1(7caf3b9540372900e90a7141f14383fe06936a2e) ) #define sc_cblas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008539.bin", 0x0000, 0x0e0033, CRC(068349f4) SHA1(b27cba3217122397eb7aea0d9a382fda9ee6a43b) ) \ - + ROM_LOAD( "95008539.bin", 0x0000, 0x0e0033, CRC(068349f4) SHA1(b27cba3217122397eb7aea0d9a382fda9ee6a43b) ) #define sc_casxt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -904,88 +836,72 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890718.bin", 0x0000, 0x5000, CRC(dd65993f) SHA1(db2af897e36d7b55ed1d1d2efe350f4802449945) ) \ ROM_LOAD( "95890719.bin", 0x0000, 0x5000, CRC(c1b36983) SHA1(2b74336915c7156723e2554f152ed34f6c88a16a) ) \ - ROM_LOAD( "95890720.bin", 0x0000, 0x5000, CRC(02e94b13) SHA1(2d8fffc631e1a590774131bdea1f0b5ec8c6e8f3) ) \ - + ROM_LOAD( "95890720.bin", 0x0000, 0x5000, CRC(02e94b13) SHA1(2d8fffc631e1a590774131bdea1f0b5ec8c6e8f3) ) #define sc_cmani_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008295.bin", 0x0000, 0x100000, CRC(a5646d3b) SHA1(9aca69f103f959a85026fd0d0ffb3bd65eebae34) ) \ - + ROM_LOAD( "95008295.bin", 0x0000, 0x100000, CRC(a5646d3b) SHA1(9aca69f103f959a85026fd0d0ffb3bd65eebae34) ) #define sc_cj_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008427.bin", 0x0000, 0x100000, CRC(a6093378) SHA1(30a64e8857da269cbc0b3febf30a62f5647d10b9) ) \ - + ROM_LOAD( "95008427.bin", 0x0000, 0x100000, CRC(a6093378) SHA1(30a64e8857da269cbc0b3febf30a62f5647d10b9) ) #define sc_ctl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008225.bin", 0x0000, 0x100000, CRC(b185224e) SHA1(a4b4c618903c4c207de8dae74b55fd2c85a5e4ff) ) \ - + ROM_LOAD( "95008225.bin", 0x0000, 0x100000, CRC(b185224e) SHA1(a4b4c618903c4c207de8dae74b55fd2c85a5e4ff) ) #define sc_crsc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008681.bin", 0x0000, 0x100000, CRC(7a459110) SHA1(51f0a51af485a0f4e447ee0c22f488a924e45117) ) \ - + ROM_LOAD( "95008681.bin", 0x0000, 0x100000, CRC(7a459110) SHA1(51f0a51af485a0f4e447ee0c22f488a924e45117) ) #define sc_cfqps_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6813 CRAZY FRUITS SOUNDS11 */ \ ROM_LOAD( "95004101.bin", 0x000000, 0x080000, CRC(31e5785a) SHA1(8da2bd3571640b0ae23e9fdcc2235dcf9d2de122) ) \ ROM_LOAD( "95004102.bin", 0x080000, 0x080000, CRC(bf059b21) SHA1(89a96c593e5385e9b40f694768986691eed4b5c5) ) \ ROM_REGION( 0x400000, "others", ROMREGION_ERASE00 ) /* PR6813 CRAZY FRUITS SOUNDS11 (same data?) */ \ - ROM_LOAD( "95008339.bin", 0x000000, 0x100000, CRC(bae07fa8) SHA1(a86a5d9ff6ac802bd15275f46894374317627e23) ) \ - + ROM_LOAD( "95008339.bin", 0x000000, 0x100000, CRC(bae07fa8) SHA1(a86a5d9ff6ac802bd15275f46894374317627e23) ) #define sc_czfr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6813 CRAZY FRUITS SOUNDS11 */ \ ROM_LOAD( "crazy sound 1.bin", 0x000000, 0x080000, CRC(31e5785a) SHA1(8da2bd3571640b0ae23e9fdcc2235dcf9d2de122) ) \ ROM_LOAD( "crazy sound 2.bin", 0x080000, 0x080000, CRC(bf059b21) SHA1(89a96c593e5385e9b40f694768986691eed4b5c5) ) \ \ ROM_REGION( 0x400000, "others", ROMREGION_ERASE00 ) \ - ROM_LOAD( "oki_sound_rom--ccfsnd.bin", 0x0000, 0x02196a, CRC(15e542c2) SHA1(9bd9218b7392c882f68e330619bea7996afd001e) ) /* oki sound rom, doubt it belongs here */ \ - + ROM_LOAD( "oki_sound_rom--ccfsnd.bin", 0x0000, 0x02196a, CRC(15e542c2) SHA1(9bd9218b7392c882f68e330619bea7996afd001e) ) /* oki sound rom, doubt it belongs here */ #define SOUND_95004150_CRAZY_FRUITS_PR6982 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004150.bin", 0x000000, 0x080000, CRC(7707ea0d) SHA1(efe187a4c64a3a5f8d10e21c269afbb603186ae7) ) \ - ROM_LOAD( "95004151.bin", 0x080000, 0x080000, CRC(54845756) SHA1(e53dfa8f836044232ee1a8006051ef586ac24d8c) ) \ - + ROM_LOAD( "95004151.bin", 0x080000, 0x080000, CRC(54845756) SHA1(e53dfa8f836044232ee1a8006051ef586ac24d8c) ) #define PR1152_CRAZY_FRUITS_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004280.sn1", 0x000000, 0x080000, CRC(44d1b0d9) SHA1(2e361a1b65955acecbc26ba47000e4ef6316a22d) ) \ - ROM_LOAD( "95004281.sn2", 0x080000, 0x080000, CRC(31f057f3) SHA1(a6415eee8499ada43225901dee2d12c93d494658) ) \ - + ROM_LOAD( "95004281.sn2", 0x080000, 0x080000, CRC(31f057f3) SHA1(a6415eee8499ada43225901dee2d12c93d494658) ) #define sc_crnjw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008469.bin", 0x0000, 0x100000, CRC(07df5a41) SHA1(56dacba05e26258e50085f78dfe965196917addf) ) /* PR1608 CROWN JEWELS SOUNDS11 */ \ - + ROM_LOAD( "95008469.bin", 0x0000, 0x100000, CRC(07df5a41) SHA1(56dacba05e26258e50085f78dfe965196917addf) ) /* PR1608 CROWN JEWELS SOUNDS11 */ #define PR000055_CJEWELS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009176.bin", 0x000000, 0x100000, CRC(d1db2564) SHA1(641f94108df9dffde599012018d944e3848f50ed) ) \ - ROM_LOAD( "95009177.bin", 0x100000, 0x100000, CRC(e574cc1c) SHA1(760284d60d336571495da921ff666ac5725d7c19) ) \ - + ROM_LOAD( "95009177.bin", 0x100000, 0x100000, CRC(e574cc1c) SHA1(760284d60d336571495da921ff666ac5725d7c19) ) #define sc_cclim_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008243.bin", 0x0000, 0x100000, CRC(b21e073b) SHA1(dfe309490c5c69052041c2121258c17b974f88ed) ) \ - + ROM_LOAD( "95008243.bin", 0x0000, 0x100000, CRC(b21e073b) SHA1(dfe309490c5c69052041c2121258c17b974f88ed) ) #define sc_chavi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008563.bin", 0x0000, 0x100000, CRC(e4d30521) SHA1(70a2d88842ee40c77011a2ed8ca45f71316d2579) ) \ - + ROM_LOAD( "95008563.bin", 0x0000, 0x100000, CRC(e4d30521) SHA1(70a2d88842ee40c77011a2ed8ca45f71316d2579) ) #define sc_chavy_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008964.bin", 0x0000, 0x0fc821, CRC(597bc1c8) SHA1(f28d3fe1dd5ccf4d5ff6e1088a392b4713e6d1b5) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890437.bin", 0x0000, 0x5000, CRC(e4c29dae) SHA1(5e81acde46a489b8a9056167e33efec3d2d1b95a) ) \ ROM_LOAD( "95890438.bin", 0x0000, 0x5000, CRC(9154d99a) SHA1(61ef137e6db5f8394b948c589c0cee506a48f9ed) ) \ - ROM_LOAD( "95890439.bin", 0x0000, 0x5000, CRC(0fee15c6) SHA1(3d24e9861c2c7a67a3d4d156b9281e857de30a55) ) \ - + ROM_LOAD( "95890439.bin", 0x0000, 0x5000, CRC(0fee15c6) SHA1(3d24e9861c2c7a67a3d4d156b9281e857de30a55) ) #define sc_crotr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009049.bin", 0x000000, 0x100000, CRC(10c94788) SHA1(8fb5113036a0122a4dbc9af15b600ffe99e51094) ) \ - ROM_LOAD( "95009050.bin", 0x100000, 0x100000, CRC(5e47e86c) SHA1(9aaca1390852f9079cd355c48b889fb5962c5c09) ) \ - + ROM_LOAD( "95009050.bin", 0x100000, 0x100000, CRC(5e47e86c) SHA1(9aaca1390852f9079cd355c48b889fb5962c5c09) ) #define sc_crsgr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009139.bin", 0x000000, 0x100000, CRC(f2e4fa3c) SHA1(1909de32f232e5bfb3ee3c624f29c585cca254c2) ) \ - ROM_LOAD( "95009140.bin", 0x100000, 0x100000, CRC(81bdf47f) SHA1(49c02fb87a4ffc1be4c748c469f5518c314b1391) ) \ - + ROM_LOAD( "95009140.bin", 0x100000, 0x100000, CRC(81bdf47f) SHA1(49c02fb87a4ffc1be4c748c469f5518c314b1391) ) #define sc_copsr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1412 */ \ ROM_LOAD( "95008393.bin", 0x0000, 0x100000, CRC(693cd9be) SHA1(e965b2dcd6d6619815c919b7d2c372c726abfea3) ) \ @@ -996,15 +912,13 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "others3", ROMREGION_ERASE00 ) /* PR3255 (alt checksum, many more sounds) */ \ ROM_LOAD( "95009130.bin", 0x0000, 0x100000, CRC(f6813371) SHA1(bd9e5d009c7870d50149d9de396f363fb19b183c) ) \ ROM_REGION( 0x400000, "others4", ROMREGION_ERASE00 ) /* bad? no header */ \ - ROM_LOAD( "cops_rob_snd.bin", 0x0000, 0x080000, CRC(e25bddb7) SHA1(96d6be2407bf876ad685bdc13d96585782ad4a50) ) \ - + ROM_LOAD( "cops_rob_snd.bin", 0x0000, 0x080000, CRC(e25bddb7) SHA1(96d6be2407bf876ad685bdc13d96585782ad4a50) ) #define sc_corst_others \ /* PR3521 CORRONATION ST SOUNDS11 */ \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009037.bin", 0x000000, 0x100000, CRC(c2d3b6ee) SHA1(36e7e9c956ab91fd1b2e52800b4482ce3a3597f5) ) \ - ROM_LOAD( "95009038.bin", 0x100000, 0x100000, CRC(45dc4df3) SHA1(7710a0ba9bbe7ae6f590b61bbc1395cd408926d2) ) \ - + ROM_LOAD( "95009038.bin", 0x100000, 0x100000, CRC(45dc4df3) SHA1(7710a0ba9bbe7ae6f590b61bbc1395cd408926d2) ) #define sc_coro_others \ /* CORRY SOUNDS */ \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -1016,22 +930,19 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890367.bin", 0x0000, 0x5000, CRC(f9d583af) SHA1(f22e3ed7c4d954a98cec9dc077113761fdcef858) ) \ ROM_LOAD( "95890377.bin", 0x0000, 0x5000, CRC(edbf2523) SHA1(8165c2c2f12fd85f706aed31bc3cbd51648440de) ) \ ROM_LOAD( "95890378.bin", 0x0000, 0x5000, CRC(f169d59f) SHA1(fa8116f43c25de7af05f1cf8a379a24cce489f21) ) \ - ROM_LOAD( "95890379.bin", 0x0000, 0x5000, CRC(3233f70f) SHA1(df485c4df31872921c3d97973a7b3e7d4a58446d) ) \ - + ROM_LOAD( "95890379.bin", 0x0000, 0x5000, CRC(3233f70f) SHA1(df485c4df31872921c3d97973a7b3e7d4a58446d) ) #define sc_corcl_others \ /* CCORO SOUNDS */ \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008867.bin", 0x000000, 0x100000, CRC(b11779d2) SHA1(720d30445232baa18e613259bded1a6827777de6) ) \ ROM_LOAD( "95008868.bin", 0x100000, 0x05fdb4, CRC(424b08e5) SHA1(fc0fe01516c0c6bb20adcf2bf8b1263ff59657e8) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ - ROM_LOAD( "95890770.bin", 0x0000, 0x5000, CRC(551ab279) SHA1(39e4c16f3cc708d84762ba5b80c720cbbc123f0d) ) /* why is this in an sc4 set? */ \ - + ROM_LOAD( "95890770.bin", 0x0000, 0x5000, CRC(551ab279) SHA1(39e4c16f3cc708d84762ba5b80c720cbbc123f0d) ) /* why is this in an sc4 set? */ #define sc_count_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008615.bin", 0x000000, 0x100000, CRC(97c602c0) SHA1(cd71c062df3ac700ab72fc992542e08651270ec8) ) \ - ROM_LOAD( "95008616.bin", 0x100000, 0x100000, CRC(2b80b1a5) SHA1(a94b4402ba738a6369f58c73a5b9d66e0476eeb1) ) \ - + ROM_LOAD( "95008616.bin", 0x100000, 0x100000, CRC(2b80b1a5) SHA1(a94b4402ba738a6369f58c73a5b9d66e0476eeb1) ) #define sc_devil_others \ ROM_REGION( 0x5000, "pics", 0 ) \ @@ -1039,82 +950,66 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890465.bin", 0x0000, 0x5000, CRC(407400a5) SHA1(dba6f4204a27f26056ffc3d9b512c0f4a8f17562) ) \ ROM_LOAD( "95890466.bin", 0x0000, 0x5000, CRC(dececcf9) SHA1(6ebaec58330b7ce8bb166d2aefd203147c4823fa) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008978.bin", 0x0000, 0x0ff462, CRC(b0dac89b) SHA1(afdc4fec96849b81e52aa03d9df821e336001c74) ) \ - + ROM_LOAD( "95008978.bin", 0x0000, 0x0ff462, CRC(b0dac89b) SHA1(afdc4fec96849b81e52aa03d9df821e336001c74) ) #define sc_daylt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "daylsnd1.bin", 0x000000, 0x080000, CRC(4510d156) SHA1(b001bdf3bfad6124647f640065b411c07c8cf555) ) \ - ROM_LOAD( "daylsnd2.bin", 0x080000, 0x080000, CRC(71a1428f) SHA1(029ae979f192bcd7704ae78aba14815acdabe60f) ) \ - + ROM_LOAD( "daylsnd2.bin", 0x080000, 0x080000, CRC(71a1428f) SHA1(029ae979f192bcd7704ae78aba14815acdabe60f) ) #define sc_derby_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008129.bin", 0x000000, 0x100000, CRC(4892cf07) SHA1(9ce745f4b3aee623a7855e2fee4cc35de20646a3) ) \ - ROM_LOAD( "95008130.bin", 0x100000, 0x100000, CRC(b9bfde2a) SHA1(25329d5b93318586095715111fbbb854bba394b9) ) \ - + ROM_LOAD( "95008130.bin", 0x100000, 0x100000, CRC(b9bfde2a) SHA1(25329d5b93318586095715111fbbb854bba394b9) ) #define sc_deepi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008329.bin", 0x0000, 0x100000, CRC(427dad17) SHA1(f8834dfbe6608abb08d6214cd87ec809df963805) ) \ - + ROM_LOAD( "95008329.bin", 0x0000, 0x100000, CRC(427dad17) SHA1(f8834dfbe6608abb08d6214cd87ec809df963805) ) #define sc_ddosh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008299.bin", 0x0000, 0x100000, CRC(fee81425) SHA1(188cb7275963193a39571d3e4da3b9f6693a79d0) ) \ - + ROM_LOAD( "95008299.bin", 0x0000, 0x100000, CRC(fee81425) SHA1(188cb7275963193a39571d3e4da3b9f6693a79d0) ) #define sc_dhh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008586.bin", 0x000000, 0x100000, CRC(43fde3ad) SHA1(662402449b025bbf75a10c3b1ac746d9359b0b0d) ) \ - ROM_LOAD( "95008587.bin", 0x100000, 0x100000, CRC(6f7a607f) SHA1(da3c8aaa69b30f10f122a9bde49d987dd0950474) ) \ - + ROM_LOAD( "95008587.bin", 0x100000, 0x100000, CRC(6f7a607f) SHA1(da3c8aaa69b30f10f122a9bde49d987dd0950474) ) #define sc_dmine_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008293.bin", 0x0000, 0x100000, CRC(acbed8e1) SHA1(607dafa2215632d02c34e65b79bf1341b981f63b) ) \ - + ROM_LOAD( "95008293.bin", 0x0000, 0x100000, CRC(acbed8e1) SHA1(607dafa2215632d02c34e65b79bf1341b981f63b) ) /* PR1954 */ #define PR1954_CASINO_DOND_R_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008631.bin", 0x000000, 0x100000, CRC(7208854a) SHA1(a02de60cfcbafe5da4f67596ab65237f5b5f41b7) ) \ - + ROM_LOAD( "95008631.bin", 0x000000, 0x100000, CRC(7208854a) SHA1(a02de60cfcbafe5da4f67596ab65237f5b5f41b7) ) /* PR1945 */ #define PR1945_CASINO_DOND_R_SOUNDS12 \ - ROM_LOAD( "95008661.bin", 0x000000, 0x100000, CRC(2d9ebcd5) SHA1(d824a227420cbe616aca6e2fd279af691ddfd87a) ) \ - + ROM_LOAD( "95008661.bin", 0x000000, 0x100000, CRC(2d9ebcd5) SHA1(d824a227420cbe616aca6e2fd279af691ddfd87a) ) #define PR1945_CASINO_D_O_N_D_SOUNDS11 \ ROM_LOAD( "95008632.bin", 0x000000, 0x100000, CRC(fd81a317) SHA1(1e597fd58aab5a7a8321dc4daf138ee07b42c094) ) \ - ROM_LOAD( "95008633.bin", 0x100000, 0x100000, CRC(a7a445d4) SHA1(dbb1938c33ce654c2d4aa3b6af8c210f5aad2ae3) ) \ - + ROM_LOAD( "95008633.bin", 0x100000, 0x100000, CRC(a7a445d4) SHA1(dbb1938c33ce654c2d4aa3b6af8c210f5aad2ae3) ) /* PR1964 */ #define PR1964_CASINO_DOND_SOUNDS11 \ - ROM_LOAD( "95008680.bin", 0x000000, 0x100000, CRC(9bd439d1) SHA1(5e71d04e5697e92998bae28f7352ea7742cafe07) ) \ - + ROM_LOAD( "95008680.bin", 0x000000, 0x100000, CRC(9bd439d1) SHA1(5e71d04e5697e92998bae28f7352ea7742cafe07) ) #define PR1964_CASINO_DOND_SOUNDS12 \ - ROM_LOAD( "95008698.bin", 0x000000, 0x100000, CRC(8eea7754) SHA1(7612c128d6c062bba3477d55aee3089e1255f61e) ) \ - + ROM_LOAD( "95008698.bin", 0x000000, 0x100000, CRC(8eea7754) SHA1(7612c128d6c062bba3477d55aee3089e1255f61e) ) #define PR1964_DND \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ PR1964_CASINO_DOND_SOUNDS11 \ - PR1964_CASINO_DOND_SOUNDS12 \ - + PR1964_CASINO_DOND_SOUNDS12 /* PR1907 */ #define PR1907_DEAL_OR_NO_DEAL_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008606.bin", 0x000000, 0x100000, CRC(c63c8663) SHA1(4718baf87340fe93ccfe642a1a0cdb9d9dcac57f) ) \ - ROM_LOAD( "95008607.bin", 0x100000, 0x100000, CRC(a615514f) SHA1(d4ff7d4fe6f1dd1d7b00cc504f90b2921aa5e8fb) ) \ - + ROM_LOAD( "95008607.bin", 0x100000, 0x100000, CRC(a615514f) SHA1(d4ff7d4fe6f1dd1d7b00cc504f90b2921aa5e8fb) ) #define sc_dndbb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008788.bin", 0x000000, 0x100000, CRC(51384d64) SHA1(3af87bcc7fb4881ae671d9cbb484fb6a2a534cce) ) \ - ROM_LOAD( "95008789.bin", 0x100000, 0x100000, CRC(4f2d72c3) SHA1(f167ad8d7178682833e7e9efcc393b5826108d70) ) \ - + ROM_LOAD( "95008789.bin", 0x100000, 0x100000, CRC(4f2d72c3) SHA1(f167ad8d7178682833e7e9efcc393b5826108d70) ) #define sc_dndbo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009158.bin", 0x000000, 0x100000, CRC(27f11b81) SHA1(f2690c2828ad09d73cb14c5c1cb53c2ad1fc7b53) ) \ - ROM_LOAD( "95009159.bin", 0x100000, 0x100000, CRC(95e278c8) SHA1(7d85b6dbe3ccacd6c5a5b4eb475598a3d5548ce0) ) \ - + ROM_LOAD( "95009159.bin", 0x100000, 0x100000, CRC(95e278c8) SHA1(7d85b6dbe3ccacd6c5a5b4eb475598a3d5548ce0) ) #define sc_dndbq_others \ ROM_REGION( 0x5000, "pics", 0 ) \ @@ -1122,143 +1017,116 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95891058.bin", 0x0000, 0x5000, CRC(69163f2d) SHA1(66b6b593126c452f01b36c03e82d003860340025) ) \ ROM_LOAD( "95891059.bin", 0x0000, 0x5000, CRC(aa4c1dbd) SHA1(4ebd1b132a4125bdcf58d5867cffb821e3e7b1a3) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008887.bin", 0x0000, 0x100000, CRC(53cb9dc5) SHA1(66cdf8624736ea5a4e239bdb81fc96366ec4623e) ) \ - + ROM_LOAD( "95008887.bin", 0x0000, 0x100000, CRC(53cb9dc5) SHA1(66cdf8624736ea5a4e239bdb81fc96366ec4623e) ) #define PR3068_BEAT_THE_BANKER_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008713.bin", 0x000000, 0x100000, CRC(7311db5e) SHA1(24a4b3f44fa6dbbe756b0acac2b513c6e92cdf26) ) \ - ROM_LOAD( "95008714.bin", 0x100000, 0x100000, CRC(c6ebc845) SHA1(6a135f42940b8c44422736650e369fa12b51e0df) ) \ - + ROM_LOAD( "95008714.bin", 0x100000, 0x100000, CRC(c6ebc845) SHA1(6a135f42940b8c44422736650e369fa12b51e0df) ) #define sc_dndcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008629.bin", 0x000000, 0x100000, CRC(6f7cf500) SHA1(bf3db728872251116b32aa2c44f72a87d29b13d2) ) \ - ROM_LOAD( "95008630.bin", 0x100000, 0x100000, CRC(5dfda41e) SHA1(6d61d0eedc6a1599777f47d3880689f954f326c9) ) \ - + ROM_LOAD( "95008630.bin", 0x100000, 0x100000, CRC(5dfda41e) SHA1(6d61d0eedc6a1599777f47d3880689f954f326c9) ) #define sc_dndcr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009033.bin", 0x000000, 0x100000, CRC(4e167844) SHA1(d0e7101fe033bc9fc0e279c3d457a7da8e8aab00) ) \ - ROM_LOAD( "95009034.bin", 0x100000, 0x100000, CRC(a3e7b40a) SHA1(09f1fde693750f15e78da91c796e8593d06d19e9) ) \ - + ROM_LOAD( "95009034.bin", 0x100000, 0x100000, CRC(a3e7b40a) SHA1(09f1fde693750f15e78da91c796e8593d06d19e9) ) #define sc_dnddd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* dond double */ \ ROM_LOAD( "95008804.bin", 0x000000, 0x100000, CRC(19fd19fa) SHA1(db68a40d8bb3de130c6d5777217fb3c3a4c13d17) ) \ - ROM_LOAD( "95008805.bin", 0x100000, 0x100000, CRC(f497337d) SHA1(9e827116f8b1d882cfcd0b56aaede9de14b2e943) ) \ - + ROM_LOAD( "95008805.bin", 0x100000, 0x100000, CRC(f497337d) SHA1(9e827116f8b1d882cfcd0b56aaede9de14b2e943) ) #define sc_dndde_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009053.bin", 0x000000, 0x100000, CRC(f06acb47) SHA1(043756eda04d193f7365f2fd0fafc36c3b6b0bd9) ) \ - ROM_LOAD( "95009054.bin", 0x100000, 0x100000, CRC(595baae8) SHA1(9aa03b265294eaed0051b0a25cc9a0e1481b4390) ) \ - + ROM_LOAD( "95009054.bin", 0x100000, 0x100000, CRC(595baae8) SHA1(9aa03b265294eaed0051b0a25cc9a0e1481b4390) ) #define sc_dnddi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009191.bin", 0x000000, 0x100000, CRC(2f3cda1a) SHA1(017533caadf86d0d70e1b57b697621e0b4a8fef2) ) \ - ROM_LOAD( "95009192.bin", 0x100000, 0x100000, CRC(eb9b6b0b) SHA1(127bb283b32a997c04a1b29c18f4093f4d969151) ) \ - + ROM_LOAD( "95009192.bin", 0x100000, 0x100000, CRC(eb9b6b0b) SHA1(127bb283b32a997c04a1b29c18f4093f4d969151) ) #define sc_dnddt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009106.bin", 0x000000, 0x100000, CRC(afa266cf) SHA1(adc80bc677a7524bec4bbd102a4a5ff293571abc) ) \ - ROM_LOAD( "95009107.bin", 0x100000, 0x100000, CRC(493981a8) SHA1(77308e453848d092d63330e10e3b1e88caeb4fb5) ) \ - + ROM_LOAD( "95009107.bin", 0x100000, 0x100000, CRC(493981a8) SHA1(77308e453848d092d63330e10e3b1e88caeb4fb5) ) #define sc_dnddo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009120.bin", 0x000000, 0x100000, CRC(327c01a0) SHA1(9b7fa28ff6ecc83c2e9ee73aac0af98be170b28f) ) \ - ROM_LOAD( "95009121.bin", 0x100000, 0x100000, CRC(d7991c7e) SHA1(4f4e4043f272ff2325b0fa64c66b34cb1aefb97c) ) \ - + ROM_LOAD( "95009121.bin", 0x100000, 0x100000, CRC(d7991c7e) SHA1(4f4e4043f272ff2325b0fa64c66b34cb1aefb97c) ) #define sc_dndfl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008847.bin", 0x000000, 0x100000, CRC(7f3eae56) SHA1(f5d25c87caf76fc1961c8fb5c389bb73cefbcb28) ) \ - ROM_LOAD( "95008848.bin", 0x100000, 0x100000, CRC(ba00c16d) SHA1(f2e55441857e5f036e19d2ee29dfad97b99134b8) ) \ - + ROM_LOAD( "95008848.bin", 0x100000, 0x100000, CRC(ba00c16d) SHA1(f2e55441857e5f036e19d2ee29dfad97b99134b8) ) #define sc_dndgo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009197.bin", 0x000000, 0x100000, CRC(bdf253cb) SHA1(6f046f1c27bae1141919874b27a8d87295b39261) ) \ - ROM_LOAD( "95009198.bin", 0x100000, 0x100000, CRC(420105d4) SHA1(23e4eac4146a3985c3a7dc5f80f1b5900a116303) ) \ - + ROM_LOAD( "95009198.bin", 0x100000, 0x100000, CRC(420105d4) SHA1(23e4eac4146a3985c3a7dc5f80f1b5900a116303) ) #define sc_dndgl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009102.bin", 0x000000, 0x100000, CRC(9d03cd95) SHA1(e062c816a19af0dc86bfa5a66f69342e69fffcfa) ) \ - ROM_LOAD( "95009103.bin", 0x100000, 0x100000, CRC(51ae4095) SHA1(b397984d3b0beb4ca95050ff595648a80e5ea87a) ) \ - + ROM_LOAD( "95009103.bin", 0x100000, 0x100000, CRC(51ae4095) SHA1(b397984d3b0beb4ca95050ff595648a80e5ea87a) ) #define sc_dndld_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009184.bin", 0x000000, 0x100000, CRC(25a36077) SHA1(92c05f410456414b825b09338a474c52f7c1bd9b) ) \ - ROM_LOAD( "95009185.bin", 0x100000, 0x100000, CRC(eacdfc26) SHA1(8ab462e7f49ca9374b9245d9d97cf909ea979ae3) ) \ - + ROM_LOAD( "95009185.bin", 0x100000, 0x100000, CRC(eacdfc26) SHA1(8ab462e7f49ca9374b9245d9d97cf909ea979ae3) ) #define sc_dndmb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009156.bin", 0x000000, 0x100000, CRC(7c68c70c) SHA1(eb4006e185f3cd4e7d66999b3ff064a7903f5bc8) ) \ - ROM_LOAD( "95009157.bin", 0x100000, 0x100000, CRC(a0541504) SHA1(689ba32fd1b1a9592a9cd7039424655a652b1bcd) ) \ - + ROM_LOAD( "95009157.bin", 0x100000, 0x100000, CRC(a0541504) SHA1(689ba32fd1b1a9592a9cd7039424655a652b1bcd) ) #define sc_dndmd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009170.bin", 0x000000, 0x100000, CRC(6ab363a5) SHA1(1a98566161aec187074cbbdb7372ed8484202639) ) \ - ROM_LOAD( "95009171.bin", 0x100000, 0x100000, CRC(bc5d3113) SHA1(836eff78265f6d0371be18467c5edc6d32aba6d5) ) \ - + ROM_LOAD( "95009171.bin", 0x100000, 0x100000, CRC(bc5d3113) SHA1(836eff78265f6d0371be18467c5edc6d32aba6d5) ) #define sc_dndpa_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009150.bin", 0x000000, 0x100000, CRC(54d9f01a) SHA1(6d62ca07443c42e16243a843dee6a11c7a1383fc) ) \ - ROM_LOAD( "95009151.bin", 0x100000, 0x100000, CRC(89bb7543) SHA1(e8bea8a00798329af590be5e2ccbfcc54f70f98d) ) \ - + ROM_LOAD( "95009151.bin", 0x100000, 0x100000, CRC(89bb7543) SHA1(e8bea8a00798329af590be5e2ccbfcc54f70f98d) ) #define sc_ddptg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009041.bin", 0x000000, 0x100000, CRC(143d05fb) SHA1(f3d2735dc5b1bdc4e3f4205521f1b614d4b4c4b0) ) \ - ROM_LOAD( "95009042.bin", 0x100000, 0x100000, CRC(65efd8fd) SHA1(c7f2d1f6b31767a56269f53e9327de3abe64218f) ) \ - + ROM_LOAD( "95009042.bin", 0x100000, 0x100000, CRC(65efd8fd) SHA1(c7f2d1f6b31767a56269f53e9327de3abe64218f) ) #define sc_ddply_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008830.bin", 0x000000, 0x100000, CRC(bb66ae0c) SHA1(4a7df180dd67aa96059a83986cb98721a81963d8) ) \ - ROM_LOAD( "95008831.bin", 0x100000, 0x100000, CRC(8a632940) SHA1(e955b05a82312ab356117f348903292d6f26a5a5) ) \ - + ROM_LOAD( "95008831.bin", 0x100000, 0x100000, CRC(8a632940) SHA1(e955b05a82312ab356117f348903292d6f26a5a5) ) #define sc_dndrr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009188.bin", 0x000000, 0x100000, CRC(a2dceadd) SHA1(af1696bf32f37005c6a01bb209f38b90daab4e29) ) \ - ROM_LOAD( "95009189.bin", 0x100000, 0x100000, CRC(02b0d336) SHA1(7713212ebf59fa2464110b0238a870e81d43be05) ) \ - + ROM_LOAD( "95009189.bin", 0x100000, 0x100000, CRC(02b0d336) SHA1(7713212ebf59fa2464110b0238a870e81d43be05) ) #define sc_dndsi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008838.bin", 0x000000, 0x100000, CRC(34e9d2eb) SHA1(140f9ccf287e24e3917b1a6bb8d8118bf20f232c) ) \ - ROM_LOAD( "95008839.bin", 0x100000, 0x100000, CRC(4475bb6b) SHA1(864575f9b35495bfe0d8f7563e2d4b5e35b6a396) ) \ - + ROM_LOAD( "95008839.bin", 0x100000, 0x100000, CRC(4475bb6b) SHA1(864575f9b35495bfe0d8f7563e2d4b5e35b6a396) ) #define sc_dndrt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009141.bin", 0x000000, 0x100000, CRC(e53f8ba3) SHA1(10eea3246352bf65e1ca7b4cd6e1a873d6a2f7fe) ) \ - ROM_LOAD( "95009142.bin", 0x100000, 0x100000, CRC(54b47cbd) SHA1(71e8f49b0d031fcc8c5450279dc26d39b90af678) ) \ - + ROM_LOAD( "95009142.bin", 0x100000, 0x100000, CRC(54b47cbd) SHA1(71e8f49b0d031fcc8c5450279dc26d39b90af678) ) #define sc_dndpd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009172.bin", 0x000000, 0x100000, CRC(f124785f) SHA1(2291dca731bb6037d655dc8bbdfa7f35f6a4d4d1) ) \ - ROM_LOAD( "95009173.bin", 0x100000, 0x100000, CRC(aae9318c) SHA1(4b53bec7284950fbca4650117e727ab9a01b5509) ) \ - + ROM_LOAD( "95009173.bin", 0x100000, 0x100000, CRC(aae9318c) SHA1(4b53bec7284950fbca4650117e727ab9a01b5509) ) #define sc_dndtb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009186.bin", 0x000000, 0x100000, CRC(1da5489b) SHA1(b282e523b52e34a625502ec99ca42f059e701448) ) \ - ROM_LOAD( "95009187.bin", 0x100000, 0x100000, CRC(2c3ea82c) SHA1(50ade918503e224288407abf60b3d53e5334aadb) ) \ - + ROM_LOAD( "95009187.bin", 0x100000, 0x100000, CRC(2c3ea82c) SHA1(50ade918503e224288407abf60b3d53e5334aadb) ) #define sc_dndhf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008705.bin", 0x000000, 0x100000, CRC(09e02843) SHA1(a6ac658c857eca2aca0bacda423dd012434e93bc) ) \ - ROM_LOAD( "95008706.bin", 0x100000, 0x100000, CRC(805e7eb8) SHA1(107c6ba26e37d8f2eec81b62c3edf3efb7e44ca2) ) \ - + ROM_LOAD( "95008706.bin", 0x100000, 0x100000, CRC(805e7eb8) SHA1(107c6ba26e37d8f2eec81b62c3edf3efb7e44ca2) ) #define sc_dndys_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008779.bin", 0x000000, 0x100000, CRC(cf04d115) SHA1(3255b58cd4fba7d231ca35c00d1cb70da1f6cfbd) ) \ - ROM_LOAD( "95008780.bin", 0x100000, 0x100000, CRC(ec270dbe) SHA1(f649ffd4530feed491dc050f40aa0205f4bfdd89) ) \ - + ROM_LOAD( "95008780.bin", 0x100000, 0x100000, CRC(ec270dbe) SHA1(f649ffd4530feed491dc050f40aa0205f4bfdd89) ) #define sc_dndww_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008688.bin", 0x000000, 0x100000, CRC(9a5c8ac0) SHA1(988a26b042acd1462927c1b8ad300fe67c8d7c00) ) \ ROM_LOAD( "95008689.bin", 0x100000, 0x100000, CRC(5c1cf5fb) SHA1(c05b819158622ab96c265c85072b48ae3593b962) ) \ ROM_REGION( 0x400000, "others", ROMREGION_ERASE00 ) /* casino set */ \ - ROM_LOAD( "95008730.bin", 0x0000, 0x100000, CRC(e2aebdb0) SHA1(d22fee7ff3d5912ea9a7440ec82de52a7d016090) ) /* casino wow */ \ - + ROM_LOAD( "95008730.bin", 0x0000, 0x100000, CRC(e2aebdb0) SHA1(d22fee7ff3d5912ea9a7440ec82de52a7d016090) ) /* casino wow */ #define sc_dndtr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008832.bin", 0x000000, 0x100000, CRC(1d2aa204) SHA1(52ad7a6ea369198b48d593de508f317ed11e84de) ) \ - ROM_LOAD( "95008833.bin", 0x100000, 0x100000, CRC(92f462f6) SHA1(c0782639d4cd2653a3d14e1b422c2d6117dac029) ) \ - + ROM_LOAD( "95008833.bin", 0x100000, 0x100000, CRC(92f462f6) SHA1(c0782639d4cd2653a3d14e1b422c2d6117dac029) ) #define sc_dndwb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1962 */ \ ROM_LOAD( "95008651.bin", 0x000000, 0x100000, CRC(c3738d54) SHA1(bf3c62e196a2cea144868729f136000a7b924c3d) ) /* wiyb */ \ @@ -1268,49 +1136,40 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "others2", ROMREGION_ERASE00 ) /* PR3071 (alt checksum, extra sound??) */ \ ROM_LOAD( "95008766.bin", 0x000000, 0x100000, CRC(62accb81) SHA1(ed0456cefed2fbf9a1cfd911f871262e892a4ce8) ) /* wiyb */ \ ROM_REGION( 0x400000, "others3", ROMREGION_ERASE00 ) /* PR3084 (wrong game?) */ \ - ROM_LOAD( "95008767.bin", 0x000000, 0x100000, CRC(0aa49d8a) SHA1(a2baffc495656f0b5426b720cac298a78774b7fa) ) /* super slam?? */ \ - + ROM_LOAD( "95008767.bin", 0x000000, 0x100000, CRC(0aa49d8a) SHA1(a2baffc495656f0b5426b720cac298a78774b7fa) ) /* super slam?? */ #define sc_dndpg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008822.bin", 0x000000, 0x100000, CRC(16411f05) SHA1(11f2d17b6647b9d9e713e38bab6604e4feb51432) ) \ - ROM_LOAD( "95008823.bin", 0x100000, 0x100000, CRC(4f7bab89) SHA1(bbb203cff3212571c313e8f22f9083980baf2566) ) \ - + ROM_LOAD( "95008823.bin", 0x100000, 0x100000, CRC(4f7bab89) SHA1(bbb203cff3212571c313e8f22f9083980baf2566) ) #define sc_dndtp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008673.bin", 0x000000, 0x100000, CRC(4b8d1e0b) SHA1(8cba9632abb2800f8e9a45d1bf0abbc9abe8cb8c) ) \ - ROM_LOAD( "95008674.bin", 0x100000, 0x100000, CRC(66236e20) SHA1(222fefdeddb22eb290302528a8f937468ccd5698) ) \ - + ROM_LOAD( "95008674.bin", 0x100000, 0x100000, CRC(66236e20) SHA1(222fefdeddb22eb290302528a8f937468ccd5698) ) #define sc_dndbe_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008624.bin", 0x000000, 0x100000, CRC(bf9620ea) SHA1(63f5a209da3d0117fcb579364a53b23d2b02cfe5) ) \ - ROM_LOAD( "95008625.bin", 0x100000, 0x100000, CRC(2e1a1db0) SHA1(41ebad0615d0ad3fea6f2c00e2bb170d5e417e4a) ) \ - + ROM_LOAD( "95008625.bin", 0x100000, 0x100000, CRC(2e1a1db0) SHA1(41ebad0615d0ad3fea6f2c00e2bb170d5e417e4a) ) #define sc_dndbc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009100.bin", 0x000000, 0x100000, CRC(b06110c0) SHA1(84289721a8c71124cc4df79fc90d0ded8d43fd07) ) \ - ROM_LOAD( "95009101.bin", 0x100000, 0x100000, CRC(53b38d0a) SHA1(1da40cbee8a18713864e3a578ac49c2108585e44) ) \ - + ROM_LOAD( "95009101.bin", 0x100000, 0x100000, CRC(53b38d0a) SHA1(1da40cbee8a18713864e3a578ac49c2108585e44) ) #define sc_dndlp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008792.bin", 0x000000, 0x100000, CRC(2e7e1a5a) SHA1(000cb48c67b7f23d00318d37206c2df426c79281) ) \ - ROM_LOAD( "95008793.bin", 0x100000, 0x100000, CRC(4b91b638) SHA1(b97cb1d22f91a791fc4d47bbae8965882898a317) ) \ - + ROM_LOAD( "95008793.bin", 0x100000, 0x100000, CRC(4b91b638) SHA1(b97cb1d22f91a791fc4d47bbae8965882898a317) ) #define sc_dndra_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008752.bin", 0x000000, 0x100000, CRC(82bfd510) SHA1(857f294d46d64275b15c56187bbbc19e2aa0f5bc) ) \ - ROM_LOAD( "95008753.bin", 0x100000, 0x100000, CRC(ee0b5da9) SHA1(f6cb6037f525df504c1ba8106f19990ecf8d1bd2) ) \ - + ROM_LOAD( "95008753.bin", 0x100000, 0x100000, CRC(ee0b5da9) SHA1(f6cb6037f525df504c1ba8106f19990ecf8d1bd2) ) #define sc_dndbd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008790.bin", 0x000000, 0x100000, CRC(3c56a8b6) SHA1(8c06aa725233f4feb7c2e703f203cf9b0c6669a1) ) \ - ROM_LOAD( "95008791.bin", 0x100000, 0x100000, CRC(7378a4a8) SHA1(af9dd1fcbd8b77fab4afc85a325c0eb011f35e3a) ) \ - + ROM_LOAD( "95008791.bin", 0x100000, 0x100000, CRC(7378a4a8) SHA1(af9dd1fcbd8b77fab4afc85a325c0eb011f35e3a) ) #define sc_dndbr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008723.bin", 0x000000, 0x100000, CRC(6e1d9bd5) SHA1(92b2fd0b75a195af6ddfbdee3316f8af4bc4eb1a) ) \ - ROM_LOAD( "95008724.bin", 0x100000, 0x100000, CRC(309c1bf1) SHA1(82811b503a06e30a915eebdbdbcd63b567f241c1) ) \ - + ROM_LOAD( "95008724.bin", 0x100000, 0x100000, CRC(309c1bf1) SHA1(82811b503a06e30a915eebdbdbcd63b567f241c1) ) #define sc_dndcc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008746.bin", 0x000000, 0x100000, CRC(ef3c39b9) SHA1(21b9788080de68acd436608d7d46fd9663d1589b) ) /* crazy chair */ \ @@ -1321,35 +1180,28 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95008841.bin", 0x100000, 0x100000, CRC(594a9cd7) SHA1(667fa3106327ce4ff23877f2d48d3e3e360848d0) ) \ \ ROM_LOAD( "95009131.bin", 0x000000, 0x100000, CRC(59a9e50a) SHA1(15d79b177a1e926cd5aee0f969f5ef8b30fac203) ) /* crazy chair */ \ - ROM_LOAD( "95009132.bin", 0x100000, 0x100000, CRC(5e8a7ca6) SHA1(419ecc6ac15004bdd83bcd5b3e00d9dcd0d24936) ) \ - + ROM_LOAD( "95009132.bin", 0x100000, 0x100000, CRC(5e8a7ca6) SHA1(419ecc6ac15004bdd83bcd5b3e00d9dcd0d24936) ) #define sc_dnddw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008754.bin", 0x000000, 0x100000, CRC(d2c3e3e5) SHA1(3d21c812456618471a331d596760ea8746afc036) ) \ - ROM_LOAD( "95008755.bin", 0x100000, 0x100000, CRC(e6906180) SHA1(81215fd3dfe315123d5b028047a93e30baa52b5d) ) \ - + ROM_LOAD( "95008755.bin", 0x100000, 0x100000, CRC(e6906180) SHA1(81215fd3dfe315123d5b028047a93e30baa52b5d) ) #define sc_dnddf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008738.bin", 0x000000, 0x100000, CRC(2a06f488) SHA1(666bd9c8091edda4b003fa586e5ae270831c119f) ) \ - ROM_LOAD( "95008739.bin", 0x100000, 0x100000, CRC(33d677b0) SHA1(5283d23671e340e3fda4eb4c6795d1d56b073206) ) \ - + ROM_LOAD( "95008739.bin", 0x100000, 0x100000, CRC(33d677b0) SHA1(5283d23671e340e3fda4eb4c6795d1d56b073206) ) #define sc_disco_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004220", 0x000000, 0x080000, CRC(530be6ac) SHA1(eede25d9d8a429dace91c1dc37ce4da7152b1836) ) \ - ROM_LOAD( "95004221", 0x080000, 0x080000, CRC(0b2020c9) SHA1(75c7af9312ea1b84df66a640fac903aedac5a0eb) ) \ - + ROM_LOAD( "95004221", 0x080000, 0x080000, CRC(0b2020c9) SHA1(75c7af9312ea1b84df66a640fac903aedac5a0eb) ) #define sc_dbldm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008540.bin", 0x0000, 0x0ff77d, CRC(752628b0) SHA1(42b07736549b0e5e9d15cccd4922fac1e4135687) ) \ - + ROM_LOAD( "95008540.bin", 0x0000, 0x0ff77d, CRC(752628b0) SHA1(42b07736549b0e5e9d15cccd4922fac1e4135687) ) #define sc_dblfr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004307.bin", 0x0000, 0x080000, CRC(69b55ce9) SHA1(c635add8001dc7c5c81ffcae05b2b83bb37e9e72) ) \ - + ROM_LOAD( "95004307.bin", 0x0000, 0x080000, CRC(69b55ce9) SHA1(c635add8001dc7c5c81ffcae05b2b83bb37e9e72) ) #define sc_dough_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008505.bin", 0x0000, 0x100000, CRC(e18549be) SHA1(7062f05b6245c4188ed68a51dc7fbc8b138698f4) ) \ - + ROM_LOAD( "95008505.bin", 0x0000, 0x100000, CRC(e18549be) SHA1(7062f05b6245c4188ed68a51dc7fbc8b138698f4) ) #define sc_emmer_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -1357,166 +1209,132 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890452.bin", 0x0000, 0x5000, CRC(193927ce) SHA1(fe02d1d1519139199fbb743ce0e67b810261e9a2) ) \ ROM_LOAD( "95890453.bin", 0x0000, 0x5000, CRC(6caf63fa) SHA1(86657e0e14eac91f91bd4da4c04b88c8ee28de45) ) \ - ROM_LOAD( "95890454.bin", 0x0000, 0x5000, CRC(f215afa6) SHA1(0e28affa6557474856087dbeeb0a3127616b7fe6) ) \ - + ROM_LOAD( "95890454.bin", 0x0000, 0x5000, CRC(f215afa6) SHA1(0e28affa6557474856087dbeeb0a3127616b7fe6) ) #define sc_evol_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "evolsnd.p1", 0x000000, 0x100000, CRC(13e18cc3) SHA1(114301af1abf86cdd9c2f01b316d257bb1ca086d) ) \ - ROM_LOAD( "evolsnd.p2", 0x100000, 0x08399a, CRC(345f3f11) SHA1(dd4d4f0f32650304cc6010b8f059c23dd5535919) ) \ - + ROM_LOAD( "evolsnd.p2", 0x100000, 0x08399a, CRC(345f3f11) SHA1(dd4d4f0f32650304cc6010b8f059c23dd5535919) ) #define sc_fgbh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009118.bin", 0x000000, 0x100000, CRC(f6ce47b9) SHA1(bb3917a3eed718e23dc37b1ffe93f2e349990d3c) ) \ - ROM_LOAD( "95009119.bin", 0x100000, 0x100000, CRC(9d96e3fd) SHA1(5d2d3939a2f1f765c2272f7747a0eea7d0cf1bf8) ) \ - + ROM_LOAD( "95009119.bin", 0x100000, 0x100000, CRC(9d96e3fd) SHA1(5d2d3939a2f1f765c2272f7747a0eea7d0cf1bf8) ) #define sc_fggp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008824.bin", 0x000000, 0x100000, CRC(58119c7f) SHA1(40f6376b5e1caf0c3231a9b870f584e9b2362676) ) \ - ROM_LOAD( "95008825.bin", 0x100000, 0x100000, CRC(7fdae5e2) SHA1(57bcb01b66bdd7ad68dc601f67bc13229ad604f8) ) \ - + ROM_LOAD( "95008825.bin", 0x100000, 0x100000, CRC(7fdae5e2) SHA1(57bcb01b66bdd7ad68dc601f67bc13229ad604f8) ) #define sc_fast_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008453.bin", 0x0000, 0x0a5c12, CRC(bc1d0d4b) SHA1(1a6de68ead3287b32741dd596ca23b64e2a47925) ) \ - + ROM_LOAD( "95008453.bin", 0x0000, 0x0a5c12, CRC(bc1d0d4b) SHA1(1a6de68ead3287b32741dd596ca23b64e2a47925) ) #define sc_fnclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008670.bin", 0x000000, 0x100000, CRC(345c0993) SHA1(9fdc586c415c5f4586b8395d4a8d93d87792d43e) ) \ - ROM_LOAD( "95008671.bin", 0x100000, 0x100000, CRC(11dd3c77) SHA1(f125c510a10819dac3391a582277f99b53c131fa) ) \ - + ROM_LOAD( "95008671.bin", 0x100000, 0x100000, CRC(11dd3c77) SHA1(f125c510a10819dac3391a582277f99b53c131fa) ) #define sc_fires_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008442.bin", 0x0000, 0x100000, CRC(8b815735) SHA1(8374c706a5378bb8923fd331b96dd07f0204b2e7) ) \ - + ROM_LOAD( "95008442.bin", 0x0000, 0x100000, CRC(8b815735) SHA1(8374c706a5378bb8923fd331b96dd07f0204b2e7) ) #define sc_ftcas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008894.bin", 0x0000, 0x0ff163, CRC(9a25809f) SHA1(8be16ac75056be025b4881d50493650c8e290183) ) \ - + ROM_LOAD( "95008894.bin", 0x0000, 0x0ff163, CRC(9a25809f) SHA1(8be16ac75056be025b4881d50493650c8e290183) ) #define sc_floop_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890455.bin", 0x0000, 0x5000, CRC(e69028e8) SHA1(4b2f2daf0f0cda3fb9c48fe04eaedce3a1bb1bcd) ) \ ROM_LOAD( "95890456.bin", 0x0000, 0x5000, CRC(93066cdc) SHA1(6bae40c87d083d11ec3b920637c10427ab30d0e2) ) \ ROM_LOAD( "95890457.bin", 0x0000, 0x5000, CRC(0dbca080) SHA1(3855987a78f1110741ed8580999c3eceb9126378) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008974.bin", 0x0000, 0x0fdd10, CRC(22b0f002) SHA1(df0e66b693ea5587b6cb54847adafc4720dddaa6) ) \ - + ROM_LOAD( "95008974.bin", 0x0000, 0x0fdd10, CRC(22b0f002) SHA1(df0e66b693ea5587b6cb54847adafc4720dddaa6) ) #define sc_fbspn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008526.bin", 0x0000, 0x100000, CRC(81890751) SHA1(1e9cedc07c9028eb65620371d9fcf73ae84ad274) ) \ - + ROM_LOAD( "95008526.bin", 0x0000, 0x100000, CRC(81890751) SHA1(1e9cedc07c9028eb65620371d9fcf73ae84ad274) ) #define sc_fire_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008307.bin", 0x0000, 0x100000, CRC(e1b9b37c) SHA1(96bc9cb530f94b77c3243b2d9d743aeed209d64d) ) \ - + ROM_LOAD( "95008307.bin", 0x0000, 0x100000, CRC(e1b9b37c) SHA1(96bc9cb530f94b77c3243b2d9d743aeed209d64d) ) #define sc_fguy_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008813.bin", 0x000000, 0x100000, CRC(e5548d68) SHA1(ac20af71cedd0c6d61d6a28afa8d700c1446e442) ) \ - ROM_LOAD( "95008814.bin", 0x100000, 0x100000, CRC(06f3165c) SHA1(936a8c1d31bca93a5b985e89c48a1faaef602ae0) ) \ - + ROM_LOAD( "95008814.bin", 0x100000, 0x100000, CRC(06f3165c) SHA1(936a8c1d31bca93a5b985e89c48a1faaef602ae0) ) #define sc_fmj_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008982.bin", 0x0000, 0x0fe74c, CRC(c5ce4a41) SHA1(abbecddba4dd4691240df112138fa95f1e125a85) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890477.bin", 0x0000, 0x5000, CRC(a7dd60c5) SHA1(dfa3a89939cec2225d975984caf4703d83708b85) ) \ ROM_LOAD( "95890478.bin", 0x0000, 0x5000, CRC(d24b24f1) SHA1(0c3a9c9579bb1066ea3e82e58b65d3bcac7fe900) ) \ - ROM_LOAD( "95890479.bin", 0x0000, 0x5000, CRC(4cf1e8ad) SHA1(924b454aa9c7340374b98201fbbaf922b836d779) ) \ - + ROM_LOAD( "95890479.bin", 0x0000, 0x5000, CRC(4cf1e8ad) SHA1(924b454aa9c7340374b98201fbbaf922b836d779) ) #define sc_fwp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "5wayssnd.bin", 0x0000, 0x0f0833, CRC(0f165ccb) SHA1(709c91845cbe6b17c888e143eb121d649a221418) ) \ - + ROM_LOAD( "5wayssnd.bin", 0x0000, 0x0f0833, CRC(0f165ccb) SHA1(709c91845cbe6b17c888e143eb121d649a221418) ) #define sc_grq_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008357.bin", 0x0000, 0x100000, CRC(c5d8c1ba) SHA1(b017c0b616b5ad2e54f111571b16067269a0e69f) ) \ - + ROM_LOAD( "95008357.bin", 0x0000, 0x100000, CRC(c5d8c1ba) SHA1(b017c0b616b5ad2e54f111571b16067269a0e69f) ) #define sc_gldfv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008347.bin", 0x0000, 0x100000, CRC(1d24f3ed) SHA1(01c7a8d2c8811cccee3748305681df75361f2254) ) \ - + ROM_LOAD( "95008347.bin", 0x0000, 0x100000, CRC(1d24f3ed) SHA1(01c7a8d2c8811cccee3748305681df75361f2254) ) #define sc_gldgo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009166.bin", 0x000000, 0x100000, CRC(06ae879f) SHA1(b4357306f4361bd26532e3db399f105f09fdf5be) ) \ - ROM_LOAD( "95009167.bin", 0x100000, 0x100000, CRC(5e34266d) SHA1(35fa153ccb7fd9001cd23dc0c9e683291615e9e0) ) \ - + ROM_LOAD( "95009167.bin", 0x100000, 0x100000, CRC(5e34266d) SHA1(35fa153ccb7fd9001cd23dc0c9e683291615e9e0) ) #define sc_gldsp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008543.bin", 0x0000, 0x0d877c, CRC(eabb0fd5) SHA1(260807cf2ce23e02bfaa7d880823e606f8240bee) ) \ - + ROM_LOAD( "95008543.bin", 0x0000, 0x0d877c, CRC(eabb0fd5) SHA1(260807cf2ce23e02bfaa7d880823e606f8240bee) ) #define sc_gmclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009112.bin", 0x000000, 0x100000, CRC(80be159b) SHA1(2e6d19f97613152fcb17d027efc886815102fd56) ) \ - ROM_LOAD( "95009113.bin", 0x100000, 0x100000, CRC(edd3d30e) SHA1(94a56fda349d998b8571c271041d11cc79afaec2) ) \ - + ROM_LOAD( "95009113.bin", 0x100000, 0x100000, CRC(edd3d30e) SHA1(94a56fda349d998b8571c271041d11cc79afaec2) ) #define sc_gamcs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004285.snd", 0x0000, 0x080000, CRC(034a84a6) SHA1(f5b815d943fe9f7eaff4358657426be5260753bf) ) \ - + ROM_LOAD( "95004285.snd", 0x0000, 0x080000, CRC(034a84a6) SHA1(f5b815d943fe9f7eaff4358657426be5260753bf) ) #define sc_game_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004285.snd", 0x0000, 0x080000, CRC(034a84a6) SHA1(f5b815d943fe9f7eaff4358657426be5260753bf) ) \ - + ROM_LOAD( "95004285.snd", 0x0000, 0x080000, CRC(034a84a6) SHA1(f5b815d943fe9f7eaff4358657426be5260753bf) ) #define sc_ziggy_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008472.bin", 0x0000, 0x0ece7a, CRC(12a9ec95) SHA1(1c3634b27718b1ce496c02c7dd6ef29800d1d2ee) ) \ - + ROM_LOAD( "95008472.bin", 0x0000, 0x0ece7a, CRC(12a9ec95) SHA1(1c3634b27718b1ce496c02c7dd6ef29800d1d2ee) ) #define sc_gldcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008968.bin", 0x0000, 0x0f4e4e, CRC(23e718a6) SHA1(1c781380d6b4fb307af6cb81be830159ce610352) ) \ - + ROM_LOAD( "95008968.bin", 0x0000, 0x0f4e4e, CRC(23e718a6) SHA1(1c781380d6b4fb307af6cb81be830159ce610352) ) #define sc_ghost_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008594.bin", 0x0000, 0x0b2ad7, CRC(3f7767d0) SHA1(b7ca39a42b59d1ac2088412fbb5f987b68f0189a) ) \ - + ROM_LOAD( "95008594.bin", 0x0000, 0x0b2ad7, CRC(3f7767d0) SHA1(b7ca39a42b59d1ac2088412fbb5f987b68f0189a) ) #define sc_ggrid_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008346.bin", 0x0000, 0x0e486b, CRC(1ec79154) SHA1(d6aff554e882e6f689caed383db79c752c9e672b) ) \ - + ROM_LOAD( "95008346.bin", 0x0000, 0x0e486b, CRC(1ec79154) SHA1(d6aff554e882e6f689caed383db79c752c9e672b) ) #define sc4ggcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008400.bin", 0x0000, 0x0e486b, CRC(78704d20) SHA1(c5f62434785b10d2bff5bcf415c2236b4f1ee551) ) \ - + ROM_LOAD( "95008400.bin", 0x0000, 0x0e486b, CRC(78704d20) SHA1(c5f62434785b10d2bff5bcf415c2236b4f1ee551) ) #define sc4goldo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004165.bin", 0x000000, 0x080000, CRC(c52f4218) SHA1(2648f3ef35d68bdd14a0a773151157dae0271067) ) \ - ROM_LOAD( "95004166.bin", 0x080000, 0x080000, CRC(a77f1337) SHA1(e292c87fa8e643846cc0ddd7b9a585429b7efdd6) ) \ - + ROM_LOAD( "95004166.bin", 0x080000, 0x080000, CRC(a77f1337) SHA1(e292c87fa8e643846cc0ddd7b9a585429b7efdd6) ) #define sc_gshot_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008904.bin", 0x0000, 0x0b32a1, CRC(6e11054e) SHA1(45ff06ce84cf1675747976b11e144a43d96977ac) ) \ - + ROM_LOAD( "95008904.bin", 0x0000, 0x0b32a1, CRC(6e11054e) SHA1(45ff06ce84cf1675747976b11e144a43d96977ac) ) #define sc_goldw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008356.bin", 0x0000, 0x080000, CRC(c8f1ca20) SHA1(13136df35c09fea102c5176e249436f9e64616a5) ) /* golden winner */ \ - + ROM_LOAD( "95008356.bin", 0x0000, 0x080000, CRC(c8f1ca20) SHA1(13136df35c09fea102c5176e249436f9e64616a5) ) /* golden winner */ #define PR1436_TRIPLE_CASINO_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008423.bin", 0x0000, 0x100000, CRC(4cab20ee) SHA1(e27221a94e54db340eaf7fc30e722b354c85686d) ) /* triple casino */ \ - + ROM_LOAD( "95008423.bin", 0x0000, 0x100000, CRC(4cab20ee) SHA1(e27221a94e54db340eaf7fc30e722b354c85686d) ) /* triple casino */ #define sc_gx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004185", 0x0000, 0x080000, CRC(86756ea2) SHA1(86180e038a9bb3a3a700af1ddc571794e6948165) ) \ - + ROM_LOAD( "95004185", 0x0000, 0x080000, CRC(86756ea2) SHA1(86180e038a9bb3a3a700af1ddc571794e6948165) ) #define sc_gxcas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004185", 0x0000, 0x080000, CRC(86756ea2) SHA1(86180e038a9bb3a3a700af1ddc571794e6948165) ) \ - + ROM_LOAD( "95004185", 0x0000, 0x080000, CRC(86756ea2) SHA1(86180e038a9bb3a3a700af1ddc571794e6948165) ) #define sc_gd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1016 GOLD DIG SOUNDS11 (game header actually lists PR1016 GOLD DIGGER SOUNDS11 but it accepts these) */ \ ROM_LOAD( "95008187.bin", 0x000000, 0x100000, CRC(1fbbc7cc) SHA1(6e19b582a3654bbbcf65b8f42bd556029f43e8cb) ) \ - ROM_LOAD( "95008188.bin", 0x100000, 0x100000, CRC(a74b23a7) SHA1(f7948edfb5524eaf80039c07ca7a9f76883f5a6f) ) \ - + ROM_LOAD( "95008188.bin", 0x100000, 0x100000, CRC(a74b23a7) SHA1(f7948edfb5524eaf80039c07ca7a9f76883f5a6f) ) #define PR3509_GOLD_DIGGER_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR3509 GOLD DIGGER SOUNDS11 */ \ ROM_LOAD( "95009061.bin", 0x000000, 0x100000, CRC(c4cad720) SHA1(ce67af8d9e0b2f4f79d38b7a01dfc5ff7323e162) ) \ - ROM_LOAD( "95009062.bin", 0x100000, 0x100000, CRC(509761d3) SHA1(6a133cc33bac6a1696de98a4961572a86cefc1c8) ) \ - + ROM_LOAD( "95009062.bin", 0x100000, 0x100000, CRC(509761d3) SHA1(6a133cc33bac6a1696de98a4961572a86cefc1c8) ) #define sc_gdmz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -1524,123 +1342,101 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890471.bin", 0x0000, 0x5000, CRC(98fce599) SHA1(559534c3b33c6390a06b2e97e4c595055c8c4fea) ) \ ROM_LOAD( "95890472.bin", 0x0000, 0x5000, CRC(ed6aa1ad) SHA1(83b69606398a30cb9c2ebc2f7406ef3215afab9e) ) \ - ROM_LOAD( "95890473.bin", 0x0000, 0x5000, CRC(73d06df1) SHA1(6959ee1b1c05398bc95430fea3590e5a86dd4312) ) \ - + ROM_LOAD( "95890473.bin", 0x0000, 0x5000, CRC(73d06df1) SHA1(6959ee1b1c05398bc95430fea3590e5a86dd4312) ) #define sc_gdclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008248.bin", 0x0000, 0x100000, CRC(abfba7ee) SHA1(95b61b34080196d745cc00ae32a333edb111da89) ) \ - + ROM_LOAD( "95008248.bin", 0x0000, 0x100000, CRC(abfba7ee) SHA1(95b61b34080196d745cc00ae32a333edb111da89) ) #define sc_gunp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008744.bin", 0x000000, 0x100000, CRC(be8313a2) SHA1(247ec0b2140d261bf5e7ab21cedb4ad2fd708ca7) ) \ - ROM_LOAD( "95008745.bin", 0x100000, 0x100000, CRC(355caf88) SHA1(82951c00efd27533ccbc78b46cd5b69be5c3e26d) ) \ - + ROM_LOAD( "95008745.bin", 0x100000, 0x100000, CRC(355caf88) SHA1(82951c00efd27533ccbc78b46cd5b69be5c3e26d) ) #define sc_gag_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004132.1_1", 0x000000, 0x080000, CRC(17320a32) SHA1(113ab1db5227fe17053969dd98f94f0b3b7555f5) ) \ - ROM_LOAD( "95004132.1_2", 0x080000, 0x080000, CRC(03593875) SHA1(a5f6730664b1bbfdb7b98b41379e9b240f43c53c) ) \ - + ROM_LOAD( "95004132.1_2", 0x080000, 0x080000, CRC(03593875) SHA1(a5f6730664b1bbfdb7b98b41379e9b240f43c53c) ) #define sc_goud_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004288.sn1", 0x000000, 0x080000, CRC(ae6d0680) SHA1(467d0127e2a63ca031ebf2816dde99273b513913) ) \ - ROM_LOAD( "95004289.sn2", 0x080000, 0x080000, CRC(9c88f3c8) SHA1(1152077f59cc28726f1428a9fdaf2c92ddef6c73) ) \ - + ROM_LOAD( "95004289.sn2", 0x080000, 0x080000, CRC(9c88f3c8) SHA1(1152077f59cc28726f1428a9fdaf2c92ddef6c73) ) #define sc_hirol_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890458.bin", 0x0000, 0x5000, CRC(237fc19f) SHA1(41c0dad102e8345c568f6178b13a17acedcbe1b3) ) \ ROM_LOAD( "95890459.bin", 0x0000, 0x5000, CRC(56e985ab) SHA1(48c425f85a8feba6775f2b34be8c91c78c233d66) ) \ ROM_LOAD( "95890460.bin", 0x0000, 0x5000, CRC(c85349f7) SHA1(7be87d120dc5d5972663ede3df6c9221deddff9b) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008977.bin", 0x0000, 0x0d9fcb, CRC(99173f54) SHA1(86d6432a37453865f6ee3b80bf8e1c1c84c6e3f9) ) \ - + ROM_LOAD( "95008977.bin", 0x0000, 0x0d9fcb, CRC(99173f54) SHA1(86d6432a37453865f6ee3b80bf8e1c1c84c6e3f9) ) #define sc_hulk_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008367.bin", 0x000000, 0x100000, CRC(37eea219) SHA1(e612b2c0bca83d742b35fbaf487b6805cfac024d) ) \ - ROM_LOAD( "95008368.bin", 0x100000, 0x100000, CRC(06549054) SHA1(923a320f9689361802dc82db467b294f7bc85147) ) \ - + ROM_LOAD( "95008368.bin", 0x100000, 0x100000, CRC(06549054) SHA1(923a320f9689361802dc82db467b294f7bc85147) ) #define PR1327_CAS_HAPPY_NOTES_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008312.bin", 0x000000, 0x100000, CRC(cf33e14d) SHA1(33382be257a145784d9de7050b5c90f725241de4) ) \ - + ROM_LOAD( "95008312.bin", 0x000000, 0x100000, CRC(cf33e14d) SHA1(33382be257a145784d9de7050b5c90f725241de4) ) #define sc_hapnt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1306 HAPPY NOTES SOUNDS11 */ \ - ROM_LOAD( "95008290.bin", 0x000000, 0x100000, CRC(427fc43d) SHA1(c63154c7f2bb3e7ec78e31268a8040d0eb131f2f) ) \ - + ROM_LOAD( "95008290.bin", 0x000000, 0x100000, CRC(427fc43d) SHA1(c63154c7f2bb3e7ec78e31268a8040d0eb131f2f) ) #define sc_hfcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004272.bin", 0x000000, 0x080000, CRC(843cea31) SHA1(1d3a524600c8a0b7d6e3a32cad71f7f53c8190a1) ) \ - ROM_LOAD( "95004273.bin", 0x080000, 0x080000, CRC(c0782f35) SHA1(d763f7f8377c97129485522b201413e35c9c5760) ) \ - + ROM_LOAD( "95004273.bin", 0x080000, 0x080000, CRC(c0782f35) SHA1(d763f7f8377c97129485522b201413e35c9c5760) ) #define sc_hill_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008494.bin", 0x0000, 0x100000, CRC(b2a2d2ca) SHA1(f9cd50c043dd58e4c92f94e4255c2fcb47963d39) ) \ - + ROM_LOAD( "95008494.bin", 0x0000, 0x100000, CRC(b2a2d2ca) SHA1(f9cd50c043dd58e4c92f94e4255c2fcb47963d39) ) #define sc_himi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008268.bin", 0x0000, 0x0ff264, CRC(6d5e7041) SHA1(bcc7b5c000aa8c25818aa063cd74f998484224a2) ) \ - + ROM_LOAD( "95008268.bin", 0x0000, 0x0ff264, CRC(6d5e7041) SHA1(bcc7b5c000aa8c25818aa063cd74f998484224a2) ) #define sc_hiss_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008910.bin", 0x0000, 0x0fff2c, CRC(e5079d76) SHA1(0c44060d695e44720e7c34a9a142bdccd86ee943) ) \ - + ROM_LOAD( "95008910.bin", 0x0000, 0x0fff2c, CRC(e5079d76) SHA1(0c44060d695e44720e7c34a9a142bdccd86ee943) ) #define sc_hotrd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008571.bin", 0x0000, 0x100000, CRC(50331772) SHA1(84aa448320210bfa8ea656f59cc4a320a0a46a32) ) \ - + ROM_LOAD( "95008571.bin", 0x0000, 0x100000, CRC(50331772) SHA1(84aa448320210bfa8ea656f59cc4a320a0a46a32) ) #define sc_hotsh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3211 HOT SHOT SOUNDS11 */ \ ROM_LOAD( "95008794.bin", 0x000000, 0x100000, CRC(2bbe0adc) SHA1(1d5fb724ced3dbe8d744c2befae33fff69fbecba) ) \ - ROM_LOAD( "95008795.bin", 0x100000, 0x100000, CRC(0affc9f9) SHA1(0eea59a9e8293fb68172a9389d23488be508dda5) ) \ - + ROM_LOAD( "95008795.bin", 0x100000, 0x100000, CRC(0affc9f9) SHA1(0eea59a9e8293fb68172a9389d23488be508dda5) ) #define sc_hotwd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1311 HOT WAD SOUNDS11 */ \ - ROM_LOAD( "95008309.bin", 0x000000, 0x100000, CRC(8cd75778) SHA1(5d75c10b32477faa24c73ad03de75914385787f6) ) \ - + ROM_LOAD( "95008309.bin", 0x000000, 0x100000, CRC(8cd75778) SHA1(5d75c10b32477faa24c73ad03de75914385787f6) ) #define sc_celeb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008440.bin", 0x000000, 0x100000, CRC(72a98e5d) SHA1(5f3e441d6c3fa2373284cee704630028cf7800ad) ) \ - ROM_LOAD( "95008441.bin", 0x100000, 0x100000, CRC(d7382975) SHA1(f5a4d92f243ec745f91d008d623b43dfa024635c) ) \ - + ROM_LOAD( "95008441.bin", 0x100000, 0x100000, CRC(d7382975) SHA1(f5a4d92f243ec745f91d008d623b43dfa024635c) ) #define sc_iab_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890446.bin", 0x0000, 0x5000, CRC(8fbf0046) SHA1(5e121f73fcf1777041995c9891465e17c37c8163) ) \ ROM_LOAD( "95890447.bin", 0x0000, 0x5000, CRC(fa294472) SHA1(71fa4cfaf8ba81f446d9f3504123e3c0c9a9af90) ) \ ROM_LOAD( "95890448.bin", 0x0000, 0x5000, CRC(6493882e) SHA1(c69401b35ef710d0df51541e615818dbd259c7f7) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008969.bin", 0x0000, 0x0fe101, CRC(798c9559) SHA1(4afb21a78be73353741b5903099d3c48e44fcebb) ) \ - + ROM_LOAD( "95008969.bin", 0x0000, 0x0fe101, CRC(798c9559) SHA1(4afb21a78be73353741b5903099d3c48e44fcebb) ) #define sc_ijbdo_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891076.bin", 0x0000, 0x5000, CRC(d535ed90) SHA1(0e349023bec422b356d7b9cf7f892a10fabbdedd) ) \ ROM_LOAD( "95891077.bin", 0x0000, 0x5000, CRC(a0a3a9a4) SHA1(e74ec6d2729bbef737300a014e83409ef034f605) ) \ ROM_LOAD( "95891078.bin", 0x0000, 0x5000, CRC(3e1965f8) SHA1(b37c73edf7f4b17fe3554fa394846929ad2031c0) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008896.bin", 0x0000, 0x0eeaef, CRC(d581cb00) SHA1(16b44ba6cf4008109792a016d7aef12e6d6329d7) ) \ - + ROM_LOAD( "95008896.bin", 0x0000, 0x0eeaef, CRC(d581cb00) SHA1(16b44ba6cf4008109792a016d7aef12e6d6329d7) ) #define sc_inspn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008909.bin", 0x0000, 0x0face9, CRC(e79bdfa0) SHA1(b31362a2d14c17b1367b45ea8734e408a2899fc2) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890327.bin", 0x0000, 0x5000, CRC(f63a2e4f) SHA1(2982130035f122a3d9a4f4a277bc272c9613562b) ) \ ROM_LOAD( "95890328.bin", 0x0000, 0x5000, CRC(83ac6a7b) SHA1(e4aae883b1070278314c6d388a132d362a059c5b) ) \ - ROM_LOAD( "95890329.bin", 0x0000, 0x5000, CRC(1d16a627) SHA1(985d526178de176869fdad3c4264f47de14d4d7f) ) \ - + ROM_LOAD( "95890329.bin", 0x0000, 0x5000, CRC(1d16a627) SHA1(985d526178de176869fdad3c4264f47de14d4d7f) ) #define sc_ijob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008764.bin", 0x000000, 0x100000, CRC(995c0c63) SHA1(7459e92ad80d4eb61008a011bf5ae3a1d5cb8f9d) ) \ /* ROM_LOAD( "95008765.bin", 0x100000, 0x0fb251, CRC(3c2feab2) SHA1(797ef43d2166c0522f6da5dd17bf4443f08891a5) ) */ \ - ROM_LOAD( "95008765.bin", 0x100000, 0x100000, CRC(72702540) SHA1(72525c65d4d49ed311e14ba5fc476296e5dbfc8a) ) \ - + ROM_LOAD( "95008765.bin", 0x100000, 0x100000, CRC(72702540) SHA1(72525c65d4d49ed311e14ba5fc476296e5dbfc8a) ) #define sc_jjok_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008470.bin", 0x000000, 0x100000, CRC(b5162561) SHA1(28feebc4de68264b92325e58bbf95458533bde7f) ) \ - + ROM_LOAD( "95008470.bin", 0x000000, 0x100000, CRC(b5162561) SHA1(28feebc4de68264b92325e58bbf95458533bde7f) ) #define sc_kingx_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890374.bin", 0x0000, 0x5000, CRC(87f2ca06) SHA1(480be8b0a42c9be55cb9e4c264438667734eb644) ) \ @@ -1650,86 +1446,72 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890701.bin", 0x0000, 0x5000, CRC(e66f564d) SHA1(7267fd9d4ad1b1886870eb89c940f59a8f84c014) ) \ ROM_LOAD( "95890702.bin", 0x0000, 0x5000, CRC(253574dd) SHA1(15b9aac5e9a176f792eefcbd7de2ad8df38ff67b) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008995.bin", 0x0000, 0x0931b3, CRC(e874bd15) SHA1(8adb32532dd053ca2c4e0987352013310ce197a0) ) /* = 95008995.bin sc4ckx Casino King X (Mazooma) (Scorpion 4) */ \ - + ROM_LOAD( "95008995.bin", 0x0000, 0x0931b3, CRC(e874bd15) SHA1(8adb32532dd053ca2c4e0987352013310ce197a0) ) /* = 95008995.bin sc4ckx Casino King X (Mazooma) (Scorpion 4) */ #define sc_ldvl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008866.bin", 0x0000, 0x0ff4f6, CRC(de0f7488) SHA1(dc9d546efa940f0cc69afb296bda0f07f82a4258) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890764.bin", 0x0000, 0x5000, CRC(15baa871) SHA1(9d3f021cfde738bc68d99f072160aee3eeaf8798) ) \ ROM_LOAD( "95890765.bin", 0x0000, 0x5000, CRC(602cec45) SHA1(94f97824a90c4771e8c1fbab2cb41723b786f7be) ) \ - ROM_LOAD( "95890766.bin", 0x0000, 0x5000, CRC(fe962019) SHA1(e7283db78ac104bb47a37e5e81d50cd81db477f5) ) \ - + ROM_LOAD( "95890766.bin", 0x0000, 0x5000, CRC(fe962019) SHA1(e7283db78ac104bb47a37e5e81d50cd81db477f5) ) #define sc_lotrf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008251.bin", 0x000000, 0x100000, CRC(2af25e80) SHA1(fb606e434ac99eee6e114d6639f28f0fa1e7ffb3) ) \ - ROM_LOAD( "95008252.bin", 0x100000, 0x100000, CRC(fbca1cfb) SHA1(27c610af14b10d1d72774186fd3afc12d5db925e) ) \ - + ROM_LOAD( "95008252.bin", 0x100000, 0x100000, CRC(fbca1cfb) SHA1(27c610af14b10d1d72774186fd3afc12d5db925e) ) #define sc_lotr2_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008320.bin", 0x000000, 0x100000, CRC(8ba801e3) SHA1(4d6a009c2f4f4478276f1227af6315b4be90fc87) ) \ - ROM_LOAD( "95008321.bin", 0x100000, 0x100000, CRC(42482ddc) SHA1(304961f267b85bc599dd64c97c14f34b2913dd59) ) \ - + ROM_LOAD( "95008321.bin", 0x100000, 0x100000, CRC(42482ddc) SHA1(304961f267b85bc599dd64c97c14f34b2913dd59) ) #define sc_ltr2c_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008342.bin", 0x000000, 0x100000, CRC(44f48bf6) SHA1(2b36fb9ca6eb9cb35cf67e580d736c711d96ea25) ) \ - ROM_LOAD( "95008343.bin", 0x100000, 0x100000, CRC(f35a7927) SHA1(f2a93c8ff4699c7e6572a7a43b6b2bc50683594c) ) \ - + ROM_LOAD( "95008343.bin", 0x100000, 0x100000, CRC(f35a7927) SHA1(f2a93c8ff4699c7e6572a7a43b6b2bc50683594c) ) #define sc_lotrt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008251.bin", 0x000000, 0x100000, CRC(2af25e80) SHA1(fb606e434ac99eee6e114d6639f28f0fa1e7ffb3) ) \ - ROM_LOAD( "95008252.bin", 0x100000, 0x100000, CRC(fbca1cfb) SHA1(27c610af14b10d1d72774186fd3afc12d5db925e) ) \ - + ROM_LOAD( "95008252.bin", 0x100000, 0x100000, CRC(fbca1cfb) SHA1(27c610af14b10d1d72774186fd3afc12d5db925e) ) #define sc_lotrr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008413.bin", 0x000000, 0x100000, CRC(66d6fd58) SHA1(dff5cc3f09fb4082fde4d5d4a9ecfe00cbce7242) ) \ - ROM_LOAD( "95008414.bin", 0x100000, 0x100000, CRC(8ec846ac) SHA1(3f66cbe5bc7190406425488beccb3e1d15356b1a) ) \ - + ROM_LOAD( "95008414.bin", 0x100000, 0x100000, CRC(8ec846ac) SHA1(3f66cbe5bc7190406425488beccb3e1d15356b1a) ) #define sc_luck7_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "lucky7s.bin", 0x0000, 0x200000, CRC(93002e7d) SHA1(50edf9064fb3bc9fd13efc65be6b12a4329fdb41) ) \ - + ROM_LOAD( "lucky7s.bin", 0x0000, 0x200000, CRC(93002e7d) SHA1(50edf9064fb3bc9fd13efc65be6b12a4329fdb41) ) #define sc_monky_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890706.bin", 0x0000, 0x5000, CRC(4b2c5ee0) SHA1(e5bdcc4f076cc5550e51f3f4d4de5d8c59a4f545) ) \ ROM_LOAD( "95890707.bin", 0x0000, 0x5000, CRC(3eba1ad4) SHA1(c780a4813c6b507a7e21ef2d7a401f3d764fd0f7) ) \ ROM_LOAD( "95890708.bin", 0x0000, 0x5000, CRC(a000d688) SHA1(bcc197af2596b9c81cc56926fefc5854d7a94a27) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008998.bin", 0x0000, 0x0f0a3e, CRC(cc0dd8f2) SHA1(c99c54ce1289604f57ce2345ec5cb69be91b69d6) ) \ - + ROM_LOAD( "95008998.bin", 0x0000, 0x0f0a3e, CRC(cc0dd8f2) SHA1(c99c54ce1289604f57ce2345ec5cb69be91b69d6) ) #define sc_mobob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008842.bin", 0x000000, 0x100000, CRC(3205f4c9) SHA1(a8b92e1558911e02281b1c38c64c5e04836794b0) ) \ - ROM_LOAD( "95008843.bin", 0x100000, 0x100000, CRC(95057e16) SHA1(6c26451dd336f908ce0fcea0c56176b589111868) ) \ - + ROM_LOAD( "95008843.bin", 0x100000, 0x100000, CRC(95057e16) SHA1(6c26451dd336f908ce0fcea0c56176b589111868) ) #define sc_momil_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009110.bin", 0x000000, 0x100000, CRC(8ec67890) SHA1(ba7f8cd4315a4ca8d2adeedc40c50e9e9a9b38f6) ) \ - ROM_LOAD( "95009111.bin", 0x100000, 0x100000, CRC(de68000c) SHA1(be69779ccb213a95698c2eafafe1f4a339febc4f) ) \ - + ROM_LOAD( "95009111.bin", 0x100000, 0x100000, CRC(de68000c) SHA1(be69779ccb213a95698c2eafafe1f4a339febc4f) ) #define sc_moms_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891135.bin", 0x0000, 0x5000, CRC(3fdecc78) SHA1(271699c347bcd2b40282d22f9e1a4e36713845e1) ) \ ROM_LOAD( "95891136.bin", 0x0000, 0x5000, CRC(4a48884c) SHA1(d641295cdcc0226c64797d24799d8508ef13f204) ) \ ROM_LOAD( "95891137.bin", 0x0000, 0x5000, CRC(d4f24410) SHA1(a35803e69aa8a45d46409baebbcbc20a35c1ac5d) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95009023.bin", 0x0000, 0x0ffbf6, CRC(a10e8614) SHA1(85fc093f176cb81660717eb84301e9204402e83e) ) \ - + ROM_LOAD( "95009023.bin", 0x0000, 0x0ffbf6, CRC(a10e8614) SHA1(85fc093f176cb81660717eb84301e9204402e83e) ) #define sc_mor2r_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891090.bin", 0x0000, 0x5000, CRC(a5009c47) SHA1(38b08c39ded1f1baef8a01373f19694b49d032b7) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95009004.bin", 0x0000, 0x0ffe87, CRC(2403a082) SHA1(cd69739b2249724e3a88ea1c0b61151aeae0ea01) ) \ - + ROM_LOAD( "95009004.bin", 0x0000, 0x0ffe87, CRC(2403a082) SHA1(cd69739b2249724e3a88ea1c0b61151aeae0ea01) ) #define sc_monwa_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891094.bin", 0x0000, 0x5000, CRC(a241259b) SHA1(94dfcc7371593d983c8b62dba085b3ec51a33ed1) ) \ ROM_LOAD( "95891095.bin", 0x0000, 0x5000, CRC(d7d761af) SHA1(a7adda6fe7bcec0f40587273a9a1d16a220f400a) ) \ ROM_LOAD( "95891096.bin", 0x0000, 0x5000, CRC(496dadf3) SHA1(997f91c4c96b8971cc3ccfcaaaa42af6aac42ddd) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008010.bin", 0x0000, 0x0d5d57, CRC(1a75f403) SHA1(3bb5ca732d27aa4b8a2c96945be7e32c2abfe1c4) ) \ - + ROM_LOAD( "95008010.bin", 0x0000, 0x0d5d57, CRC(1a75f403) SHA1(3bb5ca732d27aa4b8a2c96945be7e32c2abfe1c4) ) #define sc_cmcob_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891127.bin", 0x0000, 0x5000, CRC(7e7d858c) SHA1(8fe2b07275ad36ae80149e091582f729c8a1d240) ) \ @@ -1737,61 +1519,50 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95891129.bin", 0x0000, 0x5000, CRC(c7299792) SHA1(f6279d507091d257a74b2419ec883c363b3c548f) ) \ ROM_LOAD( "95891130.bin", 0x0000, 0x5000, CRC(15a8fe82) SHA1(7fb448b5559d8248a302b7b0cfaa7dfa07dc16dd) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95009021.bin", 0x0000, 0x0ff73b, CRC(068c715c) SHA1(25f80da3b548b9b0b6331d402d732a312985993b) ) \ - + ROM_LOAD( "95009021.bin", 0x0000, 0x0ff73b, CRC(068c715c) SHA1(25f80da3b548b9b0b6331d402d732a312985993b) ) #define sc_mogta_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009039.bin", 0x000000, 0x100000, CRC(0756b1b7) SHA1(82a8f9bf4c70a492ae2d4f478ecc73cccf9aecdd) ) \ - ROM_LOAD( "95009040.bin", 0x100000, 0x100000, CRC(9a928ef4) SHA1(5b19f70d067540aef3dc140115c12601d2b8176e) ) \ - + ROM_LOAD( "95009040.bin", 0x100000, 0x100000, CRC(9a928ef4) SHA1(5b19f70d067540aef3dc140115c12601d2b8176e) ) #define sc_monsp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* 95004291 MONEYSPINNER PR1158 */ \ - ROM_LOAD( "95004291.snd", 0x000000, 0x080000, CRC(0ea304f7) SHA1(3d524e108cd12e83956fec3997316a92a9e0898d) ) \ - + ROM_LOAD( "95004291.snd", 0x000000, 0x080000, CRC(0ea304f7) SHA1(3d524e108cd12e83956fec3997316a92a9e0898d) ) #define sc_monop_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* MPDX SOUNDS */ \ - ROM_LOAD( "95008514.bin", 0x0000, 0x0ed840, CRC(2608cbde) SHA1(4831570fbc825592781e6473173d6ec911a0054d) ) \ - + ROM_LOAD( "95008514.bin", 0x0000, 0x0ed840, CRC(2608cbde) SHA1(4831570fbc825592781e6473173d6ec911a0054d) ) #define sc_mmm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008944.bin", 0x0000, 0x0c76af, CRC(d2683fa2) SHA1(ebccd3da695cc69826493ac9e745b8dc2ce2ab8c) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890425.bin", 0x0000, 0x5000, CRC(fde2f6d4) SHA1(e62c28175138ed7d92c1e00c0a07a8e1f4a41ad2) ) \ ROM_LOAD( "95890426.bin", 0x0000, 0x5000, CRC(8874b2e0) SHA1(0ba474cd47a65a5120df20b0f1ffcfe0aa51b0c5) ) \ - ROM_LOAD( "95890427.bin", 0x0000, 0x5000, CRC(16ce7ebc) SHA1(8561cf7808f09a92af8715999000684c1bef11bb) ) \ - + ROM_LOAD( "95890427.bin", 0x0000, 0x5000, CRC(16ce7ebc) SHA1(8561cf7808f09a92af8715999000684c1bef11bb) ) #define sc_mmad_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008519.bin", 0x0000, 0x0fe4d6, CRC(e16efe22) SHA1(144e93e01967f343607ee8cee6add3d8ac8f5f28) ) \ - + ROM_LOAD( "95008519.bin", 0x0000, 0x0fe4d6, CRC(e16efe22) SHA1(144e93e01967f343607ee8cee6add3d8ac8f5f28) ) #define sc_mdm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008844.bin", 0x000000, 0x100000, CRC(807916aa) SHA1(d266cdb2c4961337b1b1f5b6325a0b0bec934bad) ) \ - ROM_LOAD( "95008845.bin", 0x100000, 0x100000, CRC(e1e74669) SHA1(32cb963c3698a0659c23c0662da04a97539a3c28) ) \ - + ROM_LOAD( "95008845.bin", 0x100000, 0x100000, CRC(e1e74669) SHA1(32cb963c3698a0659c23c0662da04a97539a3c28) ) #define sc_mhn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008857.bin", 0x0000, 0x0f2fe8, CRC(a7f64802) SHA1(8a667ebf29feaffb2676ebd770b570c1015f3c2a) ) /* r2r sounds */ \ - + ROM_LOAD( "95008857.bin", 0x0000, 0x0f2fe8, CRC(a7f64802) SHA1(8a667ebf29feaffb2676ebd770b570c1015f3c2a) ) /* r2r sounds */ #define sc_mhp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008707.bin", 0x000000, 0x100000, CRC(88ffdb28) SHA1(724a2fe6703d4e5aab7d3989be9d3ae4dc8ab057) ) \ - ROM_LOAD( "95008708.bin", 0x100000, 0x100000, CRC(fa8aa99e) SHA1(bd4dd726b0af371d9b8589de461316990c3232dc) ) \ - + ROM_LOAD( "95008708.bin", 0x100000, 0x100000, CRC(fa8aa99e) SHA1(bd4dd726b0af371d9b8589de461316990c3232dc) ) #define sc_mmb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1911 MPOLY MONEYBAGS SOUNDS11 */ \ ROM_LOAD( "95008612.bin", 0x000000, 0x100000, CRC(5f76152c) SHA1(c9f0ac000ec0b11ac3ba5eb5ff7e3dc2084f6744) ) \ - ROM_LOAD( "95008613.bin", 0x100000, 0x100000, CRC(df266121) SHA1(ece6b5a42ec3d18d97cffe3e6c98c6e6cd34682b) ) \ - + ROM_LOAD( "95008613.bin", 0x100000, 0x100000, CRC(df266121) SHA1(ece6b5a42ec3d18d97cffe3e6c98c6e6cd34682b) ) #define PR3413_MPOLY_MB_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3413 MPOLY MB SOUNDS11 */ \ ROM_LOAD( "95009168.bin", 0x000000, 0x100000, CRC(1ad311a5) SHA1(bd7728423cd855ea58fe21097d3d3db5a7e08339) ) \ - ROM_LOAD( "95009169.bin", 0x100000, 0x100000, CRC(23a8705f) SHA1(a36e71706cee64b56958fe4aefba8b85d2369e38) ) \ - + ROM_LOAD( "95009169.bin", 0x100000, 0x100000, CRC(23a8705f) SHA1(a36e71706cee64b56958fe4aefba8b85d2369e38) ) #define sc_mrh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008852.bin", 0x0000, 0x0c845b, CRC(265db01b) SHA1(6b9b62eded887ec528bb53b255d539122124eccc) ) \ @@ -1799,16 +1570,14 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890721.bin", 0x0000, 0x5000, CRC(766aaa4d) SHA1(bd1bfd7209e4d54e1fc798b720b749dd7ce8f9e6) ) \ ROM_LOAD( "95890722.bin", 0x0000, 0x5000, CRC(6abc5af1) SHA1(61ef7254ab948899df9de693227e0eff2ad22e74) ) \ - ROM_LOAD( "95890723.bin", 0x0000, 0x5000, CRC(a9e67861) SHA1(2ce81fb21e709438c63d5eb74d107e6dc1905dd2) ) \ - + ROM_LOAD( "95890723.bin", 0x0000, 0x5000, CRC(a9e67861) SHA1(2ce81fb21e709438c63d5eb74d107e6dc1905dd2) ) #define sc_mr2r_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008893.bin", 0x0000, 0x0f2fe8, CRC(a7f64802) SHA1(8a667ebf29feaffb2676ebd770b570c1015f3c2a) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890480.bin", 0x0000, 0x5000, CRC(3618777f) SHA1(97ab5be3bcdbe1c94e638c4dceac69bbfe359a0e) ) \ ROM_LOAD( "95890481.bin", 0x0000, 0x5000, CRC(438e334b) SHA1(69b132ea3cbe31d31fd6fa6b915ddc2f4e66f068) ) \ - ROM_LOAD( "95890482.bin", 0x0000, 0x5000, CRC(dd34ff17) SHA1(b057c4a70066e8e8f9657e16adc4e0bfb6f00494) ) \ - + ROM_LOAD( "95890482.bin", 0x0000, 0x5000, CRC(dd34ff17) SHA1(b057c4a70066e8e8f9657e16adc4e0bfb6f00494) ) #define sc_mcas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* MONO SOUNDS */ \ @@ -1816,22 +1585,18 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890727.bin", 0x0000, 0x5000, CRC(10ec3f00) SHA1(986bfce992e113bab26eea8d1981905a54367b94) ) \ ROM_LOAD( "95890728.bin", 0x0000, 0x5000, CRC(0c3acfbc) SHA1(ff39c8236d5bd44c7d238edd1827af5aebc46e5c) ) \ - ROM_LOAD( "95890729.bin", 0x0000, 0x5000, CRC(cf60ed2c) SHA1(df015b71567d6762b4c8ea6ad6d719cefdfdc60f) ) \ - + ROM_LOAD( "95890729.bin", 0x0000, 0x5000, CRC(cf60ed2c) SHA1(df015b71567d6762b4c8ea6ad6d719cefdfdc60f) ) #define sc_mono_alt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* MONO SOUNDS */ \ - ROM_LOAD( "95008436.bin", 0x0000, 0x0e6369, CRC(32e8df77) SHA1(fa044287970d4e54af53ff492eabc50afa9a7a92) ) \ - + ROM_LOAD( "95008436.bin", 0x0000, 0x0e6369, CRC(32e8df77) SHA1(fa044287970d4e54af53ff492eabc50afa9a7a92) ) #define PR1706_WHEEL_OF_WEALTH_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008550.bin", 0x000000, 0x100000, CRC(db6343bf) SHA1(e4d702020af67aa5be0560027706c1cbf34296fa) ) \ - + ROM_LOAD( "95008550.bin", 0x000000, 0x100000, CRC(db6343bf) SHA1(e4d702020af67aa5be0560027706c1cbf34296fa) ) #define WHEEL_OF_WEALTH_WOWT_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008869.bin", 0x000000, 0x0b9d9d, CRC(f3ef3bbb) SHA1(92f9835e96c4fc444a451e97b2b8a7b66e5794b7) ) \ - + ROM_LOAD( "95008869.bin", 0x000000, 0x0b9d9d, CRC(f3ef3bbb) SHA1(92f9835e96c4fc444a451e97b2b8a7b66e5794b7) ) #define sc_mowow_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -1840,8 +1605,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890712.bin", 0x0000, 0x5000, CRC(ec6db00b) SHA1(d16a1527caa3c115e3326c897ce0fa66e3a0420d) ) \ ROM_LOAD( "95890713.bin", 0x0000, 0x5000, CRC(f0bb40b7) SHA1(33c19dab3086cdeae4f503fbf3f3cc5f0dad98c4) ) \ - ROM_LOAD( "95890714.bin", 0x0000, 0x5000, CRC(33e16227) SHA1(87efc1a046ef6af0b72cc76a6ee393a4d1ddbce3) ) \ - + ROM_LOAD( "95890714.bin", 0x0000, 0x5000, CRC(33e16227) SHA1(87efc1a046ef6af0b72cc76a6ee393a4d1ddbce3) ) /* the game accepts either of these pairs, what's the difference? */ #define sc_nmare_others \ @@ -1852,75 +1616,62 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "altymz", ROMREGION_ERASE00 ) \ /* PR3002 ELM STREET SOUNDS11 */ \ ROM_LOAD( "95008664.bin", 0x000000, 0x100000, CRC(54d245d7) SHA1(503db10681bc1d6cf1cffb2a6f818c5d912a7f56) ) \ - ROM_LOAD( "95008665.bin", 0x100000, 0x100000, CRC(79a00527) SHA1(b8207d3a81e97b2233fea1df883a4128388570e4) ) \ - + ROM_LOAD( "95008665.bin", 0x100000, 0x100000, CRC(79a00527) SHA1(b8207d3a81e97b2233fea1df883a4128388570e4) ) #define sc_nunsm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008522.bin", 0x0000, 0x0f9907, CRC(df612d06) SHA1(cbca56230c4ad4c6411aa5c2e2ca2ae8152b5297) ) \ - + ROM_LOAD( "95008522.bin", 0x0000, 0x0f9907, CRC(df612d06) SHA1(cbca56230c4ad4c6411aa5c2e2ca2ae8152b5297) ) #define sc_rainb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009122.bin", 0x000000, 0x100000, CRC(7197027f) SHA1(216e43135c00452556ad5e7647891f14641840ed) ) \ - ROM_LOAD( "95009123.bin", 0x100000, 0x100000, CRC(3454f17d) SHA1(fc45d2653a0f260702a94663939b0d0176fc1c87) ) \ - + ROM_LOAD( "95009123.bin", 0x100000, 0x100000, CRC(3454f17d) SHA1(fc45d2653a0f260702a94663939b0d0176fc1c87) ) #define sc_parot_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008736.bin", 0x000000, 0x100000, CRC(148a7600) SHA1(d57f4a667151e78715d617b3d1e963d29d83b538) ) \ - ROM_LOAD( "95008737.bin", 0x100000, 0x100000, CRC(4e61167f) SHA1(6faa7a395bd2d9067b88a9c9c365198ea26ebb39) ) \ - + ROM_LOAD( "95008737.bin", 0x100000, 0x100000, CRC(4e61167f) SHA1(6faa7a395bd2d9067b88a9c9c365198ea26ebb39) ) #define sc_pilep_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891066.bin", 0x0000, 0x5000, CRC(c058097e) SHA1(f6940ac1fe02498d13d62bd4318fd7445880c9a9) ) \ ROM_LOAD( "95891067.bin", 0x0000, 0x5000, CRC(b5ce4d4a) SHA1(918009698696ce6bd9d0d68b4dc3e4234ff552bb) ) \ ROM_LOAD( "95891068.bin", 0x0000, 0x5000, CRC(2b748116) SHA1(f6100c3ce79b4456d2f7fcda8e48734aad48141c) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008892.bin", 0x0000, 0x0fe398, CRC(e59abfb2) SHA1(fbe9ec614774a46f93ffb3ef9b8d4ee430d0aeed) ) \ - + ROM_LOAD( "95008892.bin", 0x0000, 0x0fe398, CRC(e59abfb2) SHA1(fbe9ec614774a46f93ffb3ef9b8d4ee430d0aeed) ) #define sc_potsm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008966.bin", 0x0000, 0x0ff8c9, CRC(1cc159e9) SHA1(f7f5a027806c561825656c5741166e0893a30b10) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890443.bin", 0x0000, 0x5000, CRC(d6ee4a71) SHA1(f638c1e150ae089533ea43ca66010cb7190eb646) ) \ ROM_LOAD( "95890444.bin", 0x0000, 0x5000, CRC(a3780e45) SHA1(4babae846051a0199f0e0baa6de0c7b16c73a185) ) \ - ROM_LOAD( "95890445.bin", 0x0000, 0x5000, CRC(3dc2c219) SHA1(acad92fd6d5112a5366b609761fbd2907bbce91a) ) \ - + ROM_LOAD( "95890445.bin", 0x0000, 0x5000, CRC(3dc2c219) SHA1(acad92fd6d5112a5366b609761fbd2907bbce91a) ) #define sc_cpen1_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009057.bin", 0x000000, 0x100000, CRC(7b83611b) SHA1(6163ab8e848f019190af446710b31e3516386c57) ) \ - ROM_LOAD( "95009058.bin", 0x100000, 0x100000, CRC(43858a26) SHA1(fdb831e6a2ba161e72883100c22e2e9eee335fe6) ) \ - + ROM_LOAD( "95009058.bin", 0x100000, 0x100000, CRC(43858a26) SHA1(fdb831e6a2ba161e72883100c22e2e9eee335fe6) ) #define sc_potp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008483.bin", 0x0000, 0x100000, CRC(d208755d) SHA1(f87b9b7dc077f4a1bf141ae8ca1e985796c4bada) ) \ - + ROM_LOAD( "95008483.bin", 0x0000, 0x100000, CRC(d208755d) SHA1(f87b9b7dc077f4a1bf141ae8ca1e985796c4bada) ) // these 3 are for the adder 5 game #define SD_PANTHER_SNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* SD_PANTHER SNDS */ \ - ROM_LOAD( "95008948.bin", 0x0000, 0x08b98b, CRC(35e995c5) SHA1(9d12a3002423e9434bcd76fe13f9fc0891354e40) ) \ - + ROM_LOAD( "95008948.bin", 0x0000, 0x08b98b, CRC(35e995c5) SHA1(9d12a3002423e9434bcd76fe13f9fc0891354e40) ) #define PINK_PANTHER_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PINK PANTHER SOUNDS */ \ - ROM_LOAD( "95008942.bin", 0x0000, 0x0ebc96, CRC(42765fbc) SHA1(ab5b9240a8e71695897fd55a1385b64f63ce52c8) ) \ - + ROM_LOAD( "95008942.bin", 0x0000, 0x0ebc96, CRC(42765fbc) SHA1(ab5b9240a8e71695897fd55a1385b64f63ce52c8) ) #define PINKP_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PINKP_SOUNDS */ \ - ROM_LOAD( "95008953.bin", 0x0000, 0x0fabc8, CRC(12d96e7a) SHA1(4f5179b5817e471b891f377f0bec81dcb4a2077c) ) \ - + ROM_LOAD( "95008953.bin", 0x0000, 0x0fabc8, CRC(12d96e7a) SHA1(4f5179b5817e471b891f377f0bec81dcb4a2077c) ) #define sc_ppcr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008950.bin", 0x0000, 0x0fabc8, CRC(291b1b0d) SHA1(9d4149d2eb1303742dcba6e0e6d1b914f8a4019e) ) \ - + ROM_LOAD( "95008950.bin", 0x0000, 0x0fabc8, CRC(291b1b0d) SHA1(9d4149d2eb1303742dcba6e0e6d1b914f8a4019e) ) #define sc_ppctc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008785.bin", 0x000000, 0x100000, CRC(4f2284e6) SHA1(4a85bce29d9ae7181aef8874d46928e397ba915a) ) \ - ROM_LOAD( "95008786.bin", 0x100000, 0x100000, CRC(2c96e78e) SHA1(feab56483b6075ffcf8f60f8c573198ee91e7d64) ) \ - + ROM_LOAD( "95008786.bin", 0x100000, 0x100000, CRC(2c96e78e) SHA1(feab56483b6075ffcf8f60f8c573198ee91e7d64) ) #define sc_ppdym_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* DYMN SOUNDS */ \ @@ -1930,95 +1681,77 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890483.bin", 0x0000, 0x5000, CRC(0ee68077) SHA1(163a46b16da238123cd542a62119dbaa726fca1b) ) \ ROM_LOAD( "95890484.bin", 0x0000, 0x5000, CRC(123070cb) SHA1(4f3b313c3f7bd43120dd390fd9a187523838f559) ) \ - ROM_LOAD( "95890485.bin", 0x0000, 0x5000, CRC(d16a525b) SHA1(7358a180b1db0e2c5f4442481e9483a1170974a1) ) \ - + ROM_LOAD( "95890485.bin", 0x0000, 0x5000, CRC(d16a525b) SHA1(7358a180b1db0e2c5f4442481e9483a1170974a1) ) #define sc_ppsag_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008975.bin", 0x0000, 0x100000, CRC(0203bef7) SHA1(01b1f3225eb97303a3ddc678ad51aef90d2bb84a) ) \ - + ROM_LOAD( "95008975.bin", 0x0000, 0x100000, CRC(0203bef7) SHA1(01b1f3225eb97303a3ddc678ad51aef90d2bb84a) ) #define sc_pony_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008408.bin", 0x0000, 0x100000, CRC(a28ef50e) SHA1(c5080418585a37ea63372b427c7e67b8c010f40c) ) \ - + ROM_LOAD( "95008408.bin", 0x0000, 0x100000, CRC(a28ef50e) SHA1(c5080418585a37ea63372b427c7e67b8c010f40c) ) #define sc_popey_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008798.bin", 0x000000, 0x100000, CRC(916cb144) SHA1(c75fa7a27be4e8dbd85fa074f6228877b5c86fc9) ) \ - ROM_LOAD( "95008799.bin", 0x100000, 0x100000, CRC(2f4c8eb6) SHA1(ca02b32705352735c4217aa20e9bc82eac8c3645) ) \ - + ROM_LOAD( "95008799.bin", 0x100000, 0x100000, CRC(2f4c8eb6) SHA1(ca02b32705352735c4217aa20e9bc82eac8c3645) ) #define sc_pwrbl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008496.bin", 0x0000, 0x100000, CRC(66b32a17) SHA1(3adaa7067f91c071ca70e4c8b1c3d07f0402e1bb) ) \ - + ROM_LOAD( "95008496.bin", 0x0000, 0x100000, CRC(66b32a17) SHA1(3adaa7067f91c071ca70e4c8b1c3d07f0402e1bb) ) #define sc_qual_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008354.bin", 0x0000, 0x100000, CRC(1fb18180) SHA1(c21456253b670ce140efeaff6a590f8a50112bd4) ) \ - + ROM_LOAD( "95008354.bin", 0x0000, 0x100000, CRC(1fb18180) SHA1(c21456253b670ce140efeaff6a590f8a50112bd4) ) #define sc_quidv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008993.bin", 0x0000, 0x0fab1c, CRC(e99defa5) SHA1(43954ec9acfedc86794d577d1e3058320264471e) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890703.bin", 0x0000, 0x5000, CRC(c87e0232) SHA1(c8de2c6b4f327ffd5b6bdb1248df1ba5573b21f0) ) \ ROM_LOAD( "95890704.bin", 0x0000, 0x5000, CRC(bde84606) SHA1(0fe8285d862b97fee2a5a43082294a061b01bb16) ) \ - ROM_LOAD( "95890705.bin", 0x0000, 0x5000, CRC(23528a5a) SHA1(ac5b5a16a1e96a600be3760bd82cae2903459c24) ) \ - + ROM_LOAD( "95890705.bin", 0x0000, 0x5000, CRC(23528a5a) SHA1(ac5b5a16a1e96a600be3760bd82cae2903459c24) ) #define sc_rhog_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008783.bin", 0x000000, 0x100000, CRC(50d2c89b) SHA1(f3e592f009765118009f97bd7d0951b72ffc2898) ) \ - ROM_LOAD( "95008784.bin", 0x100000, 0x100000, CRC(88185c65) SHA1(b3a6d06aca91dc04d9efbc1e4ff89b37bcf87a57) ) \ - + ROM_LOAD( "95008784.bin", 0x100000, 0x100000, CRC(88185c65) SHA1(b3a6d06aca91dc04d9efbc1e4ff89b37bcf87a57) ) #define sc_rhclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008802.bin", 0x000000, 0x100000, CRC(36647f4a) SHA1(ffa0cdf4f2b8ccc9afda67160a50e603b2a41ae6) ) \ - ROM_LOAD( "95008803.bin", 0x100000, 0x100000, CRC(2d26ff8a) SHA1(b9c797dfb2b06b3558e9a02d197e046244f4f2fc) ) \ - + ROM_LOAD( "95008803.bin", 0x100000, 0x100000, CRC(2d26ff8a) SHA1(b9c797dfb2b06b3558e9a02d197e046244f4f2fc) ) #define sc_rdrag_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008485.bin", 0x0000, 0x0e7e1d, CRC(037269cd) SHA1(7b528427740c9f1b28e00d9b45ebeb5e77ca9ead) ) /* red dragon */ \ - + ROM_LOAD( "95008485.bin", 0x0000, 0x0e7e1d, CRC(037269cd) SHA1(7b528427740c9f1b28e00d9b45ebeb5e77ca9ead) ) /* red dragon */ #define sc_rdrcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008525.bin", 0x0000, 0x0e7e1d, CRC(0c7aa11d) SHA1(3d028d2d5558056e84626ba66f7c22286be34bd9) ) /* club red dragon */ \ - + ROM_LOAD( "95008525.bin", 0x0000, 0x0e7e1d, CRC(0c7aa11d) SHA1(3d028d2d5558056e84626ba66f7c22286be34bd9) ) /* club red dragon */ #define sc_rhx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* REDX SOUNDS */ \ - ROM_LOAD( "95008331.bin", 0x000000, 0x100000, CRC(b41748dd) SHA1(458409a4d2f6444af564ebe28d80e110fdb845b6) ) \ - + ROM_LOAD( "95008331.bin", 0x000000, 0x100000, CRC(b41748dd) SHA1(458409a4d2f6444af564ebe28d80e110fdb845b6) ) #define RHRL_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* RHRL SOUNDS */ \ - ROM_LOAD( "95008927.bin", 0x000000, 0x0f1c08, CRC(38fccc48) SHA1(9ef11b3fbe3bbd3c5b74cee2c35581f3e41cb372) ) \ - + ROM_LOAD( "95008927.bin", 0x000000, 0x0f1c08, CRC(38fccc48) SHA1(9ef11b3fbe3bbd3c5b74cee2c35581f3e41cb372) ) #define sc_rhxcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008313.bin", 0x0000, 0x0c8958, CRC(4850fb2b) SHA1(9dde245c5b4afd6dbfd33372dff35fcbeefc2fe4) ) \ - + ROM_LOAD( "95008313.bin", 0x0000, 0x0c8958, CRC(4850fb2b) SHA1(9dde245c5b4afd6dbfd33372dff35fcbeefc2fe4) ) #define sc_relcz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008185.bin", 0x000000, 0x100000, CRC(d41a9b86) SHA1(9269000ec8d81b24e04a98b63e3294d56439820d) ) \ - ROM_LOAD( "95008186.bin", 0x100000, 0x100000, CRC(8f5bfdaf) SHA1(ecba8cacc83224d75b8076c6fd5fe46863a0689e) ) \ - + ROM_LOAD( "95008186.bin", 0x100000, 0x100000, CRC(8f5bfdaf) SHA1(ecba8cacc83224d75b8076c6fd5fe46863a0689e) ) #define sc_rotc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rotcsnd.bin", 0x0000, 0x100000, CRC(301147a2) SHA1(49a31e1e3c8af19e524f4f4b68533e4b2cc5e03d) ) \ - + ROM_LOAD( "rotcsnd.bin", 0x0000, 0x100000, CRC(301147a2) SHA1(49a31e1e3c8af19e524f4f4b68533e4b2cc5e03d) ) #define sc_rttt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008306.bin", 0x0000, 0x100000, CRC(9c61f2ff) SHA1(5f000dcb2ec694fa8578f32fa485e61ad065e3d5) ) \ - + ROM_LOAD( "95008306.bin", 0x0000, 0x100000, CRC(9c61f2ff) SHA1(5f000dcb2ec694fa8578f32fa485e61ad065e3d5) ) /* used by Rocket Science and Blast Off */ #define sc_roksc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* ROCKETSCIENCESND */ \ - ROM_LOAD( "95008405.bin", 0x0000, 0x0fec18, CRC(847c5cbb) SHA1(cd304c31bd1f87e6b2444b50450ab9dd42ca79eb) ) \ - + ROM_LOAD( "95008405.bin", 0x0000, 0x0fec18, CRC(847c5cbb) SHA1(cd304c31bd1f87e6b2444b50450ab9dd42ca79eb) ) @@ -2028,61 +1761,52 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890724.bin", 0x0000, 0x5000, CRC(118e80ca) SHA1(9cd3dc111710224a8916f7b0f24e8997a9d98a8c) ) \ ROM_LOAD( "95890725.bin", 0x0000, 0x5000, CRC(0d587076) SHA1(b470b3f1c1c82526c9dd08ae7dedbdc38bfb334d) ) \ - ROM_LOAD( "95890726.bin", 0x0000, 0x5000, CRC(ce0252e6) SHA1(9d6f69de70647e12d8352bc73922393006602797) ) \ - + ROM_LOAD( "95890726.bin", 0x0000, 0x5000, CRC(ce0252e6) SHA1(9d6f69de70647e12d8352bc73922393006602797) ) #define sc_redsq_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008920.bin", 0x0000, 0x0f8d12, CRC(ac69f283) SHA1(4b62d2759f82effea988310df5ca92dd9f417a6d) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890350.bin", 0x0000, 0x5000, CRC(3e015e16) SHA1(c3a180d3611f46c9d7e93309d751b2422ec672cc) ) \ ROM_LOAD( "95890351.bin", 0x0000, 0x5000, CRC(4b971a22) SHA1(205feec301bb69bf461fc4377704f675b5664944) ) \ - ROM_LOAD( "95890352.bin", 0x0000, 0x5000, CRC(d52dd67e) SHA1(8e5623d1fe4e096b1a19a153b0d2184424642469) ) \ - + ROM_LOAD( "95890352.bin", 0x0000, 0x5000, CRC(d52dd67e) SHA1(8e5623d1fe4e096b1a19a153b0d2184424642469) ) #define sc_rich_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008085.hi", 0x000000, 0x100000, CRC(eb748aa3) SHA1(b81acfbceb5ff9df8bb30d3da82deea70bfce2fe) ) \ - ROM_LOAD( "95008084.lo", 0x100000, 0x100000, CRC(2231c842) SHA1(2180109949281b053313c8a8de33496d31d4279e) ) \ - + ROM_LOAD( "95008084.lo", 0x100000, 0x100000, CRC(2231c842) SHA1(2180109949281b053313c8a8de33496d31d4279e) ) #define sc_rosts_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008820.bin", 0x000000, 0x100000, CRC(31c0d215) SHA1(7d0172de75e54a7c00b7c28e21d738e64597f4f5) ) \ - ROM_LOAD( "95008821.bin", 0x100000, 0x100000, CRC(9c934f26) SHA1(2598870f724a2b070c5f791a2d30e582f87c06da) ) \ - + ROM_LOAD( "95008821.bin", 0x100000, 0x100000, CRC(9c934f26) SHA1(2598870f724a2b070c5f791a2d30e582f87c06da) ) #define sc_rovrt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008961.bin", 0x0000, 0x0feba0, CRC(174f22f8) SHA1(e96c7019a48f1499c4b766e1fb700b2d4db59d5e) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890431.bin", 0x0000, 0x5000, CRC(a3d4624e) SHA1(4d66727af8cd1f10708635655777d80fe99e02af) ) \ ROM_LOAD( "95890432.bin", 0x0000, 0x5000, CRC(d642267a) SHA1(9f2d0cd87e6acfebd855a7669c862dc20f1a52e3) ) \ - ROM_LOAD( "95890433.bin", 0x0000, 0x5000, CRC(48f8ea26) SHA1(156a83c1980483b12577fdb680d85a3f0f7bfdbd) ) \ - + ROM_LOAD( "95890433.bin", 0x0000, 0x5000, CRC(48f8ea26) SHA1(156a83c1980483b12577fdb680d85a3f0f7bfdbd) ) #define sc_sharp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008561.bin", 0x000000, 0x100000, CRC(98d21491) SHA1(e06156dbe83fc26968da1a2432d697d68e6b88ee) ) \ - ROM_LOAD( "95008562.bin", 0x100000, 0x100000, CRC(fb3a25e7) SHA1(e8a60e4e870438fd4a330453ce1bdf8ad836fbc0) ) \ - + ROM_LOAD( "95008562.bin", 0x100000, 0x100000, CRC(fb3a25e7) SHA1(e8a60e4e870438fd4a330453ce1bdf8ad836fbc0) ) #define sc_srrqp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891091.bin", 0x0000, 0x5000, CRC(e8a89f86) SHA1(0260292e43320b4d7a7cd93c9c058be6250a1441) ) \ ROM_LOAD( "95891092.bin", 0x0000, 0x5000, CRC(9d3edbb2) SHA1(6a1f3030dc6438da5e83f1d9144bd7f4fab98c97) ) \ - ROM_LOAD( "95891093.bin", 0x0000, 0x5000, CRC(038417ee) SHA1(5e4234bf9b7d698b0f82af702209789948456e32) ) \ - + ROM_LOAD( "95891093.bin", 0x0000, 0x5000, CRC(038417ee) SHA1(5e4234bf9b7d698b0f82af702209789948456e32) ) #define sc_witwi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008756.bin", 0x000000, 0x100000, CRC(bde21cff) SHA1(fc8945e66416447d690515161acf9260620d7768) ) \ - ROM_LOAD( "95008757.bin", 0x100000, 0x100000, CRC(7c33cf90) SHA1(f3ad90c5623d97e3bf013927945383115042b84b) ) \ - + ROM_LOAD( "95008757.bin", 0x100000, 0x100000, CRC(7c33cf90) SHA1(f3ad90c5623d97e3bf013927945383115042b84b) ) #define sc_spnrn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008538.bin", 0x0000, 0x0de67f, CRC(5f689b5c) SHA1(a0469987b93fdd0c661ef622403e03c6edbc561a) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890178.bin", 0x0000, 0x5000, CRC(bb0186be) SHA1(575f212b555035a6a30fea7f49836f4ad72868d2) ) \ ROM_LOAD( "95890179.bin", 0x0000, 0x5000, CRC(ea390914) SHA1(ac34e41f6e277115e5fc2ea2bb1675c1d7df0dfe) ) \ - ROM_LOAD( "95890180.bin", 0x0000, 0x5000, CRC(7483c548) SHA1(06675caa6e0e4f136995d542210bddbb2e9e2ba4) ) \ - + ROM_LOAD( "95890180.bin", 0x0000, 0x5000, CRC(7483c548) SHA1(06675caa6e0e4f136995d542210bddbb2e9e2ba4) ) #define sc_sleut_others \ @@ -2091,8 +1815,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890777.bin", 0x0000, 0x5000, CRC(12e0a0db) SHA1(f7360b7f7086111dd951c9742f4b0402dfdd988c) ) \ ROM_LOAD( "95890778.bin", 0x0000, 0x5000, CRC(6776e4ef) SHA1(a39e7aefb57521e4782dd0a8b37c904b7b76ff29) ) \ - ROM_LOAD( "95890779.bin", 0x0000, 0x5000, CRC(f9cc28b3) SHA1(031df3658b5aec9f318f42f04e8041fd9ae1b761) ) \ - + ROM_LOAD( "95890779.bin", 0x0000, 0x5000, CRC(f9cc28b3) SHA1(031df3658b5aec9f318f42f04e8041fd9ae1b761) ) #define sc_showt_others \ @@ -2101,41 +1824,33 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95008735.bin", 0x100000, 0x100000, CRC(fa614cc1) SHA1(e5ecce4936a8db267b08b938ab5bc7500cf98f99) ) \ ROM_REGION( 0x400000, "others2", ROMREGION_ERASE00 ) /* PR3243 SHOWTIME SOUNDS11 */ \ ROM_LOAD( "95008777.bin", 0x000000, 0x100000, CRC(1ff19229) SHA1(6db08982ee923ef4568caf76e05088574f99fc36) ) \ - ROM_LOAD( "95008778.bin", 0x100000, 0x100000, CRC(2f2f3ee1) SHA1(cade826fec6c07a1fffa548c96404da83db14dd7) ) \ - + ROM_LOAD( "95008778.bin", 0x100000, 0x100000, CRC(2f2f3ee1) SHA1(cade826fec6c07a1fffa548c96404da83db14dd7) ) #define sc_slad_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008375.bin", 0x0000, 0x100000, CRC(967e41ec) SHA1(4ca9eb1db89b6f918b416f1c68805c4306850c7a) ) \ - + ROM_LOAD( "95008375.bin", 0x0000, 0x100000, CRC(967e41ec) SHA1(4ca9eb1db89b6f918b416f1c68805c4306850c7a) ) #define sc_srrmz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008155.bin", 0x000000, 0x100000, CRC(2c12d323) SHA1(78199130f15b90f2c8f932f40d7e1e0e0646ce57) ) \ - ROM_LOAD( "95008156.bin", 0x100000, 0x100000, CRC(775dd1cd) SHA1(2b0ffa326ae53b60dbda6eb1f066b2ea29e6dd26) ) \ - + ROM_LOAD( "95008156.bin", 0x100000, 0x100000, CRC(775dd1cd) SHA1(2b0ffa326ae53b60dbda6eb1f066b2ea29e6dd26) ) #define sc_sahed_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008353.bin", 0x0000, 0x0fbc01, CRC(593626e0) SHA1(f348d6ea347efa706b1587235241231562c447d3) ) \ - + ROM_LOAD( "95008353.bin", 0x0000, 0x0fbc01, CRC(593626e0) SHA1(f348d6ea347efa706b1587235241231562c447d3) ) #define sc_sirpz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "sound_1", 0x000000, 0x080000, CRC(e5e1b0d5) SHA1(bfdc90e09534b97d9a6b6804284c80800db1aff7) ) \ - ROM_LOAD( "sound_2", 0x080000, 0x080000, CRC(3f8c71ed) SHA1(3bab20e8f6af2cfb8c7bba04b29f5aec4c692c1b) ) \ - + ROM_LOAD( "sound_2", 0x080000, 0x080000, CRC(3f8c71ed) SHA1(3bab20e8f6af2cfb8c7bba04b29f5aec4c692c1b) ) #define sc_smk7_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004163.lo", 0x000000, 0x080000, CRC(fd8fd1a9) SHA1(a6c1bfefc7200f9ad429bf166d0deeb6092e9e4d) ) \ - ROM_LOAD( "95004164.hi", 0x080000, 0x080000, CRC(9d8d69d3) SHA1(345ea1b517828cd4b140ec91e7014176cd45f6ad) ) \ - + ROM_LOAD( "95004164.hi", 0x080000, 0x080000, CRC(9d8d69d3) SHA1(345ea1b517828cd4b140ec91e7014176cd45f6ad) ) #define sc_smtm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95416744.bin", 0x0000, 0x100000, CRC(3aa90fed) SHA1(d399f67bbe1d6f58d4c0a9e322156055cf3dccdc) ) \ - + ROM_LOAD( "95416744.bin", 0x0000, 0x100000, CRC(3aa90fed) SHA1(d399f67bbe1d6f58d4c0a9e322156055cf3dccdc) ) #define sc_spice_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008585.bin", 0x0000, 0x100000, CRC(2f15c4a4) SHA1(df543cd6ebecbbd3922bb8550e4bf349fd8eb45c) ) \ - + ROM_LOAD( "95008585.bin", 0x0000, 0x100000, CRC(2f15c4a4) SHA1(df543cd6ebecbbd3922bb8550e4bf349fd8eb45c) ) #define sc_sus_others \ @@ -2144,38 +1859,32 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890413.bin", 0x0000, 0x5000, CRC(5cdcd7cc) SHA1(7eaf28a20ca68c7edda1ee0cb5efefd00831c024) ) \ ROM_LOAD( "95890414.bin", 0x0000, 0x5000, CRC(294a93f8) SHA1(f81f4cdb1b7e9107835f54702772c4e5f18d9731) ) \ - ROM_LOAD( "95890415.bin", 0x0000, 0x5000, CRC(b7f05fa4) SHA1(4cfbb0c7752edc6a0df8f9b6ab77f3fb9cd8db8e) ) \ - + ROM_LOAD( "95890415.bin", 0x0000, 0x5000, CRC(b7f05fa4) SHA1(4cfbb0c7752edc6a0df8f9b6ab77f3fb9cd8db8e) ) #define sc_srr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008213.bin", 0x0000, 0x100000, CRC(e8f82b1d) SHA1(9357f587d638289b2cd5029e5895f69097d69089) ) \ - + ROM_LOAD( "95008213.bin", 0x0000, 0x100000, CRC(e8f82b1d) SHA1(9357f587d638289b2cd5029e5895f69097d69089) ) #define sc_sslam_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008731.bin", 0x0000, 0x100000, CRC(b6f92b76) SHA1(69be21d12940dc415816dd3c77f4eb2c1bd1a555) ) \ - + ROM_LOAD( "95008731.bin", 0x0000, 0x100000, CRC(b6f92b76) SHA1(69be21d12940dc415816dd3c77f4eb2c1bd1a555) ) #define sc_swbak_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008929.bin", 0x0000, 0x0f973a, CRC(016f4cc0) SHA1(763c6bf389e0c1e83d903d7aec23ac1a53261e7c) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890368.bin", 0x0000, 0x5000, CRC(01900e28) SHA1(c3e86b917b48249bdf0f1072f0cf5fa4b749d834) ) \ ROM_LOAD( "95890369.bin", 0x0000, 0x5000, CRC(74064a1c) SHA1(0c254916fd56026dfd0df2abb4dc1c0b2dff1a7d) ) \ - ROM_LOAD( "95890370.bin", 0x0000, 0x5000, CRC(eabc8640) SHA1(41a5f5530289672563210d3ef71eb896cf6b3d5d) ) \ - + ROM_LOAD( "95890370.bin", 0x0000, 0x5000, CRC(eabc8640) SHA1(41a5f5530289672563210d3ef71eb896cf6b3d5d) ) #define sc_tempt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1963 TEMPTATION SOUNDS11 */ \ ROM_LOAD( "95008654.bin", 0x000000, 0x100000, CRC(9963724c) SHA1(90d22b11934e95fd2bfda026dcde51dcd74f93cc) ) \ - ROM_LOAD( "95008655.bin", 0x100000, 0x100000, CRC(12735319) SHA1(166fbcc5828fd26ace63eed127427cbd0c81570d) ) \ - + ROM_LOAD( "95008655.bin", 0x100000, 0x100000, CRC(12735319) SHA1(166fbcc5828fd26ace63eed127427cbd0c81570d) ) #define sc_typ_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008662.bin", 0x000000, 0x100000, CRC(51959c94) SHA1(8a4b68460da4223071e33158747ae0ea18b83a52) ) \ - ROM_LOAD( "95008663.bin", 0x100000, 0x100000, CRC(839687b2) SHA1(a9fd3645eb903cb52b348dd8313f0d953d5a5ec0) ) \ - + ROM_LOAD( "95008663.bin", 0x100000, 0x100000, CRC(839687b2) SHA1(a9fd3645eb903cb52b348dd8313f0d953d5a5ec0) ) #define sc_vamp_others \ @@ -2183,8 +1892,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95008890.bin", 0x0000, 0x0ffd25, CRC(bdf5491b) SHA1(231264d83a84fcc54bf45a43a37464fc5c604d9b) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95891062.bin", 0x0000, 0x5000, CRC(3816210d) SHA1(890eed46cf9d7285887d0fe422ff6c8d8bf35820) ) \ - ROM_LOAD( "95891063.bin", 0x0000, 0x5000, CRC(4d806539) SHA1(73958733c49fa020f6425aef511489965df13907) ) \ - + ROM_LOAD( "95891063.bin", 0x0000, 0x5000, CRC(4d806539) SHA1(73958733c49fa020f6425aef511489965df13907) ) #define sc_viz_others \ @@ -2194,8 +1902,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890742.bin", 0x0000, 0x5000, CRC(247f75ec) SHA1(92d63123aabf6932b283bbbd581c1bbe526318ce) ) \ ROM_LOAD( "95890743.bin", 0x0000, 0x5000, CRC(51e931d8) SHA1(91ceb930eac97e090de5471c8a789ddd31c65a10) ) \ - ROM_LOAD( "95890744.bin", 0x0000, 0x5000, CRC(cf53fd84) SHA1(0de52e4ce83f41f2928866fc914ed36023415a4f) ) \ - + ROM_LOAD( "95890744.bin", 0x0000, 0x5000, CRC(cf53fd84) SHA1(0de52e4ce83f41f2928866fc914ed36023415a4f) ) #define sc_wacky_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR3330 WACKY RACES SOUNDS11 */ \ @@ -2203,42 +1910,34 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95008835.bin", 0x100000, 0x100000, CRC(9a10ff4f) SHA1(903e43d9db726dc5ee92abaf23b61454611064b1) ) \ /* PR3330 WACKY RACES SOUNDS12 */ \ ROM_LOAD( "95009128.bin", 0x000000, 0x100000, CRC(d9883f0c) SHA1(3cfeb470248a9d5d6b653175c16f88c54d51fceb) ) \ - ROM_LOAD( "95009129.bin", 0x100000, 0x100000, CRC(969f418a) SHA1(ca65dfa23f9e6a516bc65baa8ddd80faa530af1f) ) \ - + ROM_LOAD( "95009129.bin", 0x100000, 0x100000, CRC(969f418a) SHA1(ca65dfa23f9e6a516bc65baa8ddd80faa530af1f) ) #define sc_wotw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008925.bin", 0x0000, 0x0eea8c, CRC(9cb8a972) SHA1(9b99eea5264fa0764f4598330f442335a8024cdb) ) \ - + ROM_LOAD( "95008925.bin", 0x0000, 0x0eea8c, CRC(9cb8a972) SHA1(9b99eea5264fa0764f4598330f442335a8024cdb) ) #define sc_wca_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008524.bin", 0x0000, 0x0ec9a6, CRC(a585c613) SHA1(dbe4f3b8584b92012e84d48c232b31a0fba6e20c) ) \ - + ROM_LOAD( "95008524.bin", 0x0000, 0x0ec9a6, CRC(a585c613) SHA1(dbe4f3b8584b92012e84d48c232b31a0fba6e20c) ) #define sc_wok_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008811.bin", 0x000000, 0x100000, CRC(0aae3aea) SHA1(a13ca57b4ff95022392b6bf06065593c3271637a) ) \ - ROM_LOAD( "95008812.bin", 0x100000, 0x100000, CRC(4a48eabd) SHA1(30dc0cccc636c1472b7577353c1db8e88242bba4) ) \ - + ROM_LOAD( "95008812.bin", 0x100000, 0x100000, CRC(4a48eabd) SHA1(30dc0cccc636c1472b7577353c1db8e88242bba4) ) #define sc_pircl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009200.bin", 0x000000, 0x100000, CRC(45392f4b) SHA1(9a71834e52480f87ab303c22efe15157b8f25b5c) ) \ - ROM_LOAD( "95009201.bin", 0x100000, 0x100000, CRC(3aece97c) SHA1(fc469870fef892da0a4aa49077c7746315933d40) ) \ - + ROM_LOAD( "95009201.bin", 0x100000, 0x100000, CRC(3aece97c) SHA1(fc469870fef892da0a4aa49077c7746315933d40) ) #define PR1034_GOLDEN_BALLS_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008161.bin", 0x000000, 0x080000, CRC(ecd13fd9) SHA1(51d11b9133d4e840ce9afd7cf716520ea0fc0343) ) \ - ROM_LOAD( "95008162.bin", 0x080000, 0x080000, CRC(b4b4a5c5) SHA1(d0748decfaee7da52d2f6a4bc0877be4243ed6fb) ) \ - + ROM_LOAD( "95008162.bin", 0x080000, 0x080000, CRC(b4b4a5c5) SHA1(d0748decfaee7da52d2f6a4bc0877be4243ed6fb) ) #define sc_gball_pthers \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1604 GOLDEN BALLS SOUNDS12 */ \ ROM_LOAD( "95008465.bin", 0x000000, 0x100000, CRC(5d1fa2c9) SHA1(c12de2b89f0bcb8f1b35630fffd205fd9d5b9777) ) \ - ROM_LOAD( "95008466.bin", 0x100000, 0x100000, CRC(418068ab) SHA1(342939e9bcc1d213bc2f52666cc3765442e18635) ) \ - + ROM_LOAD( "95008466.bin", 0x100000, 0x100000, CRC(418068ab) SHA1(342939e9bcc1d213bc2f52666cc3765442e18635) ) #define sc_gfev_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95416146.bin", 0x0000, 0x100000, CRC(17e92fa0) SHA1(7dea5166f3f70e5d249da56f01bbe2267ce43d6a) ) \ - + ROM_LOAD( "95416146.bin", 0x0000, 0x100000, CRC(17e92fa0) SHA1(7dea5166f3f70e5d249da56f01bbe2267ce43d6a) ) #define sc_ggame_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008992.bin", 0x0000, 0x0aa536, CRC(aad10089) SHA1(d8a32f66432ee901be05435e8930d3897f4b4e33) ) /* BARX */ \ @@ -2248,8 +1947,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890410.bin", 0x0000, 0x5000, CRC(9588ae1d) SHA1(ae45d9e0272b2b048b99e337def1acfb2524597e) ) \ ROM_LOAD( "95890411.bin", 0x0000, 0x5000, CRC(895e5ea1) SHA1(070df49baca709f69fa1e522b21e42b716af0ba5) ) \ - ROM_LOAD( "95890412.bin", 0x0000, 0x5000, CRC(4a047c31) SHA1(aeb969801c89b60a644b4ffc2e1bbb73f6d61643) ) \ - + ROM_LOAD( "95890412.bin", 0x0000, 0x5000, CRC(4a047c31) SHA1(aeb969801c89b60a644b4ffc2e1bbb73f6d61643) ) #define sc_ggg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95009015.bin", 0x0000, 0x0b7821, CRC(8b6ca362) SHA1(4c50935b6d1038738ce631fbdc359416197b8c03) ) /* BARX SOUNDS */ \ @@ -2258,32 +1956,26 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "pivs", ROMREGION_ERASE00 ) \ ROM_LOAD( "95890730.bin", 0x0000, 0x5000, CRC(9673d1ce) SHA1(fee90139fc8de5e7b6dfe741b4852a363c17eb93) ) \ ROM_LOAD( "95890731.bin", 0x0000, 0x5000, CRC(8aa52172) SHA1(441a649e3da00556a8ea966a88ee9b58b4943d3b) ) \ - ROM_LOAD( "95890732.bin", 0x0000, 0x5000, CRC(49ff03e2) SHA1(f8b77c97f2b1bb5de06f4c9835275ae9b83d0988) ) \ - + ROM_LOAD( "95890732.bin", 0x0000, 0x5000, CRC(49ff03e2) SHA1(f8b77c97f2b1bb5de06f4c9835275ae9b83d0988) ) #define SC4_95004211_HELLS_BELLS_PR6945 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004211.bin", 0x0000, 0x080000, CRC(2e729642) SHA1(c8dcdce52f930b3fa894c46907691a28a5499a16) ) \ - + ROM_LOAD( "95004211.bin", 0x0000, 0x080000, CRC(2e729642) SHA1(c8dcdce52f930b3fa894c46907691a28a5499a16) ) #define sc_hellb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1402 HELLS BELLS SOUNDS11 */ \ - ROM_LOAD( "95008341.bin", 0x0000, 0x100000, CRC(486e5395) SHA1(0ad68f271f4839d50a790b7f4427e1f1f1933bd4) ) \ - + ROM_LOAD( "95008341.bin", 0x0000, 0x100000, CRC(486e5395) SHA1(0ad68f271f4839d50a790b7f4427e1f1f1933bd4) ) #define sc_leg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008093.bin", 0x000000, 0x100000, CRC(86e27465) SHA1(1d27358fe795286676a8031382387ff4225f7118) ) \ - ROM_LOAD( "95008094.bin", 0x100000, 0x100000, CRC(08909b00) SHA1(3e5b3da186036d7fe67ed2739de6fba79d4a978a) ) \ - + ROM_LOAD( "95008094.bin", 0x100000, 0x100000, CRC(08909b00) SHA1(3e5b3da186036d7fe67ed2739de6fba79d4a978a) ) #define sc_legcb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008197.bin", 0x000000, 0x100000, CRC(234ff677) SHA1(571c2fa2b5a24d07e90e43061d9947f64874e482) ) \ - ROM_LOAD( "95008198.bin", 0x100000, 0x100000, CRC(4b03df47) SHA1(13c24cc90a618ebc7c150ab3694a1b787fb049d6) ) \ - + ROM_LOAD( "95008198.bin", 0x100000, 0x100000, CRC(4b03df47) SHA1(13c24cc90a618ebc7c150ab3694a1b787fb049d6) ) #define sc_luckb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008167.bin", 0x000000, 0x080000, CRC(13aaf063) SHA1(70ab005c867c0c8f63b16722f4fc3ba0c935a96f) ) /* lucky balls */ \ - ROM_LOAD( "95008168.bin", 0x080000, 0x080000, CRC(71aebb68) SHA1(479b3915552be029d459d3f05ccf668c21f05554) ) \ - + ROM_LOAD( "95008168.bin", 0x080000, 0x080000, CRC(71aebb68) SHA1(479b3915552be029d459d3f05ccf668c21f05554) ) #define sc_mww_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008593.bin", 0x0000, 0x06a118, CRC(e4aee21b) SHA1(bda104a05bd2c0d4506f389c54e8842dc20d84b0) ) \ @@ -2294,76 +1986,62 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890164.bin", 0x0000, 0x5000, CRC(7375c3a6) SHA1(8e5340e201261ccd8b47334f5d23e8adb33d031f) ) \ ROM_LOAD( "95890387.bin", 0x0000, 0x5000, CRC(7e8703c6) SHA1(139dab5081ce9bdfade8c2a188562d98a15f8bb2) ) \ ROM_LOAD( "95890388.bin", 0x0000, 0x5000, CRC(6251f37a) SHA1(3c8beafa021b6f4d32bd46f3fd755a7f877414ea) ) \ - ROM_LOAD( "95890389.bin", 0x0000, 0x5000, CRC(a10bd1ea) SHA1(e575a7cd0d40a7282aee2b7cd9f4801408ff846d) ) \ - + ROM_LOAD( "95890389.bin", 0x0000, 0x5000, CRC(a10bd1ea) SHA1(e575a7cd0d40a7282aee2b7cd9f4801408ff846d) ) #define sc_manic_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008684.bin", 0x000000, 0x100000, CRC(52b7d26e) SHA1(ba6629dbad8d00c132c0ddf6a8a41ddc99231c75) ) \ - ROM_LOAD( "95008685.bin", 0x100000, 0x100000, CRC(dc9717c0) SHA1(27234bb7c7e7bd1f395972ce2958d55e84005313) ) \ - + ROM_LOAD( "95008685.bin", 0x100000, 0x100000, CRC(dc9717c0) SHA1(27234bb7c7e7bd1f395972ce2958d55e84005313) ) #define QPS_PACP_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PACP SOUNDS */ \ ROM_LOAD( "97000000.evn", 0x000000, 0x080000, CRC(5b13fe7b) SHA1(1bd32e577914ab4e3bc3282261f8c3cdf015b85d) ) /* pacp */ \ - ROM_LOAD( "97000000.odd", 0x080000, 0x080000, CRC(8bab1c78) SHA1(ddc915a8c56473ba4d67d8c62c66105dd622b593) ) \ - + ROM_LOAD( "97000000.odd", 0x080000, 0x080000, CRC(8bab1c78) SHA1(ddc915a8c56473ba4d67d8c62c66105dd622b593) ) #define PACMAN_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PACMAN SOUNDS */ \ ROM_LOAD( "95004183", 0x000000, 0x080000, CRC(4b28f610) SHA1(fff01c890a8c109bb4b522ee2391c15abdc2758c) ) \ - ROM_LOAD( "95004184", 0x080000, 0x080000, CRC(bee11fdd) SHA1(b5ce97108812e296c92a000444c1fb7a11286de4) ) \ - + ROM_LOAD( "95004184", 0x080000, 0x080000, CRC(bee11fdd) SHA1(b5ce97108812e296c92a000444c1fb7a11286de4) ) #define sc_paccs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004199.lo", 0x000000, 0x080000, CRC(3a9605c8) SHA1(ce1c94fe26eac9e145e94539f62f2bde740e5b9a) ) \ - ROM_LOAD( "95004199.hi", 0x080000, 0x080000, CRC(0ecfc531) SHA1(15e20eedf4b7d9102c40834612d111559b4dcbca) ) \ - + ROM_LOAD( "95004199.hi", 0x080000, 0x080000, CRC(0ecfc531) SHA1(15e20eedf4b7d9102c40834612d111559b4dcbca) ) #define sc_paccl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008145.bin", 0x0000, 0x100000, CRC(e2ec54f8) SHA1(bb1c40b13151ed1e3c7ba603506701457392bb8b) ) \ - ROM_LOAD( "pacmancsnd.bin", 0x0000, 0x0bbb33, CRC(c505aa18) SHA1(a99bd1c4101269e2eb2b6becf210d9991fee1da1) ) /* identical but cut at 0xff bytes */ \ - + ROM_LOAD( "pacmancsnd.bin", 0x0000, 0x0bbb33, CRC(c505aa18) SHA1(a99bd1c4101269e2eb2b6becf210d9991fee1da1) ) /* identical but cut at 0xff bytes */ #define sc_pacpl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008049", 0x0000, 0x0ff7f5, CRC(efb3c1aa) SHA1(345ad862a329eedf7c016ddd809c8b60185d9962) ) \ - + ROM_LOAD( "95008049", 0x0000, 0x0ff7f5, CRC(efb3c1aa) SHA1(345ad862a329eedf7c016ddd809c8b60185d9962) ) #define sc_pmani_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008201.bin", 0x0000, 0x100000, CRC(4e0358c5) SHA1(b9d8b78c77f87eebb9408a4ea1b9fd3a64ae724d) ) \ - + ROM_LOAD( "95008201.bin", 0x0000, 0x100000, CRC(4e0358c5) SHA1(b9d8b78c77f87eebb9408a4ea1b9fd3a64ae724d) ) #define sc_polem_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "pole_p.sn1", 0x000000, 0x080000, CRC(cbb7b019) SHA1(1404ff5fe2c3e54370a79ea141617e58e56217e9) ) \ - ROM_LOAD( "pole_p.sn2", 0x080000, 0x080000, CRC(95d9939b) SHA1(29d03f2f2d33a807df002271e14b614bae3d10e4) ) \ - + ROM_LOAD( "pole_p.sn2", 0x080000, 0x080000, CRC(95d9939b) SHA1(29d03f2f2d33a807df002271e14b614bae3d10e4) ) #define sc_polen_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "polesnd1.bin", 0x000000, 0x080000, CRC(09f720e3) SHA1(1a5c581b16b974e949679c3d71696984755f3c7c) ) \ - ROM_LOAD( "polesnd2.bin", 0x080000, 0x080000, CRC(80c2702b) SHA1(6c7b1d535d8f1eeb25a1a84ccf9e97b3e453af6d) ) \ - + ROM_LOAD( "polesnd2.bin", 0x080000, 0x080000, CRC(80c2702b) SHA1(6c7b1d535d8f1eeb25a1a84ccf9e97b3e453af6d) ) #define PR3082_C_POTS_OF_GOLD_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008750.bin", 0x000000, 0x100000, CRC(25a94ab7) SHA1(9ee3a1acb2734a5663d925fa050c15d154f79678) ) \ - ROM_LOAD( "95008751.bin", 0x100000, 0x100000, CRC(53c97577) SHA1(5ec3868967073b4ed429fed943fbcd568a85b4f3) ) \ - + ROM_LOAD( "95008751.bin", 0x100000, 0x100000, CRC(53c97577) SHA1(5ec3868967073b4ed429fed943fbcd568a85b4f3) ) #define PR000050_POTOFGLD_1 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASEFF) \ ROM_LOAD( "95008836.bin", 0x000000, 0x100000, CRC(45105fca) SHA1(3c603726bb9f4a01113a225868e864106da9fa35) ) \ - ROM_LOAD( "95008837.bin", 0x100000, 0x100000, CRC(3db8829c) SHA1(e8de259afd2797279154252cfeb6682b482b54a9) ) \ - + ROM_LOAD( "95008837.bin", 0x100000, 0x100000, CRC(3db8829c) SHA1(e8de259afd2797279154252cfeb6682b482b54a9) ) #define sc_rt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008203_1.bin", 0x000000, 0x100000, CRC(778a18e5) SHA1(2ad4d0259f08786f50928064a4d345ffa6bb52e2) ) \ - ROM_LOAD( "95008204_2.bin", 0x100000, 0x100000, CRC(ef036383) SHA1(cb26a334fe043c6aba312dc6d3fe91bd93e0cb2f) ) \ - + ROM_LOAD( "95008204_2.bin", 0x100000, 0x100000, CRC(ef036383) SHA1(cb26a334fe043c6aba312dc6d3fe91bd93e0cb2f) ) #define sc_sace_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008270.bin", 0x0000, 0x0fde91, CRC(5c87d4ce) SHA1(6fce212a89334a9595411aa2d20bde5e3fae4710) ) \ - + ROM_LOAD( "95008270.bin", 0x0000, 0x0fde91, CRC(5c87d4ce) SHA1(6fce212a89334a9595411aa2d20bde5e3fae4710) ) #define sc_starp_others \ @@ -2371,130 +2049,104 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "star prize snd1.bin", 0x000000, 0x080000, CRC(9f7f7442) SHA1(576e5e92455455ad18ae596a9dae500a17912faa) ) \ ROM_LOAD( "star prize snd2.bin", 0x080000, 0x080000, CRC(0ae992b5) SHA1(b3a8ba472aa3a6785678a554a7fe789f9f3dc6c0) ) \ ROM_REGION( 0x400000, "altymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "sprizesn.1", 0x0000, 0x080000, CRC(5a9a9903) SHA1(ac79fedeaa1b37661d0ec28bf6c5b141c7fcc328) ) \ - + ROM_LOAD( "sprizesn.1", 0x0000, 0x080000, CRC(5a9a9903) SHA1(ac79fedeaa1b37661d0ec28bf6c5b141c7fcc328) ) #define sc_tetri_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008097_1.bin", 0x000000, 0x100000, CRC(01a251eb) SHA1(0cb63736065b97956f02710867ac11609b1f282c) ) \ - ROM_LOAD( "95008098_2.bin", 0x100000, 0x100000, CRC(5ebcfd20) SHA1(be415d965732b3fde47684dacdfe93711182faf4) ) \ - + ROM_LOAD( "95008098_2.bin", 0x100000, 0x100000, CRC(5ebcfd20) SHA1(be415d965732b3fde47684dacdfe93711182faf4) ) #define sc_trail_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "trailblazer.bin", 0x0000, 0x0f6a6c, CRC(c27b5f9d) SHA1(24ac4ae0bec9a898690dfa2a78f765026d58255b) ) \ - + ROM_LOAD( "trailblazer.bin", 0x0000, 0x0f6a6c, CRC(c27b5f9d) SHA1(24ac4ae0bec9a898690dfa2a78f765026d58255b) ) #define sc_ttpie_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008579.bin", 0x0000, 0x100000, CRC(b3741823) SHA1(77890bf89b848fa2222e885aeb51f05f033143ba) ) \ - + ROM_LOAD( "95008579.bin", 0x0000, 0x100000, CRC(b3741823) SHA1(77890bf89b848fa2222e885aeb51f05f033143ba) ) #define PR6927_CASINO_VMEXICO_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004209.lo", 0x00001, 0x080000, CRC(40247425) SHA1(54c8540f9ce45b8b02f6616233b81e33af804f63) ) \ - ROM_LOAD( "95004210.hi", 0x00000, 0x080000, CRC(6f6ce2c8) SHA1(7e9ce336a1307b8290196d58c7419996d0758ab9) ) \ - + ROM_LOAD( "95004210.hi", 0x00000, 0x080000, CRC(6f6ce2c8) SHA1(7e9ce336a1307b8290196d58c7419996d0758ab9) ) #define PR3010_VIVA_MEXICO_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008719.bin", 0x000000, 0x100000, CRC(f99eafef) SHA1(7a7dedf5bf8292b94ac6da78478441335bfcb66f) ) \ - ROM_LOAD( "95008720.bin", 0x100000, 0x100000, CRC(6419033f) SHA1(3d222696dd9f4f201596fd444a031690cc8c1b0d) ) \ - + ROM_LOAD( "95008720.bin", 0x100000, 0x100000, CRC(6419033f) SHA1(3d222696dd9f4f201596fd444a031690cc8c1b0d) ) #define PR6927_CASINO_VMEXICO_SOUNDS21 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004246.bin", 0x000000, 0x080000, CRC(4e5a0143) SHA1(a9e668aceb21671a78b584fd55c21d5501ea1f8a) ) \ - ROM_LOAD( "95004247.bin", 0x080000, 0x080000, CRC(4a35b6a1) SHA1(24e4ed93149b7f6caf785ecaa5a4685585a36f5b) ) \ - + ROM_LOAD( "95004247.bin", 0x080000, 0x080000, CRC(4a35b6a1) SHA1(24e4ed93149b7f6caf785ecaa5a4685585a36f5b) ) #define PR6907_VIVA_MEXICO_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "viva_mex.sn1", 0x000000, 0x080000, CRC(ed357575) SHA1(610047e83062fd4a6d23d9b9281a3a6c04d63f7d) ) \ - ROM_LOAD( "viva_mex.sn2", 0x080000, 0x080000, CRC(aab9421d) SHA1(db2941e013597be3fe05a2b002aebdfb0f7a2b41) ) \ - + ROM_LOAD( "viva_mex.sn2", 0x080000, 0x080000, CRC(aab9421d) SHA1(db2941e013597be3fe05a2b002aebdfb0f7a2b41) ) #define PR7132_CLUB_VIVA_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008101.bin", 0x000000, 0x100000, CRC(751a433f) SHA1(36aaf1b2425c58bd49671fc6bd61addc33a082f1) ) \ - ROM_LOAD( "95008102.bin", 0x100000, 0x100000, CRC(155ec8ab) SHA1(5f38fb49facab94d041f315178a3d2adf9d95853) ) \ - + ROM_LOAD( "95008102.bin", 0x100000, 0x100000, CRC(155ec8ab) SHA1(5f38fb49facab94d041f315178a3d2adf9d95853) ) #define sc_vrgcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008143.bin", 0x000000, 0x100000, CRC(8bf35d69) SHA1(0a5017d02ba839f2f21402df99e7684ce559d931) ) \ - ROM_LOAD( "95008144.bin", 0x100000, 0x100000, CRC(1ce7f671) SHA1(ccca34515217e72ef1879a3cbad77c7adea3a665) ) \ - + ROM_LOAD( "95008144.bin", 0x100000, 0x100000, CRC(1ce7f671) SHA1(ccca34515217e72ef1879a3cbad77c7adea3a665) ) #define sc_wldjk_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008999.bin", 0x0000, 0x0b4dd9, CRC(0fa36a2e) SHA1(0168a326fd50c15e8f48293dff45e1411e5044f8) ) \ ROM_REGION( 0x400000, "pics", 0 ) \ ROM_LOAD( "95890709.bin", 0x0000, 0x5000, CRC(4b3ba87a) SHA1(6ec85bc6d14825ea0a497e6ee6e38d17c0c7b79f) ) \ ROM_LOAD( "95890710.bin", 0x0000, 0x5000, CRC(3eadec4e) SHA1(bbb80a6325fd561ca762a0261b68b550285bb8f6) ) \ - ROM_LOAD( "95890711.bin", 0x0000, 0x5000, CRC(a0172012) SHA1(07ceb089ec88801700ea12f52e4cc49e8c1d5d36) ) \ - + ROM_LOAD( "95890711.bin", 0x0000, 0x5000, CRC(a0172012) SHA1(07ceb089ec88801700ea12f52e4cc49e8c1d5d36) ) #define sc_bsp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008725.bin", 0x000000, 0x100000, CRC(e0a46426) SHA1(f6bc41c48ec1c4f113968a6ccc7a7dc81a7674b2) ) \ - ROM_LOAD( "95008726.bin", 0x100000, 0x100000, CRC(f01062bb) SHA1(a75937e85010ff4da01277336ad37bcbb8d0ba9f) ) \ - + ROM_LOAD( "95008726.bin", 0x100000, 0x100000, CRC(f01062bb) SHA1(a75937e85010ff4da01277336ad37bcbb8d0ba9f) ) #define sc_chain_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008318.bin", 0x0000, 0x100000, CRC(d4fb4702) SHA1(b6cdeb8e34d081a403d5918ec95e2eb387102538) ) \ - + ROM_LOAD( "95008318.bin", 0x0000, 0x100000, CRC(d4fb4702) SHA1(b6cdeb8e34d081a403d5918ec95e2eb387102538) ) #define sc_clown_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008552.bin", 0x0000, 0x100000, CRC(89173513) SHA1(7c332b6c14725897b0ae1ed33d38a384eae9cfdd) ) \ - + ROM_LOAD( "95008552.bin", 0x0000, 0x100000, CRC(89173513) SHA1(7c332b6c14725897b0ae1ed33d38a384eae9cfdd) ) #define sc_bb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008350.bin", 0x0000, 0x0e3be3, CRC(b19e617c) SHA1(46eb761ac44fef0ff0f1731b098b067ce6843461) ) \ - + ROM_LOAD( "95008350.bin", 0x0000, 0x0e3be3, CRC(b19e617c) SHA1(46eb761ac44fef0ff0f1731b098b067ce6843461) ) #define sc_bbclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008383.bin", 0x0000, 0x0f350f, CRC(a93300db) SHA1(4f2864cc71b3fe7ac1b323dfd226c18be83d301f) ) \ - + ROM_LOAD( "95008383.bin", 0x0000, 0x0f350f, CRC(a93300db) SHA1(4f2864cc71b3fe7ac1b323dfd226c18be83d301f) ) #define sc_botn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008484.bin", 0x0000, 0x0f8e5a, CRC(83e34402) SHA1(e90c3ef784dfce7df2d60b06bc84ec9a21ff9a12) ) \ - + ROM_LOAD( "95008484.bin", 0x0000, 0x0f8e5a, CRC(83e34402) SHA1(e90c3ef784dfce7df2d60b06bc84ec9a21ff9a12) ) #define sc_brkfs_others \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "95008013.lo", 0x000000, 0x100000, CRC(286e59da) SHA1(e43901f4ad9fc7f083cbb7ef5cd7e4ad6289833b) ) \ - ROM_LOAD( "95008014.hi", 0x100000, 0x100000, CRC(1b9936ad) SHA1(0c98618d1ca30fa4f9913a5214a5f431e520917c) ) \ - + ROM_LOAD( "95008014.hi", 0x100000, 0x100000, CRC(1b9936ad) SHA1(0c98618d1ca30fa4f9913a5214a5f431e520917c) ) #define sc_bulcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008547.bin", 0x000000, 0x100000, CRC(33d997ba) SHA1(22c28360757bad350907b145e18a8e438d68f2b1) ) \ - ROM_LOAD( "95008548.bin", 0x100000, 0x100000, CRC(896bae80) SHA1(264127b6d22c048a0a54e7a63433c3aed6f053e2) ) \ - + ROM_LOAD( "95008548.bin", 0x100000, 0x100000, CRC(896bae80) SHA1(264127b6d22c048a0a54e7a63433c3aed6f053e2) ) #define sc_bankb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008350.bin", 0x0000, 0x0e3be3, CRC(b19e617c) SHA1(46eb761ac44fef0ff0f1731b098b067ce6843461) ) \ - + ROM_LOAD( "95008350.bin", 0x0000, 0x0e3be3, CRC(b19e617c) SHA1(46eb761ac44fef0ff0f1731b098b067ce6843461) ) #define sc_bed_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008315.bin", 0x0000, 0x100000, CRC(5098077e) SHA1(8ecba67e3585dc7851f8bacb7c5235959f883143) ) \ - + ROM_LOAD( "95008315.bin", 0x0000, 0x100000, CRC(5098077e) SHA1(8ecba67e3585dc7851f8bacb7c5235959f883143) ) #define sc_captn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008139.bin", 0x0000, 0x0c076f, CRC(8c87abf8) SHA1(2dfdf9202378723db267ed9d8f2abd076b5214d6) ) \ - + ROM_LOAD( "95008139.bin", 0x0000, 0x0c076f, CRC(8c87abf8) SHA1(2dfdf9202378723db267ed9d8f2abd076b5214d6) ) #define sc_cashn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004292.sn1", 0x000000, 0x080000, CRC(e7efab30) SHA1(b2587c14e427fdb51cb5c96e5e017c69f5c134e8) ) \ - ROM_LOAD( "95004293.sn2", 0x080000, 0x080000, CRC(89584d87) SHA1(935b6e873342aefd1c39bb474c6b780799a0e049) ) \ - + ROM_LOAD( "95004293.sn2", 0x080000, 0x080000, CRC(89584d87) SHA1(935b6e873342aefd1c39bb474c6b780799a0e049) ) #define sc_cashm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008123_1.bin", 0x000000, 0x100000, CRC(9f1fc98b) SHA1(9233ef6a82f8b23066f959957a7561fb33120d46) ) \ - ROM_LOAD( "95008124_2.bin", 0x100000, 0x100000, CRC(4795c128) SHA1(7b55b39f335b81f6a895ed9beb123464e10a48ee) ) \ - + ROM_LOAD( "95008124_2.bin", 0x100000, 0x100000, CRC(4795c128) SHA1(7b55b39f335b81f6a895ed9beb123464e10a48ee) ) #define sc_cbaz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008317.bin", 0x0000, 0x100000, CRC(05ef55b5) SHA1(5130b9243647b9724998600b5f2ef2bbe7b5b1e5) ) \ - + ROM_LOAD( "95008317.bin", 0x0000, 0x100000, CRC(05ef55b5) SHA1(5130b9243647b9724998600b5f2ef2bbe7b5b1e5) ) #define sc_ccc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004282.snd", 0x0000, 0x080000, CRC(e17fb009) SHA1(27fa336c8576bd4a2414f4d71857e9113102cb3d) ) \ - + ROM_LOAD( "95004282.snd", 0x0000, 0x080000, CRC(e17fb009) SHA1(27fa336c8576bd4a2414f4d71857e9113102cb3d) ) #define sc_ccogs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008361.bin", 0x0000, 0x0ff54f, CRC(d1cc7b58) SHA1(32328e0e56bbf65e91e32de8802edce38f0abc65) ) @@ -2502,113 +2154,89 @@ INPUT_PORTS_EXTERN( sc4_base ); #define sc_cclas_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004250.bin", 0x000000, 0x080000, CRC(5250f18b) SHA1(bbdc556df845753f9ce15dd7dfb2347539dfa00f) ) \ - ROM_LOAD( "95004251.bin", 0x080000, 0x080000, CRC(7a0a7876) SHA1(f172c8a1fbe214f201e6bf671c2f0534b6d9d395) ) \ - + ROM_LOAD( "95004251.bin", 0x080000, 0x080000, CRC(7a0a7876) SHA1(f172c8a1fbe214f201e6bf671c2f0534b6d9d395) ) #define sc_cjcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008435.bin", 0x0000, 0x100000, CRC(f0b58825) SHA1(124132a510e7473ade3d03fb63f24f120d3a08e4) ) \ - + ROM_LOAD( "95008435.bin", 0x0000, 0x100000, CRC(f0b58825) SHA1(124132a510e7473ade3d03fb63f24f120d3a08e4) ) #define sc_ctlcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008181.bin", 0x000000, 0x100000, CRC(9eb3e51e) SHA1(95e90e9574cba0526e495a8b17150a5081c13df8) ) \ - ROM_LOAD( "95008182.bin", 0x100000, 0x100000, CRC(5d31955a) SHA1(49dbb4f3efc7e03d1763abb3c6db21c81e961735) ) \ - + ROM_LOAD( "95008182.bin", 0x100000, 0x100000, CRC(5d31955a) SHA1(49dbb4f3efc7e03d1763abb3c6db21c81e961735) ) #define PR6923_CRAZY_FRUITS_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR6923 CRAZY FRUITS SOUNDS11 */ \ ROM_LOAD( "ccfsnd1.bin", 0x000000, 0x080000, CRC(d389aeb3) SHA1(855f3d4bba4922026b1fa963e60c5e58556739c3) ) \ - ROM_LOAD( "ccfsnd2.bin", 0x080000, 0x080000, CRC(6fbda954) SHA1(812c2c96a9e750daf5ac4a878c63847bfd5a2593) ) \ - + ROM_LOAD( "ccfsnd2.bin", 0x080000, 0x080000, CRC(6fbda954) SHA1(812c2c96a9e750daf5ac4a878c63847bfd5a2593) ) #define sc_cfcla_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1396 CLSIC CRAZY FRUITS SND11 */ \ - ROM_LOAD( "95008316.bin", 0x00000, 0x100000, CRC(3b08ccac) SHA1(d71805a424b1af3d54406374a0d1ca95c4bc594c) ) \ - + ROM_LOAD( "95008316.bin", 0x00000, 0x100000, CRC(3b08ccac) SHA1(d71805a424b1af3d54406374a0d1ca95c4bc594c) ) #define PR1430_CRAZY_F_SIT_D_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008381.bin", 0x00000, 0x100000, CRC(78c97785) SHA1(5ac40b2850c25699f65ee08c173d194ddb4a3846) ) \ - + ROM_LOAD( "95008381.bin", 0x00000, 0x100000, CRC(78c97785) SHA1(5ac40b2850c25699f65ee08c173d194ddb4a3846) ) #define sc_cfclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004144.lo", 0x000000, 0x080000, CRC(9d861825) SHA1(4b8776a014e31f5041f7e172ae69cb172f42fae5) ) \ - ROM_LOAD( "95004145.hi", 0x080000, 0x080000, CRC(9570fbbc) SHA1(34bdca9ef125e5304b238dd8f1421a888c9ba33e) ) \ - + ROM_LOAD( "95004145.hi", 0x080000, 0x080000, CRC(9570fbbc) SHA1(34bdca9ef125e5304b238dd8f1421a888c9ba33e) ) #define sc_cfdu_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008184.bin", 0x0000, 0x100000, CRC(dc98ec1b) SHA1(6b600d7790bb0a90c5309d7e7684e4cca26c5a50) ) \ - + ROM_LOAD( "95008184.bin", 0x0000, 0x100000, CRC(dc98ec1b) SHA1(6b600d7790bb0a90c5309d7e7684e4cca26c5a50) ) #define sc_cfgcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008577.bin", 0x0000, 0x100000, CRC(f18f1116) SHA1(ba47360e7b489c1bcded786dd1efe518b62b039e) ) \ - + ROM_LOAD( "95008577.bin", 0x0000, 0x100000, CRC(f18f1116) SHA1(ba47360e7b489c1bcded786dd1efe518b62b039e) ) #define sc_crcp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008743.bin", 0x0000, 0x100000, CRC(d44e91bf) SHA1(f42a8c8b0ee5f233cddb4b6084a37e45e2490dd9) ) \ - + ROM_LOAD( "95008743.bin", 0x0000, 0x100000, CRC(d44e91bf) SHA1(f42a8c8b0ee5f233cddb4b6084a37e45e2490dd9) ) #define sc_crcc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004120.lo", 0x000000, 0x080000, CRC(770a9c0f) SHA1(2d06e32b1d07bc9dc51f39f9ba22c9fe8a678ef3) ) \ - ROM_LOAD( "95004121.hi", 0x080000, 0x080000, CRC(239f389c) SHA1(75d6f9f500aab5f114f8b86c4ca1f8dce6ea2ca4) ) \ - + ROM_LOAD( "95004121.hi", 0x080000, 0x080000, CRC(239f389c) SHA1(75d6f9f500aab5f114f8b86c4ca1f8dce6ea2ca4) ) #define sc_crcc_matrix \ ROM_REGION( 0x400000, "matrix", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95000611.p1", 0x0000, 0x010000, CRC(3f40a2c9) SHA1(f73731171c56add1329f3a9d2f84303311d87884) ) \ - + ROM_LOAD( "95000611.p1", 0x0000, 0x010000, CRC(3f40a2c9) SHA1(f73731171c56add1329f3a9d2f84303311d87884) ) #define sc_crgc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008323.bin", 0x0000, 0x100000, CRC(461dd238) SHA1(cab717b285fb217bf47ebe07bd6e7737cf0517c9) ) \ - + ROM_LOAD( "95008323.bin", 0x0000, 0x100000, CRC(461dd238) SHA1(cab717b285fb217bf47ebe07bd6e7737cf0517c9) ) #define sc_crzky_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008242.bin", 0x0000, 0x100000, CRC(7d5c1356) SHA1(efab297024650c95a0abb1296b2ebabd09b299a8) ) \ - + ROM_LOAD( "95008242.bin", 0x0000, 0x100000, CRC(7d5c1356) SHA1(efab297024650c95a0abb1296b2ebabd09b299a8) ) #define sc_crzgn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004248.lo", 0x000000, 0x080000, CRC(4fff74c5) SHA1(2704a15e3afd73848c8f3963920f606310b86963) ) \ - ROM_LOAD( "95004249.hi", 0x080000, 0x080000, CRC(2c8cdeb1) SHA1(771bcc907be91be2d178b87a76b72bd3cc07fe30) ) \ - + ROM_LOAD( "95004249.hi", 0x080000, 0x080000, CRC(2c8cdeb1) SHA1(771bcc907be91be2d178b87a76b72bd3cc07fe30) ) #define sc_cvani_others \ ROM_REGION( 0x400000, "ymz", 0 ) \ - ROM_LOAD( "95008237.bin", 0x0000, 0x0fdb37, CRC(ce0a3555) SHA1(7ba0c53709236d41f9e73b3a5151174ca2bf3fae) ) \ - + ROM_LOAD( "95008237.bin", 0x0000, 0x0fdb37, CRC(ce0a3555) SHA1(7ba0c53709236d41f9e73b3a5151174ca2bf3fae) ) #define sc_cvclb_others \ ROM_REGION( 0x400000, "ymz", 0 ) \ - ROM_LOAD( "95008345.bin", 0x0000, 0x0fdb37, CRC(1e01057c) SHA1(f54cd2b59b1b4901b972b8b33c85defc975b0fac) ) \ - + ROM_LOAD( "95008345.bin", 0x0000, 0x0fdb37, CRC(1e01057c) SHA1(f54cd2b59b1b4901b972b8b33c85defc975b0fac) ) #define sc_druby_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008423.bin", 0x0000, 0x100000, CRC(4cab20ee) SHA1(e27221a94e54db340eaf7fc30e722b354c85686d) ) /* triple casino */ \ - + ROM_LOAD( "95008423.bin", 0x0000, 0x100000, CRC(4cab20ee) SHA1(e27221a94e54db340eaf7fc30e722b354c85686d) ) /* triple casino */ #define sc_darw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008214.bin", 0x0000, 0x0e7add, CRC(423575e6) SHA1(52d9a22824b0ee828095f99dcc5209787f5a2c32) ) \ - + ROM_LOAD( "95008214.bin", 0x0000, 0x0e7add, CRC(423575e6) SHA1(52d9a22824b0ee828095f99dcc5209787f5a2c32) ) #define sc_duckq_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008337.bin", 0x0000, 0x0fd2ce, CRC(d452995e) SHA1(3a8196f44078a4730ec18f16ce3a68b647205a29) ) \ - + ROM_LOAD( "95008337.bin", 0x0000, 0x0fd2ce, CRC(d452995e) SHA1(3a8196f44078a4730ec18f16ce3a68b647205a29) ) #define sc_dyna_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008209.bin", 0x0000, 0x100000, CRC(7845c5e7) SHA1(14cd505e11149b6bdfa0e8a92236f3229f7a2a0e) ) \ - + ROM_LOAD( "95008209.bin", 0x0000, 0x100000, CRC(7845c5e7) SHA1(14cd505e11149b6bdfa0e8a92236f3229f7a2a0e) ) #define sc_easy_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008195.bin", 0x000000, 0x100000, CRC(e032e67a) SHA1(062f48bd2c38b51ffba8cda7860bb37abad40c71) ) \ - ROM_LOAD( "95008196.bin", 0x100000, 0x100000, CRC(4a23e184) SHA1(2d1c1d92c9cdccd95ca4f466a2d7765def7d990b) ) \ - + ROM_LOAD( "95008196.bin", 0x100000, 0x100000, CRC(4a23e184) SHA1(2d1c1d92c9cdccd95ca4f466a2d7765def7d990b) ) #define PR1326_CAS_EASY_STREAK_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008288.bin", 0x000000, 0x100000, CRC(da74e2d3) SHA1(a16b3d6c0590b0ccc7b2488a2f23383a332c332a) ) \ - + ROM_LOAD( "95008288.bin", 0x000000, 0x100000, CRC(da74e2d3) SHA1(a16b3d6c0590b0ccc7b2488a2f23383a332c332a) ) #define sc_fastf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008272.bin", 0x0000, 0x0fafac, CRC(a9bdc1e2) SHA1(60ff02ff4906d8b0f6392cccb96976b912c61e2d) ) \ - + ROM_LOAD( "95008272.bin", 0x0000, 0x0fafac, CRC(a9bdc1e2) SHA1(60ff02ff4906d8b0f6392cccb96976b912c61e2d) ) #define sc_fd7th_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ @@ -2616,122 +2244,97 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "frankie snd2.bin", 0x080000, 0x080000, CRC(8863c8e6) SHA1(0e852155cb2d50d8f0b892c055b37e9955fd8da4) ) \ \ ROM_REGION( 0x400000, "altymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "frdesnd1", 0x0000, 0x080000, CRC(deb93ffa) SHA1(5a549b6bde6f92561952584e3184c1985903464f) ) \ - + ROM_LOAD( "frdesnd1", 0x0000, 0x080000, CRC(deb93ffa) SHA1(5a549b6bde6f92561952584e3184c1985903464f) ) #define sc_frenz_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008052.bin", 0x0000, 0x100000, CRC(36b422b2) SHA1(1ee085393922b46588a604c5e88ad454357711bb) ) \ - + ROM_LOAD( "95008052.bin", 0x0000, 0x100000, CRC(36b422b2) SHA1(1ee085393922b46588a604c5e88ad454357711bb) ) #define sc_ftopi_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "frtsnd.bin", 0x0000, 0x0a6326, CRC(f718f2f0) SHA1(eccedf4eda8eda34633b917165e063d2fbb03abf) ) \ - + ROM_LOAD( "frtsnd.bin", 0x0000, 0x0a6326, CRC(f718f2f0) SHA1(eccedf4eda8eda34633b917165e063d2fbb03abf) ) #define sc_ffru_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "ff_snd.bin", 0x0000, 0x0e54bf, CRC(9d1b711d) SHA1(29386915460b8be92fc5f79177efaf05b7f613cd) ) \ ROM_LOAD( "ff_snd1.bin", 0x000000, 0x080000, CRC(3f0cb386) SHA1(a400177b1e3b986ba5ddfa5f549180b006ced5a2) ) \ - ROM_LOAD( "ff_snd2.bin", 0x080000, 0x080000, CRC(88d7cc1a) SHA1(7cb45ccc41f0c4a842595598f6f30b78e6c42480) ) \ - + ROM_LOAD( "ff_snd2.bin", 0x080000, 0x080000, CRC(88d7cc1a) SHA1(7cb45ccc41f0c4a842595598f6f30b78e6c42480) ) // the set header says it wants FEVER SOUNDS11, but it accept FEVER SOUNDS12, production error? #define sc_fever_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* PR1007 FEVER SOUNDS12 */ \ ROM_LOAD( "95008137.bin", 0x000000, 0x100000, CRC(f74f3916) SHA1(659b160db41e46a53149688f8677e73a78f22e63) ) \ - ROM_LOAD( "95008138.bin", 0x100000, 0x100000, CRC(68563cdd) SHA1(df92dadecf9242bfa147e3134039266e9016faea) ) \ - + ROM_LOAD( "95008138.bin", 0x100000, 0x100000, CRC(68563cdd) SHA1(df92dadecf9242bfa147e3134039266e9016faea) ) #define sc_fever7157_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* 95004239 FEVER PR7157 */ \ ROM_LOAD( "95004239.sn1", 0x000000, 0x080000, CRC(12c4d8eb) SHA1(a404bce7eb1a1148cba4a4d8326ea36e31e881b4) ) \ - ROM_LOAD( "95004240.sn2", 0x080000, 0x080000, CRC(a990a2c4) SHA1(2630dc0408359f32d05ecfd5bcc81789854e5229) ) \ - + ROM_LOAD( "95004240.sn2", 0x080000, 0x080000, CRC(a990a2c4) SHA1(2630dc0408359f32d05ecfd5bcc81789854e5229) ) #define sc_fevnx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004318.sn1", 0x000000, 0x080000, CRC(bb5d74bd) SHA1(104dd8b2faedce3382533c755ca05d03ec2bc50a) ) \ - ROM_LOAD( "95004319.sn2", 0x080000, 0x080000, CRC(73dc297e) SHA1(a826e7d0b88b9e01ceab21a2a92f69f15b402acb) ) \ - + ROM_LOAD( "95004319.sn2", 0x080000, 0x080000, CRC(73dc297e) SHA1(a826e7d0b88b9e01ceab21a2a92f69f15b402acb) ) #define sc_fpitc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008091.bin", 0x000000, 0x100000, CRC(81a28437) SHA1(99b9e5c04c2ab7e9aba0b9b8a0bacee424a079de) ) \ - ROM_LOAD( "95008092.bin", 0x100000, 0x100000, CRC(0987737f) SHA1(bab6bf1ffd3df5465c87996795b1c25f5e863beb) ) \ - + ROM_LOAD( "95008092.bin", 0x100000, 0x100000, CRC(0987737f) SHA1(bab6bf1ffd3df5465c87996795b1c25f5e863beb) ) #define sc_fcc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004103.lo", 0x000000, 0x080000, CRC(9926f103) SHA1(f29a0d25eebd0a0990cd165116b425b795ed62e0) ) \ - ROM_LOAD( "95004104.hi", 0x080000, 0x080000, CRC(bec75a23) SHA1(cdf895081ebf3afb52d5bfaab29f713800c85fc9) ) \ - \ - + ROM_LOAD( "95004104.hi", 0x080000, 0x080000, CRC(bec75a23) SHA1(cdf895081ebf3afb52d5bfaab29f713800c85fc9) ) #define sc_fcc_matrix \ ROM_REGION( 0x200000, "matrix", ROMREGION_ERASEFF )\ - ROM_LOAD( "club-firecracker_mtx_ass.bin", 0x0000, 0x010000, CRC(c23ffee9) SHA1(b4f2542e8ed0b282a439e523baa6cd43c5b2cb50) )\ - + ROM_LOAD( "club-firecracker_mtx_ass.bin", 0x0000, 0x010000, CRC(c23ffee9) SHA1(b4f2542e8ed0b282a439e523baa6cd43c5b2cb50) ) #define sc_frsu_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004229.bin", 0x000000, 0x080000, CRC(fe94f724) SHA1(6cebd17d277f1fa88982158d5ac9422f6f16bc3b) ) \ - ROM_LOAD( "95004230.bin", 0x080000, 0x080000, CRC(4b0a6a18) SHA1(6df706b4431cc97318df612c9533c34085cd341d) ) \ - + ROM_LOAD( "95004230.bin", 0x080000, 0x080000, CRC(4b0a6a18) SHA1(6df706b4431cc97318df612c9533c34085cd341d) ) #define sc_fullt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008449.bin", 0x0000, 0x0fde7d, CRC(9e3ce927) SHA1(00ce43a0ca94e81ac90f53c647e40ac6cb454937) ) \ - + ROM_LOAD( "95008449.bin", 0x0000, 0x0fde7d, CRC(9e3ce927) SHA1(00ce43a0ca94e81ac90f53c647e40ac6cb454937) ) #define sc_greed_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008325.bin", 0x0000, 0x100000, CRC(82356c95) SHA1(bbf9dc2e4ca20a35a8bc581e322956e17f220022) ) \ - + ROM_LOAD( "95008325.bin", 0x0000, 0x100000, CRC(82356c95) SHA1(bbf9dc2e4ca20a35a8bc581e322956e17f220022) ) #define sc_gslam_others \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "95004169.bin", 0x000000, 0x080000, CRC(d2293b2f) SHA1(e3eed38a15885c5a6d63fc79d95f77c5225e9168) ) \ - ROM_LOAD( "95004170.bin", 0x080000, 0x080000, CRC(1da0db8f) SHA1(b3c37b5e02efe7267556d8603c362298ed55bb88) ) \ - + ROM_LOAD( "95004170.bin", 0x080000, 0x080000, CRC(1da0db8f) SHA1(b3c37b5e02efe7267556d8603c362298ed55bb88) ) #define sc_heatw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004287.snd", 0x0000, 0x080000, CRC(7a86c853) SHA1(60a5582f43cda30e9c48a1207ee1a4cafdce0276) ) \ - + ROM_LOAD( "95004287.snd", 0x0000, 0x080000, CRC(7a86c853) SHA1(60a5582f43cda30e9c48a1207ee1a4cafdce0276) ) #define sc_helrd_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004326.snd", 0x0000, 0x080000, CRC(193851ca) SHA1(de71622b6d50d039bd625189303191d316bdc671) ) \ - + ROM_LOAD( "95004326.snd", 0x0000, 0x080000, CRC(193851ca) SHA1(de71622b6d50d039bd625189303191d316bdc671) ) #define sc_helrs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004326.snd", 0x0000, 0x080000, CRC(193851ca) SHA1(de71622b6d50d039bd625189303191d316bdc671) ) \ - + ROM_LOAD( "95004326.snd", 0x0000, 0x080000, CRC(193851ca) SHA1(de71622b6d50d039bd625189303191d316bdc671) ) #define sc_hi5_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008107.bin", 0x000000, 0x100000, CRC(f2b5a284) SHA1(c2b427aa59a233eedefff55d3afdc120f486af83) ) \ - ROM_LOAD( "95008108.bin", 0x100000, 0x100000, CRC(c8bd435d) SHA1(cc78030ae92424db3ba572f355d12db7f9291bd7) ) \ - + ROM_LOAD( "95008108.bin", 0x100000, 0x100000, CRC(c8bd435d) SHA1(cc78030ae92424db3ba572f355d12db7f9291bd7) ) #define sc_sprng_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008276.bin", 0x0000, 0x0f7b99, CRC(e13380bd) SHA1(f4ec3f2d4d8f20e82324fda89e5383a9689bf02a) ) \ - + ROM_LOAD( "95008276.bin", 0x0000, 0x0f7b99, CRC(e13380bd) SHA1(f4ec3f2d4d8f20e82324fda89e5383a9689bf02a) ) #define sc_hilo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008177.bin", 0x000000, 0x100000, CRC(4dad5ea3) SHA1(efa226af2bae5bab25deb3507a635412b0f031e8) ) \ - ROM_LOAD( "95008178.bin", 0x100000, 0x100000, CRC(3a59e427) SHA1(7d530426a57dd9651aef51730b0b8a5324f81024) ) \ - + ROM_LOAD( "95008178.bin", 0x100000, 0x100000, CRC(3a59e427) SHA1(7d530426a57dd9651aef51730b0b8a5324f81024) ) #define sc_hitsh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008239.bin", 0x0000, 0x100000, CRC(cc12346b) SHA1(dd3656a3024c3d26348482c3aa04e0f6638053f7) ) \ - + ROM_LOAD( "95008239.bin", 0x0000, 0x100000, CRC(cc12346b) SHA1(dd3656a3024c3d26348482c3aa04e0f6638053f7) ) #define sc_holyw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008071.bin", 0x000000, 0x100000, CRC(005c5847) SHA1(9d8a801e70f5b1c07d46a4f6e9fab22adf5a9415) ) \ - ROM_LOAD( "95008072.bin", 0x100000, 0x100000, CRC(78756706) SHA1(56b744ec5cb431b30c13bc748d323ebe14727546) ) \ - + ROM_LOAD( "95008072.bin", 0x100000, 0x100000, CRC(78756706) SHA1(56b744ec5cb431b30c13bc748d323ebe14727546) ) #define sc_h6cl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008576.bin", 0x0000, 0x100000, CRC(15d77734) SHA1(db314df1dc558ce66d3c4d62895ab699d36bdf46) ) \ - + ROM_LOAD( "95008576.bin", 0x0000, 0x100000, CRC(15d77734) SHA1(db314df1dc558ce66d3c4d62895ab699d36bdf46) ) #define sc_hf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008163.bin", 0x0000, 0x100000, CRC(0d8abe3c) SHA1(e3dc45ca8aea3113c5884ae3af9216f627ce71ba) ) \ - + ROM_LOAD( "95008163.bin", 0x0000, 0x100000, CRC(0d8abe3c) SHA1(e3dc45ca8aea3113c5884ae3af9216f627ce71ba) ) #define sc_hotpr_others \ ROM_REGION( 0x800000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "97000034.p1", 0x000000, 0x100000, CRC(f06cb0f1) SHA1(856bdd31a35e93e6f52f88f2ac738cc3fab09c11) ) \ @@ -2742,167 +2345,133 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95008016.lo", 0x00000, 0x800000, CRC(6553f5b9) SHA1(17ab5162f4fd3fa5a56641f0b1cbc31c0fe1a52c) ) \ /* bad dumps (2nd half of regular roms) */ \ /* ROM_LOAD( "hot_p.sn1", 0x0000, 0x080000, CRC(c918da0e) SHA1(7eebd41c70be65b1455bafd4087246f41a8b3622) ) */ \ - /* ROM_LOAD( "hot_p.sn2", 0x0000, 0x080000, CRC(31fa3827) SHA1(aa099bfda63d3627cab2b5f12fe0ec7d8600f90e) ) */ \ - + /* ROM_LOAD( "hot_p.sn2", 0x0000, 0x080000, CRC(31fa3827) SHA1(aa099bfda63d3627cab2b5f12fe0ec7d8600f90e) ) */ #define sc_ijclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008888.bin", 0x0000, 0x0fc30c, CRC(71ad9f31) SHA1(40d42bbe7e3d38cab48006a4f0d4d25d2b56a647) ) \ ROM_REGION( 0x5000, "pics", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95891060.bin", 0x0000, 0x5000, CRC(791ebcf2) SHA1(88298c6d1eec718b84e51aae447ffd74493a27f4) ) \ - + ROM_LOAD( "95891060.bin", 0x0000, 0x5000, CRC(791ebcf2) SHA1(88298c6d1eec718b84e51aae447ffd74493a27f4) ) #define sc_jack_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008289.bin", 0x0000, 0x0ffb45, CRC(76d2af0f) SHA1(0460ecc4f80cceb6861b8b0ebf59f0e87bf2b38c) ) \ - ROM_LOAD( "jack the kipper sound 1 maz fc64.bin", 0x0000, 0x100000, CRC(f31090f9) SHA1(4e9edfdf6472b4229d4393cb3033134f6b27920b) ) \ - + ROM_LOAD( "jack the kipper sound 1 maz fc64.bin", 0x0000, 0x100000, CRC(f31090f9) SHA1(4e9edfdf6472b4229d4393cb3033134f6b27920b) ) #define sc_jjunc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008284.bin", 0x0000, 0x100000, CRC(f90feeb8) SHA1(672abc79a88b2237fa584d12b9123a2baeec83b8) ) \ - + ROM_LOAD( "95008284.bin", 0x0000, 0x100000, CRC(f90feeb8) SHA1(672abc79a88b2237fa584d12b9123a2baeec83b8) ) #define sc_jjucl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008395.bin", 0x0000, 0x100000, CRC(619865d6) SHA1(9e76267140709ae2ca09ea0866fc0b27b94d26af) ) \ - + ROM_LOAD( "95008395.bin", 0x0000, 0x100000, CRC(619865d6) SHA1(9e76267140709ae2ca09ea0866fc0b27b94d26af) ) #define sc_jiggn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004179", 0x000000, 0x080000, CRC(fd2521e8) SHA1(58027efa8110004fc4d823dc19d4de115a925711) ) \ - ROM_LOAD( "95004180", 0x080000, 0x080000, CRC(7750b004) SHA1(4c6cb7a5c4b69ca1d65b57271798ac17cd06ce61) ) \ - + ROM_LOAD( "95004180", 0x080000, 0x080000, CRC(7750b004) SHA1(4c6cb7a5c4b69ca1d65b57271798ac17cd06ce61) ) #define sc_jolly_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008254.bin", 0x0000, 0x0f9355, CRC(4742beac) SHA1(2f060a5f54719fdf5aea1077d8d5de6534b41f0c) ) \ - + ROM_LOAD( "95008254.bin", 0x0000, 0x0f9355, CRC(4742beac) SHA1(2f060a5f54719fdf5aea1077d8d5de6534b41f0c) ) #define sc_juicy_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008216.bin", 0x000000, 0x100000, CRC(1fcf52e3) SHA1(0e585678cb928e107343ebc64f77434ac6a62555) ) \ - ROM_LOAD( "95008217.bin", 0x100000, 0x100000, CRC(995f77f6) SHA1(ac964bc58490448cd3b5a1ed0c7636c2354c8c7d) ) \ - + ROM_LOAD( "95008217.bin", 0x100000, 0x100000, CRC(995f77f6) SHA1(ac964bc58490448cd3b5a1ed0c7636c2354c8c7d) ) #define sc_jjf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004085.lo", 0x000000, 0x080000, CRC(1b1f3455) SHA1(8733193640b907cf0aae3bc474dd4f1766c6e74c) ) \ - ROM_LOAD( "95004086.hi", 0x080000, 0x080000, CRC(5b678da4) SHA1(05c3760b35e77ea70401e47762dcbf0cc779ea3c) ) \ - + ROM_LOAD( "95004086.hi", 0x080000, 0x080000, CRC(5b678da4) SHA1(05c3760b35e77ea70401e47762dcbf0cc779ea3c) ) #define sc_kalei_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008444.bin", 0x0000, 0x0f8d34, CRC(a6a6c950) SHA1(97b9859a8795a5890156ce68f71b3f67707efdd2) ) \ - + ROM_LOAD( "95008444.bin", 0x0000, 0x0f8d34, CRC(a6a6c950) SHA1(97b9859a8795a5890156ce68f71b3f67707efdd2) ) #define sc_lasv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004261.snd", 0x0000, 0x080000, CRC(a2fbd1f1) SHA1(7ae7108235f4b9758282506558054b056d92abed) ) \ - + ROM_LOAD( "95004261.snd", 0x0000, 0x080000, CRC(a2fbd1f1) SHA1(7ae7108235f4b9758282506558054b056d92abed) ) #define sc_lined_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004241.bin", 0x000000, 0x080000, CRC(e524fd19) SHA1(af0bcf9cf75592beb928f78a915875f3e3ecedac) ) \ - ROM_LOAD( "95004242.bin", 0x080000, 0x080000, CRC(6d86611e) SHA1(2ec6a6745446502a77c10c487b75b59be1fc266e) ) \ - + ROM_LOAD( "95004242.bin", 0x080000, 0x080000, CRC(6d86611e) SHA1(2ec6a6745446502a77c10c487b75b59be1fc266e) ) #define sc_ldvcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008897.bin", 0x0000, 0x0ff4f6, CRC(3b459b50) SHA1(ba4aa9bcf42cd95f366fbe51c343680cd3fbcd47) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ - ROM_LOAD( "95891079.bin", 0x0000, 0x5000, CRC(378bb888) SHA1(054cdcad83a3909c8c17852f3848c7a7c4daae31) ) \ - + ROM_LOAD( "95891079.bin", 0x0000, 0x5000, CRC(378bb888) SHA1(054cdcad83a3909c8c17852f3848c7a7c4daae31) ) #define sc4lockb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008223.bin", 0x0000, 0x100000, CRC(1b938782) SHA1(501567017e5097c616b90623b16e503b5ab941fd) ) \ - + ROM_LOAD( "95008223.bin", 0x0000, 0x100000, CRC(1b938782) SHA1(501567017e5097c616b90623b16e503b5ab941fd) ) #define sc_lkbcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008285.bin", 0x0000, 0x100000, CRC(c6a5033b) SHA1(9c7abea9052f606dd501e359a4fc4b69860c5269) ) \ - + ROM_LOAD( "95008285.bin", 0x0000, 0x100000, CRC(c6a5033b) SHA1(9c7abea9052f606dd501e359a4fc4b69860c5269) ) #define sc_lir_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008103.bin", 0x000000, 0x100000, CRC(74ec1e6c) SHA1(1636192a63afcb060ee9453d24d7deb3a6776f51) ) \ - ROM_LOAD( "95008104.bin", 0x100000, 0x100000, CRC(b11bd959) SHA1(1739035495a14fedcbc67b724e7595693425d15f) ) \ - + ROM_LOAD( "95008104.bin", 0x100000, 0x100000, CRC(b11bd959) SHA1(1739035495a14fedcbc67b724e7595693425d15f) ) #define sc_miljo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004305.sn1", 0x000000, 0x080000, CRC(1fffefe8) SHA1(e4dd8ee3ac82c598b50fe49afeddf11bcca96581) ) \ - ROM_LOAD( "95004306.sn2", 0x080000, 0x080000, CRC(afc501d4) SHA1(9a28381a7c1c047d6e7bb70736d2c8308c8911a3) ) \ - + ROM_LOAD( "95004306.sn2", 0x080000, 0x080000, CRC(afc501d4) SHA1(9a28381a7c1c047d6e7bb70736d2c8308c8911a3) ) #define sc_milja_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004305.sn1", 0x000000, 0x080000, CRC(1fffefe8) SHA1(e4dd8ee3ac82c598b50fe49afeddf11bcca96581) ) \ - ROM_LOAD( "95004306.sn2", 0x080000, 0x080000, CRC(afc501d4) SHA1(9a28381a7c1c047d6e7bb70736d2c8308c8911a3) ) \ - + ROM_LOAD( "95004306.sn2", 0x080000, 0x080000, CRC(afc501d4) SHA1(9a28381a7c1c047d6e7bb70736d2c8308c8911a3) ) #define PR1132_MONEY_GO_ROUND_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "snd_mgo.p1", 0x0000, 0x100000, CRC(b2f8dd11) SHA1(2db747a0c422d7dd18972f80ba94570c69564c9b) ) \ - + ROM_LOAD( "snd_mgo.p1", 0x0000, 0x100000, CRC(b2f8dd11) SHA1(2db747a0c422d7dd18972f80ba94570c69564c9b) ) #define PR1132_MONEY_GO_ROUND_SOUNDS11_ALT \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008212.bin", 0x0000, 0x100000, CRC(1d0fffb3) SHA1(da7e10479b1ba9e67af94feaa20702bae687168f) ) \ - + ROM_LOAD( "95008212.bin", 0x0000, 0x100000, CRC(1d0fffb3) SHA1(da7e10479b1ba9e67af94feaa20702bae687168f) ) #define sc_mspid_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008278.bin", 0x0000, 0x100000, CRC(8fc20733) SHA1(6ede5578fa11cb3322291958d6e1ef8f6cd99da0) ) \ - + ROM_LOAD( "95008278.bin", 0x0000, 0x100000, CRC(8fc20733) SHA1(6ede5578fa11cb3322291958d6e1ef8f6cd99da0) ) #define sc_msclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008191.bin", 0x0000, 0x100000, CRC(4d392e0c) SHA1(798ba07fdb0bebe5367f58b1e13226827153e0e8) ) \ - + ROM_LOAD( "95008191.bin", 0x0000, 0x100000, CRC(4d392e0c) SHA1(798ba07fdb0bebe5367f58b1e13226827153e0e8) ) #define sc_mtb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "mtb_snd1.bin", 0x000000, 0x080000, CRC(4abca575) SHA1(8f0e3fd169cbf0876368dac335bf81ab0601c923) ) \ - ROM_LOAD( "mtb_snd2.bin", 0x080000, 0x080000, CRC(034a49dc) SHA1(aac70d867856f13f5948e81ed3ca7f2746edf134) ) \ - + ROM_LOAD( "mtb_snd2.bin", 0x080000, 0x080000, CRC(034a49dc) SHA1(aac70d867856f13f5948e81ed3ca7f2746edf134) ) #define sc_mtbcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008009.lo", 0x000000, 0x100000, CRC(b9334137) SHA1(e7481688e18b56bddee4a2eff219f83ac5180082) ) \ - ROM_LOAD( "95008010.hi", 0x100000, 0x100000, CRC(cb197b7e) SHA1(56fb416a98bc2875df11024518babf4a07418a79) ) \ - + ROM_LOAD( "95008010.hi", 0x100000, 0x100000, CRC(cb197b7e) SHA1(56fb416a98bc2875df11024518babf4a07418a79) ) #define sc_magci_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008480.bin", 0x0000, 0x0c4846, CRC(025a1417) SHA1(6f522e71b4707829c98f77551f7cd4f2910f15b5) ) \ - + ROM_LOAD( "95008480.bin", 0x0000, 0x0c4846, CRC(025a1417) SHA1(6f522e71b4707829c98f77551f7cd4f2910f15b5) ) #define sc_magic_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008340.bin", 0x0000, 0x0ff5d7, CRC(1371b0d9) SHA1(aa8c23a86cbd5e8274bb035c1132da11d71fd2f8) ) \ - + ROM_LOAD( "95008340.bin", 0x0000, 0x0ff5d7, CRC(1371b0d9) SHA1(aa8c23a86cbd5e8274bb035c1132da11d71fd2f8) ) #define sc_maxim_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008151.bin", 0x0000, 0x184af2, CRC(775d8471) SHA1(d784e25f52e6df18da9eabf93e6b50de5217c374) ) \ - + ROM_LOAD( "95008151.bin", 0x0000, 0x184af2, CRC(775d8471) SHA1(d784e25f52e6df18da9eabf93e6b50de5217c374) ) #define sc_monob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* both of these are the same, one is just padded */ \ ROM_LOAD( "95008359.bin", 0x0000, 0x0e89fa, CRC(763e4367) SHA1(c44b70f8336c2d6c00cd0dde9b6ca014667c59a6) ) \ - ROM_LOAD( "monopoly95008359_sound1.bin", 0x0000, 0x100000, CRC(93f005f2) SHA1(d2351982d6352d9793efac617ac9fb9569f229c6) ) \ - + ROM_LOAD( "monopoly95008359_sound1.bin", 0x0000, 0x100000, CRC(93f005f2) SHA1(d2351982d6352d9793efac617ac9fb9569f229c6) ) #define sc_mou_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008364.bin", 0x0000, 0x0e98ac, CRC(47aae23d) SHA1(0964a4f68c3688ebd65daf317b17e1341fcd3ceb) ) \ - + ROM_LOAD( "95008364.bin", 0x0000, 0x0e98ac, CRC(47aae23d) SHA1(0964a4f68c3688ebd65daf317b17e1341fcd3ceb) ) #define sc_nmtj_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008472.bin", 0x0000, 0x0fe798, CRC(a522157a) SHA1(f1fea963579cb8caddd5fcbfa36e33dc35c6e2a0) ) \ - + ROM_LOAD( "95008472.bin", 0x0000, 0x0fe798, CRC(a522157a) SHA1(f1fea963579cb8caddd5fcbfa36e33dc35c6e2a0) ) #define sc_mclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cwow sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "cwow sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_mdlx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008514.bin", 0x0000, 0x0ed840, CRC(2608cbde) SHA1(4831570fbc825592781e6473173d6ec911a0054d) ) \ - + ROM_LOAD( "95008514.bin", 0x0000, 0x0ed840, CRC(2608cbde) SHA1(4831570fbc825592781e6473173d6ec911a0054d) ) #define sc_mont_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004314.bin", 0x0000, 0x0ccf04, CRC(0faba601) SHA1(1f21e39c2a9a18dd74292e68456c725ec2631aac) ) /* lotech sounds? */ \ - + ROM_LOAD( "95004314.bin", 0x0000, 0x0ccf04, CRC(0faba601) SHA1(1f21e39c2a9a18dd74292e68456c725ec2631aac) ) /* lotech sounds? */ #define sc_nudit_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95404303.bin", 0x000000, 0x080000, CRC(adb71c93) SHA1(e91165b0280da9f79415b1cd7bb2ff8c1ea974fe) ) \ - ROM_LOAD( "95404304.bin", 0x080000, 0x080000, CRC(96190422) SHA1(0e3192d959f1ea4296474684f04847c50a983400) ) \ - + ROM_LOAD( "95404304.bin", 0x080000, 0x080000, CRC(96190422) SHA1(0e3192d959f1ea4296474684f04847c50a983400) ) #define sc_pen1_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "pub-en.s1", 0x000000, 0x080000, CRC(7e3f4295) SHA1(b7a2c538d79663a3d21f89311195619158fa7197) ) /* need testing */ \ @@ -2910,133 +2479,105 @@ INPUT_PORTS_EXTERN( sc4_base ); \ ROM_REGION( 0x400000, "matrix", 0 ) \ /* I don't think the SC4 version uses a DMD */ \ - ROM_LOAD( "pbemydot", 0x0000, 0x010000, CRC(b056d3d4) SHA1(6c1dbc6fcb4761c25f9cc8123e9f0fe791488c19) ) /* DMD rom? Possibly SC2 DM01 */ \ - + ROM_LOAD( "pbemydot", 0x0000, 0x010000, CRC(b056d3d4) SHA1(6c1dbc6fcb4761c25f9cc8123e9f0fe791488c19) ) /* DMD rom? Possibly SC2 DM01 */ #define sc_oyf_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008301.bin", 0x0000, 0x100000, CRC(0e042883) SHA1(2e73e5a49bcc525edfddf56e0d4ef5137116eec2) ) \ - + ROM_LOAD( "95008301.bin", 0x0000, 0x100000, CRC(0e042883) SHA1(2e73e5a49bcc525edfddf56e0d4ef5137116eec2) ) #define sc_opses_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008211.bin", 0x0000, 0x100000, CRC(535fbad0) SHA1(25804a47e20dcfe364f49195da0ab057bce31266) ) \ - + ROM_LOAD( "95008211.bin", 0x0000, 0x100000, CRC(535fbad0) SHA1(25804a47e20dcfe364f49195da0ab057bce31266) ) #define sc_party_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008113.bin", 0x000000, 0x100000, CRC(7e54f87c) SHA1(b64e4da7c088ba2f328d6adcfd0a3824d98a5f31) ) \ - ROM_LOAD( "95008114.bin", 0x100000, 0x100000, CRC(594fef43) SHA1(8549d372ffb0194823afc11992d8a16f6caed2ff) ) \ - + ROM_LOAD( "95008114.bin", 0x100000, 0x100000, CRC(594fef43) SHA1(8549d372ffb0194823afc11992d8a16f6caed2ff) ) #define sc_paytm_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004224.sn1", 0x000000, 0x080000, CRC(74382d29) SHA1(bd0323b7208e9b03e2d8468f7d4603fb4a3fe394) ) \ - ROM_LOAD( "95004225.sn2", 0x080000, 0x080000, CRC(23efa88d) SHA1(af52ec3dcb45a2ea26eaa273c783134402105168) ) \ - + ROM_LOAD( "95004225.sn2", 0x080000, 0x080000, CRC(23efa88d) SHA1(af52ec3dcb45a2ea26eaa273c783134402105168) ) #define SC4_95004316_CAS_PHAR_GOLD_PR1261 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004316.snd", 0x000000, 0x080000, CRC(94a9ec9c) SHA1(bab1a431e2857b9db9fa3f3ef28f150e19c4ae50) ) /* casino */ \ - + ROM_LOAD( "95004316.snd", 0x000000, 0x080000, CRC(94a9ec9c) SHA1(bab1a431e2857b9db9fa3f3ef28f150e19c4ae50) ) /* casino */ #define sc_pgold_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008141.bin", 0x000000, 0x100000, CRC(e1b214dc) SHA1(811f6ec42961496f8cd9fb3434ab6a07457ca61a) ) \ - ROM_LOAD( "95008142.bin", 0x100000, 0x100000, CRC(faa84d52) SHA1(f5139df5e9ff95fab3c01ac2b1aa44b1d939bf7a) ) \ - + ROM_LOAD( "95008142.bin", 0x100000, 0x100000, CRC(faa84d52) SHA1(f5139df5e9ff95fab3c01ac2b1aa44b1d939bf7a) ) #define sc_polic_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008327.bin", 0x0000, 0x0d24fe, CRC(767251af) SHA1(9cc9f4f2c6f6762a1929b845521549256e9b9f4f) ) \ - + ROM_LOAD( "95008327.bin", 0x0000, 0x0d24fe, CRC(767251af) SHA1(9cc9f4f2c6f6762a1929b845521549256e9b9f4f) ) #define sc_potsh_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008431.bin", 0x0000, 0x0ffeaf, CRC(400843fd) SHA1(35a0195b120e61c40e8f5e193b44f9fcb5b7d99d) ) \ - + ROM_LOAD( "95008431.bin", 0x0000, 0x0ffeaf, CRC(400843fd) SHA1(35a0195b120e61c40e8f5e193b44f9fcb5b7d99d) ) #define sc_pwrsg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008257.bin", 0x0000, 0x0dc608, CRC(ac648ab0) SHA1(58c919be129388ca9c34cad177520175ef08cfaa) ) \ - + ROM_LOAD( "95008257.bin", 0x0000, 0x0dc608, CRC(ac648ab0) SHA1(58c919be129388ca9c34cad177520175ef08cfaa) ) #define sc_pir_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008264.bin", 0x0000, 0x100000, CRC(c3301cf1) SHA1(59e3c5c8ab7be1901800d493fe98e72dd24c181c) ) \ - + ROM_LOAD( "95008264.bin", 0x0000, 0x100000, CRC(c3301cf1) SHA1(59e3c5c8ab7be1901800d493fe98e72dd24c181c) ) #define sc_ppclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008934.bin", 0x000000, 0x100000, CRC(87290522) SHA1(27deddd66b0ac9a0f4fe526f0eda7f6b2e73a8b6) ) \ - ROM_LOAD( "95008935.bin", 0x100000, 0x100000, CRC(7517053c) SHA1(d83019c52b8c78539359e9277864717c76fae0ce) ) \ - + ROM_LOAD( "95008935.bin", 0x100000, 0x100000, CRC(7517053c) SHA1(d83019c52b8c78539359e9277864717c76fae0ce) ) #define sc_pipe_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pipingsnd.bin", 0x0000, 0x0c50d9, CRC(ff240faa) SHA1(f0961b3207c0c8779479c773d1453ac4ff376bd2) ) \ - + ROM_LOAD( "pipingsnd.bin", 0x0000, 0x0c50d9, CRC(ff240faa) SHA1(f0961b3207c0c8779479c773d1453ac4ff376bd2) ) #define sc_plumb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008430.bin", 0x0000, 0x0c690f, CRC(29059625) SHA1(4e46f794726b778e03f67ab3ec3cd4cb71be0b64) ) \ - + ROM_LOAD( "95008430.bin", 0x0000, 0x0c690f, CRC(29059625) SHA1(4e46f794726b778e03f67ab3ec3cd4cb71be0b64) ) #define sc_qmodo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "97000080.bin", 0x0000, 0x0ea2e7, CRC(060bf37a) SHA1(732fa84ed0145f931557e3fef66276370dde6884) ) \ - + ROM_LOAD( "97000080.bin", 0x0000, 0x0ea2e7, CRC(060bf37a) SHA1(732fa84ed0145f931557e3fef66276370dde6884) ) #define sc_quidr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008269.bin", 0x0000, 0x0e5ee2, CRC(b61e664a) SHA1(9ee423015b5532cc4c06ddb76846800fa325074c) ) \ - + ROM_LOAD( "95008269.bin", 0x0000, 0x0e5ee2, CRC(b61e664a) SHA1(9ee423015b5532cc4c06ddb76846800fa325074c) ) #define sc_redad_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004266.snd", 0x0000, 0x080000, CRC(457fffbf) SHA1(ede2adc836ba4904cdf3d1ed825f9128c27b2b58) ) \ - + ROM_LOAD( "95004266.snd", 0x0000, 0x080000, CRC(457fffbf) SHA1(ede2adc836ba4904cdf3d1ed825f9128c27b2b58) ) #define sc_redal_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004266.snd", 0x0000, 0x080000, CRC(457fffbf) SHA1(ede2adc836ba4904cdf3d1ed825f9128c27b2b58) ) \ - + ROM_LOAD( "95004266.snd", 0x0000, 0x080000, CRC(457fffbf) SHA1(ede2adc836ba4904cdf3d1ed825f9128c27b2b58) ) #define sc_rio_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004309.snd", 0x0000, 0x080000, CRC(60eb25fc) SHA1(66f3ac8bc1be99eda07c71f63ebc818014ef7800) ) \ - + ROM_LOAD( "95004309.snd", 0x0000, 0x080000, CRC(60eb25fc) SHA1(66f3ac8bc1be99eda07c71f63ebc818014ef7800) ) #define sc_rvlnx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004320.snd", 0x0000, 0x080000, CRC(b20c0557) SHA1(f61df4a80751571caf4d44add753b5477c13b7f0) ) \ - + ROM_LOAD( "95004320.snd", 0x0000, 0x080000, CRC(b20c0557) SHA1(f61df4a80751571caf4d44add753b5477c13b7f0) ) #define sc_rvl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004259.sn1", 0x000000, 0x080000, CRC(c26ed994) SHA1(da336ab76c1c148906c734d7239b2b83a05ec083) ) \ - ROM_LOAD( "95004260.sn2", 0x080000, 0x080000, CRC(1a32d1bd) SHA1(e88ba7b8b353ea168a689e1d2be8c753a56f8f1d) ) \ - + ROM_LOAD( "95004260.sn2", 0x080000, 0x080000, CRC(1a32d1bd) SHA1(e88ba7b8b353ea168a689e1d2be8c753a56f8f1d) ) #define sc_rogds_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008256.bin", 0x0000, 0x0fafa4, CRC(6d70436f) SHA1(adf7d18d9fcbb216ee461183951c1ab2972b8ef7) ) \ - + ROM_LOAD( "95008256.bin", 0x0000, 0x0fafa4, CRC(6d70436f) SHA1(adf7d18d9fcbb216ee461183951c1ab2972b8ef7) ) #define sc_royle_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008207.bin", 0x000000, 0x100000, CRC(269f845f) SHA1(eaddeaebdafd3f237b6af5c3539da407a6782210) ) \ - ROM_LOAD( "95008208.bin", 0x100000, 0x100000, CRC(07d4d9fa) SHA1(841fead29de19da0436f937614de50e1f07ebc8b) ) \ - + ROM_LOAD( "95008208.bin", 0x100000, 0x100000, CRC(07d4d9fa) SHA1(841fead29de19da0436f937614de50e1f07ebc8b) ) #define sc_rbank_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008233.bin", 0x000000, 0x100000, CRC(ebdb6017) SHA1(ca723483f6a7ae6512fa4abc4437c1f8eb606784) ) \ - ROM_LOAD( "95008234.bin", 0x100000, 0x100000, CRC(4b7ac02a) SHA1(29c51906e5ca1e0c9c70db86e3a24f08be06b7e0) ) \ - + ROM_LOAD( "95008234.bin", 0x100000, 0x100000, CRC(4b7ac02a) SHA1(29c51906e5ca1e0c9c70db86e3a24f08be06b7e0) ) #define sc_pstat_others \ ROM_REGION( 0x100000, "ymz", 0 ) \ - ROM_LOAD( "95008294", 0x0000, 0x100000, CRC(0d87f9af) SHA1(7b00cbe3ba69f646fd692bfd6f002bd37801325e) ) \ - + ROM_LOAD( "95008294", 0x0000, 0x100000, CRC(0d87f9af) SHA1(7b00cbe3ba69f646fd692bfd6f002bd37801325e) ) #define sc_po8_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008416.bin", 0x0000, 0x0fe66d, CRC(9ae69b6a) SHA1(7bb94d7c941c64c1ea53e391b3f66a6e1b483417) ) \ - + ROM_LOAD( "95008416.bin", 0x0000, 0x0fe66d, CRC(9ae69b6a) SHA1(7bb94d7c941c64c1ea53e391b3f66a6e1b483417) ) #define sc_sidsp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008369.bin", 0x0000, 0x100000, CRC(76ea0074) SHA1(6cc4f320d8e331477569dfc7e961afd30a4ce7b2) ) \ - + ROM_LOAD( "95008369.bin", 0x0000, 0x100000, CRC(76ea0074) SHA1(6cc4f320d8e331477569dfc7e961afd30a4ce7b2) ) #define sc_sbust_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008255.bin", 0x0000, 0x0d55db, CRC(feef5ac9) SHA1(83b7de3bd3a1fa3f5ae17f102cc54467d564740f) ) \ - + ROM_LOAD( "95008255.bin", 0x0000, 0x0d55db, CRC(feef5ac9) SHA1(83b7de3bd3a1fa3f5ae17f102cc54467d564740f) ) #define sc_strbr_others \ ROM_REGION( 0x400000, "unk", ROMREGION_ERASE00 ) \ /* this looks encrypted, or like samples.. I don't think it belongs here, check */ \ @@ -3044,175 +2585,139 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD16_BYTE( "sbar714.bin", 0x0000, 0x010000, CRC(57dbca5f) SHA1(22a6fcf1e11dd9ba2b3f73cd7520e2b4a740a893) ) \ ROM_LOAD16_BYTE( "sbar715.bin", 0x0000, 0x010000, CRC(e9192085) SHA1(a030e81f54338bcb8667c59bad9a6b35a41bbd9f) ) \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004290.snd", 0x0000, 0x080000, CRC(488972c2) SHA1(4cd9bbb6df0fbaf9b8dd93294046c71c82bf4b5b) ) \ - + ROM_LOAD( "95004290.snd", 0x0000, 0x080000, CRC(488972c2) SHA1(4cd9bbb6df0fbaf9b8dd93294046c71c82bf4b5b) ) #define sc_strx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008247.bin", 0x0000, 0x100000, CRC(0817596f) SHA1(250db171d1f7893883ffbcfdd3fd3f6e62524bdc) ) \ - + ROM_LOAD( "95008247.bin", 0x0000, 0x100000, CRC(0817596f) SHA1(250db171d1f7893883ffbcfdd3fd3f6e62524bdc) ) #define sc_s6c_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004095.p1", 0x000000, 0x080000, CRC(d9d7b876) SHA1(fdd9b5f07665b7b7edd198e00d3b005b32d1609c) ) \ - ROM_LOAD( "95004096.p1", 0x080000, 0x080000, CRC(fb8e103f) SHA1(fd8e2c8ae1e459f7426aa6b5de20f91dfae7bec9) ) \ - + ROM_LOAD( "95004096.p1", 0x080000, 0x080000, CRC(fb8e103f) SHA1(fd8e2c8ae1e459f7426aa6b5de20f91dfae7bec9) ) #define sc_slc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008412.bin", 0x0000, 0x100000, CRC(197edb63) SHA1(f1851029f6870d41d6aaf2df0a49fc54f5c79e4c) ) \ - + ROM_LOAD( "95008412.bin", 0x0000, 0x100000, CRC(197edb63) SHA1(f1851029f6870d41d6aaf2df0a49fc54f5c79e4c) ) #define sc_sstep_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "97000120.bin", 0x0000, 0x080000, CRC(d887ca0a) SHA1(b1fd4633ca47fe1d99c9938af48768cd0cf451c6) ) \ - + ROM_LOAD( "97000120.bin", 0x0000, 0x080000, CRC(d887ca0a) SHA1(b1fd4633ca47fe1d99c9938af48768cd0cf451c6) ) #define sc_solgl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008159.bin", 0x000000, 0x100000, CRC(e6ad55e4) SHA1(4bea205a9e6e2832cd06d0d5c96599f2a83f8fec) ) \ - ROM_LOAD( "95008160.bin", 0x100000, 0x100000, CRC(d52329ca) SHA1(e0feebe0d0ec13cd15cf4af1023246a1a3a9adc7) ) \ - + ROM_LOAD( "95008160.bin", 0x100000, 0x100000, CRC(d52329ca) SHA1(e0feebe0d0ec13cd15cf4af1023246a1a3a9adc7) ) #define sc_spark_others \ ROM_REGION( 0x200000, "ymz", 0 ) \ ROM_LOAD( "95008031.bin", 0x000000, 0x100000, CRC(445d3cf7) SHA1(ded74e46b4fb4ef405eb74027a63d301efce1f45) ) \ - ROM_LOAD( "95008032.bin", 0x100000, 0x0fd082, CRC(88781139) SHA1(e8e972032664c314f5263d7acb5a3f0769c7fb2a) ) \ - + ROM_LOAD( "95008032.bin", 0x100000, 0x0fd082, CRC(88781139) SHA1(e8e972032664c314f5263d7acb5a3f0769c7fb2a) ) #define sc_stirc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008117.bin", 0x0000, 0x197791, CRC(9d555ddf) SHA1(753b838fa7f64317b64fe0ae0ee7e6484f2a5af3) ) \ - + ROM_LOAD( "95008117.bin", 0x0000, 0x197791, CRC(9d555ddf) SHA1(753b838fa7f64317b64fe0ae0ee7e6484f2a5af3) ) #define sc_suscl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008865.bin", 0x0000, 0x0f4505, CRC(8e375291) SHA1(d7563adf330023f4fe47c11eb9ef77d593c3eaab) ) \ ROM_REGION( 0x5000, "pics", 0 ) \ - ROM_LOAD( "95890751.bin", 0x0000, 0x5000, CRC(57c944b0) SHA1(5f9aadffda6e83780e89c64315c8289a7d364ef6) ) /* does this belong with an sc5 set? */ \ - + ROM_LOAD( "95890751.bin", 0x0000, 0x5000, CRC(57c944b0) SHA1(5f9aadffda6e83780e89c64315c8289a7d364ef6) ) /* does this belong with an sc5 set? */ #define sc_strk_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008492.bin", 0x0000, 0x0fa055, CRC(4f37c766) SHA1(352dc95bb1f0fe31db233ac731618acb3046681e) ) \ - + ROM_LOAD( "95008492.bin", 0x0000, 0x0fa055, CRC(4f37c766) SHA1(352dc95bb1f0fe31db233ac731618acb3046681e) ) #define sc_taekw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008283.bin", 0x0000, 0x0fd772, CRC(59a3924c) SHA1(ceba9236db0b26eb79feabc9564eb6dec10c4ab9) ) \ - + ROM_LOAD( "95008283.bin", 0x0000, 0x0fd772, CRC(59a3924c) SHA1(ceba9236db0b26eb79feabc9564eb6dec10c4ab9) ) #define sc_taknt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008273.bin", 0x0000, 0x100000, CRC(c8695859) SHA1(5998d1f3467e522d4fa5ad6cf75b86ae1760fdd6) ) \ - + ROM_LOAD( "95008273.bin", 0x0000, 0x100000, CRC(c8695859) SHA1(5998d1f3467e522d4fa5ad6cf75b86ae1760fdd6) ) #define sc_takcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008314.bin", 0x0000, 0x100000, CRC(64d2a26a) SHA1(f01944363e77bf33b44a06224e44828b065fdee4) ) \ - + ROM_LOAD( "95008314.bin", 0x0000, 0x100000, CRC(64d2a26a) SHA1(f01944363e77bf33b44a06224e44828b065fdee4) ) #define sc_tbana_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008229.bin", 0x0000, 0x100000, CRC(003f9c3d) SHA1(38ea111096e84e77e727fb784992b525767f5b0c) ) \ - + ROM_LOAD( "95008229.bin", 0x0000, 0x100000, CRC(003f9c3d) SHA1(38ea111096e84e77e727fb784992b525767f5b0c) ) #define sc_ticlb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95004082.p1", 0x000000, 0x080000, CRC(b7caba0f) SHA1(777afdb6a2f78edad5f4df506eb4cd571f9f357b) ) \ - ROM_LOAD( "95004083.p2", 0x080000, 0x080000, CRC(c0cc21b7) SHA1(d0b22db4c1faeef34b794ac4c31bc9fd386493ea) ) \ - + ROM_LOAD( "95004083.p2", 0x080000, 0x080000, CRC(c0cc21b7) SHA1(d0b22db4c1faeef34b794ac4c31bc9fd386493ea) ) #define sc_ticlb_matrix \ ROM_REGION( 0x400000, "matrix", 0 ) \ - ROM_LOAD( "club-treasure-island_mtx_ass.bin", 0x0000, 0x010000, CRC(74f97b29) SHA1(9334bf1e4b4e2bcbbfaa5ae32201ceaab0641d83) ) /* DMD */ \ - + ROM_LOAD( "club-treasure-island_mtx_ass.bin", 0x0000, 0x010000, CRC(74f97b29) SHA1(9334bf1e4b4e2bcbbfaa5ae32201ceaab0641d83) ) /* DMD */ #define sc_tri7_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1328 TRIPLE 7S SOUNDS11 */ \ - ROM_LOAD( "95008308.bin", 0x0000, 0x100000, CRC(87a25bc3) SHA1(bf3d6b86f8f217131c33b681787f4a6fe84b8b8d) ) \ - + ROM_LOAD( "95008308.bin", 0x0000, 0x100000, CRC(87a25bc3) SHA1(bf3d6b86f8f217131c33b681787f4a6fe84b8b8d) ) #define sc_tic2_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* TTTWO SOUNDS */ \ ROM_LOAD( "95004231_1.bin", 0x000000, 0x080000, CRC(af1512be) SHA1(4196820fa06b5e09f7108894ca89fc43e4ac3da5) ) \ - ROM_LOAD( "95004232_2.bin", 0x080000, 0x080000, CRC(bddddec8) SHA1(3dd7dab9ad3e4475cd10c675bbc5a5fd28cf953e) ) \ - + ROM_LOAD( "95004232_2.bin", 0x080000, 0x080000, CRC(bddddec8) SHA1(3dd7dab9ad3e4475cd10c675bbc5a5fd28cf953e) ) #define sc_tgear_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* GEARS SOUNDS */ \ ROM_LOAD( "95008063.1", 0x000000, 0x100000, CRC(f87314dc) SHA1(00528243bd58e50ab24dde879f352feec2721019) ) \ - ROM_LOAD( "95008063.2", 0x100000, 0x100000, CRC(5d25d9e8) SHA1(a7f1abcf4bdb5ced2b414d43a13568d13ac334de) ) \ - + ROM_LOAD( "95008063.2", 0x100000, 0x100000, CRC(5d25d9e8) SHA1(a7f1abcf4bdb5ced2b414d43a13568d13ac334de) ) #define sc_tload_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* LOAD SOUNDS */ \ - ROM_LOAD( "95008362.bin", 0x0000, 0x100000, CRC(fb14b937) SHA1(c8cbdda6184cc3d5b837a3cda105a39cf745bd4d) ) \ - + ROM_LOAD( "95008362.bin", 0x0000, 0x100000, CRC(fb14b937) SHA1(c8cbdda6184cc3d5b837a3cda105a39cf745bd4d) ) #define sc_trist_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* STR3 SOUNDS */ \ - ROM_LOAD( "95008499.bin", 0x0000, 0x0efbd7, CRC(90710d1f) SHA1(923f6396941b713d3f55bb002c36b0e42063ae4d) ) \ - + ROM_LOAD( "95008499.bin", 0x0000, 0x0efbd7, CRC(90710d1f) SHA1(923f6396941b713d3f55bb002c36b0e42063ae4d) ) #define sc_ttomb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1305 TRES TOMB SOUNDS11 */ \ - ROM_LOAD( "95008287.bin", 0x0000, 0x100000, CRC(9a3f47f9) SHA1(5844f3be0fe4febe04d924afc00f2f55273c15f1) ) \ - + ROM_LOAD( "95008287.bin", 0x0000, 0x100000, CRC(9a3f47f9) SHA1(5844f3be0fe4febe04d924afc00f2f55273c15f1) ) #define sc_tridn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* TRID SOUNDS */ \ - ROM_LOAD( "95008335.bin", 0x0000, 0x0fd5ab, CRC(f0fed8d5) SHA1(dd974c70adfb9a5fb37a069eb736d5ef23b43ddf) ) \ - + ROM_LOAD( "95008335.bin", 0x0000, 0x0fd5ab, CRC(f0fed8d5) SHA1(dd974c70adfb9a5fb37a069eb736d5ef23b43ddf) ) #define sc_tub_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1103 TUBULAR BELLS SOUNDS11 */ \ - ROM_LOAD( "95008164.bin", 0x0000, 0x100000, CRC(37fb6004) SHA1(d171223dd4a4162bfb1e63e4af26ea012a2de5ea) ) \ - + ROM_LOAD( "95008164.bin", 0x0000, 0x100000, CRC(37fb6004) SHA1(d171223dd4a4162bfb1e63e4af26ea012a2de5ea) ) #define sc_twilt_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 95004299 TWILIGHT PR1154 */ \ - ROM_LOAD( "95004299.snd", 0x0000, 0x080000, CRC(f4837e10) SHA1(78c4455b1585ca60ed15734dac517f5f1ef4d237) ) \ - + ROM_LOAD( "95004299.snd", 0x0000, 0x080000, CRC(f4837e10) SHA1(78c4455b1585ca60ed15734dac517f5f1ef4d237) ) #define sc_valnv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 7025 VER1 SOUNDS */ \ ROM_LOAD( "sound1.bin", 0x000000, 0x080000, CRC(cedee498) SHA1(311ab99746cff8f72ec8ffb9ac386a713fc300dd) ) \ - ROM_LOAD( "sound2.bin", 0x080000, 0x080000, CRC(0994b7bb) SHA1(ad79998467fee8fd95c944ea6a33450fcf6d3d56) ) \ - + ROM_LOAD( "sound2.bin", 0x080000, 0x080000, CRC(0994b7bb) SHA1(ad79998467fee8fd95c944ea6a33450fcf6d3d56) ) #define sc_valqp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR2040 SOUNDS V1 */ \ ROM_LOAD( "95004296.sn1", 0x000000, 0x080000, CRC(aecc8138) SHA1(64fd18666c2c753899bff971227b9358c2bf22f1) ) \ - ROM_LOAD( "95004297.sn2", 0x080000, 0x080000, CRC(2c8b698b) SHA1(7b8dd1f2215579b5ad69a2a1f11bfcd04e3d07f9) ) \ - + ROM_LOAD( "95004297.sn2", 0x080000, 0x080000, CRC(2c8b698b) SHA1(7b8dd1f2215579b5ad69a2a1f11bfcd04e3d07f9) ) #define sc_wernr_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR7027 SOUNDS V11 */ \ ROM_LOAD( "gw_snd_1.8mb", 0x000000, 0x100000, CRC(990a3471) SHA1(356120558681440cac8252223c31fb9eca2572db) ) \ - ROM_LOAD( "gw_snd_2.8mb", 0x100000, 0x100000, CRC(468431e6) SHA1(90e8dd52b1ce752672b0a02d3cb7715cfa3fb49d) ) \ - + ROM_LOAD( "gw_snd_2.8mb", 0x100000, 0x100000, CRC(468431e6) SHA1(90e8dd52b1ce752672b0a02d3cb7715cfa3fb49d) ) #define sc_waw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* WILD SOUNDS */ \ ROM_LOAD( "95004292.bin", 0x0000, 0x17ba49, CRC(a5a03ead) SHA1(f1319d0e254b980262e3d404410e6ddbf18057b6) ) \ \ /* this is just 0x80000 - 0xfffff of the above */ \ /* ROM_REGION( 0x400000, "altymz", ROMREGION_ERASE00 ) */ \ - /* ROM_LOAD( "wetsnd1", 0x0000, 0x080000, BAD_DUMP CRC(5fb985b3) SHA1(19f85535b5082546a6098a751a2e2244ed4373ec) ) */ \ - + /* ROM_LOAD( "wetsnd1", 0x0000, 0x080000, BAD_DUMP CRC(5fb985b3) SHA1(19f85535b5082546a6098a751a2e2244ed4373ec) ) */ #define sc_winsp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* WINNINGSPINSND */ \ - ROM_LOAD( "95008504.bin", 0x0000, 0x0bd369, CRC(c27f88ca) SHA1(bfc34cc433b68dc6377af7ee464cbdb74a6e0e8d) ) \ - + ROM_LOAD( "95008504.bin", 0x0000, 0x0bd369, CRC(c27f88ca) SHA1(bfc34cc433b68dc6377af7ee464cbdb74a6e0e8d) ) #define sc_wspin_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* WINSPINNERSND */ \ - ROM_LOAD( "95008516.bin", 0x0000, 0x0c35e4, CRC(b8deeea9) SHA1(5bc5f96e5f1b994448d90f05eea2e1c01e17ab66) ) \ - + ROM_LOAD( "95008516.bin", 0x0000, 0x0c35e4, CRC(b8deeea9) SHA1(5bc5f96e5f1b994448d90f05eea2e1c01e17ab66) ) #define sc_wwys_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1301 WIN W Y S SOUNDS11 */ \ - ROM_LOAD( "95008277.bin", 0x0000, 0x100000, CRC(19051eb6) SHA1(accc9b452dd80e6ca40e79dcc7d4fc6d4f234243) ) \ - + ROM_LOAD( "95008277.bin", 0x0000, 0x100000, CRC(19051eb6) SHA1(accc9b452dd80e6ca40e79dcc7d4fc6d4f234243) ) #define sc_winxp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 95004265 WINXPLOSION PR1053 */ \ - ROM_LOAD( "95004265.snd", 0x0000, 0x080000, CRC(1e3e761d) SHA1(81c1e1af72836b25a053cf62c52341a0f8837e3e) ) \ - + ROM_LOAD( "95004265.snd", 0x0000, 0x080000, CRC(1e3e761d) SHA1(81c1e1af72836b25a053cf62c52341a0f8837e3e) ) #define sc_wondw_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1314 WONDERWH SOUNDS11 */ \ - ROM_LOAD( "95008330.bin", 0x0000, 0x100000, CRC(15e80096) SHA1(da02a8afc83400fdf1ead9dad8a461eb9e911586) ) \ - + ROM_LOAD( "95008330.bin", 0x0000, 0x100000, CRC(15e80096) SHA1(da02a8afc83400fdf1ead9dad8a461eb9e911586) ) #define sc_xmark_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1116 X MARKS T S SOUNDS11 */ \ - ROM_LOAD( "95008263.bin", 0x0000, 0x100000, CRC(43507f43) SHA1(a5eb9e142847a338bf18f4b26da7fe5a2807a027) ) \ - + ROM_LOAD( "95008263.bin", 0x0000, 0x100000, CRC(43507f43) SHA1(a5eb9e142847a338bf18f4b26da7fe5a2807a027) ) #define sc_xcash_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* 95004321 XTRACASH PR1264 */ \ - ROM_LOAD( "95004321.snd", 0x0000, 0x080000, CRC(97682381) SHA1(b1ef910e7b2e3574576fb6583a088c3de61e6019) ) \ - + ROM_LOAD( "95004321.snd", 0x0000, 0x080000, CRC(97682381) SHA1(b1ef910e7b2e3574576fb6583a088c3de61e6019) ) @@ -3221,13 +2726,11 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "matrix", ROMREGION_ERASE00 ) \ ROM_LOAD( "clubtempdot.bin", 0x0000, 0x010000, CRC(283d2d9c) SHA1(5b76a13ad674f8a40c270e5dbc61dac04d411d02) ) /* DM01 */ \ ROM_REGION( 0x400000, "matrixhex", ROMREGION_ERASE00 ) /* can probably be removed, need to verify it matches first tho */ \ - ROM_LOAD( "club-temptation_mtx_(ihex)ss.hex", 0x0000, 0x01d0da, CRC(08ebee96) SHA1(2e87d734c966abab1d4a59c9481ebea161f77286) ) \ - + ROM_LOAD( "club-temptation_mtx_(ihex)ss.hex", 0x0000, 0x01d0da, CRC(08ebee96) SHA1(2e87d734c966abab1d4a59c9481ebea161f77286) ) #define sc_dcrls_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* DCRZYSND */ \ - ROM_LOAD( "95008482.bin", 0x0000, 0x04c048, CRC(e0b13788) SHA1(e364ccedd31e1fe0560312a28ad6d5cfaac5bfaa) ) \ - + ROM_LOAD( "95008482.bin", 0x0000, 0x04c048, CRC(e0b13788) SHA1(e364ccedd31e1fe0560312a28ad6d5cfaac5bfaa) ) #define sc_gcclb_others \ ROM_REGION( 0x400000, "altymz", ROMREGION_ERASE00 ) \ /* original files */ \ @@ -3240,32 +2743,26 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* However the game we have wants the Grand Slam sounds? */ \ ROM_LOAD( "95004169.bin", 0x000000, 0x080000, CRC(d2293b2f) SHA1(e3eed38a15885c5a6d63fc79d95f77c5225e9168) ) \ - ROM_LOAD( "95004170.bin", 0x080000, 0x080000, CRC(1da0db8f) SHA1(b3c37b5e02efe7267556d8603c362298ed55bb88) ) \ - + ROM_LOAD( "95004170.bin", 0x080000, 0x080000, CRC(1da0db8f) SHA1(b3c37b5e02efe7267556d8603c362298ed55bb88) ) /* both 'On The Up' and 'Hyperactive' look for 'HYPE SOUNDS', do they both use this rom? */ #define sc_onup_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* HYPE SOUNDS */ \ - ROM_LOAD( "95008298.bin", 0x0000, 0x100000, CRC(6dcdcbfa) SHA1(1742f54ddd74d7513e8efb8cecfff574263c65df) ) \ - + ROM_LOAD( "95008298.bin", 0x0000, 0x100000, CRC(6dcdcbfa) SHA1(1742f54ddd74d7513e8efb8cecfff574263c65df) ) #define sc_phgcl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1623 CLASS PHAR GOLD SOUNDS11 */ \ - ROM_LOAD( "95008475.bin", 0x0000, 0x100000, CRC(30f77b7e) SHA1(bbb16020f33c8440344670beec8b13dd554be858) ) \ - + ROM_LOAD( "95008475.bin", 0x0000, 0x100000, CRC(30f77b7e) SHA1(bbb16020f33c8440344670beec8b13dd554be858) ) #define sc_clbmn_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR1955 C M MONEYBAGS SOUNDS11 */ \ ROM_LOAD( "95008666.bin", 0x000000, 0x100000, CRC(6dcb4a96) SHA1(844dc67bacb7136a3c0f897a69ac5bcacaa4968a) ) \ - ROM_LOAD( "95008667.bin", 0x100000, 0x100000, CRC(5243784c) SHA1(771248de9fa3446ad6fe1bd35b240ad6ae23f008) ) \ - + ROM_LOAD( "95008667.bin", 0x100000, 0x100000, CRC(5243784c) SHA1(771248de9fa3446ad6fe1bd35b240ad6ae23f008) ) #define sc_mopl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR3408 MPOLY PROP LAD SOUNDS11 */ \ ROM_LOAD( "95009160.bin", 0x000000, 0x100000, CRC(797bf91a) SHA1(e467a07b512bf753e212665367fcca481e27da54) ) \ - ROM_LOAD( "95009161.bin", 0x100000, 0x100000, CRC(5ea75d9c) SHA1(eb6d96b8a5af879b3eff5b5d501ed81e46b1e1af) ) \ - + ROM_LOAD( "95009161.bin", 0x100000, 0x100000, CRC(5ea75d9c) SHA1(eb6d96b8a5af879b3eff5b5d501ed81e46b1e1af) ) #define MAZOOMA_POWERBALL_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* POWERBALL SOUNDS */ \ ROM_LOAD( "95004218", 0x000000, 0x080000, CRC(4e90206c) SHA1(475fe57a4f08b17acaf63f0863a705fd70b910db) ) \ - ROM_LOAD( "95004219", 0x080000, 0x080000, CRC(f7e344a2) SHA1(7f2411373fdd49d7ef3c6990fb3cc1fe93ca3348) ) \ - + ROM_LOAD( "95004219", 0x080000, 0x080000, CRC(f7e344a2) SHA1(7f2411373fdd49d7ef3c6990fb3cc1fe93ca3348) ) /* missing ROMs below */ @@ -3275,31 +2772,27 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890139.bin", 0x0000, 0x5000, CRC(03d69c54) SHA1(9e1e79378874092a19eb31af8d8b5b2422364086) ) \ ROM_LOAD( "95890140.bin", 0x0000, 0x5000, CRC(1f006ce8) SHA1(4ce346e7b72546d5d6d9137a5fa6c449c6da292d) ) \ ROM_LOAD( "95890141.bin", 0x0000, 0x5000, CRC(dc5a4e78) SHA1(31aefb5dcf67eafdd9fc83e086fc00e678f0093a) ) \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_bob_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890312.bin", 0x0000, 0x5000, CRC(9dfc2404) SHA1(c35f4197c0e0cd45b35f70cce166497de385b212) ) \ ROM_LOAD( "95890313.bin", 0x0000, 0x5000, CRC(e86a6030) SHA1(c7fd1ae68aa60c448a31eb9d4103aa0a8c1892d0) ) \ - ROM_LOAD( "95890314.bin", 0x0000, 0x5000, CRC(76d0ac6c) SHA1(83d150737f942abf19a480b06dc09e1063bb0e64) ) \ - + ROM_LOAD( "95890314.bin", 0x0000, 0x5000, CRC(76d0ac6c) SHA1(83d150737f942abf19a480b06dc09e1063bb0e64) ) #define sc_clue_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "clue sounds", 0x0000, 0x100000, NO_DUMP ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890356.bin", 0x0000, 0x5000, CRC(fd78e03f) SHA1(029e2fd7e9cff3793d905d192c889873ad2a0d26) ) \ ROM_LOAD( "95890357.bin", 0x0000, 0x5000, CRC(88eea40b) SHA1(5a730add3f9941dfcbfa5cd8f6a6142d19065482) ) \ - ROM_LOAD( "95890358.bin", 0x0000, 0x5000, CRC(16546857) SHA1(d8b81b3df5e041c83c4f359c487165a6a2d5c513) ) \ - + ROM_LOAD( "95890358.bin", 0x0000, 0x5000, CRC(16546857) SHA1(d8b81b3df5e041c83c4f359c487165a6a2d5c513) ) #define sc_ducks_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890347.bin", 0x0000, 0x5000, CRC(9faa9c11) SHA1(5e2add80ad17a27dd7b5b0a298ea6753b6adca11) ) \ ROM_LOAD( "95890348.bin", 0x0000, 0x5000, CRC(ea3cd825) SHA1(0ecef82b32b0166ef5f8deecd7a85fd52fc66bf8) ) \ - ROM_LOAD( "95890349.bin", 0x0000, 0x5000, CRC(74861479) SHA1(7ba29931336985b96995688afdfe2b83a7602a84) ) \ - + ROM_LOAD( "95890349.bin", 0x0000, 0x5000, CRC(74861479) SHA1(7ba29931336985b96995688afdfe2b83a7602a84) ) #define sc_pp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "pink sounds", 0x0000, 0x100000, NO_DUMP ) \ @@ -3309,364 +2802,262 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_LOAD( "95890382.bin", 0x0000, 0x5000, CRC(c42be215) SHA1(4da4820ee08a102a2a49ce64a49f66c9548b8ab1) ) \ ROM_LOAD( "95890398.bin", 0x0000, 0x5000, CRC(007c15b3) SHA1(8330f7e8d2dc062118016d8f003df48930a5aeb8) ) \ ROM_LOAD( "95890399.bin", 0x0000, 0x5000, CRC(1caae50f) SHA1(1e978f7f4851384cd800ebecd9beeff1a5df8156) ) \ - ROM_LOAD( "95890400.bin", 0x0000, 0x5000, CRC(dff0c79f) SHA1(aae28c245a672417962cd19388e4d5c401708911) ) \ - + ROM_LOAD( "95890400.bin", 0x0000, 0x5000, CRC(dff0c79f) SHA1(aae28c245a672417962cd19388e4d5c401708911) ) #define sc_gcb_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_hdd_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_hyde_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_jiggr_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_jive_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_jbuck_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_jjc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_kkong_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_knok_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_mbags_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_m2m_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_maxcc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_monod_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_mwwcl_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_motor_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_outlw_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_pwrbq_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_pwcrz_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_ibiza_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_quart_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc5tbox_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_rmo_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define PR1918_POTS_OF_GOLD_SOUNDS11 \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pr1918 pots of gold sounds11", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "pr1918 pots of gold sounds11", 0x000000, 0x100000, NO_DUMP ) #define sc_rtclb_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_sf_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_vmnv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95008095_viva_mexico_pr6984", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "95008095_viva_mexico_pr6984", 0x000000, 0x100000, NO_DUMP ) #define sc_abra_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "abra.snd", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "abra.snd", 0x0000, 0x100000, NO_DUMP ) #define sc_broll_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rol sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "rol sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_cashm_german_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cash german sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "cash german sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_frboo_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_supst_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_ufi_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wadzl_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wag_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wldbn_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wthng_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wthnm_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wtc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc4s16_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_bgold_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_cconx_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "mtom sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "mtom sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_ccrus_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cash sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "cash sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_cerup_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cash erruption sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "cash erruption sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_cexpl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "cash explosion sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "cash explosion sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_chand_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pr7108 cash in hand sounds11", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "pr7108 cash in hand sounds11", 0x000000, 0x100000, NO_DUMP ) #define sc_crzwl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "crazy world sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "crazy world sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_cinv_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pr6809 cashinvaders sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "pr6809 cashinvaders sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_crsgc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_crcpt_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_dracp_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_dndpc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_fdice_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_gx3_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_glad_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_hotdg_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_monl_sounds \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "monl sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "monl sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_nunsb_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_pwrpl_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_rssh_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_r2r_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_rollo_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_r66_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_sfts_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_srace_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_s2k_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_splgb_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_spred_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_swywm_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_sumit_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "sumit sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "sumit sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_tsmp_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_tpsht_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc5pompa_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_viper_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - /* 95008474.bin = 95008910.bin sc4hiss Hissing Quid (Qps) (Scorpion 4) */ \ - + /* 95008474.bin = 95008910.bin sc4hiss Hissing Quid (Qps) (Scorpion 4) */ #define sc_srrcl_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_mrrcl_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_ggcas_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_gnc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_adga_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_adgtc_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_adren_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_bigdl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "bigdealsnd", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "bigdealsnd", 0x0000, 0x100000, NO_DUMP ) #define sc_bingb_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_blue_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "brinse sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "brinse sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_cbrun_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_brix_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "brix sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "brix sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_bugs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "pr7109 bugs money sounds11", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "pr7109 bugs money sounds11", 0x0000, 0x100000, NO_DUMP ) #define sc_btiab_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_btrip_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define COROST_TRIPLE_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "corost_triple_sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "corost_triple_sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_clucl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "clucl sounds", 0x000000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "clucl sounds", 0x000000, 0x100000, NO_DUMP ) #define sc_mombc_others \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890597.bin", 0x0000, 0x5000, CRC(0d24f414) SHA1(85912d9e07995ffd6682d1ef65e4d71090b6584f) ) \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_revo_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "rev sounds", 0x0000, 0x100000, NO_DUMP ) \ - + ROM_LOAD( "rev sounds", 0x0000, 0x100000, NO_DUMP ) #define sc_wild_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ \ ROM_REGION( 0x5000, "pics", 0 ) \ ROM_LOAD( "95890339.bin", 0x0000, 0x5000, CRC(e3fbc85c) SHA1(8fc235f53b9359d378f86819e04377e7c102428c) ) \ ROM_LOAD( "95890340.bin", 0x0000, 0x5000, CRC(ff2d38e0) SHA1(3b62d6c6448312f999502c244d483df8a60be77a) ) \ - ROM_LOAD( "95890341.bin", 0x0000, 0x5000, CRC(3c771a70) SHA1(bf47ecdea05757d9636526308f4aeabe3748d307) ) \ - + ROM_LOAD( "95890341.bin", 0x0000, 0x5000, CRC(3c771a70) SHA1(bf47ecdea05757d9636526308f4aeabe3748d307) ) #define sc_fbcrz_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_sdr_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) #define sc_wdw_others \ - ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - + ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* only the parent set wants 'WILD SOUNDS' but not the same as Wet N Wild */ #define sc_nudit_wild_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "wild sounds", 0x000000, 0x080000, NO_DUMP ) \ - + ROM_LOAD( "wild sounds", 0x000000, 0x080000, NO_DUMP ) /* confirmed bad / incomplete dumps */ #define sc_slih_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* missing first half of ROM, has sample table at the end with 'SLIH SOUNDS' */ \ - ROM_LOAD( "s_l_i_ho.snd", 0x0000, 0x080000, BAD_DUMP CRC(13abf434) SHA1(99d7a323c03448827d16bcfb4358c09ab691b500) ) \ - + ROM_LOAD( "s_l_i_ho.snd", 0x0000, 0x080000, BAD_DUMP CRC(13abf434) SHA1(99d7a323c03448827d16bcfb4358c09ab691b500) ) // missing first half of both roms #define sc_stl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6905 SKYS SOUNDS11 */ \ ROM_LOAD( "sk_t_lim.sn1", 0x000000, 0x080000, BAD_DUMP CRC(1b88bf7d) SHA1(76a8453fd2f8375030f69a3a569b45daceb3e4f7) ) \ - ROM_LOAD( "sk_t_lim.sn2", 0x080000, 0x080000, BAD_DUMP CRC(b3ecf658) SHA1(bf4ce85a3662df6dacfa42e3b4f9dfd6bba43b24) ) \ - + ROM_LOAD( "sk_t_lim.sn2", 0x080000, 0x080000, BAD_DUMP CRC(b3ecf658) SHA1(bf4ce85a3662df6dacfa42e3b4f9dfd6bba43b24) ) #define sc_stag_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6915 STAG SOUNDS11 */ \ ROM_LOAD( "95008017.lo", 0x000000, 0x100000, BAD_DUMP CRC(dab74220) SHA1(321f765e1908b65ec9d3e64bb33533d78c9cc58a) ) /* start of rom is blank?! */ \ - ROM_LOAD( "95008018.hi", 0x100000, 0x100000, CRC(ba328f08) SHA1(99880f22c2cac61b32c3e2a574b9b30daefefb3e) ) \ - + ROM_LOAD( "95008018.hi", 0x100000, 0x100000, CRC(ba328f08) SHA1(99880f22c2cac61b32c3e2a574b9b30daefefb3e) ) #define sc_tfclb_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6938 TUTTI FRUTTI SOUNDS11 */ \ ROM_LOAD( "95008043.bin", 0x000000, 0x100000, BAD_DUMP CRC(b168cec4) SHA1(42b891ba918c7063420688c99dc72609801a1987) ) /* start of rom is blank?! */ \ - ROM_LOAD( "95008044.bin", 0x100000, 0x100000, CRC(6074fa77) SHA1(1d4fa88a7ba2b020042ef3681e0f8eb732705d55) ) \ - + ROM_LOAD( "95008044.bin", 0x100000, 0x100000, CRC(6074fa77) SHA1(1d4fa88a7ba2b020042ef3681e0f8eb732705d55) ) #define sc_crzcs_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR6906 CRCS SOUNDS11 */ \ ROM_LOAD( "95008005.lo", 0x00000, 0x100000, BAD_DUMP CRC(0b10db9f) SHA1(e0ea7b4f2dd98ef23ab42ffe7a7892e5327f646e) ) /* start of rom is blank?! */ \ - ROM_LOAD( "95008006.hi", 0x100000, 0x100000, CRC(be2cdfd5) SHA1(87e25d6e26052dca8d79fbda705b2df1c06e2c67) ) \ - + ROM_LOAD( "95008006.hi", 0x100000, 0x100000, CRC(be2cdfd5) SHA1(87e25d6e26052dca8d79fbda705b2df1c06e2c67) ) // I don't think there is a good / complete set of sound roms in here, all the sets we have reject any configuration of this // and the dumps are a mess - we the header says sound table is at 0x001E33FB which would put it in the final (4th) 512kb block, @@ -3681,50 +3072,40 @@ INPUT_PORTS_EXTERN( sc4_base ); /* both halves of this valid sound data? */ \ ROM_LOAD( "95008055.bin", 0x0000, 0x100000, CRC(df9ae6e3) SHA1(5766cb1749aa92c34a76270a641f7a9302cc44d7) ) \ /* first 512kb of this = unique sound data? rest is garbage? */ \ - ROM_LOAD( "95008056.p2", 0x100000, 0x800000, BAD_DUMP CRC(39b1b566) SHA1(937ec27964124b92b75d4b37d09a35585baa68c6) ) \ - \ - + ROM_LOAD( "95008056.p2", 0x100000, 0x800000, BAD_DUMP CRC(39b1b566) SHA1(937ec27964124b92b75d4b37d09a35585baa68c6) ) // header lists sound table as being at 0x001FEDBF indicating this should be 2 * 0x100000 roms? #define sc_alad_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* CAVE SOUNDS */ \ - ROM_LOAD( "95008075.bin", 0x0000, 0x080000, BAD_DUMP CRC(c9306583) SHA1(8bccb9529e7d24be7b4f3ffda0d35780a170be43) ) \ - + ROM_LOAD( "95008075.bin", 0x0000, 0x080000, BAD_DUMP CRC(c9306583) SHA1(8bccb9529e7d24be7b4f3ffda0d35780a170be43) ) /* header says sound table is at 0x0FF65F so we're either missing a ROM or this is half size */ #define sc_ufg_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004167.bin", 0x0000, 0x080000, BAD_DUMP CRC(9dcd31cc) SHA1(2ce9e167debbc2315b4be964116fdc35e19b6046) ) \ - + ROM_LOAD( "95004167.bin", 0x0000, 0x080000, BAD_DUMP CRC(9dcd31cc) SHA1(2ce9e167debbc2315b4be964116fdc35e19b6046) ) /* header says sound table is at 0x0FE876 so we're either missing a ROM or this is half size */ #define sc_ttp_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004148.bin", 0x0000, 0x080000, BAD_DUMP CRC(6b352d5b) SHA1(b32f08828aad1c8cf0281faa387c9a1536fbd382) ) \ - + ROM_LOAD( "95004148.bin", 0x0000, 0x080000, BAD_DUMP CRC(6b352d5b) SHA1(b32f08828aad1c8cf0281faa387c9a1536fbd382) ) /* header says sound table is at 0x0FE7A6 so we're either missing a ROM or this is half size */ #define sc_lions_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ - ROM_LOAD( "95004142.bin", 0x0000, 0x080000, BAD_DUMP CRC(aee399f7) SHA1(54c9683f2f3159122ef35855fe19380f1a2771ca) ) \ - + ROM_LOAD( "95004142.bin", 0x0000, 0x080000, BAD_DUMP CRC(aee399f7) SHA1(54c9683f2f3159122ef35855fe19380f1a2771ca) ) /* header says sound table is at 0x1F7D58 so we're either missing a ROM or this is half size */ #define sc_cyccl_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* CLCC SOUNDS */ \ - ROM_LOAD( "95008310.bin", 0x0000, 0x100000, BAD_DUMP CRC(4dddf82d) SHA1(4bab8cdc5f6bf59c3686dfd01f2f96858f776df3) ) \ - + ROM_LOAD( "95008310.bin", 0x0000, 0x100000, BAD_DUMP CRC(4dddf82d) SHA1(4bab8cdc5f6bf59c3686dfd01f2f96858f776df3) ) /* header says sound table is at 0x1E8460 so we're either missing a ROM or this is half size */ #define sc_cyc_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) /* PR2058 COUNT Y CASH SOUNDS11 */ \ - ROM_LOAD( "95008249.bin", 0x0000, 0x100000, BAD_DUMP CRC(e8eac90a) SHA1(f79dc6912a8fbeb12c577c402d84ef4780bf4333) ) \ - + ROM_LOAD( "95008249.bin", 0x0000, 0x100000, BAD_DUMP CRC(e8eac90a) SHA1(f79dc6912a8fbeb12c577c402d84ef4780bf4333) ) /* wrong hardware below */ #define QPS_GOLDENPALCE_SOUNDS \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* Golden Palace (QPS) No Header? looks like a UPD rom instead */ \ - ROM_LOAD( "61000120.bin", 0x0000, 0x080000, CRC(a2cdc045) SHA1(5f2534683f2399e2fe0e8686be0f2e42e1b04a74) ) \ - + ROM_LOAD( "61000120.bin", 0x0000, 0x080000, CRC(a2cdc045) SHA1(5f2534683f2399e2fe0e8686be0f2e42e1b04a74) ) #define sc_casry_others \ ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ /* not for either of these games? */ \ - ROM_LOAD( "casroysnd.bin", 0x00000, 0x80000, CRC(cf1d4b59) SHA1(1b2bc74c6fcc43197a6f295bc34554da01f7b517) ) \ - + ROM_LOAD( "casroysnd.bin", 0x00000, 0x80000, CRC(cf1d4b59) SHA1(1b2bc74c6fcc43197a6f295bc34554da01f7b517) ) diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index 64fb6d26f08..2d12bb11abc 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -90,7 +90,6 @@ class dec0_automat_state : public dec0_state public: dec0_automat_state(const machine_config &mconfig, device_type type, const char *tag) : dec0_state(mconfig, type, tag) { - } UINT8 m_automat_adpcm_byte; diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h index 9b6b1e480c9..5859b2cced4 100644 --- a/src/mame/includes/gottlieb.h +++ b/src/mame/includes/gottlieb.h @@ -71,19 +71,15 @@ extern const device_type GOTTLIEB_SOUND_REV2; //************************************************************************** #define MCFG_GOTTLIEB_SOUND_R1_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV1, 0) \ - + MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV1, 0) #define MCFG_GOTTLIEB_SOUND_R1_ADD_VOTRAX(_tag) \ - MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) \ - + MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) #define MCFG_GOTTLIEB_SOUND_R2_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV2, 0) \ - + MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV2, 0) #define MCFG_GOTTLIEB_SOUND_R2_ADD_COBRAM3(_tag) \ MCFG_DEVICE_ADD(_tag, GOTTLIEB_SOUND_REV2, 0) \ - gottlieb_sound_r2_device::static_enable_cobram3_mods(*device); \ - + gottlieb_sound_r2_device::static_enable_cobram3_mods(*device); //************************************************************************** diff --git a/src/mame/includes/iremipt.h b/src/mame/includes/iremipt.h index bd41fa68445..b530a1db1a3 100644 --- a/src/mame/includes/iremipt.h +++ b/src/mame/includes/iremipt.h @@ -65,8 +65,7 @@ PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START3 ) /* If common slots, Coin3 if separate */ \ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_COIN3 ) \ PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) \ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) \ - + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) #define IREM_INPUT_PLAYER_4 \ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(4) \ PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(4) \ @@ -86,8 +85,7 @@ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE1 ) \ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) \ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) \ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Actually vblank, handled above */ \ - + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Actually vblank, handled above */ /**************************** Coinage Dip Swicthes ****************************/ diff --git a/src/mame/includes/konamipt.h b/src/mame/includes/konamipt.h index 409f5622754..5145b882643 100644 --- a/src/mame/includes/konamipt.h +++ b/src/mame/includes/konamipt.h @@ -276,8 +276,7 @@ because they just need a few lines of code */ KONAMI8_SYSTEM_10 \ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) \ - + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /**************************** Coinage Dip Swicthes ****************************/ /* Konami games from 80s-90s basically use only two kind of coinage dips. The only diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h index 31c7438cd77..348d45f7839 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -43,7 +43,6 @@ public: : driver_device(mconfig, type, tag), m_vfd(*this, "vfd") { - m_NMIENABLE = 0; } diff --git a/src/mame/includes/namcoic.h b/src/mame/includes/namcoic.h index ab090fddca2..637c0cb8ba1 100644 --- a/src/mame/includes/namcoic.h +++ b/src/mame/includes/namcoic.h @@ -99,8 +99,7 @@ C102 - Controls CPU access to ROZ Memory Area. //************************************************************************** #define MCFG_NAMCO_C45_ROAD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, NAMCO_C45_ROAD, 0) \ - + MCFG_DEVICE_ADD(_tag, NAMCO_C45_ROAD, 0) //************************************************************************** diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 8bd0e21a6a1..0f76168689b 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -128,7 +128,6 @@ class pgm_asic3_state : public pgm_state public: pgm_asic3_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag) { - } // ASIC 3 (oriental legends protection) @@ -152,7 +151,6 @@ public: pgm_arm_type1_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_arm7_shareram(*this, "arm7_shareram") { - m_curslots = 0; m_puzzli_54_trigger = 0; } @@ -218,7 +216,6 @@ public: : pgm_state(mconfig, type, tag), m_arm_ram(*this, "arm_ram"), m_arm7_shareram(*this, "arm7_shareram") { - } // kov2 UINT32 m_kov2_latchdata_68k_w; @@ -247,7 +244,6 @@ public: pgm_arm_type3_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_arm_ram(*this, "arm_ram") { - } // svg int m_svg_ram_sel; @@ -276,7 +272,6 @@ public: pgm_022_025_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_sharedprotram(*this, "sharedprotram") { - } int m_kb_cmd; int m_kb_reg; @@ -298,7 +293,6 @@ public: pgm_028_025_state(const machine_config &mconfig, device_type type, const char *tag) : pgm_state(mconfig, type, tag), m_sharedprotram(*this, "sharedprotram") { - } // olds int m_kb_cmd; diff --git a/src/mame/includes/segaipt.h b/src/mame/includes/segaipt.h index 064e51cda65..6ba705ee3a1 100644 --- a/src/mame/includes/segaipt.h +++ b/src/mame/includes/segaipt.h @@ -92,8 +92,7 @@ PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) \ PORT_DIPSETTING( 0x50, "2 Coins/1 Credit, 5/3, 6/4" ) \ PORT_DIPSETTING( 0x40, "2 Coins/1 Credit, 4/3" ) \ - PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) \ - + PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) #define SEGA_COINAGE_B_PART_L \ PORT_DIPSETTING( 0x30, "1 Coin/1 Credit, 5/6" ) \ PORT_DIPSETTING( 0x20, "1 Coin/1 Credit, 4/5" ) \ diff --git a/src/mame/machine/3do.c b/src/mame/machine/3do.c index 437bad948af..ad5703e1530 100644 --- a/src/mame/machine/3do.c +++ b/src/mame/machine/3do.c @@ -452,7 +452,6 @@ READ32_MEMBER(_3do_state::_3do_madam_r){ WRITE32_MEMBER(_3do_state::_3do_madam_w){ - if(offset == 0) { if(data == 0x0a) diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c index 1203d467e72..0108dfee707 100644 --- a/src/mame/machine/ajax.c +++ b/src/mame/machine/ajax.c @@ -134,7 +134,6 @@ READ8_MEMBER(ajax_state::ajax_ls138_f10_r) WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) { - switch ((offset & 0x01c0) >> 6) { case 0x00: /* NSFIRQ + AFR */ @@ -180,7 +179,6 @@ WRITE8_MEMBER(ajax_state::ajax_ls138_f10_w) WRITE8_MEMBER(ajax_state::ajax_bankswitch_2_w) { - /* enable char ROM reading through the video RAM */ k052109_set_rmrd_line(m_k052109, (data & 0x40) ? ASSERT_LINE : CLEAR_LINE); @@ -220,14 +218,12 @@ void ajax_state::machine_start() void ajax_state::machine_reset() { - m_priority = 0; m_firq_enable = 0; } INTERRUPT_GEN_MEMBER(ajax_state::ajax_interrupt) { - if (k051960_is_irq_enabled(m_k051960)) device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE); } diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c index 1df43f76bf7..c59e0dd4df9 100644 --- a/src/mame/machine/amiga.c +++ b/src/mame/machine/amiga.c @@ -285,7 +285,6 @@ static void amiga_m68k_reset(device_t *device) MACHINE_RESET_MEMBER(amiga_state,amiga) { - /* set m68k reset function */ m68k_set_reset_callback(machine().device("maincpu"), amiga_m68k_reset); @@ -309,7 +308,6 @@ MACHINE_RESET_MEMBER(amiga_state,amiga) TIMER_CALLBACK_MEMBER(amiga_state::scanline_callback) { - int scanline = param; device_t *cia_0 = machine().device("cia_0"); device_t *cia_1 = machine().device("cia_1"); @@ -402,7 +400,6 @@ static void update_irqs(running_machine &machine) TIMER_CALLBACK_MEMBER(amiga_state::amiga_irq_proc) { - update_irqs(machine()); m_irq_timer->reset( ); } diff --git a/src/mame/machine/arkanoid.c b/src/mame/machine/arkanoid.c index 7d26841f697..7ea84fe6086 100644 --- a/src/mame/machine/arkanoid.c +++ b/src/mame/machine/arkanoid.c @@ -17,7 +17,6 @@ READ8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_r) { - /* return the last value the 68705 wrote, and mark that we've read it */ m_m68705write = 0; return m_toz80; @@ -25,7 +24,6 @@ READ8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_r) TIMER_CALLBACK_MEMBER(arkanoid_state::test) { - m_z80write = 1; m_fromz80 = param; } @@ -39,19 +37,16 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_Z80_mcu_w) READ8_MEMBER(arkanoid_state::arkanoid_68705_port_a_r) { - return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); } WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_a_w) { - m_port_a_out = data; } WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_a_w) { - m_ddr_a = data; } @@ -73,7 +68,6 @@ READ8_MEMBER(arkanoid_state::arkanoid_68705_port_c_r) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_c_w) { - if ((m_ddr_c & 0x04) && (~data & 0x04) && (m_port_c_out & 0x04)) { /* return the last value the Z80 wrote */ @@ -92,7 +86,6 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_68705_port_c_w) WRITE8_MEMBER(arkanoid_state::arkanoid_68705_ddr_c_w) { - m_ddr_c = data; } diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index 2a193a2ea72..3464c39b254 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -26,7 +26,6 @@ static void pokey_reset(running_machine &machine); void atari_interrupt_cb(pokey_device *device, int mask) { - if (VERBOSE_POKEY) { if (mask & 0x80) diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c index 8064e3445f0..d7872c9d751 100644 --- a/src/mame/machine/atarifb.c +++ b/src/mame/machine/atarifb.c @@ -183,7 +183,6 @@ READ8_MEMBER(atarifb_state::atarifb_in0_r) READ8_MEMBER(atarifb_state::atarifb_in2_r) { - if ((m_CTRLD & 0x20) == 0x00) { return ioport("IN1")->read(); @@ -213,7 +212,6 @@ READ8_MEMBER(atarifb_state::atarifb_in2_r) READ8_MEMBER(atarifb_state::atarifb4_in0_r) { - /* LD1 and LD2 low, return sign bits */ if ((m_CTRLD & 0x60) == 0x00) { @@ -280,7 +278,6 @@ READ8_MEMBER(atarifb_state::atarifb4_in0_r) READ8_MEMBER(atarifb_state::atarifb4_in2_r) { - if ((m_CTRLD & 0x40) == 0x00) { return ioport("IN1")->read(); diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index 30770942436..11a44736d8c 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -456,7 +456,6 @@ READ8_MEMBER(balsente_state::balsente_m6850_r) TIMER_CALLBACK_MEMBER(balsente_state::m6850_data_ready_callback) { - /* set the output data byte and indicate that we're ready to go */ m_m6850_output = param; m_m6850_data_ready = 1; @@ -466,7 +465,6 @@ TIMER_CALLBACK_MEMBER(balsente_state::m6850_data_ready_callback) TIMER_CALLBACK_MEMBER(balsente_state::m6850_w_callback) { - /* indicate that the transmit buffer is no longer empty and update the I/O state */ m_m6850_status &= ~0x02; m6850_update_io(machine()); @@ -479,7 +477,6 @@ TIMER_CALLBACK_MEMBER(balsente_state::m6850_w_callback) WRITE8_MEMBER(balsente_state::balsente_m6850_w) { - /* control register is at offset 0 */ if (offset == 0) { @@ -528,7 +525,6 @@ READ8_MEMBER(balsente_state::balsente_m6850_sound_r) WRITE8_MEMBER(balsente_state::balsente_m6850_sound_w) { - /* control register is at offset 0 */ if (offset == 0) m_m6850_sound_control = data; @@ -602,7 +598,6 @@ TIMER_CALLBACK_MEMBER(balsente_state::adc_finished) READ8_MEMBER(balsente_state::balsente_adc_data_r) { - /* just return the last value read */ return m_adc_value; } @@ -925,7 +920,6 @@ void balsente_state::update_counter_0_timer() READ8_MEMBER(balsente_state::balsente_counter_state_r) { - /* bit D0 is the inverse of the flip-flop state */ int result = !m_counter_0_ff; @@ -1049,7 +1043,6 @@ WRITE8_MEMBER(balsente_state::balsente_chip_select_w) WRITE8_MEMBER(balsente_state::balsente_dac_data_w) { - /* LSB or MSB? */ if (offset & 1) m_dac_value = (m_dac_value & 0xfc0) | ((data >> 2) & 0x03f); @@ -1087,7 +1080,6 @@ CUSTOM_INPUT_MEMBER(balsente_state::nstocker_bits_r) WRITE8_MEMBER(balsente_state::spiker_expand_w) { - /* offset 0 is the bit pattern */ if (offset == 0) m_spiker_expand_bits = data; diff --git a/src/mame/machine/bfm_bd1.c b/src/mame/machine/bfm_bd1.c index ec96687d69a..f95d34d1367 100644 --- a/src/mame/machine/bfm_bd1.c +++ b/src/mame/machine/bfm_bd1.c @@ -259,7 +259,6 @@ int bfm_bd1_t::write_char(int data) } else { - if(data < 0x80)//characters { if (data > 0x3F) @@ -420,7 +419,6 @@ void bfm_bd1_t::setdata(int segdata, int data) if ( move ) { - int mode = m_display_mode; m_pcursor_pos = m_cursor_pos; diff --git a/src/mame/machine/bfm_bd1.h b/src/mame/machine/bfm_bd1.h index b32831dde3c..7542dedfeef 100644 --- a/src/mame/machine/bfm_bd1.h +++ b/src/mame/machine/bfm_bd1.h @@ -4,11 +4,9 @@ #define MCFG_BFMBD1_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, BFM_BD1,60)\ - MCFG_BD1_PORT(_val) \ - + MCFG_BD1_PORT(_val) #define MCFG_BD1_PORT(_val) \ - bfm_bd1_t::static_set_value(*device, _val); \ - + bfm_bd1_t::static_set_value(*device, _val); #define MCFG_BFMBD1_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mame/machine/bfm_bda.c b/src/mame/machine/bfm_bda.c index ce71de1d1bd..ad439781d3e 100644 --- a/src/mame/machine/bfm_bda.c +++ b/src/mame/machine/bfm_bda.c @@ -245,10 +245,8 @@ int bfm_bda_t::write_char(int data) } else { - if(data < 0x80)//characters { - if (m_blank_flag || m_flash_flag) { if (m_blank_flag) @@ -429,7 +427,6 @@ void bfm_bda_t::setdata(int segdata, int data) if ( move ) { - int mode = m_display_mode; m_pcursor_pos = m_cursor_pos; diff --git a/src/mame/machine/bfm_bda.h b/src/mame/machine/bfm_bda.h index 77db7028272..07da9cb584a 100644 --- a/src/mame/machine/bfm_bda.h +++ b/src/mame/machine/bfm_bda.h @@ -4,11 +4,9 @@ #define MCFG_BFMBDA_ADD(_tag,_val) \ MCFG_DEVICE_ADD(_tag, BFM_BDA,60)\ - MCFG_BDA_PORT(_val) \ - + MCFG_BDA_PORT(_val) #define MCFG_BDA_PORT(_val) \ - bfm_bda_t::static_set_value(*device, _val); \ - + bfm_bda_t::static_set_value(*device, _val); #define MCFG_BFMBDA_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c index 78cff3a92f0..1f025b61294 100644 --- a/src/mame/machine/bigevglf.c +++ b/src/mame/machine/bigevglf.c @@ -33,7 +33,6 @@ READ8_MEMBER(bigevglf_state::bigevglf_68705_port_b_r) WRITE8_MEMBER(bigevglf_state::bigevglf_68705_port_b_w) { - if ((m_ddr_b & 0x02) && (~m_port_b_out & 0x02) && (data & 0x02)) /* positive going transition of the clock */ { m_mcu->execute().set_input_line(0, CLEAR_LINE); @@ -56,7 +55,6 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_68705_ddr_b_w) READ8_MEMBER(bigevglf_state::bigevglf_68705_port_c_r) { - m_port_c_in = 0; if (m_main_sent) m_port_c_in |= 0x01; @@ -78,7 +76,6 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_68705_ddr_c_w) WRITE8_MEMBER(bigevglf_state::bigevglf_mcu_w) { - m_port_a_in = data; m_main_sent = 1; m_mcu->execute().set_input_line(0, ASSERT_LINE); @@ -87,7 +84,6 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_mcu_w) READ8_MEMBER(bigevglf_state::bigevglf_mcu_r) { - m_mcu_sent = 1; return m_from_mcu; } diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c index e94526fc8a6..c6d9ab97b77 100644 --- a/src/mame/machine/bublbobl.c +++ b/src/mame/machine/bublbobl.c @@ -14,7 +14,6 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_bankswitch_w) { - /* bits 0-2 select ROM bank */ membank("bank1")->set_entry((data ^ 4) & 7); @@ -75,7 +74,6 @@ static const UINT8 tokio_prot_data[] = READ8_MEMBER(bublbobl_state::tokio_mcu_r) { - m_tokio_prot_count %= sizeof(tokio_prot_data); return tokio_prot_data[m_tokio_prot_count++]; } @@ -88,7 +86,6 @@ READ8_MEMBER(bublbobl_state::tokiob_mcu_r) TIMER_CALLBACK_MEMBER(bublbobl_state::nmi_callback) { - if (m_sound_nmi_enable) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); else @@ -108,7 +105,6 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_sh_nmi_disable_w) WRITE8_MEMBER(bublbobl_state::bublbobl_sh_nmi_enable_w) { - m_sound_nmi_enable = 1; if (m_pending_nmi) { @@ -182,7 +178,6 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_w) READ8_MEMBER(bublbobl_state::bublbobl_mcu_port1_r) { - //logerror("%04x: 6801U4 port 1 read\n", space.device().safe_pc()); m_port1_in = ioport("IN0")->read(); return (m_port1_out & m_ddr1) | (m_port1_in & ~m_ddr1); @@ -213,7 +208,6 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w) READ8_MEMBER(bublbobl_state::bublbobl_mcu_port2_r) { - //logerror("%04x: 6801U4 port 2 read\n", space.device().safe_pc()); return (m_port2_out & m_ddr2) | (m_port2_in & ~m_ddr2); } diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h index a82a404865e..ea7b9bb14d0 100644 --- a/src/mame/machine/cdicdic.h +++ b/src/mame/machine/cdicdic.h @@ -34,11 +34,9 @@ TODO: //************************************************************************** #define MCFG_CDICDIC_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MACHINE_CDICDIC, 0) \ - + MCFG_DEVICE_ADD(_tag, MACHINE_CDICDIC, 0) #define MCFG_CDICDIC_REPLACE(_tag) \ - MCFG_DEVICE_REPLACE(_tag, MACHINE_CDICDIC, 0) \ - + MCFG_DEVICE_REPLACE(_tag, MACHINE_CDICDIC, 0) //************************************************************************** diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h index f07b6ead17b..aa32bc107db 100644 --- a/src/mame/machine/cdislave.h +++ b/src/mame/machine/cdislave.h @@ -31,11 +31,9 @@ TODO: //************************************************************************** #define MCFG_CDISLAVE_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, MACHINE_CDISLAVE, 0) \ - + MCFG_DEVICE_ADD(_tag, MACHINE_CDISLAVE, 0) #define MCFG_CDISLAVE_REPLACE(_tag) \ - MCFG_DEVICE_REPLACE(_tag, MACHINE_CDISLAVE, 0) \ - + MCFG_DEVICE_REPLACE(_tag, MACHINE_CDISLAVE, 0) //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index 6e8a2e8a3e4..90ef5cf9a70 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -78,7 +78,6 @@ static const char *const sysctrl_names[] = TIMER_CALLBACK_MEMBER(dc_state::aica_dma_irq) { - m_wave_dma.start = g2bus_regs[SB_ADST] = 0; dc_sysctrl_regs[SB_ISTNRM] |= IST_DMA_AICA; dc_update_interrupt_status(machine()); @@ -86,7 +85,6 @@ TIMER_CALLBACK_MEMBER(dc_state::aica_dma_irq) TIMER_CALLBACK_MEMBER(dc_state::pvr_dma_irq) { - m_pvr_dma.start = pvrctrl_regs[SB_PDST] = 0; dc_sysctrl_regs[SB_ISTNRM] |= IST_DMA_PVR; dc_update_interrupt_status(machine()); @@ -110,7 +108,6 @@ void dc_maple_irq(running_machine &machine) TIMER_CALLBACK_MEMBER(dc_state::ch2_dma_irq) { - dc_sysctrl_regs[SB_C2DLEN]=0; dc_sysctrl_regs[SB_C2DST]=0; dc_sysctrl_regs[SB_ISTNRM] |= IST_DMA_CH2; @@ -119,7 +116,6 @@ TIMER_CALLBACK_MEMBER(dc_state::ch2_dma_irq) TIMER_CALLBACK_MEMBER(dc_state::yuv_fifo_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= IST_EOXFER_YUV; dc_update_interrupt_status(machine()); } @@ -735,7 +731,6 @@ WRITE64_HANDLER( dc_rtc_w ) TIMER_CALLBACK_MEMBER(dc_state::dc_rtc_increment) { - dc_rtcregister[RTC2] = (dc_rtcregister[RTC2] + 1) & 0xFFFF; if (dc_rtcregister[RTC2] == 0) dc_rtcregister[RTC1] = (dc_rtcregister[RTC1] + 1) & 0xFFFF; @@ -784,7 +779,6 @@ static void rtc_initial_setup(running_machine &machine) void dc_state::machine_start() { - rtc_initial_setup(machine()); // save states @@ -817,7 +811,6 @@ void dc_state::machine_start() void dc_state::machine_reset() { - /* halt the ARM7 */ machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index f6bd92e368a..ebb4e161f40 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -133,7 +133,6 @@ WRITE8_MEMBER(decocass_state::decocass_nmi_reset_w) WRITE8_MEMBER(decocass_state::decocass_quadrature_decoder_reset_w) { - /* just latch the analog controls here */ m_quadrature_decoder[0] = ioport("AN0")->read(); m_quadrature_decoder[1] = ioport("AN1")->read(); diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c index 7f9276794e8..ec092494c2e 100644 --- a/src/mame/machine/flstory.c +++ b/src/mame/machine/flstory.c @@ -22,14 +22,12 @@ READ8_MEMBER(flstory_state::flstory_68705_port_a_r) { - //logerror("%04x: 68705 port A read %02x\n", space.device().safe_pc(), m_port_a_in); return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); } WRITE8_MEMBER(flstory_state::flstory_68705_port_a_w) { - //logerror("%04x: 68705 port A write %02x\n", space.device().safe_pc(), data); m_port_a_out = data; } @@ -85,7 +83,6 @@ WRITE8_MEMBER(flstory_state::flstory_68705_ddr_b_w) READ8_MEMBER(flstory_state::flstory_68705_port_c_r) { - m_port_c_in = 0; if (m_main_sent) m_port_c_in |= 0x01; @@ -110,7 +107,6 @@ WRITE8_MEMBER(flstory_state::flstory_68705_ddr_c_w) WRITE8_MEMBER(flstory_state::flstory_mcu_w) { - logerror("%04x: mcu_w %02x\n", space.device().safe_pc(), data); m_from_main = data; m_main_sent = 1; @@ -119,7 +115,6 @@ WRITE8_MEMBER(flstory_state::flstory_mcu_w) READ8_MEMBER(flstory_state::flstory_mcu_r) { - logerror("%04x: mcu_r %02x\n",space.device().safe_pc(), m_from_mcu); m_mcu_sent = 0; return m_from_mcu; diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c index a041f97be5a..637a3c955bd 100644 --- a/src/mame/machine/irobot.c +++ b/src/mame/machine/irobot.c @@ -193,13 +193,11 @@ void irobot_state::machine_reset() WRITE8_MEMBER(irobot_state::irobot_control_w) { - m_control_num = offset & 0x03; } READ8_MEMBER(irobot_state::irobot_control_r) { - if (m_control_num == 0) return ioport("AN0")->read(); else if (m_control_num == 1) diff --git a/src/mame/machine/kaneko_calc3.c b/src/mame/machine/kaneko_calc3.c index 0eac6d18bbf..f825d030ea9 100644 --- a/src/mame/machine/kaneko_calc3.c +++ b/src/mame/machine/kaneko_calc3.c @@ -1386,7 +1386,6 @@ int kaneko_calc3_device::calc3_decompress_table(running_machine& machine, int ta } else { - UINT8 inlinet = datarom[inline_table_base + (i%inline_table_size)]; dat = datarom[offset+i]; @@ -1641,7 +1640,6 @@ void kaneko_calc3_device::calc3_mcu_run(running_machine &machine) /* 0xff is a special 'init' command */ if (mcu_command == 0xff) { - // clear old command (handshake to main cpu) m_calc3_mcuram[(calc3.mcu_command_offset>>1)+0] = 0x0000; diff --git a/src/mame/machine/kaneko_hit.c b/src/mame/machine/kaneko_hit.c index 93f77a8d66a..3c21e7dbac8 100644 --- a/src/mame/machine/kaneko_hit.c +++ b/src/mame/machine/kaneko_hit.c @@ -107,7 +107,6 @@ void kaneko_hit_device::device_start() void kaneko_hit_device::device_reset() { - } diff --git a/src/mame/machine/kaneko_toybox.c b/src/mame/machine/kaneko_toybox.c index eaf41da50c4..3303e4103dd 100644 --- a/src/mame/machine/kaneko_toybox.c +++ b/src/mame/machine/kaneko_toybox.c @@ -113,7 +113,6 @@ WRITE16_MEMBER(kaneko_toybox_device::toybox_mcu_ram_w) // not sure if it's all 100% endian safe void kaneko_toybox_device::toxboy_decrypt_rom(running_machine& machine) { - UINT8 *src = (UINT8 *)machine.root_device().memregion(":mcudata" )->base(); int i; diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c index 8829af2c2ad..1ab2ea42ba3 100644 --- a/src/mame/machine/konamigx.c +++ b/src/mame/machine/konamigx.c @@ -236,7 +236,6 @@ WRITE16_MEMBER(konamigx_state::K053990_martchmp_word_w) void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode) // (WARNING: assumed big endianess) { - // hand-filled but should be close static const UINT8 ztable[7][8] = { @@ -290,7 +289,6 @@ static const UINT8 ptable[7][8] = } else { - #define EXTRACT_ODD \ if((data1=obj[0])&0x8000) \ { \ diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c index 33130910ec6..37761cbbb61 100644 --- a/src/mame/machine/lkage.c +++ b/src/mame/machine/lkage.c @@ -22,14 +22,12 @@ READ8_MEMBER(lkage_state::lkage_68705_port_a_r) { - //logerror("%04x: 68705 port A read %02x\n", space.device().safe_pc(), m_port_a_in); return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); } WRITE8_MEMBER(lkage_state::lkage_68705_port_a_w) { - //logerror("%04x: 68705 port A write %02x\n", space.device().safe_pc(), data); m_port_a_out = data; } @@ -57,7 +55,6 @@ READ8_MEMBER(lkage_state::lkage_68705_port_b_r) WRITE8_MEMBER(lkage_state::lkage_68705_port_b_w) { - //logerror("%04x: 68705 port B write %02x\n", space.device().safe_pc(), data); if ((m_ddr_b & 0x02) && (~data & 0x02) && (m_port_b_out & 0x02)) @@ -89,7 +86,6 @@ WRITE8_MEMBER(lkage_state::lkage_68705_ddr_b_w) READ8_MEMBER(lkage_state::lkage_68705_port_c_r) { - m_port_c_in = 0; if (m_main_sent) m_port_c_in |= 0x01; @@ -102,7 +98,6 @@ READ8_MEMBER(lkage_state::lkage_68705_port_c_r) WRITE8_MEMBER(lkage_state::lkage_68705_port_c_w) { - logerror("%04x: 68705 port C write %02x\n", space.device().safe_pc(), data); m_port_c_out = data; } @@ -115,7 +110,6 @@ WRITE8_MEMBER(lkage_state::lkage_68705_ddr_c_w) WRITE8_MEMBER(lkage_state::lkage_mcu_w) { - logerror("%04x: mcu_w %02x\n", space.device().safe_pc(), data); m_from_main = data; m_main_sent = 1; @@ -124,7 +118,6 @@ WRITE8_MEMBER(lkage_state::lkage_mcu_w) READ8_MEMBER(lkage_state::lkage_mcu_r) { - logerror("%04x: mcu_r %02x\n", space.device().safe_pc(), m_from_mcu); m_mcu_sent = 0; return m_from_mcu; diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c index cc9d8ecce57..6a03fc1ce75 100644 --- a/src/mame/machine/lsasquad.c +++ b/src/mame/machine/lsasquad.c @@ -10,7 +10,6 @@ TIMER_CALLBACK_MEMBER(lsasquad_state::nmi_callback) { - if (m_sound_nmi_enable) m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); else @@ -24,7 +23,6 @@ WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_disable_w) WRITE8_MEMBER(lsasquad_state::lsasquad_sh_nmi_enable_w) { - m_sound_nmi_enable = 1; if (m_pending_nmi) { @@ -65,7 +63,6 @@ READ8_MEMBER(lsasquad_state::lsasquad_sound_result_r) READ8_MEMBER(lsasquad_state::lsasquad_sound_status_r) { - /* bit 0: message pending for sound cpu */ /* bit 1: message pending for main cpu */ return m_sound_pending; @@ -82,7 +79,6 @@ READ8_MEMBER(lsasquad_state::daikaiju_sh_sound_command_r) READ8_MEMBER(lsasquad_state::daikaiju_sound_status_r) { - /* bit 0: message pending for sound cpu */ /* bit 1: message pending for main cpu */ return m_sound_pending ^ 3; @@ -99,14 +95,12 @@ READ8_MEMBER(lsasquad_state::daikaiju_sound_status_r) READ8_MEMBER(lsasquad_state::lsasquad_68705_port_a_r) { - //logerror("%04x: 68705 port A read %02x\n", space.device().safe_pc(), m_port_a_in); return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); } WRITE8_MEMBER(lsasquad_state::lsasquad_68705_port_a_w) { - //logerror("%04x: 68705 port A write %02x\n", space.device().safe_pc(), data); m_port_a_out = data; } @@ -134,7 +128,6 @@ READ8_MEMBER(lsasquad_state::lsasquad_68705_port_b_r) WRITE8_MEMBER(lsasquad_state::lsasquad_68705_port_b_w) { - //logerror("%04x: 68705 port B write %02x\n", space.device().safe_pc(), data); if ((m_ddr_b & 0x02) && (~data & 0x02) && (m_port_b_out & 0x02)) @@ -163,7 +156,6 @@ WRITE8_MEMBER(lsasquad_state::lsasquad_68705_ddr_b_w) WRITE8_MEMBER(lsasquad_state::lsasquad_mcu_w) { - //logerror("%04x: mcu_w %02x\n", space.device().safe_pc(), data); m_from_main = data; m_main_sent = 1; @@ -172,7 +164,6 @@ WRITE8_MEMBER(lsasquad_state::lsasquad_mcu_w) READ8_MEMBER(lsasquad_state::lsasquad_mcu_r) { - //logerror("%04x: mcu_r %02x\n", space.device().safe_pc(), m_from_mcu); m_mcu_sent = 0; return m_from_mcu; diff --git a/src/mame/machine/md_cart.c b/src/mame/machine/md_cart.c index b908188a54b..ba90676b309 100644 --- a/src/mame/machine/md_cart.c +++ b/src/mame/machine/md_cart.c @@ -256,7 +256,6 @@ static READ16_HANDLER( l3alt_prot_r ) switch (offset) { - case 2: switch (state->m_md_cart.l3alt_pcmd) @@ -1841,7 +1840,6 @@ static int megadrive_load_nonlist(device_image_interface &image) memcpy(tmpROMnew, ROM + 0x2000, length); for (ptr = 0; ptr < length; ptr += 2) { - ROM[ptr] = secondhalf[ptr >> 1]; ROM[ptr + 1] = tmpROMnew[ptr >> 1]; } diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c index 53ed907429a..54d8a72d962 100644 --- a/src/mame/machine/mega32x.c +++ b/src/mame/machine/mega32x.c @@ -224,19 +224,16 @@ sega_32x_device::sega_32x_device(const machine_config &mconfig, const char *tag, m_lch_pwm(*this, "lch_pwm"), m_rch_pwm(*this, "rch_pwm") { - } sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_NTSC) { - } sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_PAL) { - } TIMER_CALLBACK( _32x_pwm_callback ); @@ -370,7 +367,6 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15106_w ) if (m_a15106_reg & 0x1) /* NBA Jam TE relies on this */ { - // install the game rom in the normal 0x000000-0x03fffff space used by the genesis - this allows VDP DMA operations to work as they have to be from this area or RAM // it should also UNMAP the banked rom area... space.install_rom(0x0000100, 0x03fffff, space.machine().root_device().memregion("gamecart")->base() + 0x100); @@ -889,7 +885,6 @@ READ16_MEMBER( sega_32x_device::_32x_pwm_r ) WRITE16_MEMBER( sega_32x_device::_32x_pwm_w ) { - switch(offset) { case 0x00/2: @@ -1080,7 +1075,6 @@ WRITE16_MEMBER( sega_32x_device::_32x_common_vdp_regs_w ) switch (offset) { - case 0x00: //printf("_32x_68k_a15180_w (a15180) %04x %04x source m_32x_access_auth %04x\n",data,mem_mask, m_32x_access_auth); @@ -1099,7 +1093,6 @@ WRITE16_MEMBER( sega_32x_device::_32x_common_vdp_regs_w ) } if (ACCESSING_BITS_8_15) { - } break; @@ -1111,7 +1104,6 @@ WRITE16_MEMBER( sega_32x_device::_32x_common_vdp_regs_w ) if (ACCESSING_BITS_8_15) { - } break; @@ -1458,8 +1450,7 @@ READ32_MEMBER( sega_32x_device::_32x_sh2_##NAMEA##_##NAMEB##_r ) } \ \ return retvalue; \ -} \ - +} #define _32X_MAP_WRITEHANDLERS(NAMEA,NAMEB) \ WRITE32_MEMBER( sega_32x_device::_32x_sh2_##NAMEA##_##NAMEB##_w) \ { \ @@ -1471,8 +1462,7 @@ WRITE32_MEMBER( sega_32x_device::_32x_sh2_##NAMEA##_##NAMEB##_w) { \ _32x_sh2_##NAMEB##_w(space,0,(data>>0)&0xffff,(mem_mask>>0)&0xffff); \ } \ -} \ - +} @@ -1568,7 +1558,6 @@ ADDRESS_MAP_END void sega_32x_device::_32x_check_irqs(running_machine& machine) { - if (m_sh2_master_vint_enable && m_sh2_master_vint_pending) _32x_master_cpu->set_input_line(SH2_VINT_IRQ_LEVEL,ASSERT_LINE); else _32x_master_cpu->set_input_line(SH2_VINT_IRQ_LEVEL,CLEAR_LINE); @@ -1629,7 +1618,6 @@ UINT32* sega_32x_device::_32x_render_videobuffer_to_screenbuffer_helper(running_ { if (m_32x_displaymode==1) { - UINT32 lineoffs; int start; @@ -1758,8 +1746,7 @@ void sega_32x_device::device_config_complete() // some games appear to dislike 'perfect' levels of interleave, probably due to // non-emulated cache, ram waitstates and other issues? #define _32X_INTERLEAVE_LEVEL \ - MCFG_QUANTUM_TIME(attotime::from_hz(1800000)) \ - + MCFG_QUANTUM_TIME(attotime::from_hz(1800000)) static MACHINE_CONFIG_FRAGMENT( _32x_ntsc ) diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c index 206fd3e088a..9226e0f516c 100644 --- a/src/mame/machine/megacd.c +++ b/src/mame/machine/megacd.c @@ -36,25 +36,21 @@ const device_type SEGA_SEGACD_EUROPE = &device_creator>6; @@ -436,8 +424,6 @@ WRITE8_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w_0_7 ) WRITE16_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w ) { - - if (ACCESSING_BITS_8_15) scd_a12002_memory_mode_w_8_15(space, 0, data>>8, mem_mask>>8); @@ -450,8 +436,6 @@ WRITE16_MEMBER( sega_segacd_device::scd_a12002_memory_mode_w ) READ16_MEMBER( sega_segacd_device::segacd_sub_memory_mode_r ) { - - int temp = scd_rammode; int temp2 = 0; @@ -472,9 +456,6 @@ WRITE8_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w_8_15 ) WRITE8_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w_0_7 ) { - - - segacd_memory_priority_mode = (data&0x0018)>>3; // If the mode bit is 0 then we're requesting a change to @@ -554,14 +535,11 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_memory_mode_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_flags_r ) { - return segacd_comms_flags; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_subcpu_w ) { - - if (ACCESSING_BITS_8_15) // Dragon's Lair { segacd_comms_flags = (segacd_comms_flags & 0xff00) | ((data >> 8) & 0x00ff); @@ -576,8 +554,6 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_subcpu_w ) WRITE16_MEMBER( sega_segacd_device::segacd_comms_flags_maincpu_w ) { - - if (ACCESSING_BITS_8_15) { segacd_comms_flags = (segacd_comms_flags & 0x00ff) | (data & 0xff00); @@ -612,19 +588,16 @@ WRITE16_MEMBER( sega_segacd_device::scd_4m_prgbank_ram_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_main_part1_r ) { - return segacd_comms_part1[offset]; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_main_part1_w ) { - COMBINE_DATA(&segacd_comms_part1[offset]); } READ16_MEMBER( sega_segacd_device::segacd_comms_main_part2_r ) { - return segacd_comms_part2[offset]; } @@ -636,7 +609,6 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_main_part2_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_sub_part1_r ) { - return segacd_comms_part1[offset]; } @@ -647,13 +619,11 @@ WRITE16_MEMBER( sega_segacd_device::segacd_comms_sub_part1_w ) READ16_MEMBER( sega_segacd_device::segacd_comms_sub_part2_r ) { - return segacd_comms_part2[offset]; } WRITE16_MEMBER( sega_segacd_device::segacd_comms_sub_part2_w ) { - COMBINE_DATA(&segacd_comms_part2[offset]); } @@ -679,7 +649,6 @@ READ16_MEMBER( sega_segacd_device::segacd_main_dataram_part1_r ) } else if ((scd_rammode&2)==RAM_MODE_1MEG) { - if (offset<0x20000/2) { // wordram accees @@ -785,13 +754,11 @@ READ16_MEMBER( sega_segacd_device::scd_hint_vector_r ) READ16_MEMBER( sega_segacd_device::scd_a12006_hint_register_r ) { - return segacd_hint_register; } WRITE16_MEMBER( sega_segacd_device::scd_a12006_hint_register_w ) { - COMBINE_DATA(&segacd_hint_register); } @@ -1600,7 +1567,6 @@ READ16_MEMBER( sega_segacd_device::segacd_font_converted_r ) void sega_segacd_device::device_start() { - _segacd_68k_cpu = machine().device(":segacd:segacd_68k"); sega_cd_connected = 1; @@ -1690,7 +1656,6 @@ WRITE16_MEMBER( sega_segacd_device::segacd_dmaaddr_w ) void sega_segacd_device::device_reset() { - _segacd_68k_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); _segacd_68k_cpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); @@ -1818,7 +1783,6 @@ void sega_segacd_device::SegaCD_CDC_Do_DMA(int &dmacount, UINT8 *CDC_BUFFER, UIN { if (destination==DMA_WRAM) { - if ((scd_rammode&2)==RAM_MODE_2MEG) { dstoffset &= 0x3ffff; diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h index 713a168a26e..2bb6f595ccd 100644 --- a/src/mame/machine/megacd.h +++ b/src/mame/machine/megacd.h @@ -16,23 +16,20 @@ if (lc89510_temp->get_segacd_irq_mask() & 0x08) \ { \ machine().device(":segacd:segacd_68k")->execute().set_input_line(3, HOLD_LINE); \ - } \ - + } // from master #define CHECK_SCD_LV2_INTERRUPT \ if (lc89510_temp->get_segacd_irq_mask() & 0x04) \ { \ machine.device(":segacd:segacd_68k")->execute().set_input_line(2, HOLD_LINE); \ - } \ - + } // gfx convert #define CHECK_SCD_LV1_INTERRUPT \ if (lc89510_temp->get_segacd_irq_mask() & 0x02) \ { \ machine().device(":segacd:segacd_68k")->execute().set_input_line(1, HOLD_LINE); \ - } \ - + } #define SEGACD_IRQ3_TIMER_SPEED (attotime::from_nsec(segacd_irq3_timer_reg*30720)) @@ -59,24 +56,20 @@ 16,16, \ SEGACD_NUM_TILES16, \ 4, \ - { 0,1,2,3 }, \ - + { 0,1,2,3 }, #define _16x16_END \ 8*128 \ -}; \ - +}; #define _32x32_START \ { \ 32,32, \ SEGACD_NUM_TILES32, \ 4, \ - { 0,1,2,3 }, \ - + { 0,1,2,3 }, #define _32x32_END \ 8*512 \ -}; \ - +}; #define _32x32_SEQUENCE_1 \ @@ -84,27 +77,23 @@ 1024+8, 1024+12, 1024+0, 1024+4, 1024+24, 1024+28, 1024+16, 1024+20, \ 2048+8, 2048+12, 2048+0, 2048+4, 2048+24, 2048+28, 2048+16, 2048+20, \ 3072+8, 3072+12, 3072+0, 3072+4, 3072+24, 3072+28, 3072+16, 3072+20 \ - }, \ - + }, #define _32x32_SEQUENCE_1_FLIP \ { 3072+20, 3072+16, 3072+28, 3072+24, 3072+4, 3072+0, 3072+12, 3072+8, \ 2048+20, 2048+16, 2048+28, 2048+24, 2048+4, 2048+0, 2048+12, 2048+8, \ 1024+20, 1024+16, 1024+28, 1024+24, 1024+4, 1024+0, 1024+12, 1024+8, \ - 20, 16, 28, 24, 4, 0, 12, 8}, \ - + 20, 16, 28, 24, 4, 0, 12, 8}, #define _32x32_SEQUENCE_2 \ { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, \ 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32, \ 16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32, \ - 24*32,25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32}, \ - + 24*32,25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32}, #define _32x32_SEQUENCE_2_FLIP \ { 31*32, 30*32, 29*32, 28*32, 27*32, 26*32, 25*32, 24*32, \ 23*32, 22*32, 21*32, 20*32, 19*32, 18*32, 17*32, 16*32, \ 15*32, 14*32, 13*32, 12*32, 11*32, 10*32, 9*32 , 8*32 , \ - 7*32 , 6*32 , 5*32 , 4*32 , 3*32 , 2*32 , 1*32 , 0*32}, \ - + 7*32 , 6*32 , 5*32 , 4*32 , 3*32 , 2*32 , 1*32 , 0*32}, /* 16x16 decodes */ static const gfx_layout sega_16x16_r00_f0_layout = diff --git a/src/mame/machine/megacdcd.c b/src/mame/machine/megacdcd.c index 6159061fc03..12dd80aa5dd 100644 --- a/src/mame/machine/megacdcd.c +++ b/src/mame/machine/megacdcd.c @@ -34,7 +34,6 @@ lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const ch void lc89510_temp_device::dummy_interrupt_callback(void) { - } void lc89510_temp_device::set_CDC_Do_DMA(device_t &device,segacd_dma_delegate new_segacd_dma_callback) @@ -85,7 +84,6 @@ void lc89510_temp_device::device_start() void lc89510_temp_device::device_reset() { - } @@ -859,7 +857,6 @@ READ16_MEMBER( lc89510_temp_device::cdc_data_main_r ) READ16_MEMBER( lc89510_temp_device::segacd_irq_mask_r ) { - return segacd_irq_mask; } @@ -888,7 +885,6 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_irq_mask_w ) } else { - printf("segacd_irq_mask_w only MSB written\n"); } @@ -896,7 +892,6 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_irq_mask_w ) READ16_MEMBER( lc89510_temp_device::segacd_cdd_ctrl_r ) { - return CDD_CONTROL; } @@ -1129,9 +1124,7 @@ void lc89510_temp_device::NeoCDCommsControl(UINT8 clock, UINT8 send) void lc89510_temp_device::LC8951UpdateHeader() // neocd { - if (LC8951RegistersW[REG_W_CTRL1] & 1) { - // HEAD registers have sub-header LC8951RegistersR[REG_R_HEAD0] = 0; // HEAD0 @@ -1140,7 +1133,6 @@ void lc89510_temp_device::LC8951UpdateHeader() // neocd LC8951RegistersR[REG_R_HEAD3] = 0; // HEAD3 } else { - // HEAD registers have header UINT32 msf = lba_to_msf_alt(SCD_CURLBA+150); @@ -1177,7 +1169,6 @@ void lc89510_temp_device::LC8915EndTransfer() LC8951RegistersR[REG_R_IFSTAT] |= 0x48; // set DTEI & DTBSY if (LC8951RegistersW[REG_W_IFCTRL] & 0x40) { - // trigger DTE interrupt // the Neo Geo CD doesn't use the DTE interrupt @@ -1216,7 +1207,6 @@ void lc89510_temp_device::scd_ctrl_checks(running_machine& machine) if (LC8951RegistersW[REG_W_IFCTRL] & 0x20) { - if (is_neoCD) { type1_interrupt_callback(); diff --git a/src/mame/machine/megacdcd.h b/src/mame/machine/megacdcd.h index dc0c36271e2..12c3a7d4993 100644 --- a/src/mame/machine/megacdcd.h +++ b/src/mame/machine/megacdcd.h @@ -76,23 +76,17 @@ typedef device_delegate interrupt_delegate; #define SECTOR_SIZE (2352) #define SET_CDD_DATA_MODE \ - CDD_CONTROL |= 0x0100; \ - + CDD_CONTROL |= 0x0100; #define SET_CDD_AUDIO_MODE \ - CDD_CONTROL &= ~0x0100; \ - + CDD_CONTROL &= ~0x0100; #define STOP_CDC_READ \ - SCD_STATUS_CDC &= ~0x01; \ - + SCD_STATUS_CDC &= ~0x01; #define SET_CDC_READ \ - SCD_STATUS_CDC |= 0x01; \ - + SCD_STATUS_CDC |= 0x01; #define SET_CDC_DMA \ - SCD_STATUS_CDC |= 0x08; \ - + SCD_STATUS_CDC |= 0x08; #define STOP_CDC_DMA \ - SCD_STATUS_CDC &= ~0x08; \ - + SCD_STATUS_CDC &= ~0x08; #define SCD_READ_ENABLED \ (SCD_STATUS_CDC & 1) @@ -100,31 +94,26 @@ typedef device_delegate interrupt_delegate; (SCD_STATUS_CDC & 0x08) #define CLEAR_CDD_RESULT \ - CDD_MIN = CDD_SEC = CDD_FRAME = CDD_EXT = 0; \ - + CDD_MIN = CDD_SEC = CDD_FRAME = CDD_EXT = 0; #define CHECK_SCD_LV5_INTERRUPT \ if (segacd_irq_mask & 0x20) \ { \ machine.device(":segacd:segacd_68k")->execute().set_input_line(5, HOLD_LINE); \ - } \ - + } #define CHECK_SCD_LV4_INTERRUPT \ if (segacd_irq_mask & 0x10) \ { \ machine.device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \ - } \ - + } #define CHECK_SCD_LV4_INTERRUPT_A \ if (segacd_irq_mask & 0x10) \ { \ machine().device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \ - } \ - + } #define CURRENT_TRACK_IS_DATA \ - (segacd.toc->tracks[SCD_CURTRK - 1].trktype != CD_TRACK_AUDIO) \ - + (segacd.toc->tracks[SCD_CURTRK - 1].trktype != CD_TRACK_AUDIO) #define CDD_PLAYINGCDDA 0x0100 #define CDD_READY 0x0400 @@ -132,20 +121,15 @@ typedef device_delegate interrupt_delegate; #define MCFG_SEGACD_HACK_SET_CDC_DO_DMA( _class, _method) \ - lc89510_temp_device::set_CDC_Do_DMA(*device, segacd_dma_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + lc89510_temp_device::set_CDC_Do_DMA(*device, segacd_dma_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_SEGACD_HACK_SET_NEOCD \ - lc89510_temp_device::set_is_neoCD(*device, true); \ - + lc89510_temp_device::set_is_neoCD(*device, true); #define MCFG_SET_TYPE1_INTERRUPT_CALLBACK( _class, _method) \ - lc89510_temp_device::set_type1_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + lc89510_temp_device::set_type1_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_SET_TYPE2_INTERRUPT_CALLBACK( _class, _method) \ - lc89510_temp_device::set_type2_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + lc89510_temp_device::set_type2_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_SET_TYPE3_INTERRUPT_CALLBACK( _class, _method) \ - lc89510_temp_device::set_type3_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + lc89510_temp_device::set_type3_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); /* neocd */ #define CD_FRAMES_MINUTE (60 * 75) diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c index f4fc572b813..858e17976dc 100644 --- a/src/mame/machine/megadriv.c +++ b/src/mame/machine/megadriv.c @@ -499,12 +499,10 @@ static void megadrive_io_write_tx_port(running_machine &machine, int portnum, UI static void megadrive_io_write_rx_port(running_machine &machine, int portnum, UINT16 data) { - } static void megadrive_io_write_sctrl_port(running_machine &machine, int portnum, UINT16 data) { - } @@ -605,7 +603,6 @@ static WRITE16_HANDLER( megadriv_68k_write_z80_ram ) if ((genz80.z80_has_bus==0) && (genz80.z80_is_reset==0)) { - if (!ACCESSING_BITS_0_7) // byte (MSB) access { genz80.z80_prgram[(offset<<1)] = (data & 0xff00) >> 8; diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index 8254479c486..6f9582cd288 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -135,7 +135,6 @@ void sega_genesis_vdp_device::set_genesis_vdp_palwrite_base(device_t &device, in void sega_genesis_vdp_device::device_start() { - m_vram = auto_alloc_array(machine(), UINT16, 0x10000/2); m_cram = auto_alloc_array(machine(), UINT16, 0x80/2); m_vsram = auto_alloc_array(machine(), UINT16, 0x80/2); @@ -241,7 +240,6 @@ void sega_genesis_vdp_device::device_reset_old() void sega_genesis_vdp_device::vdp_vram_write(UINT16 data) { - UINT16 sprite_base_address = MEGADRIVE_REG0C_RS1?((MEGADRIVE_REG05_SPRITE_ADDR&0x7e)<<9):((MEGADRIVE_REG05_SPRITE_ADDR&0x7f)<<9); int spritetable_size = MEGADRIVE_REG0C_RS1?0x400:0x200; int lowlimit = sprite_base_address; @@ -372,7 +370,6 @@ void sega_genesis_vdp_device::megadriv_vdp_data_port_w(running_machine &machine, } else { - switch (m_vdp_code & 0x000f) { case 0x0000: @@ -1258,7 +1255,6 @@ READ16_MEMBER( sega_genesis_vdp_device::megadriv_vdp_r ) switch (offset<<1) { - case 0x00: case 0x02: if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) mame_printf_debug("8-bit VDP read data port access, offset %04x mem_mask %04x\n",offset,mem_mask); @@ -1405,7 +1401,6 @@ void sega_genesis_vdp_device::genesis_render_spriteline_to_spritebuffer(int scan if ((drawypos<=scanline) && ((drawypos+drawheight)>scanline)) { - addr = (MEGADRIV_VDP_VRAM(((base_address>>1)+spritenum*4)+0x2) & 0x07ff)>>0; xflip = (MEGADRIV_VDP_VRAM(((base_address>>1)+spritenum*4)+0x2) & 0x0800)>>11; yflip = (MEGADRIV_VDP_VRAM(((base_address>>1)+spritenum*4)+0x2) & 0x1000)>>12; @@ -2573,7 +2568,6 @@ void sega_genesis_vdp_device::genesis_render_videobuffer_to_screenbuffer(running if (!MEGADRIVE_REG0C_SHADOW_HIGLIGHT) { - for (x=0;x<320;x++) { UINT32 dat; @@ -2630,7 +2624,6 @@ void sega_genesis_vdp_device::genesis_render_videobuffer_to_screenbuffer(running } else { - for (x=0;x<320;x++) { UINT32 dat; @@ -2964,7 +2957,6 @@ TIMER_DEVICE_CALLBACK( megadriv_scanline_timer_callback_alt_timing ) if (vdp->m_use_alt_timing) { - if (param==0) { //printf("where are we? %d %d\n", timer.machine().primary_screen->vpos(), timer.machine().primary_screen->hpos()); diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c index 7d05f12e65f..aa0938410a9 100644 --- a/src/mame/machine/mexico86.c +++ b/src/mame/machine/mexico86.c @@ -14,7 +14,6 @@ bit 0 = ? (unused?) */ WRITE8_MEMBER(mexico86_state::mexico86_f008_w) { - m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 4) ? CLEAR_LINE : ASSERT_LINE); if (m_mcu != NULL) @@ -152,7 +151,6 @@ static void mcu_simulate( running_machine &machine ) INTERRUPT_GEN_MEMBER(mexico86_state::kikikai_interrupt) { - if (m_mcu_running) mcu_simulate(machine()); @@ -225,14 +223,12 @@ INTERRUPT_GEN_MEMBER(mexico86_state::mexico86_m68705_interrupt) READ8_MEMBER(mexico86_state::mexico86_68705_port_a_r) { - //logerror("%04x: 68705 port A read %02x\n", space.device().safe_pc(), m_port_a_in); return (m_port_a_out & m_ddr_a) | (m_port_a_in & ~m_ddr_a); } WRITE8_MEMBER(mexico86_state::mexico86_68705_port_a_w) { - //logerror("%04x: 68705 port A write %02x\n", space.device().safe_pc(), data); m_port_a_out = data; } diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c index aa515064b10..9af540197f8 100644 --- a/src/mame/machine/micro3d.c +++ b/src/mame/machine/micro3d.c @@ -260,7 +260,6 @@ INLINE INT64 normalised_multiply(INT32 a, INT32 b) TIMER_CALLBACK_MEMBER(micro3d_state::mac_done_callback) { - machine().device("drmath")->execute().set_input_line(AM29000_INTR0, ASSERT_LINE); m_mac_stat = 0; } @@ -498,7 +497,6 @@ READ16_MEMBER(micro3d_state::micro3d_encoder_l_r) TIMER_CALLBACK_MEMBER(micro3d_state::adc_done_callback) { - switch (param) { case 0: m_adc_val = ioport("THROTTLE")->read_safe(0); @@ -633,7 +631,6 @@ DRIVER_INIT_MEMBER(micro3d_state,botss) void micro3d_state::machine_reset() { - m_ti_uart[STATUS] = 1; machine().device("vgb")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE); diff --git a/src/mame/machine/mw8080bw.c b/src/mame/machine/mw8080bw.c index c75034d9e37..a60b0103f4d 100644 --- a/src/mame/machine/mw8080bw.c +++ b/src/mame/machine/mw8080bw.c @@ -95,7 +95,6 @@ static void mw8080bw_start_interrupt_timer( running_machine &machine ) MACHINE_START_MEMBER(mw8080bw_state,mw8080bw) { - mw8080bw_create_interrupt_timer(machine()); m_samples = machine().device("samples"); diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index a880421057c..cce082099dc 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -1842,7 +1842,6 @@ int n64_periphs::pif_channel_handle_command(int channel, int slength, UINT8 *sda ////printf("Write mempak at %04x\n", address); if (address >= 0x8000) { - } else { diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h index 583cebfb755..e3ddff839df 100644 --- a/src/mame/machine/namco50.h +++ b/src/mame/machine/namco50.h @@ -5,8 +5,7 @@ #define MCFG_NAMCO_50XX_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, NAMCO_50XX, _clock) \ - + MCFG_DEVICE_ADD(_tag, NAMCO_50XX, _clock) DECLARE_READ8_DEVICE_HANDLER( namco_50xx_read ); void namco_50xx_read_request(device_t *device); diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c index 76e1660524f..5268329390f 100644 --- a/src/mame/machine/namcond1.c +++ b/src/mame/machine/namcond1.c @@ -77,7 +77,6 @@ READ16_MEMBER(namcond1_state::namcond1_cuskey_r) WRITE16_MEMBER(namcond1_state::namcond1_shared_ram_w) { - switch( offset ) { default : diff --git a/src/mame/machine/naomim2.c b/src/mame/machine/naomim2.c index 52116874187..82ded4e875c 100644 --- a/src/mame/machine/naomim2.c +++ b/src/mame/machine/naomim2.c @@ -73,7 +73,6 @@ void naomi_m2_board::board_setup_address(UINT32 address, bool is_dma) void naomi_m2_board::board_get_buffer(UINT8 *&base, UINT32 &limit) { if(rom_cur_address & 0x40000000) { - if(rom_cur_address == 0x4001fffe) { if(!enc_ready) enc_start(); diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c index 97cbd59d50e..414a9f1e0ef 100644 --- a/src/mame/machine/nb1413m3.c +++ b/src/mame/machine/nb1413m3.c @@ -50,7 +50,6 @@ static TIMER_CALLBACK( nb1413m3_timer_callback ) if (nb1413m3_74ls193_counter == 0x0f) { - if (nb1413m3_nmi_enable) { machine.device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c index 92046abaebf..3896378730c 100644 --- a/src/mame/machine/neoboot.c +++ b/src/mame/machine/neoboot.c @@ -1034,7 +1034,6 @@ void kf2k3upl_px_decrypt( running_machine &machine ) } { - int ofst; int i; UINT8 *rom = machine.root_device().memregion( "maincpu" )->base() + 0xfe000; diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c index f339b1904ab..a7c8d9b64a8 100644 --- a/src/mame/machine/nitedrvr.c +++ b/src/mame/machine/nitedrvr.c @@ -208,7 +208,6 @@ D5 = SKID2 WRITE8_MEMBER(nitedrvr_state::nitedrvr_out0_w) { - discrete_sound_w(m_discrete, space, NITEDRVR_MOTOR_DATA, data & 0x0f); // Motor freq data discrete_sound_w(m_discrete, space, NITEDRVR_SKID1_EN, data & 0x10); // Skid1 enable discrete_sound_w(m_discrete, space, NITEDRVR_SKID2_EN, data & 0x20); // Skid2 enable @@ -227,7 +226,6 @@ D5 = Spare (Not used) WRITE8_MEMBER(nitedrvr_state::nitedrvr_out1_w) { - set_led_status(machine(), 0, data & 0x10); m_crash_en = data & 0x01; @@ -275,7 +273,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(nitedrvr_state::nitedrvr_crash_toggle_callback) void nitedrvr_state::machine_start() { - m_maincpu = machine().device("maincpu"); save_item(NAME(m_gear)); @@ -291,7 +288,6 @@ void nitedrvr_state::machine_start() void nitedrvr_state::machine_reset() { - m_gear = 1; m_track = 0; m_steering_buf = 0; diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c index 91dc34fc1b1..191d964fb05 100644 --- a/src/mame/machine/nycaptor.c +++ b/src/mame/machine/nycaptor.c @@ -41,7 +41,6 @@ READ8_MEMBER(nycaptor_state::nycaptor_68705_port_b_r) WRITE8_MEMBER(nycaptor_state::nycaptor_68705_port_b_w) { - if (BIT(m_ddr_b, 1) && BIT(~data, 1) && BIT(m_port_b_out, 1)) { m_port_a_in = m_from_main; @@ -91,7 +90,6 @@ WRITE8_MEMBER(nycaptor_state::nycaptor_68705_ddr_c_w) WRITE8_MEMBER(nycaptor_state::nycaptor_mcu_w) { - m_from_main = data; m_main_sent = 1; m_mcu->execute().set_input_line(0, ASSERT_LINE); @@ -99,21 +97,18 @@ WRITE8_MEMBER(nycaptor_state::nycaptor_mcu_w) READ8_MEMBER(nycaptor_state::nycaptor_mcu_r) { - m_mcu_sent = 0; return m_from_mcu; } READ8_MEMBER(nycaptor_state::nycaptor_mcu_status_r1) { - /* bit 1 = when 1, mcu has sent data to the main cpu */ return m_mcu_sent ? 2 : 0; } READ8_MEMBER(nycaptor_state::nycaptor_mcu_status_r2) { - /* bit 0 = when 1, mcu is ready to receive data from main cpu */ return m_main_sent ? 0 : 1; } diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c index 62126e2edbf..23f282550f1 100644 --- a/src/mame/machine/opwolf.c +++ b/src/mame/machine/opwolf.c @@ -275,7 +275,6 @@ static const UINT16 *const level_data_lookup[] = TIMER_CALLBACK_MEMBER(opwolf_state::opwolf_timer_callback) { - // Level data command if (m_current_cmd == 0xf5) { @@ -406,7 +405,6 @@ WRITE16_MEMBER(opwolf_state::opwolf_cchip_bank_w) WRITE16_MEMBER(opwolf_state::opwolf_cchip_data_w) { - m_cchip_ram[(m_current_bank * 0x400) + offset] = data & 0xff; // if (offset != 0x64 && offset != 0x65 && offset != 0x66 && offset != 0x67 && offset != 0x68 && offset != 0x69) @@ -510,7 +508,6 @@ READ16_MEMBER(opwolf_state::opwolf_cchip_status_r) READ16_MEMBER(opwolf_state::opwolf_cchip_data_r) { - // if (offset!=0x7f && offset!=0x1c && offset!=0x1d && offset!=0x1e && offset!=0x1f && offset!=0x20 && space.device().safe_pc()!=0xc18 && space.device().safe_pc()!=0xc2e && space.device().safe_pc()!=0xc9e && offset!=0x50 && offset!=0x51 && offset!=0x52 && offset!=0x53 && offset!=0x5 && offset!=0x13 && offset!=0x79 && offset!=0x12 && offset!=0x34) // logerror("%08x: opwolf c read %04x (bank %04x)\n", space.device().safe_pc(), offset, m_current_bank); @@ -525,7 +522,6 @@ READ16_MEMBER(opwolf_state::opwolf_cchip_data_r) TIMER_CALLBACK_MEMBER(opwolf_state::cchip_timer) { - // Update input ports, these are used by both the 68k directly and by the c-chip m_cchip_ram[0x4] = ioport("IN0")->read(); m_cchip_ram[0x5] = ioport("IN1")->read(); diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c index a7f44b196c2..e3829f8ff8f 100644 --- a/src/mame/machine/pgmcrypt.c +++ b/src/mame/machine/pgmcrypt.c @@ -20,69 +20,48 @@ // some may be duplicates simply due to differing rom sizes #define IGS27_CRYPT1 \ - if ((i & 0x040480) != 0x000080) x ^= 0x0001; \ - + if ((i & 0x040480) != 0x000080) x ^= 0x0001; #define IGS27_CRYPT1_ALT \ - if ((i & 0x040080) != 0x000080) x ^= 0x0001; \ - + if ((i & 0x040080) != 0x000080) x ^= 0x0001; #define IGS27_CRYPT1_ALT2 \ - if ((i & 0x0480) != 0x0080) x ^= 0x0001; \ - + if ((i & 0x0480) != 0x0080) x ^= 0x0001; #define IGS27_CRYPT2 \ - if ((i & 0x104008) == 0x104008) x ^= 0x0002; \ - + if ((i & 0x104008) == 0x104008) x ^= 0x0002; #define IGS27_CRYPT2_ALT \ - if ((i & 0x004008) == 0x004008) x ^= 0x0002; \ - + if ((i & 0x004008) == 0x004008) x ^= 0x0002; #define IGS27_CRYPT2_ALT2 \ - if((i & 0x004008) == 0x004008 && (i & 0x180000) != 0x000000) x ^= 0x0002; \ - + if((i & 0x004008) == 0x004008 && (i & 0x180000) != 0x000000) x ^= 0x0002; #define IGS27_CRYPT2_ALT3 \ - if((i & 0x84008) == 0x84008) x ^= 0x0002; \ - + if((i & 0x84008) == 0x84008) x ^= 0x0002; #define IGS27_CRYPT3 \ - if ((i & 0x080030) == 0x080010) x ^= 0x0004; \ - + if ((i & 0x080030) == 0x080010) x ^= 0x0004; #define IGS27_CRYPT3_ALT \ - if((i & 0x000030) == 0x000010 && (i & 0x180000) != 0x080000) x ^= 0x0004; \ - + if((i & 0x000030) == 0x000010 && (i & 0x180000) != 0x080000) x ^= 0x0004; #define IGS27_CRYPT3_ALT2 \ - if ((i & 0x000030) == 0x000010) x ^= 0x0004; \ - + if ((i & 0x000030) == 0x000010) x ^= 0x0004; // ket - due to address starting at 0 and not 100000/2! #define IGS27_CRYPT3_ALT3 \ - if ((i & 0x080030) == 0x000010) x ^= 0x0004; \ - + if ((i & 0x080030) == 0x000010) x ^= 0x0004; #define IGS27_CRYPT4 \ - if ((i & 0x000242) != 0x000042) x ^= 0x0008; \ - + if ((i & 0x000242) != 0x000042) x ^= 0x0008; #define IGS27_CRYPT4_ALT \ - if ((i & 0x000042) != 0x000042) x ^= 0x0008; \ - + if ((i & 0x000042) != 0x000042) x ^= 0x0008; #define IGS27_CRYPT5 \ - if ((i & 0x008100) == 0x008000) x ^= 0x0010; \ - + if ((i & 0x008100) == 0x008000) x ^= 0x0010; #define IGS27_CRYPT5_ALT \ - if ((i & 0x48100) == 0x48000) x ^= 0x0010; \ - + if ((i & 0x48100) == 0x48000) x ^= 0x0010; #define IGS27_CRYPT6 \ - if ((i & 0x002004) != 0x000004) x ^= 0x0020; \ - + if ((i & 0x002004) != 0x000004) x ^= 0x0020; #define IGS27_CRYPT6_ALT \ - if ((i & 0x022004) != 0x000004) x ^= 0x0020; \ - + if ((i & 0x022004) != 0x000004) x ^= 0x0020; #define IGS27_CRYPT7 \ - if ((i & 0x011800) != 0x010000) x ^= 0x0040; \ - + if ((i & 0x011800) != 0x010000) x ^= 0x0040; #define IGS27_CRYPT7_ALT \ - if ((i & 0x01800) != 0x00000) x ^= 0x0040; \ - + if ((i & 0x01800) != 0x00000) x ^= 0x0040; #define IGS27_CRYPT8 \ - if ((i & 0x004820) == 0x004820) x ^= 0x0080; \ - + if ((i & 0x004820) == 0x004820) x ^= 0x0080; #define IGS27_CRYPT8_ALT \ - if ((i & 0x000820) == 0x000820) x ^= 0x0080; \ - + if ((i & 0x000820) == 0x000820) x ^= 0x0080; static const UINT8 kov_tab[256] = { 0x17, 0x1c, 0xe3, 0x02, 0x62, 0x59, 0x97, 0x4a, 0x67, 0x4d, 0x1f, 0x11, 0x76, 0x64, 0xc1, 0xe1, @@ -105,7 +84,6 @@ static const UINT8 kov_tab[256] = { void pgm_kov_decrypt(running_machine &machine) { - int i; UINT16 *src = (UINT16 *) (machine.root_device().memregion("maincpu")->base()+0x100000); @@ -152,7 +130,6 @@ static const UINT8 kovsh_tab[256] = { void pgm_kovsh_decrypt(running_machine &machine) { - int i; UINT16 *src = (UINT16 *) (machine.root_device().memregion("maincpu")->base()+0x100000); @@ -198,7 +175,6 @@ static const UINT8 photoy2k_tab[256] = { void pgm_photoy2k_decrypt(running_machine &machine) { - int i; UINT16 *src = (UINT16 *) (machine.root_device().memregion("maincpu")->base()+0x100000); @@ -243,7 +219,6 @@ static const UINT8 pstar[256] = { void pgm_pstar_decrypt(running_machine &machine) { - int i; UINT16 *src = (UINT16 *) (machine.root_device().memregion("maincpu")->base()+0x100000); @@ -987,7 +962,6 @@ static const UINT8 sdwx_tab[] = void sdwx_decrypt(running_machine &machine) { - int i; UINT16 *src = (UINT16 *) machine.root_device().memregion("user1")->base(); diff --git a/src/mame/machine/pgmprot1.c b/src/mame/machine/pgmprot1.c index 008c3bb4dee..da09ae7ad0a 100644 --- a/src/mame/machine/pgmprot1.c +++ b/src/mame/machine/pgmprot1.c @@ -1396,7 +1396,6 @@ static WRITE16_HANDLER( pgm_arm7_type1_sim_w ) } else if (offset==2) { - } } diff --git a/src/mame/machine/pgmprot4.c b/src/mame/machine/pgmprot4.c index abe5f14ca1f..c863b2c81cf 100644 --- a/src/mame/machine/pgmprot4.c +++ b/src/mame/machine/pgmprot4.c @@ -35,7 +35,6 @@ void pgm_dw3_decrypt(running_machine &machine) { - // int i; // UINT16 *src=(UINT16 *) (OP_ROM+0x100000); @@ -67,7 +66,6 @@ void pgm_dw3_decrypt(running_machine &machine) void pgm_killbld_decrypt(running_machine &machine) { - // int i; // UINT16 *src=(UINT16 *) (OP_ROM+0x100000); @@ -378,7 +376,6 @@ static READ16_HANDLER( killbld_igs025_prot_r ) } else if (state->m_kb_cmd == 5) { - UINT8 kb_region_sequence[11] = {0x17, 0x14, 0x91, 0x89, 0x21, 0xD5, 0x7C, 0x65, 0x8F, 0x8E, 0xE1}; UINT8 ret; @@ -408,7 +405,6 @@ static READ16_HANDLER( killbld_igs025_prot_r ) MACHINE_RESET_MEMBER(pgm_022_025_state,killbld) { - MACHINE_RESET_CALL_MEMBER(pgm); /* fill the protection ram with a5 + auto dma */ IGS022_reset(machine()); @@ -447,8 +443,6 @@ DRIVER_INIT_MEMBER(pgm_022_025_state,killbld) MACHINE_RESET_MEMBER(pgm_022_025_state,dw3) { - - MACHINE_RESET_CALL_MEMBER(pgm); /* fill the protection ram with a5 + auto dma */ IGS022_reset(machine()); diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c index 71d9dba2a0c..e2c0804b5b5 100644 --- a/src/mame/machine/qix.c +++ b/src/mame/machine/qix.c @@ -204,7 +204,6 @@ const pia6821_interface slither_pia_2_intf = void qix_state::machine_reset() { - /* reset the coin counter register */ m_coinctrl = 0x00; } @@ -212,7 +211,6 @@ void qix_state::machine_reset() MACHINE_START_MEMBER(qix_state,qixmcu) { - /* set up save states */ save_item(NAME(m_68705_port_in)); save_item(NAME(m_coinctrl)); @@ -323,7 +321,6 @@ READ8_MEMBER(qix_state::qix_video_firq_ack_r) READ8_MEMBER(qix_state::qixmcu_coin_r) { - logerror("6809:qixmcu_coin_r = %02X\n", m_68705_port_out[0]); return m_68705_port_out[0]; } @@ -331,7 +328,6 @@ READ8_MEMBER(qix_state::qixmcu_coin_r) WRITE8_MEMBER(qix_state::qixmcu_coin_w) { - logerror("6809:qixmcu_coin_w = %02X\n", data); /* this is a callback called by pia6821_device::write(), so I don't need to synchronize */ /* the CPUs - they have already been synchronized by qix_pia_w() */ @@ -341,7 +337,6 @@ WRITE8_MEMBER(qix_state::qixmcu_coin_w) WRITE8_MEMBER(qix_state::qixmcu_coinctrl_w) { - /* if (!(data & 0x04)) */ if (data & 0x04) { @@ -369,7 +364,6 @@ WRITE8_MEMBER(qix_state::qixmcu_coinctrl_w) READ8_MEMBER(qix_state::qix_68705_portA_r) { - UINT8 ddr = m_68705_ddr[0]; UINT8 out = m_68705_port_out[0]; UINT8 in = m_68705_port_in[0]; @@ -380,7 +374,6 @@ READ8_MEMBER(qix_state::qix_68705_portA_r) READ8_MEMBER(qix_state::qix_68705_portB_r) { - UINT8 ddr = m_68705_ddr[1]; UINT8 out = m_68705_port_out[1]; UINT8 in = (ioport("COIN")->read() & 0x0f) | ((ioport("COIN")->read() & 0x80) >> 3); @@ -390,7 +383,6 @@ READ8_MEMBER(qix_state::qix_68705_portB_r) READ8_MEMBER(qix_state::qix_68705_portC_r) { - UINT8 ddr = m_68705_ddr[2]; UINT8 out = m_68705_port_out[2]; UINT8 in = (m_coinctrl & 0x08) | ((ioport("COIN")->read() & 0x70) >> 4); @@ -407,7 +399,6 @@ READ8_MEMBER(qix_state::qix_68705_portC_r) WRITE8_MEMBER(qix_state::qix_68705_portA_w) { - logerror("68705:portA_w = %02X\n", data); m_68705_port_out[0] = data; } @@ -415,7 +406,6 @@ WRITE8_MEMBER(qix_state::qix_68705_portA_w) WRITE8_MEMBER(qix_state::qix_68705_portB_w) { - m_68705_port_out[1] = data; coin_lockout_w(machine(), 0, (~data >> 6) & 1); coin_counter_w(machine(), 0, (data >> 7) & 1); @@ -424,7 +414,6 @@ WRITE8_MEMBER(qix_state::qix_68705_portB_w) WRITE8_MEMBER(qix_state::qix_68705_portC_w) { - m_68705_port_out[2] = data; } @@ -486,7 +475,6 @@ WRITE8_MEMBER(qix_state::qix_coinctl_w) WRITE8_MEMBER(qix_state::slither_76489_1_w) { - /* write to the sound chip */ m_sn2->write(machine().device("maincpu")->space(), 0, data); @@ -506,13 +494,11 @@ WRITE8_MEMBER(qix_state::slither_76489_1_w) READ8_MEMBER(qix_state::slither_trak_lr_r) { - return ioport(m_flip ? "AN3" : "AN1")->read(); } READ8_MEMBER(qix_state::slither_trak_ud_r) { - return ioport(m_flip ? "AN2" : "AN0")->read(); } diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c index 207c9e6a0f7..1366ac9ea11 100644 --- a/src/mame/machine/rainbow.c +++ b/src/mame/machine/rainbow.c @@ -733,7 +733,6 @@ static void request_goalin_data( running_machine &machine ) TIMER_CALLBACK_MEMBER(rbisland_state::cchip_timer) { - if (m_CRAM[1][0x100] == 1) { request_round_data(machine()); diff --git a/src/mame/machine/scudsp.c b/src/mame/machine/scudsp.c index 6dc30e36cdf..349171242a9 100644 --- a/src/mame/machine/scudsp.c +++ b/src/mame/machine/scudsp.c @@ -1049,7 +1049,6 @@ static const char *const DMA_Command[] = static void dsp_dasm_prefix( const char* format, char* buffer, UINT32 *data ) { - for ( ; *format; format++ ) { if ( *format == '%' ) diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h index 16a075488c3..22cd38be094 100644 --- a/src/mame/machine/segaic16.h +++ b/src/mame/machine/segaic16.h @@ -53,26 +53,20 @@ MCFG_DEVICE_ADD(_tag, SEGA_315_5195_MEM_MAPPER, 0) \ sega_315_5195_mapper_device::static_set_cputag(*device, _cputag); \ sega_315_5195_mapper_device::static_set_mapper(*device, sega_315_5195_mapper_device::mapper_delegate(&_class::_mapper, #_class "::" #_mapper, NULL, (_class *)0)); \ - sega_315_5195_mapper_device::static_set_sound_readwrite(*device, sega_315_5195_mapper_device::sound_read_delegate(&_class::_read, #_class "::" #_read, NULL, (_class *)0), sega_315_5195_mapper_device::sound_write_delegate(&_class::_write, #_class "::" #_write, NULL, (_class *)0)); \ - + sega_315_5195_mapper_device::static_set_sound_readwrite(*device, sega_315_5195_mapper_device::sound_read_delegate(&_class::_read, #_class "::" #_read, NULL, (_class *)0), sega_315_5195_mapper_device::sound_write_delegate(&_class::_write, #_class "::" #_write, NULL, (_class *)0)); #define MCFG_SEGA_315_5248_MULTIPLIER_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_315_5248_MULTIPLIER, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_315_5248_MULTIPLIER, 0) #define MCFG_SEGA_315_5249_DIVIDER_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_315_5249_DIVIDER, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_315_5249_DIVIDER, 0) #define MCFG_SEGA_315_5250_COMPARE_TIMER_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_315_5250_COMPARE_TIMER, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_315_5250_COMPARE_TIMER, 0) #define MCFG_SEGA_315_5250_TIMER_ACK(_class, _func) \ - sega_315_5250_compare_timer_device::static_set_timer_ack(*device, sega_315_5250_compare_timer_device::timer_ack_delegate(&_class::_func, #_class "::" #_func, NULL, (_class *)0)); \ - + sega_315_5250_compare_timer_device::static_set_timer_ack(*device, sega_315_5250_compare_timer_device::timer_ack_delegate(&_class::_func, #_class "::" #_func, NULL, (_class *)0)); #define MCFG_SEGA_315_5250_SOUND_WRITE(_class, _func) \ - sega_315_5250_compare_timer_device::static_set_sound_write(*device, sega_315_5250_compare_timer_device::sound_write_delegate(&_class::_func, #_class "::" #_func, NULL, (_class *)0)); \ - + sega_315_5250_compare_timer_device::static_set_sound_write(*device, sega_315_5250_compare_timer_device::sound_write_delegate(&_class::_func, #_class "::" #_func, NULL, (_class *)0)); //************************************************************************** diff --git a/src/mame/machine/segamsys.c b/src/mame/machine/segamsys.c index 0ce7ef991ed..7a70c1e3a76 100644 --- a/src/mame/machine/segamsys.c +++ b/src/mame/machine/segamsys.c @@ -979,7 +979,6 @@ static void sms_copy_to_renderbuffer(int scanline, struct sms_vdp* chip) static void sms_draw_scanline(int scanline, struct sms_vdp* chip) { - if (scanline>=0 && scanlinescreen_mode].sms2_height) { sms_render_spriteline(scanline, chip); @@ -1188,7 +1187,6 @@ SCREEN_VBLANK(sms) VIDEO_START(sms) { - } @@ -1686,8 +1684,6 @@ void megatech_set_genz80_as_sms_standard_map(running_machine &machine, const cha if (mapper == MAPPER_STANDARD ) { - - machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_write_handler(0xfffc, 0xffff, FUNC(mt_sms_standard_rom_bank_w)); } diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c index 926dcc34767..ca010cb1ca7 100644 --- a/src/mame/machine/seicop.c +++ b/src/mame/machine/seicop.c @@ -2022,8 +2022,7 @@ static UINT16 u1,u2; #define COP_CMD(_1_,_2_,_3_,_4_,_5_,_6_,_7_,_8_,_u1_,_u2_) \ (copd2_table[command+0] == _1_ && copd2_table[command+1] == _2_ && copd2_table[command+2] == _3_ && copd2_table[command+3] == _4_ && \ copd2_table[command+4] == _5_ && copd2_table[command+5] == _6_ && copd2_table[command+6] == _7_ && copd2_table[command+7] == _8_ && \ - u1 == _u1_ && u2 == _u2_) \ - + u1 == _u1_ && u2 == _u2_) /* Godzilla 0x12c0 X = 0x21ed Y = 0x57da diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 43e3e70f969..2791cf01206 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -13,7 +13,6 @@ WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w) { - if (data == 0xff) return; @@ -33,7 +32,6 @@ WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w) WRITE8_MEMBER(simpsons_state::simpsons_coin_counter_w) { - /* bit 0,1 coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -77,7 +75,6 @@ static void simpsons_postload(running_machine &machine) void simpsons_state::machine_start() { - m_generic_paletteram_8.allocate(0x1000); m_xtraram = auto_alloc_array_clear(machine(), UINT8, 0x1000); m_spriteram = auto_alloc_array_clear(machine(), UINT16, 0x1000 / 2); diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c index d439f4a1d46..1c9c381f874 100644 --- a/src/mame/machine/slapfght.c +++ b/src/mame/machine/slapfght.c @@ -51,14 +51,12 @@ WRITE8_MEMBER(slapfght_state::slapfight_port_01_w) /* Disable and clear hardware interrupt */ WRITE8_MEMBER(slapfght_state::slapfight_port_06_w) { - m_irq_mask = 0; } /* Enable hardware interrupt */ WRITE8_MEMBER(slapfght_state::slapfight_port_07_w) { - m_irq_mask = 1; } @@ -805,7 +803,6 @@ READ8_MEMBER(slapfght_state::tigerh_68705_portB_r) WRITE8_MEMBER(slapfght_state::tigerh_68705_portB_w) { - if ((m_ddrB & 0x02) && (~data & 0x02) && (m_portB_out & 0x02)) { m_portA_in = m_from_main; diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index c89688439d1..3f94eec1e60 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -103,7 +103,6 @@ void st010_write_ram(snes_state *state, UINT16 addr, UINT8 data) TIMER_CALLBACK_MEMBER(snes_state::snes_nmi_tick) { - // pull NMI m_maincpu->set_input_line(G65816_LINE_NMI, ASSERT_LINE); @@ -160,7 +159,6 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_update_io) TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick) { - /* Increase current line - we want to latch on this line during it, not after it */ snes_ppu.beam.current_vert = machine().primary_screen->vpos(); diff --git a/src/mame/machine/snesbsx.c b/src/mame/machine/snesbsx.c index 820040ef53a..20fcc171903 100644 --- a/src/mame/machine/snesbsx.c +++ b/src/mame/machine/snesbsx.c @@ -134,7 +134,6 @@ static WRITE8_HANDLER( bsx_write ) static void bsx_init( running_machine &machine ) { - memset(bsx_state.cart_regs, 0, ARRAY_LENGTH(bsx_state.cart_regs)); bsx_state.cart_regs[0x07] = 0x80; diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c index 2250713bb82..410a20c07a4 100644 --- a/src/mame/machine/starwars.c +++ b/src/mame/machine/starwars.c @@ -219,7 +219,6 @@ static void run_mproc(running_machine &machine) /* loop until finished */ while (M_STOP > 0) { - /* each step of the matrix processor takes five clock cycles */ mptime += 5; diff --git a/src/mame/machine/steppers.c b/src/mame/machine/steppers.c index 2d08e52592a..691bbb00993 100644 --- a/src/mame/machine/steppers.c +++ b/src/mame/machine/steppers.c @@ -215,7 +215,6 @@ static void update_optic(int which) void stepper_reset_position(int which) { - step[which].step_pos = 0x00; step[which].pattern = 0x00; step[which].old_pattern = 0x00; diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c index a9d165fce31..e03b5a8f1a8 100644 --- a/src/mame/machine/stvprot.c +++ b/src/mame/machine/stvprot.c @@ -126,7 +126,6 @@ static READ32_HANDLER( twcup98_prot_r ) #endif switch(a_bus[3]) { - } } return a_bus[offset]; @@ -622,7 +621,6 @@ void write_prot_data(UINT32 data, UINT32 mem_mask, int offset, int which) */ { - FILE* fp; if (which==1) fp = fopen("table1x","wb"); else fp = fopen("table1","wb"); diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c index 9430fb38f70..e8917634bfe 100644 --- a/src/mame/machine/taitoio.c +++ b/src/mame/machine/taitoio.c @@ -124,7 +124,6 @@ WRITE8_DEVICE_HANDLER( tc0220ioc_w ) tc0220ioc->regs[offset] = data; switch (offset) { - case 0x00: space.machine().watchdog_reset(); break; @@ -430,7 +429,6 @@ WRITE8_DEVICE_HANDLER( tc0640fio_w ) tc0640fio->regs[offset] = data; switch (offset) { - case 0x00: space.machine().watchdog_reset(); break; diff --git a/src/mame/machine/ticket.h b/src/mame/machine/ticket.h index 7618a34f411..09d6fcd7051 100644 --- a/src/mame/machine/ticket.h +++ b/src/mame/machine/ticket.h @@ -57,8 +57,7 @@ extern const device_type TICKET_DISPENSER; #define MCFG_TICKET_DISPENSER_ADD(_tag, _period_in_msec, _motor_sense, _status_sense) \ MCFG_DEVICE_ADD(_tag, TICKET_DISPENSER, 0) \ ticket_dispenser_device::static_set_period(*device, _period_in_msec); \ - ticket_dispenser_device::static_set_senses(*device, _motor_sense, _status_sense); \ - + ticket_dispenser_device::static_set_senses(*device, _motor_sense, _status_sense); //************************************************************************** diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c index 1b912026fe4..693212edd12 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -662,7 +662,6 @@ MACHINE_RESET_MEMBER(tnzs_state,tnzs) MACHINE_RESET_MEMBER(tnzs_state,jpopnics) { - m_screenflip = 0; m_mcu_type = -1; } @@ -699,7 +698,6 @@ MACHINE_START_MEMBER(tnzs_state,jpopnics) MACHINE_START_MEMBER(tnzs_state,tnzs) { - MACHINE_START_CALL_MEMBER( jpopnics ); m_audiocpu = machine().device("audiocpu"); @@ -723,7 +721,6 @@ MACHINE_START_MEMBER(tnzs_state,tnzs) WRITE8_MEMBER(tnzs_state::tnzs_ramrom_bankswitch_w) { - // logerror("PC %04x: writing %02x to bankswitch\n", space.device().safe_pc(),data); /* bit 4 resets the second CPU */ diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c index 71b14902ed1..fd1ab9e1bad 100644 --- a/src/mame/machine/toaplan1.c +++ b/src/mame/machine/toaplan1.c @@ -41,7 +41,6 @@ static const UINT8 toaplan1_credits_for_coin[TOAPLAN1_REGION_OTHER+1][2][4] = INTERRUPT_GEN_MEMBER(toaplan1_state::toaplan1_interrupt) { - if (m_intenable) device.execute().set_input_line(4, HOLD_LINE); } @@ -57,7 +56,6 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_intenable_w) WRITE16_MEMBER(toaplan1_state::demonwld_dsp_addrsel_w) { - /* This sets the main CPU RAM address the DSP should */ /* read/write, via the DSP IO port 0 */ /* Top three bits of data need to be shifted left 9 places */ @@ -126,7 +124,6 @@ WRITE16_MEMBER(toaplan1_state::demonwld_dsp_bio_w) READ16_MEMBER(toaplan1_state::demonwld_BIO_r) { - return m_dsp_BIO; } @@ -320,7 +317,6 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_reset_sound) WRITE8_MEMBER(toaplan1_state::rallybik_coin_w) { - switch (data) { case 0x08: if (m_coin_count) { coin_counter_w(machine(), 0, 1); coin_counter_w(machine(), 0, 0); } break; case 0x09: if (m_coin_count) { coin_counter_w(machine(), 2, 1); coin_counter_w(machine(), 2, 0); } break; @@ -379,7 +375,6 @@ WRITE16_MEMBER(toaplan1_state::samesame_coin_w) MACHINE_RESET_MEMBER(toaplan1_state,toaplan1) { - m_intenable = 0; m_coin_count = 0; m_unk_reset_port = 0; @@ -397,14 +392,12 @@ void toaplan1_driver_savestate(running_machine &machine) MACHINE_RESET_MEMBER(toaplan1_state,zerowing)/* Hack for ZeroWing and OutZone. See the video driver */ { - MACHINE_RESET_CALL_MEMBER(toaplan1); m_unk_reset_port = 1; } MACHINE_RESET_MEMBER(toaplan1_state,demonwld) { - MACHINE_RESET_CALL_MEMBER(toaplan1); m_dsp_addr_w = 0; m_main_ram_seg = 0; @@ -425,7 +418,6 @@ void demonwld_driver_savestate(running_machine &machine) MACHINE_RESET_MEMBER(toaplan1_state,vimana) { - MACHINE_RESET_CALL_MEMBER(toaplan1); m_vimana_coins[0] = m_vimana_coins[1] = 0; m_vimana_credits = 0; diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c index 12b2cd0a363..ef3ac9846ea 100644 --- a/src/mame/machine/twincobr.c +++ b/src/mame/machine/twincobr.c @@ -303,7 +303,6 @@ WRITE8_MEMBER(twincobr_state::wardner_coin_dsp_w) MACHINE_RESET_MEMBER(twincobr_state,twincobr) { - m_toaplan_main_cpu = 0; /* 68000 */ twincobr_display(machine(), 0); m_intenable = 0; diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c index 2b6f261bb0f..23d30d047d7 100644 --- a/src/mame/machine/tx1.c +++ b/src/mame/machine/tx1.c @@ -780,7 +780,6 @@ WRITE16_MEMBER(tx1_state::tx1_math_w) /* /MUXCS */ else if ((offset & 0xc00) == 0xc00) { - /* /TMPLD1: 0 /TMPLD2: 0 diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c index d1332b776b4..6f02898b3af 100644 --- a/src/mame/machine/vertigo.c +++ b/src/mame/machine/vertigo.c @@ -198,7 +198,6 @@ READ16_MEMBER(vertigo_state::vertigo_sio_r) void vertigo_state::machine_start() { - m_custom = machine().device("custom"); m_ttl74148 = machine().device("74148"); diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c index 761f4c6db97..f287764dc05 100644 --- a/src/mame/machine/volfied.c +++ b/src/mame/machine/volfied.c @@ -280,7 +280,6 @@ static const UINT16 *const palette_data_lookup[] = TIMER_CALLBACK_MEMBER(volfied_state::volfied_timer_callback) { - // Palette commands - palette data written to bank 0: $10 - $af if (m_current_cmd >= 0x1 && m_current_cmd < 0x12) { @@ -339,7 +338,6 @@ WRITE16_MEMBER(volfied_state::volfied_cchip_bank_w) WRITE16_MEMBER(volfied_state::volfied_cchip_ram_w) { - m_cchip_ram[(m_current_bank * 0x400) + offset] = data; // if (offset != 0x8) @@ -429,7 +427,6 @@ READ16_MEMBER(volfied_state::volfied_cchip_ctrl_r) READ16_MEMBER(volfied_state::volfied_cchip_ram_r) { - /* Check for input ports */ if (m_current_bank == 0) { diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 2ac8c583a75..1fccdc7b295 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -69,7 +69,6 @@ READ8_MEMBER(vsnes_state::gun_in0_r) READ8_MEMBER(vsnes_state::vsnes_in0_r) { - int ret = (m_input_latch[0]) & 1; /* shift */ @@ -138,7 +137,6 @@ READ8_MEMBER(vsnes_state::vsnes_in1_1_r) MACHINE_RESET_MEMBER(vsnes_state,vsnes) { - m_last_bank = 0xff; m_sound_fix = 0; m_input_latch[0] = m_input_latch[1] = 0; @@ -154,7 +152,6 @@ MACHINE_RESET_MEMBER(vsnes_state,vsnes) MACHINE_RESET_MEMBER(vsnes_state,vsdual) { - m_input_latch[0] = m_input_latch[1] = 0; m_input_latch[2] = m_input_latch[3] = 0; @@ -358,7 +355,6 @@ WRITE8_MEMBER(vsnes_state::gun_in0_w) /* here we do things a little different */ if (data & 1) { - /* load up the latches */ m_input_latch[0] = ioport("IN0")->read(); @@ -948,7 +944,6 @@ WRITE8_MEMBER(vsnes_state::mapper68_rom_banking) DRIVER_INIT_MEMBER(vsnes_state,platoon) { - /* when starting a mapper 68 game the first 16K ROM bank in the cart is loaded into $8000 the LAST 16K ROM bank is loaded into $C000. The last 16K of ROM cannot be swapped. */ diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c index 908c9bff40c..7065dde20b1 100644 --- a/src/mame/machine/xevious.c +++ b/src/mame/machine/xevious.c @@ -37,7 +37,6 @@ void battles_customio_init(running_machine &machine) TIMER_DEVICE_CALLBACK_MEMBER(xevious_state::battles_nmi_generate) { - battles_customio_prev_command = battles_customio_command; if( battles_customio_command & 0x10 ) diff --git a/src/mame/machine/zndip.h b/src/mame/machine/zndip.h index 790f127b286..8d1c468662f 100644 --- a/src/mame/machine/zndip.h +++ b/src/mame/machine/zndip.h @@ -8,8 +8,7 @@ extern const device_type ZNDIP; #define MCFG_ZNDIP_DATA_HANDLER(_devcb) \ - devcb = &zndip_device::set_data_handler(*device, DEVCB2_##_devcb); \ - + devcb = &zndip_device::set_data_handler(*device, DEVCB2_##_devcb); class zndip_device : public psxsiodev_device { public: diff --git a/src/mame/machine/zs01.h b/src/mame/machine/zs01.h index 5576641fc17..20e5cdbc96d 100644 --- a/src/mame/machine/zs01.h +++ b/src/mame/machine/zs01.h @@ -10,8 +10,7 @@ #define MCFG_ZS01_ADD(_tag, ds2401_tag) \ MCFG_DEVICE_ADD(_tag, ZS01, 0) \ - zs01_device::static_set_ds2401_tag(*device, ds2401_tag); \ - + zs01_device::static_set_ds2401_tag(*device, ds2401_tag); #include "machine/secflash.h" class zs01_device : public device_secure_serial_flash diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c index 1e4c32be081..2aefa9bc9af 100644 --- a/src/mame/video/1942.c +++ b/src/mame/video/1942.c @@ -140,14 +140,12 @@ void _1942_state::video_start() WRITE8_MEMBER(_1942_state::c1942_fgvideoram_w) { - m_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_MEMBER(_1942_state::c1942_bgvideoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty((offset & 0x0f) | ((offset >> 1) & 0x01f0)); } @@ -155,7 +153,6 @@ WRITE8_MEMBER(_1942_state::c1942_bgvideoram_w) WRITE8_MEMBER(_1942_state::c1942_palette_bank_w) { - if (m_palette_bank != data) { m_palette_bank = data; @@ -165,7 +162,6 @@ WRITE8_MEMBER(_1942_state::c1942_palette_bank_w) WRITE8_MEMBER(_1942_state::c1942_scroll_w) { - m_scroll[offset] = data; m_bg_tilemap->set_scrollx(0, m_scroll[0] | (m_scroll[1] << 8)); } @@ -235,7 +231,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 _1942_state::screen_update_1942(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index f217293e166..d13cf4e0c0d 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -121,21 +121,18 @@ void _1943_state::palette_init() WRITE8_MEMBER(_1943_state::c1943_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(_1943_state::c1943_colorram_w) { - m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(_1943_state::c1943_c804_w) { - /* bits 0 and 1 are coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -154,7 +151,6 @@ WRITE8_MEMBER(_1943_state::c1943_c804_w) WRITE8_MEMBER(_1943_state::c1943_d806_w) { - /* bit 4 enables bg 1 */ m_bg1_on = data & 0x10; diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c index b4420539d13..e133a076f72 100644 --- a/src/mame/video/20pacgal.c +++ b/src/mame/video/20pacgal.c @@ -408,7 +408,6 @@ static void draw_stars(_20pacgal_state *state, bitmap_rgb32 &bitmap, const recta UINT32 _20pacgal_state::screen_update_20pacgal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); draw_stars(this, bitmap,cliprect); draw_chars(this, bitmap); diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c index 48b4afac0f5..94229378a04 100644 --- a/src/mame/video/4enraya.c +++ b/src/mame/video/4enraya.c @@ -11,7 +11,6 @@ WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w) { - m_videoram[(offset & 0x3ff) * 2] = data; m_videoram[(offset & 0x3ff) * 2 + 1] = (offset & 0xc00) >> 10; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); @@ -19,7 +18,6 @@ WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w) TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info) { - int code = m_videoram[tile_index * 2] + (m_videoram[tile_index * 2 + 1] << 8); SET_TILE_INFO_MEMBER( 0, @@ -30,13 +28,11 @@ TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info) void _4enraya_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(_4enraya_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } UINT32 _4enraya_state::screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/88games.c b/src/mame/video/88games.c index 6b540df9485..f777c551f6c 100644 --- a/src/mame/video/88games.c +++ b/src/mame/video/88games.c @@ -56,7 +56,6 @@ void _88games_zoom_callback( running_machine &machine, int *code, int *color, in UINT32 _88games_state::screen_update_88games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); if (m_k88games_priority) diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index 09a1c6b2d4e..acf1187f73f 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -26,7 +26,6 @@ void actfancr_state::video_start() UINT32 actfancr_state::screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* Draw playfield */ //m_flipscreen = m_control_2[0] & 0x80; //machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c index 3574cbfa2af..fb6dbab106f 100644 --- a/src/mame/video/aeroboto.c +++ b/src/mame/video/aeroboto.c @@ -41,7 +41,6 @@ TILE_GET_INFO_MEMBER(aeroboto_state::get_tile_info) void aeroboto_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(aeroboto_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); m_bg_tilemap->set_transparent_pen(0); m_bg_tilemap->set_scroll_rows(64); @@ -84,7 +83,6 @@ READ8_MEMBER(aeroboto_state::aeroboto_in0_r) WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w) { - /* bit 0 selects both flip screen and player1/player2 controls */ flip_screen_set(data & 0x01); @@ -101,14 +99,12 @@ WRITE8_MEMBER(aeroboto_state::aeroboto_3000_w) WRITE8_MEMBER(aeroboto_state::aeroboto_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(aeroboto_state::aeroboto_tilecolor_w) { - if (m_tilecolor[offset] != data) { m_tilecolor[offset] = data; @@ -151,7 +147,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 aeroboto_state::screen_update_aeroboto(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - const rectangle splitrect1(0, 255, 0, 39); const rectangle splitrect2(0, 255, 40, 255); UINT8 *src_base, *src_colptr, *src_rowptr; diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c index c7d82d9e07c..d99d8f2522b 100644 --- a/src/mame/video/airbustr.c +++ b/src/mame/video/airbustr.c @@ -109,7 +109,6 @@ TILE_GET_INFO_MEMBER(airbustr_state::get_bg_tile_info) void airbustr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(airbustr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -127,7 +126,6 @@ void airbustr_state::video_start() UINT32 airbustr_state::screen_update_airbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -142,7 +140,6 @@ void airbustr_state::screen_eof_airbustr(screen_device &screen, bool state) // rising edge if (state) { - // update the sprite bitmap pandora_eof(m_pandora); } diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c index c0e5a1a6be5..55d81593d06 100644 --- a/src/mame/video/ajax.c +++ b/src/mame/video/ajax.c @@ -70,7 +70,6 @@ void ajax_zoom_callback( running_machine &machine, int *code, int *color, int *f void ajax_state::video_start() { - m_layer_colorbase[0] = 64; m_layer_colorbase[1] = 0; m_layer_colorbase[2] = 32; @@ -88,7 +87,6 @@ void ajax_state::video_start() UINT32 ajax_state::screen_update_ajax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c index 3403116427d..1a59ddbfabd 100644 --- a/src/mame/video/aliens.c +++ b/src/mame/video/aliens.c @@ -55,7 +55,6 @@ void aliens_sprite_callback( running_machine &machine, int *code, int *color, in void aliens_state::video_start() { - m_generic_paletteram_8.allocate(0x400); m_layer_colorbase[0] = 0; @@ -74,7 +73,6 @@ void aliens_state::video_start() UINT32 aliens_state::screen_update_aliens(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index b0b25e7bb8f..d084fbb6bd0 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -63,7 +63,6 @@ WRITE16_MEMBER(alpha68k_state::alpha68k_videoram_w) VIDEO_START_MEMBER(alpha68k_state,alpha68k) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(alpha68k_state::get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fix_tilemap->set_transparent_pen(0); } @@ -126,7 +125,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 alpha68k_state::screen_update_alpha68k_II(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_last_bank != m_bank_base) machine().tilemap().mark_all_dirty(); @@ -311,7 +309,6 @@ UINT32 alpha68k_state::screen_update_alpha68k_V(screen_device &screen, bitmap_in UINT32 alpha68k_state::screen_update_alpha68k_V_sb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_last_bank != m_bank_base) machine().tilemap().mark_all_dirty(); diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c index 0775976bc3f..9f75ede17d7 100644 --- a/src/mame/video/amigaaga.c +++ b/src/mame/video/amigaaga.c @@ -73,7 +73,6 @@ void amiga_aga_palette_write(running_machine &machine, int color_reg, UINT16 dat VIDEO_START_MEMBER(amiga_state,amiga_aga) { - VIDEO_START_CALL_MEMBER( amiga ); m_aga_diwhigh_written = 0; diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c index 73cd28cf297..80904b6cbdc 100644 --- a/src/mame/video/angelkds.c +++ b/src/mame/video/angelkds.c @@ -24,14 +24,12 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_tx_tile_info) WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w) { - m_txvideoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(angelkds_state::angelkds_txbank_write) { - if (m_txbank != data) { m_txbank = data; @@ -55,14 +53,12 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgtop_tile_info) WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w) { - m_bgtopvideoram[offset] = data; m_bgtop_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(angelkds_state::angelkds_bgtopbank_write) { - if (m_bgtopbank != data) { m_bgtopbank = data; @@ -72,7 +68,6 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgtopbank_write) WRITE8_MEMBER(angelkds_state::angelkds_bgtopscroll_write) { - m_bgtop_tilemap->set_scrollx(0, data); } @@ -92,7 +87,6 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgbot_tile_info) WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w) { - m_bgbotvideoram[offset] = data; m_bgbot_tilemap->mark_tile_dirty(offset); } @@ -100,7 +94,6 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w) WRITE8_MEMBER(angelkds_state::angelkds_bgbotbank_write) { - if (m_bgbotbank != data) { m_bgbotbank = data; @@ -110,14 +103,12 @@ WRITE8_MEMBER(angelkds_state::angelkds_bgbotbank_write) WRITE8_MEMBER(angelkds_state::angelkds_bgbotscroll_write) { - m_bgbot_tilemap->set_scrollx(0, data); } WRITE8_MEMBER(angelkds_state::angelkds_layer_ctrl_write) { - m_layer_ctrl = data; } @@ -245,7 +236,6 @@ WRITE8_MEMBER(angelkds_state::angelkds_paletteram_w) void angelkds_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(angelkds_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 7f7357c2c3a..20a9e9ad9be 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -132,7 +132,6 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_bg_tile_info) VIDEO_START_MEMBER(appoooh_state,appoooh) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(appoooh_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c index a16ba487bf8..cf7d4b09251 100644 --- a/src/mame/video/arabian.c +++ b/src/mame/video/arabian.c @@ -268,7 +268,6 @@ static void blit_area( running_machine &machine, UINT8 plane, UINT16 src, UINT8 WRITE8_MEMBER(arabian_state::arabian_blitter_w) { - /* write the data */ m_blitter[offset] = data; diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c index 4f08749845e..44c9fea6961 100644 --- a/src/mame/video/arcadecl.c +++ b/src/mame/video/arcadecl.c @@ -79,7 +79,6 @@ VIDEO_START_MEMBER(arcadecl_state,arcadecl) UINT32 arcadecl_state::screen_update_arcadecl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* draw the playfield */ arcadecl_bitmap_render(machine(), bitmap, cliprect); diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index d75e97d3f33..401829a3f4d 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -119,7 +119,6 @@ WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w) WRITE8_MEMBER(arkanoid_state::hexa_d008_w) { - /* bit 0 = flipx (or y?) */ if (flip_screen_x() != (data & 0x01)) { @@ -160,7 +159,6 @@ TILE_GET_INFO_MEMBER(arkanoid_state::get_bg_tile_info) VIDEO_START_MEMBER(arkanoid_state,arkanoid) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(arkanoid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -198,7 +196,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 arkanoid_state::screen_update_arkanoid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; @@ -206,7 +203,6 @@ UINT32 arkanoid_state::screen_update_arkanoid(screen_device &screen, bitmap_ind1 UINT32 arkanoid_state::screen_update_hexa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index def2d682d28..f4be195cefa 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -115,7 +115,6 @@ TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info) VIDEO_START_MEMBER(armedf_state,terraf) { - m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); @@ -137,7 +136,6 @@ VIDEO_START_MEMBER(armedf_state,terraf) VIDEO_START_MEMBER(armedf_state,armedf) { - m_sprite_offy = (m_scroll_type & 2 ) ? 0 : 128; /* legion, legiono, crazy climber 2 */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(armedf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 64, 32); @@ -164,20 +162,17 @@ VIDEO_START_MEMBER(armedf_state,armedf) READ8_MEMBER(armedf_state::nb1414m4_text_videoram_r) { - return m_text_videoram[offset]; } WRITE8_MEMBER(armedf_state::nb1414m4_text_videoram_w) { - m_text_videoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset & 0x7ff); } READ8_MEMBER(armedf_state::armedf_text_videoram_r) { - return m_text_videoram[offset]; } diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c index f3114eedc32..5c219edfc7f 100644 --- a/src/mame/video/ashnojoe.c +++ b/src/mame/video/ashnojoe.c @@ -93,7 +93,6 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_joe_tile_info_7) WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram_w) { - m_tileram[offset] = data; m_joetilemap->mark_tile_dirty(offset); } @@ -101,49 +100,42 @@ WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram_w) WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram2_w) { - m_tileram_2[offset] = data; m_joetilemap2->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram3_w) { - m_tileram_3[offset] = data; m_joetilemap3->mark_tile_dirty(offset); } WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram4_w) { - m_tileram_4[offset] = data; m_joetilemap4->mark_tile_dirty(offset); } WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram5_w) { - m_tileram_5[offset] = data; m_joetilemap5->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram6_w) { - m_tileram_6[offset] = data; m_joetilemap6->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(ashnojoe_state::ashnojoe_tileram7_w) { - m_tileram_7[offset] = data; m_joetilemap7->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_xscroll_w) { - switch( offset ) { case 0: @@ -167,7 +159,6 @@ WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_xscroll_w) WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_yscroll_w) { - switch( offset ) { case 0: @@ -191,7 +182,6 @@ WRITE16_MEMBER(ashnojoe_state::joe_tilemaps_yscroll_w) void ashnojoe_state::video_start() { - m_joetilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_joetilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_joetilemap3 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ashnojoe_state::get_joe_tile_info_3),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -209,7 +199,6 @@ void ashnojoe_state::video_start() UINT32 ashnojoe_state::screen_update_ashnojoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - //m_tilemap_reg[0] & 0x10 // ?? on coin insertion flip_screen_set(m_tilemap_reg[0] & 1); diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c index b182f943ac7..d5a349326a0 100644 --- a/src/mame/video/astrocde.c +++ b/src/mame/video/astrocde.c @@ -162,7 +162,6 @@ PALETTE_INIT_MEMBER(astrocde_state,profpac) void astrocde_state::video_start() { - /* allocate timers */ m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(astrocde_state::scanline_callback),this)); m_scanline_timer->adjust(machine().primary_screen->time_until_pos(1), 1); @@ -179,7 +178,6 @@ void astrocde_state::video_start() VIDEO_START_MEMBER(astrocde_state,profpac) { - /* allocate timers */ m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(astrocde_state::scanline_callback),this)); m_scanline_timer->adjust(machine().primary_screen->time_until_pos(1), 1); diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c index d8c9ef621ac..d64c5fcfe85 100644 --- a/src/mame/video/asuka.c +++ b/src/mame/video/asuka.c @@ -8,7 +8,6 @@ WRITE16_MEMBER(asuka_state::asuka_spritectrl_w) { - /* Bits 2-5 are color bank; in asuka games bit 0 is global priority */ pc090oj_set_sprite_ctrl(m_pc090oj, ((data & 0x3c) >> 2) | ((data & 0x1) << 15)); } diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c index 034f3769a98..b1d761f7f6f 100644 --- a/src/mame/video/atarifb.c +++ b/src/mame/video/atarifb.c @@ -58,7 +58,6 @@ TILE_GET_INFO_MEMBER(atarifb_state::field_get_tile_info) WRITE8_MEMBER(atarifb_state::atarifb_alpha1_videoram_w) { - m_alphap1_videoram[offset] = data; m_alpha1_tilemap->mark_tile_dirty(offset); } @@ -66,7 +65,6 @@ WRITE8_MEMBER(atarifb_state::atarifb_alpha1_videoram_w) WRITE8_MEMBER(atarifb_state::atarifb_alpha2_videoram_w) { - m_alphap2_videoram[offset] = data; m_alpha2_tilemap->mark_tile_dirty(offset); } @@ -74,7 +72,6 @@ WRITE8_MEMBER(atarifb_state::atarifb_alpha2_videoram_w) WRITE8_MEMBER(atarifb_state::atarifb_field_videoram_w) { - m_field_videoram[offset] = data; m_field_tilemap->mark_tile_dirty(offset); } @@ -89,7 +86,6 @@ WRITE8_MEMBER(atarifb_state::atarifb_field_videoram_w) void atarifb_state::video_start() { - m_alpha1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha1_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); m_alpha2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::alpha2_get_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 3, 32); m_field_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atarifb_state::field_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c index ed0a44a082c..5878e99ba9f 100644 --- a/src/mame/video/atarig1.c +++ b/src/mame/video/atarig1.c @@ -148,7 +148,6 @@ void atarig1_state::scanline_update(screen_device &screen, int scanline) UINT32 atarig1_state::screen_update_atarig1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* draw the playfield */ m_playfield_tilemap->draw(bitmap, cliprect, 0, 0); @@ -165,7 +164,6 @@ void atarig1_state::screen_eof_atarig1(screen_device &screen, bool state) // rising edge if (state) { - atarirle_eof(m_rle); } } diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 29d49ba468e..084c699a8b9 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -226,7 +226,6 @@ void atarig42_state::screen_eof_atarig42(screen_device &screen, bool state) // rising edge if (state) { - atarirle_eof(m_rle); } } diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c index f4adb23c090..b2044cab083 100644 --- a/src/mame/video/atarigt.c +++ b/src/mame/video/atarigt.c @@ -632,7 +632,6 @@ void atarigt_state::screen_eof_atarigt(screen_device &screen, bool state) // rising edge if (state) { - atarirle_eof(m_rle); } } diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c index 76b4e83c17b..9c94810d45f 100644 --- a/src/mame/video/atarigx2.c +++ b/src/mame/video/atarigx2.c @@ -219,7 +219,6 @@ void atarigx2_state::screen_eof_atarigx2(screen_device &screen, bool state) // rising edge if (state) { - atarirle_eof(m_rle); } } diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c index fba572e4b99..138e3c17507 100644 --- a/src/mame/video/atetris.c +++ b/src/mame/video/atetris.c @@ -49,7 +49,6 @@ WRITE8_MEMBER(atetris_state::atetris_videoram_w) void atetris_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(atetris_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 64,32); } @@ -63,7 +62,6 @@ void atetris_state::video_start() UINT32 atetris_state::screen_update_atetris(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0,0); return 0; } diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index 07f5cc6d162..d7c907d289e 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -283,7 +283,6 @@ static int dvg_gostrobe(vgdata *vg) if (vg->op == 0xf) { - scale = (vg->scale + (((vg->dvy & 0x800) >> 11) | (((vg->dvx & 0x800) ^ 0x800) >> 10) @@ -312,7 +311,6 @@ static int dvg_gostrobe(vgdata *vg) while (fin--) { - /* * The 7497 Bit Rate Multiplier is a 6 bit counter with * clever decoding of output bits to perform the following diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c index f7f614d6a7c..06f2b43e41b 100644 --- a/src/mame/video/awpvid.c +++ b/src/mame/video/awpvid.c @@ -31,7 +31,6 @@ void awp_draw_reel(int rno) } else { - output_set_value(rg,(reelpos[rno])); // if the reel isn't configured don't do this, otherwise you'll get DIV0 diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index 4893dc74509..30a8d0d535d 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -18,7 +18,6 @@ void balsente_state::video_start() { - /* reset the system */ m_palettebank_vis = 0; m_sprite_bank[0] = memregion("gfx1")->base(); @@ -43,7 +42,6 @@ void balsente_state::video_start() WRITE8_MEMBER(balsente_state::balsente_videoram_w) { - /* expand the two pixel values into two bytes */ m_videoram[offset] = data; @@ -61,7 +59,6 @@ WRITE8_MEMBER(balsente_state::balsente_videoram_w) WRITE8_MEMBER(balsente_state::balsente_palette_select_w) { - /* only update if changed */ if (m_palettebank_vis != (data & 3)) { diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c index 039495deaf6..d2b94509baa 100644 --- a/src/mame/video/bankp.c +++ b/src/mame/video/bankp.c @@ -83,34 +83,29 @@ void bankp_state::palette_init() WRITE8_MEMBER(bankp_state::bankp_scroll_w) { - m_scroll_x = data; } WRITE8_MEMBER(bankp_state::bankp_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bankp_state::bankp_colorram_w) { - m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bankp_state::bankp_videoram2_w) { - m_videoram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bankp_state::bankp_colorram2_w) { - m_colorram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -154,7 +149,6 @@ TILE_GET_INFO_MEMBER(bankp_state::get_fg_tile_info) void bankp_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bankp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -167,7 +161,6 @@ void bankp_state::video_start() UINT32 bankp_state::screen_update_bankp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (flip_screen()) { m_fg_tilemap->set_scrollx(0, -m_scroll_x); diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c index fae4c9b9be0..472565f9ea8 100644 --- a/src/mame/video/battlane.c +++ b/src/mame/video/battlane.c @@ -227,7 +227,6 @@ static void draw_fg_bitmap( running_machine &machine, bitmap_ind16 &bitmap ) UINT32 battlane_state::screen_update_battlane(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->mark_all_dirty(); // HACK m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index d41601fb511..ab17ff51bcc 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -112,7 +112,6 @@ WRITE8_MEMBER(battlera_state::HuC6270_data_w) switch (offset) { case 0: /* LSB */ switch (m_VDC_register) { - case 0: /* MAWR */ m_HuC6270_registers[0]=(m_HuC6270_registers[0]&0xff00) | (data); return; @@ -172,7 +171,6 @@ WRITE8_MEMBER(battlera_state::HuC6270_data_w) case 1: /* MSB (Autoincrement on this write) */ switch (m_VDC_register) { - case 0: /* MAWR - Memory Address Write Register */ m_HuC6270_registers[0]=(m_HuC6270_registers[0]&0xff) | (data<<8); return; diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c index 6d9a1513d73..d67d574f0a5 100644 --- a/src/mame/video/battlex.c +++ b/src/mame/video/battlex.c @@ -91,7 +91,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 battlex_state::screen_update_battlex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_scroll_lsb | (m_scroll_msb << 8)); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c index d46a54e33a7..46e1224ed4e 100644 --- a/src/mame/video/battlnts.c +++ b/src/mame/video/battlnts.c @@ -44,7 +44,6 @@ WRITE8_MEMBER(battlnts_state::battlnts_spritebank_w) UINT32 battlnts_state::screen_update_battlnts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k007342_tilemap_update(m_k007342); k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE ,0); diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index dc8fcd08577..9bbe0bc4b8a 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -50,21 +50,18 @@ TILE_GET_INFO_MEMBER(bbusters_state::get_pf2_tile_info) WRITE16_MEMBER(bbusters_state::bbusters_video_w) { - COMBINE_DATA(&m_videoram[offset]); m_fix_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(bbusters_state::bbusters_pf1_w) { - COMBINE_DATA(&m_pf1_data[offset]); m_pf1_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(bbusters_state::bbusters_pf2_w) { - COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset); } @@ -73,7 +70,6 @@ WRITE16_MEMBER(bbusters_state::bbusters_pf2_w) VIDEO_START_MEMBER(bbusters_state,bbuster) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 128, 32); @@ -84,7 +80,6 @@ VIDEO_START_MEMBER(bbusters_state,bbuster) VIDEO_START_MEMBER(bbusters_state,mechatt) { - m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_bbusters_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bbusters_state::get_pf2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 256, 32); @@ -160,7 +155,6 @@ static void bbusters_draw_block(running_machine &machine, bitmap_ind16 &dest,int int sx, ex = state->m_scale_line_count; while (state->m_scale_line_count) { - if (dy>=16 && dy<240) { UINT16 *destline = &dest.pix16(dy); UINT8 srcline=*state->m_scale_table_ptr; @@ -273,7 +267,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const U UINT32 bbusters_state::screen_update_bbuster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_pf1_tilemap->set_scrollx(0, m_pf1_scroll_data[0]); m_pf1_tilemap->set_scrolly(0, m_pf1_scroll_data[1]); m_pf2_tilemap->set_scrollx(0, m_pf2_scroll_data[0]); @@ -290,7 +283,6 @@ UINT32 bbusters_state::screen_update_bbuster(screen_device &screen, bitmap_ind16 UINT32 bbusters_state::screen_update_mechatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_pf1_tilemap->set_scrollx(0, m_pf1_scroll_data[0]); m_pf1_tilemap->set_scrolly(0, m_pf1_scroll_data[1]); m_pf2_tilemap->set_scrollx(0, m_pf2_scroll_data[0]); diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c index 1261801407f..573f2015ca3 100644 --- a/src/mame/video/bfm_dm01.c +++ b/src/mame/video/bfm_dm01.c @@ -134,7 +134,6 @@ static READ8_HANDLER( mux_r ) static WRITE8_HANDLER( mux_w ) { - if ( dm01.xcounter < DM_BYTESPERROW ) { dm01.scanline[dm01.xcounter] = data; @@ -150,7 +149,6 @@ static WRITE8_HANDLER( mux_w ) while ( p < (DM_BYTESPERROW) ) { - UINT8 d = dm01.scanline[p]; for (int bitpos=0; bitpos <8; bitpos++) diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c index 5ca28840bba..6efa2c817f4 100644 --- a/src/mame/video/bigevglf.c +++ b/src/mame/video/bigevglf.c @@ -20,7 +20,6 @@ WRITE8_MEMBER(bigevglf_state::bigevglf_palette_w) WRITE8_MEMBER(bigevglf_state::bigevglf_gfxcontrol_w) { - /* bits used: 0,1,2,3 0 and 2 select plane, 1 and 3 select visible plane, @@ -51,7 +50,6 @@ READ8_MEMBER(bigevglf_state::bigevglf_vidram_r) void bigevglf_state::video_start() { - machine().primary_screen->register_screen_bitmap(m_tmp_bitmap[0]); machine().primary_screen->register_screen_bitmap(m_tmp_bitmap[1]); machine().primary_screen->register_screen_bitmap(m_tmp_bitmap[2]); @@ -87,7 +85,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 bigevglf_state::screen_update_bigevglf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - copybitmap(bitmap, m_tmp_bitmap[m_plane_visible], 0, 0, 0, 0, cliprect); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c index 2f510bbd452..4e6a27b126b 100644 --- a/src/mame/video/bigstrkb.c +++ b/src/mame/video/bigstrkb.c @@ -123,7 +123,6 @@ void bigstrkb_state::video_start() UINT32 bigstrkb_state::screen_update_bigstrkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // bitmap.fill(get_black_pen(machine()), cliprect); m_tilemap2->set_scrollx(0, m_vidreg1[0]+(256-14)); diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c index 8370d86d910..d54ffd20338 100644 --- a/src/mame/video/bionicc.c +++ b/src/mame/video/bionicc.c @@ -35,7 +35,6 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info) { - int attr = m_bgvideoram[2 * tile_index + 1]; SET_TILE_INFO_MEMBER( 1, @@ -46,7 +45,6 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info) { - int attr = m_fgvideoram[2 * tile_index + 1]; int flags; @@ -72,7 +70,6 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info) TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info) { - int attr = m_txvideoram[tile_index + 0x400]; SET_TILE_INFO_MEMBER( 0, @@ -91,7 +88,6 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info) void bionicc_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bionicc_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -112,21 +108,18 @@ void bionicc_state::video_start() WRITE16_MEMBER(bionicc_state::bionicc_bgvideoram_w) { - COMBINE_DATA(&m_bgvideoram[offset]); m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(bionicc_state::bionicc_fgvideoram_w) { - COMBINE_DATA(&m_fgvideoram[offset]); m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(bionicc_state::bionicc_txvideoram_w) { - COMBINE_DATA(&m_txvideoram[offset]); m_tx_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -154,7 +147,6 @@ WRITE16_MEMBER(bionicc_state::bionicc_paletteram_w) WRITE16_MEMBER(bionicc_state::bionicc_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) @@ -176,7 +168,6 @@ WRITE16_MEMBER(bionicc_state::bionicc_scroll_w) WRITE16_MEMBER(bionicc_state::bionicc_gfxctrl_w) { - if (ACCESSING_BITS_8_15) { flip_screen_set(data & 0x0100); @@ -238,7 +229,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 bionicc_state::screen_update_bionicc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); m_fg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0); /* nothing in FRONT */ m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c index 96ba68faed9..cb2b58dadc1 100644 --- a/src/mame/video/bishi.c +++ b/src/mame/video/bishi.c @@ -26,7 +26,6 @@ void bishi_tile_callback( running_machine &machine, int layer, int *code, int *c void bishi_state::video_start() { - assert(machine().primary_screen->format() == BITMAP_FORMAT_RGB32); k056832_set_layer_association(m_k056832, 0); diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index ab38c388241..b6f38350422 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -116,7 +116,6 @@ WRITE8_MEMBER(bking_state::bking_yld3_w) WRITE8_MEMBER(bking_state::bking_cont1_w) { - /* D0 = COIN LOCK */ /* D1 = BALL 5 (Controller selection) */ /* D2 = VINV (flip screen) */ @@ -136,7 +135,6 @@ WRITE8_MEMBER(bking_state::bking_cont1_w) WRITE8_MEMBER(bking_state::bking_cont2_w) { - /* D0-D2 = BALL10 - BALL12 (Selects player 1 ball picture) */ /* D3-D5 = BALL20 - BALL22 (Selects player 2 ball picture) */ /* D6 = HIT1 */ @@ -150,7 +148,6 @@ WRITE8_MEMBER(bking_state::bking_cont2_w) WRITE8_MEMBER(bking_state::bking_cont3_w) { - /* D0 = CROW INV (inverts Crow picture and coordinates) */ /* D1-D2 = COLOR 0 - COLOR 1 (switches 4 color palettes, global across all graphics) */ /* D3 = SOUND STOP */ @@ -235,7 +232,6 @@ void bking_state::video_start() UINT32 bking_state::screen_update_bking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* draw the balls */ diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c index 0a67b58f2af..48d4f1bc9f7 100644 --- a/src/mame/video/blktiger.c +++ b/src/mame/video/blktiger.c @@ -64,7 +64,6 @@ TILE_GET_INFO_MEMBER(blktiger_state::get_tx_tile_info) void blktiger_state::video_start() { - m_chon = 1; m_bgon = 1; m_objon = 1; @@ -163,7 +162,6 @@ WRITE8_MEMBER(blktiger_state::blktiger_video_control_w) WRITE8_MEMBER(blktiger_state::blktiger_video_enable_w) { - /* not sure which is which, but I think that bit 1 and 2 enable background and sprites */ /* bit 1 enables bg ? */ m_bgon = ~data & 0x02; @@ -220,7 +218,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 blktiger_state::screen_update_blktiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(1023, cliprect); if (m_bgon) diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c index c60ab90e51b..c2d85f60770 100644 --- a/src/mame/video/blmbycar.c +++ b/src/mame/video/blmbycar.c @@ -44,7 +44,6 @@ Note: if MAME_DEBUG is defined, pressing Z with: WRITE16_MEMBER(blmbycar_state::blmbycar_palette_w) { - data = COMBINE_DATA(&m_paletteram[offset]); palette_set_color_rgb( machine(), offset, pal4bit(data >> 4), pal4bit(data >> 0), pal4bit(data >> 8)); } @@ -120,7 +119,6 @@ WRITE16_MEMBER(blmbycar_state::blmbycar_vram_1_w) void blmbycar_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(blmbycar_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 16, 16, DIM_NX, DIM_NY ); diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c index ebe056260a5..8489f3cc068 100644 --- a/src/mame/video/blockade.c +++ b/src/mame/video/blockade.c @@ -27,7 +27,6 @@ void blockade_state::video_start() UINT32 blockade_state::screen_update_blockade(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c index 3ad450ee8f9..e7de534d2c1 100644 --- a/src/mame/video/blockhl.c +++ b/src/mame/video/blockhl.c @@ -43,7 +43,6 @@ void blockhl_sprite_callback( running_machine &machine, int *code, int *color, i void blockhl_state::video_start() { - m_generic_paletteram_8.allocate(0x800); m_layer_colorbase[0] = 0; @@ -54,7 +53,6 @@ void blockhl_state::video_start() UINT32 blockhl_state::screen_update_blockhl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); k052109_tilemap_update(m_k052109); diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c index c9cd69322cd..789cc4f1b76 100644 --- a/src/mame/video/blockout.c +++ b/src/mame/video/blockout.c @@ -40,14 +40,12 @@ static void setcolor( running_machine &machine, int color, int rgb ) WRITE16_MEMBER(blockout_state::blockout_paletteram_w) { - COMBINE_DATA(&m_paletteram[offset]); setcolor(machine(), offset, m_paletteram[offset]); } WRITE16_MEMBER(blockout_state::blockout_frontcolor_w) { - COMBINE_DATA(&m_color); setcolor(machine(), 512, m_color); } @@ -61,7 +59,6 @@ WRITE16_MEMBER(blockout_state::blockout_frontcolor_w) ***************************************************************************/ void blockout_state::video_start() { - /* Allocate temporary bitmaps */ machine().primary_screen->register_screen_bitmap(m_tmpbitmap); save_item(NAME(m_tmpbitmap)); @@ -99,7 +96,6 @@ static void update_pixels( running_machine &machine, int x, int y ) WRITE16_MEMBER(blockout_state::blockout_videoram_w) { - COMBINE_DATA(&m_videoram[offset]); update_pixels(machine(), (offset % 256) * 2, (offset / 256) % 256); } diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c index 59870e09d3c..51c2ad0b2ae 100644 --- a/src/mame/video/bogeyman.c +++ b/src/mame/video/bogeyman.c @@ -38,28 +38,24 @@ void bogeyman_state::palette_init() WRITE8_MEMBER(bogeyman_state::bogeyman_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bogeyman_state::bogeyman_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bogeyman_state::bogeyman_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(bogeyman_state::bogeyman_colorram2_w) { - m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -147,7 +143,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 bogeyman_state::screen_update_bogeyman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 965389dd53b..7068258bf1a 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -23,7 +23,6 @@ WRITE8_MEMBER(bombjack_state::bombjack_colorram_w) WRITE8_MEMBER(bombjack_state::bombjack_background_w) { - if (m_background_image != data) { m_background_image = data; @@ -76,7 +75,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const for (offs = state->m_spriteram.bytes() - 4; offs >= 0; offs -= 4) { - /* abbbbbbb cdefgggg hhhhhhhh iiiiiiii diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index 0ec90d656f7..8923a7f9dfe 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -126,7 +126,6 @@ TILE_GET_INFO_MEMBER(bosco_state::fg_get_tile_info ) VIDEO_START_MEMBER(bosco_state,bosco) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bosco_state::bg_get_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(bosco_state::fg_get_tile_info),this),tilemap_mapper_delegate(FUNC(bosco_state::fg_tilemap_scan),this), 8,8, 8,32); @@ -283,7 +282,6 @@ static void draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rec UINT32 bosco_state::screen_update_bosco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* the radar tilemap is just 8x32. We rely on the tilemap code to repeat it across the screen, and clip it to only the position where it is supposed to be shown */ rectangle fg_clip = cliprect; diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c index 351e01aa0de..aab3f3f4e11 100644 --- a/src/mame/video/bottom9.c +++ b/src/mame/video/bottom9.c @@ -56,7 +56,6 @@ void bottom9_zoom_callback( running_machine &machine, int *code, int *color, int void bottom9_state::video_start() { - m_layer_colorbase[0] = 0; /* not used */ m_layer_colorbase[1] = 0; m_layer_colorbase[2] = 16; @@ -74,7 +73,6 @@ void bottom9_state::video_start() UINT32 bottom9_state::screen_update_bottom9(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); /* note: FIX layer is not used */ diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index 13aab7446d0..ded68fb860b 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -88,7 +88,6 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_bg_tile_info) WRITE8_MEMBER(brkthru_state::brkthru_bgram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -102,14 +101,12 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_fg_tile_info) WRITE8_MEMBER(brkthru_state::brkthru_fgram_w) { - m_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } void brkthru_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(brkthru_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 16); @@ -120,7 +117,6 @@ void brkthru_state::video_start() WRITE8_MEMBER(brkthru_state::brkthru_1800_w) { - if (offset == 0) /* low 8 bits of scroll */ m_bgscroll = (m_bgscroll & 0x100) | data; else if (offset == 1) @@ -247,7 +243,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 brkthru_state::screen_update_brkthru(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bgscroll); m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c index d849076d44f..769b8de52f4 100644 --- a/src/mame/video/bsktball.c +++ b/src/mame/video/bsktball.c @@ -10,7 +10,6 @@ WRITE8_MEMBER(bsktball_state::bsktball_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -52,7 +51,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 bsktball_state::screen_update_bsktball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index 0406179f078..5f25efbf3a0 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -116,7 +116,6 @@ Start the video hardware emulation. VIDEO_START_MEMBER(btime_state,btime) { - if (machine().gfx[0]->srcdata() == NULL) machine().gfx[0]->set_source(m_deco_charram); if (machine().gfx[1]->srcdata() == NULL) diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index ee2b0385b4e..6dce4fd4e09 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -231,7 +231,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 buggychl_state::screen_update_buggychl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_sky_on) draw_sky(bitmap, cliprect); else diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c index bc370578bc6..5080800affa 100644 --- a/src/mame/video/cabal.c +++ b/src/mame/video/cabal.c @@ -11,7 +11,6 @@ TILE_GET_INFO_MEMBER(cabal_state::get_back_tile_info) { - int tile = m_videoram[tile_index]; int color = (tile>>12)&0xf; @@ -26,7 +25,6 @@ TILE_GET_INFO_MEMBER(cabal_state::get_back_tile_info) TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info) { - int tile = m_colorram[tile_index]; int color = (tile>>10); @@ -42,7 +40,6 @@ TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info) void cabal_state::video_start() { - m_background_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_back_tile_info),this),TILEMAP_SCAN_ROWS,16,16,16,16); m_text_layer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cabal_state::get_text_tile_info),this),TILEMAP_SCAN_ROWS, 8,8,32,32); diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c index 7881c2ea559..a55e61e0004 100644 --- a/src/mame/video/canyon.c +++ b/src/mame/video/canyon.c @@ -25,7 +25,6 @@ TILE_GET_INFO_MEMBER(canyon_state::get_bg_tile_info) void canyon_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(canyon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } @@ -72,7 +71,6 @@ static void draw_bombs( running_machine &machine, bitmap_ind16 &bitmap, const re UINT32 canyon_state::screen_update_canyon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c index 206329236e1..714e2717d98 100644 --- a/src/mame/video/capbowl.c +++ b/src/mame/video/capbowl.c @@ -91,7 +91,6 @@ READ8_MEMBER(capbowl_state::capbowl_tms34061_r) WRITE8_MEMBER(capbowl_state::bowlrama_blitter_w) { - switch (offset) { case 0x08: /* Write address high byte (only 2 bits used) */ diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c index 81829c7ff41..fb9bd9a6198 100644 --- a/src/mame/video/carjmbre.c +++ b/src/mame/video/carjmbre.c @@ -45,7 +45,6 @@ void carjmbre_state::palette_init() WRITE8_MEMBER(carjmbre_state::carjmbre_flipscreen_w) { - m_flipscreen = (data & 1) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0; machine().tilemap().set_flip_all(m_flipscreen); } @@ -76,7 +75,6 @@ WRITE8_MEMBER(carjmbre_state::carjmbre_8806_w) WRITE8_MEMBER(carjmbre_state::carjmbre_videoram_w) { - m_videoram[offset] = data; m_cj_tilemap->mark_tile_dirty(offset & 0x3ff); } @@ -98,7 +96,6 @@ TILE_GET_INFO_MEMBER(carjmbre_state::get_carjmbre_tile_info) void carjmbre_state::video_start() { - m_cj_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(carjmbre_state::get_carjmbre_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); save_item(NAME(m_flipscreen)); save_item(NAME(m_bgcolor)); diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c index 1db914b3fdb..a064e3f3911 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -143,7 +143,6 @@ void carpolo_state::palette_init() void carpolo_state::video_start() { - m_sprite_sprite_collision_bitmap1 = auto_bitmap_ind16_alloc(machine(), SPRITE_WIDTH*2, SPRITE_HEIGHT*2); m_sprite_sprite_collision_bitmap2 = auto_bitmap_ind16_alloc(machine(), SPRITE_WIDTH*2, SPRITE_HEIGHT*2); diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c index 4fd90f7cf94..2ff58a1727f 100644 --- a/src/mame/video/cbasebal.c +++ b/src/mame/video/cbasebal.c @@ -38,7 +38,6 @@ TILE_GET_INFO_MEMBER(cbasebal_state::get_fg_tile_info) void cbasebal_state::video_start() { - m_textram = auto_alloc_array(machine(), UINT8, 0x1000); m_scrollram = auto_alloc_array(machine(), UINT8, 0x1000); @@ -61,7 +60,6 @@ void cbasebal_state::video_start() WRITE8_MEMBER(cbasebal_state::cbasebal_textram_w) { - m_textram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } @@ -73,7 +71,6 @@ READ8_MEMBER(cbasebal_state::cbasebal_textram_r) WRITE8_MEMBER(cbasebal_state::cbasebal_scrollram_w) { - m_scrollram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -85,7 +82,6 @@ READ8_MEMBER(cbasebal_state::cbasebal_scrollram_r) WRITE8_MEMBER(cbasebal_state::cbasebal_gfxctrl_w) { - /* bit 0 is unknown - toggles continuously */ /* bit 1 is flip screen */ @@ -170,7 +166,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 cbasebal_state::screen_update_cbasebal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_bg_on) m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index 10e523d1d16..d6bb942b102 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -209,7 +209,6 @@ WRITE8_MEMBER(ccastles_state::ccastles_videoram_w) READ8_MEMBER(ccastles_state::ccastles_bitmode_r) { - /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1); @@ -226,7 +225,6 @@ READ8_MEMBER(ccastles_state::ccastles_bitmode_r) WRITE8_MEMBER(ccastles_state::ccastles_bitmode_w) { - /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (m_bitmode_addr[1] << 7) | (m_bitmode_addr[0] >> 1); @@ -243,7 +241,6 @@ WRITE8_MEMBER(ccastles_state::ccastles_bitmode_w) WRITE8_MEMBER(ccastles_state::ccastles_bitmode_addr_w) { - /* write through to video RAM and also to the addressing latches */ ccastles_write_vram(machine(), offset, data, 0, 0); m_bitmode_addr[offset] = data; diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index db8638d9a94..65f2d5d0405 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -75,7 +75,6 @@ READ8_MEMBER(chaknpop_state::chaknpop_gfxmode_r) WRITE8_MEMBER(chaknpop_state::chaknpop_gfxmode_w) { - if (m_gfxmode != data) { int all_dirty = 0; @@ -102,14 +101,12 @@ WRITE8_MEMBER(chaknpop_state::chaknpop_gfxmode_w) WRITE8_MEMBER(chaknpop_state::chaknpop_txram_w) { - m_tx_ram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(chaknpop_state::chaknpop_attrram_w) { - if (m_attr_ram[offset] != data) { m_attr_ram[offset] = data; @@ -255,7 +252,6 @@ static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 chaknpop_state::screen_update_chaknpop(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tx_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); draw_bitmap(machine(), bitmap, cliprect); diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c index 7cce273f2ff..2219e8f1c07 100644 --- a/src/mame/video/changela.c +++ b/src/mame/video/changela.c @@ -19,7 +19,6 @@ Todo: Priority between tree0 and tree1. void changela_state::video_start() { - m_memory_devices = auto_alloc_array(machine(), UINT8, 4 * 0x800); /* 0 - not connected, 1,2,3 - RAMs*/ m_tree_ram = auto_alloc_array(machine(), UINT8, 2 * 0x20); diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c index 0c7aef3fe6a..68e28c73daf 100644 --- a/src/mame/video/cheekyms.c +++ b/src/mame/video/cheekyms.c @@ -42,7 +42,6 @@ void cheekyms_state::palette_init() WRITE8_MEMBER(cheekyms_state::cheekyms_port_40_w) { - /* the lower bits probably trigger sound samples */ m_dac->write_unsigned8(data ? 0x80 : 0); } @@ -50,7 +49,6 @@ WRITE8_MEMBER(cheekyms_state::cheekyms_port_40_w) WRITE8_MEMBER(cheekyms_state::cheekyms_port_80_w) { - /* d0-d1 - sound enables, not sure which bit is which */ /* d3-d5 - man scroll amount */ /* d6 - palette select (selects either 0 = PROM M9, 1 = PROM M8) */ diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c index 22c162f2dd8..f8fda7b74a4 100644 --- a/src/mame/video/chqflag.c +++ b/src/mame/video/chqflag.c @@ -54,7 +54,6 @@ void chqflag_zoom_callback_1( running_machine &machine, int *code, int *color, i void chqflag_state::video_start() { - m_generic_paletteram_8.allocate(0x800); m_sprite_colorbase = 0; @@ -70,7 +69,6 @@ void chqflag_state::video_start() UINT32 chqflag_state::screen_update_chqflag(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); k051316_zoom_draw(m_k051316_2, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c index 8ea412afaa7..62b2338a5a7 100644 --- a/src/mame/video/cischeat.c +++ b/src/mame/video/cischeat.c @@ -258,7 +258,6 @@ VIDEO_START_MEMBER(cischeat_state,cischeat) /* 16 colour codes for the tiles */ VIDEO_START_MEMBER(cischeat_state,f1gpstar) { - VIDEO_START_CALL_MEMBER(cischeat); m_bits_per_color_code = 4; diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 3bf76cd2c2f..ef854845d30 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -82,7 +82,6 @@ WRITE8_MEMBER(citycon_state::citycon_linecolor_w) WRITE8_MEMBER(citycon_state::citycon_background_w) { - /* bits 4-7 control the background image */ if (m_bg_image != (data >> 4)) { diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index 0ea01fdcc2f..30e51f494a5 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -94,7 +94,6 @@ void cloak_state::set_current_bitmap_videoram_pointer() WRITE8_MEMBER(cloak_state::cloak_clearbmp_w) { - machine().primary_screen->update_now(); m_bitmap_videoram_selected = data & 0x01; set_current_bitmap_videoram_pointer(); @@ -127,7 +126,6 @@ READ8_MEMBER(cloak_state::graph_processor_r) WRITE8_MEMBER(cloak_state::graph_processor_w) { - switch (offset) { case 0x03: m_bitmap_videoram_address_x = data; break; @@ -163,7 +161,6 @@ TILE_GET_INFO_MEMBER(cloak_state::get_bg_tile_info) void cloak_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(cloak_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bitmap_videoram1 = auto_alloc_array(machine(), UINT8, 256*256); diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index 32a1d812ec9..bf66b9cb803 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -53,7 +53,6 @@ void cloud9_state::video_start() WRITE8_MEMBER(cloud9_state::cloud9_video_control_w) { - /* only D7 matters */ m_video_control[offset] = (data >> 7) & 1; } @@ -193,7 +192,6 @@ WRITE8_MEMBER(cloud9_state::cloud9_videoram_w) READ8_MEMBER(cloud9_state::cloud9_bitmode_r) { - /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2); @@ -210,7 +208,6 @@ READ8_MEMBER(cloud9_state::cloud9_bitmode_r) WRITE8_MEMBER(cloud9_state::cloud9_bitmode_w) { - /* in bitmode, the address comes from the autoincrement latches */ UINT16 addr = (m_bitmode_addr[1] << 6) | (m_bitmode_addr[0] >> 2); @@ -227,7 +224,6 @@ WRITE8_MEMBER(cloud9_state::cloud9_bitmode_w) WRITE8_MEMBER(cloud9_state::cloud9_bitmode_addr_w) { - /* write through to video RAM and also to the addressing latches */ cloud9_write_vram(machine(), offset, data, 0, 0); m_bitmode_addr[offset] = data; diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 0069c256135..d4a36310da5 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -14,7 +14,6 @@ VIDEO_START_MEMBER(cninja_state,stoneage) { - /* The bootleg has broken scroll registers */ deco16ic_set_scrolldx(m_deco_tilegen1, 3, 0, -10, -10); /* pf4 16x16 tilemap */ deco16ic_set_scrolldx(m_deco_tilegen1, 1, 0, -10, -10); /* pf2 16x16 tilemap */ diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c index 9147a9a7978..e1c2619ea18 100644 --- a/src/mame/video/combatsc.c +++ b/src/mame/video/combatsc.c @@ -280,7 +280,6 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg) VIDEO_START_MEMBER(combatsc_state,combatsc) { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_textlayer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -300,7 +299,6 @@ VIDEO_START_MEMBER(combatsc_state,combatsc) VIDEO_START_MEMBER(combatsc_state,combatscb) { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info0_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_tile_info1_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_textlayer = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(combatsc_state::get_text_info_bootleg),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c index c927e27a517..dc1bb8e9629 100644 --- a/src/mame/video/commando.c +++ b/src/mame/video/commando.c @@ -12,49 +12,42 @@ WRITE8_MEMBER(commando_state::commando_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(commando_state::commando_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(commando_state::commando_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(commando_state::commando_colorram2_w) { - m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(commando_state::commando_scrollx_w) { - m_scroll_x[offset] = data; m_bg_tilemap->set_scrollx(0, m_scroll_x[0] | (m_scroll_x[1] << 8)); } WRITE8_MEMBER(commando_state::commando_scrolly_w) { - m_scroll_y[offset] = data; m_bg_tilemap->set_scrolly(0, m_scroll_y[0] | (m_scroll_y[1] << 8)); } WRITE8_MEMBER(commando_state::commando_c804_w) { - // bits 0 and 1 are coin counters coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -88,7 +81,6 @@ TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info) void commando_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(commando_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -128,7 +120,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 commando_state::screen_update_commando(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c index 302a7ec5845..3a4c711c291 100644 --- a/src/mame/video/contra.c +++ b/src/mame/video/contra.c @@ -164,7 +164,6 @@ TILE_GET_INFO_MEMBER(contra_state::get_tx_tile_info) void contra_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(contra_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -196,42 +195,36 @@ void contra_state::video_start() WRITE8_MEMBER(contra_state::contra_fg_vram_w) { - m_fg_vram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(contra_state::contra_fg_cram_w) { - m_fg_cram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(contra_state::contra_bg_vram_w) { - m_bg_vram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(contra_state::contra_bg_cram_w) { - m_bg_cram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(contra_state::contra_text_vram_w) { - m_tx_vram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(contra_state::contra_text_cram_w) { - m_tx_cram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index a18bb72440c..1e854d0b2eb 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -584,7 +584,6 @@ UINT32 cosmic_state::screen_update_magspot(screen_device &screen, bitmap_ind16 & UINT32 cosmic_state::screen_update_devzone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); if (m_background_enable) @@ -598,7 +597,6 @@ UINT32 cosmic_state::screen_update_devzone(screen_device &screen, bitmap_ind16 & UINT32 cosmic_state::screen_update_nomnlnd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* according to the video summation logic on pg4, the trees and river have the highest priority */ diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index a8eb7fbe473..dad577698de 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1596,7 +1596,6 @@ WRITE16_MEMBER(cps_state::cps1_cps_a_w) READ16_MEMBER(cps_state::cps1_cps_b_r) { - /* Some games interrogate a couple of registers on bootup. */ /* These are CPS1 board B self test checks. They wander from game to */ /* game. */ @@ -1780,7 +1779,6 @@ static void cps2_gfx_decode( running_machine &machine ) DRIVER_INIT_MEMBER(cps_state,cps1) { - cps1_gfx_decode(machine()); m_scanline1 = 0; @@ -1795,7 +1793,6 @@ DRIVER_INIT_MEMBER(cps_state,cps1) DRIVER_INIT_MEMBER(cps_state,cps2_video) { - cps2_gfx_decode(machine()); m_scanline1 = 262; @@ -2174,14 +2171,12 @@ VIDEO_START_MEMBER(cps_state,cps) VIDEO_START_MEMBER(cps_state,cps1) { - m_cps_version = 1; VIDEO_START_CALL_MEMBER(cps); } VIDEO_START_MEMBER(cps_state,cps2) { - m_cps_version = 2; VIDEO_START_CALL_MEMBER(cps); } @@ -2455,7 +2450,6 @@ static void cps1_render_sprites( running_machine &machine, bitmap_ind16 &bitmap, WRITE16_MEMBER(cps_state::cps2_objram_bank_w) { - if (ACCESSING_BITS_0_7) m_objram_bank = data & 1; } @@ -2943,7 +2937,6 @@ void cps_state::screen_eof_cps1(screen_device &screen, bool state) // rising edge if (state) { - /* Get video memory base registers */ cps1_get_video_base(machine()); diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c index c639ebfe0c8..28f933b9da7 100644 --- a/src/mame/video/crgolf.c +++ b/src/mame/video/crgolf.c @@ -20,7 +20,6 @@ WRITE8_MEMBER(crgolf_state::crgolf_videoram_w) { - if (*m_screen_select & 1) m_videoram_b[offset] = data; else @@ -90,7 +89,6 @@ static void get_pens( running_machine &machine, pen_t *pens ) VIDEO_START_MEMBER(crgolf_state,crgolf) { - /* allocate memory for the two bitmaps */ m_videoram_a = auto_alloc_array(machine(), UINT8, VIDEORAM_SIZE); m_videoram_b = auto_alloc_array(machine(), UINT8, VIDEORAM_SIZE); diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c index 8dbf697e3f7..7e4f30a15b7 100644 --- a/src/mame/video/crimfght.c +++ b/src/mame/video/crimfght.c @@ -57,7 +57,6 @@ void crimfght_sprite_callback( running_machine &machine, int *code, int *color, void crimfght_state::video_start() { - m_generic_paletteram_8.allocate(0x400); m_layer_colorbase[0] = 0; @@ -76,7 +75,6 @@ void crimfght_state::video_start() UINT32 crimfght_state::screen_update_crimfght(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); k052109_tilemap_draw(m_k052109, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c index fd6729a1e98..a7ef0565c3b 100644 --- a/src/mame/video/crospang.c +++ b/src/mame/video/crospang.c @@ -15,7 +15,6 @@ WRITE16_MEMBER(crospang_state::bestri_tilebank_w) { - m_bestri_tilebank = (data>>10) & 0xf; //printf("bestri %04x\n", data); @@ -26,7 +25,6 @@ WRITE16_MEMBER(crospang_state::bestri_tilebank_w) WRITE16_MEMBER(crospang_state::bestri_bg_scrolly_w) { - /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x0155; m_bg_layer->set_scrolly(0, -scroll + 7); @@ -34,7 +32,6 @@ WRITE16_MEMBER(crospang_state::bestri_bg_scrolly_w) WRITE16_MEMBER(crospang_state::bestri_fg_scrolly_w) { - /* Very Strange */ int scroll = (data & 0x3ff) ^ 0x00ab; m_fg_layer->set_scrolly(0, -scroll + 7); @@ -42,14 +39,12 @@ WRITE16_MEMBER(crospang_state::bestri_fg_scrolly_w) WRITE16_MEMBER(crospang_state::bestri_fg_scrollx_w) { - // printf("fg_layer x %04x\n",data); m_fg_layer->set_scrollx(0, data + 32); } WRITE16_MEMBER(crospang_state::bestri_bg_scrollx_w) { - // printf("bg_layer x %04x\n",data); m_bg_layer->set_scrollx(0, data - 60); } diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c index 56fea8be4a0..620327099dc 100644 --- a/src/mame/video/crshrace.c +++ b/src/mame/video/crshrace.c @@ -39,7 +39,6 @@ UINT32 crshrace_state::crshrace_tile_callback( UINT32 code ) void crshrace_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(crshrace_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -57,21 +56,18 @@ void crshrace_state::video_start() WRITE16_MEMBER(crshrace_state::crshrace_videoram1_w) { - COMBINE_DATA(&m_videoram1[offset]); m_tilemap1->mark_tile_dirty(offset); } WRITE16_MEMBER(crshrace_state::crshrace_videoram2_w) { - COMBINE_DATA(&m_videoram2[offset]); m_tilemap2->mark_tile_dirty(offset); } WRITE16_MEMBER(crshrace_state::crshrace_roz_bank_w) { - if (ACCESSING_BITS_0_7) { if (m_roz_bank != (data & 0xff)) @@ -85,7 +81,6 @@ WRITE16_MEMBER(crshrace_state::crshrace_roz_bank_w) WRITE16_MEMBER(crshrace_state::crshrace_gfxctrl_w) { - if (ACCESSING_BITS_0_7) { m_gfxctrl = data & 0xdf; @@ -116,7 +111,6 @@ static void draw_fg(running_machine &machine, bitmap_ind16 &bitmap, const rectan UINT32 crshrace_state::screen_update_crshrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_gfxctrl & 0x04) /* display disable? */ { bitmap.fill(get_black_pen(machine()), cliprect); diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c index 978f889cf42..d2ec861786e 100644 --- a/src/mame/video/cvs.c +++ b/src/mame/video/cvs.c @@ -84,7 +84,6 @@ static void set_pens( running_machine &machine ) WRITE8_MEMBER(cvs_state::cvs_video_fx_w) { - if (data & 0xce) logerror("%4x : CVS: Unimplemented CVS video fx = %2x\n",space.device().safe_pc(), data & 0xce); @@ -123,7 +122,6 @@ WRITE8_MEMBER(cvs_state::cvs_scroll_w) VIDEO_START_MEMBER(cvs_state,cvs) { - cvs_init_stars(machine()); /* create helper bitmaps */ diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 3cd41deecd8..9ea5daf1e12 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -25,7 +25,6 @@ TILE_GET_INFO_MEMBER(darius_state::get_fg_tile_info) void darius_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(darius_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,128,64); m_fg_tilemap->set_transparent_pen(0); @@ -35,7 +34,6 @@ void darius_state::video_start() WRITE16_MEMBER(darius_state::darius_fg_layer_w) { - COMBINE_DATA(&m_fg_ram[offset]); if (offset < 0x4000) m_fg_tilemap->mark_tile_dirty((offset & 0x1fff)); diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index a0b34655405..d852cf3611a 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -55,7 +55,6 @@ WRITE16_MEMBER(darkseal_state::darkseal_palette_24bit_b_w) void darkseal_state::video_start() { - } /******************************************************************************/ diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c index f7e07359d8c..6d450407f83 100644 --- a/src/mame/video/dbz.c +++ b/src/mame/video/dbz.c @@ -74,7 +74,6 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg1_tile_info) void dbz_state::video_start() { - m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg1_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(dbz_state::get_dbz_bg2_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index adfa2879fa0..8702c4ac3fb 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -931,7 +931,6 @@ static void tex_get_info(running_machine &machine,texinfo *t, pvrta_state *sa) switch (miptype) { - case 0: // 4bpp //printf("4bpp\n"); t->address += mipmap_4_8_offset[(t->sizes)&7]>>1; @@ -1055,7 +1054,6 @@ WRITE64_HANDLER( pvr_ta_w ) } if (dat & 2) { - #if DEBUG_PVRTA mame_printf_verbose("pvr_ta_w: Core Pipeline soft reset\n"); #endif @@ -1294,35 +1292,30 @@ WRITE64_HANDLER( pvr_ta_w ) TIMER_CALLBACK_MEMBER(dc_state::transfer_opaque_list_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= IST_EOXFER_OPLST; dc_update_interrupt_status(machine()); } TIMER_CALLBACK_MEMBER(dc_state::transfer_opaque_modifier_volume_list_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= IST_EOXFER_OPMV; dc_update_interrupt_status(machine()); } TIMER_CALLBACK_MEMBER(dc_state::transfer_translucent_list_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= IST_EOXFER_TRLST; dc_update_interrupt_status(machine()); } TIMER_CALLBACK_MEMBER(dc_state::transfer_translucent_modifier_volume_list_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= IST_EOXFER_TRMV; dc_update_interrupt_status(machine()); } TIMER_CALLBACK_MEMBER(dc_state::transfer_punch_through_list_irq) { - dc_sysctrl_regs[SB_ISTNRM] |= (1 << 21); dc_update_interrupt_status(machine()); } @@ -1933,7 +1926,6 @@ static void render_tri_sorted(running_machine &machine, bitmap_rgb32 &bitmap, te render_span(machine, bitmap, ti, v1->y, v2->y, v1->x, v0->x, v1->u, v0->u, v1->v, v0->v, v1->w, v0->w, dx12dy, dx02dy, du12dy, du02dy, dv12dy, dv02dy, dw12dy, dw02dy); } else if(!dy12) { - if(v2->x > v1->x) render_span(machine, bitmap, ti, v0->y, v1->y, v0->x, v0->x, v0->u, v0->u, v0->v, v0->v, v0->w, v0->w, dx01dy, dx02dy, du01dy, du02dy, dv01dy, dv02dy, dw01dy, dw02dy); else @@ -1948,7 +1940,6 @@ static void render_tri_sorted(running_machine &machine, bitmap_rgb32 &bitmap, te v1->x, v0->x + dx02dy*dy01, v1->u, v0->u + du02dy*dy01, v1->v, v0->v + dv02dy*dy01, v1->w, v0->w + dw02dy*dy01, dx12dy, dx02dy, du12dy, du02dy, dv12dy, dv02dy, dw12dy, dw02dy); } else { - render_span(machine, bitmap, ti, v0->y, v1->y, v0->x, v0->x, v0->u, v0->u, v0->v, v0->v, v0->w, v0->w, dx02dy, dx01dy, du02dy, du01dy, dv02dy, dv01dy, dw02dy, dw01dy); @@ -2575,7 +2566,6 @@ TIMER_CALLBACK_MEMBER(dc_state::endofrender_isp) void dc_state::video_start() { - memset(pvrctrl_regs, 0, sizeof(pvrctrl_regs)); memset(pvrta_regs, 0, sizeof(pvrta_regs)); memset(state_ta.grab, 0, sizeof(state_ta.grab)); @@ -2631,7 +2621,6 @@ void dc_state::video_start() UINT32 dc_state::screen_update_dc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - /****************** MAME note ******************* diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c index c07208b9717..1b4bdd87ab6 100644 --- a/src/mame/video/dcheese.c +++ b/src/mame/video/dcheese.c @@ -92,7 +92,6 @@ TIMER_CALLBACK_MEMBER(dcheese_state::dcheese_signal_irq_callback) void dcheese_state::video_start() { - /* the destination bitmap is not directly accessible to the CPU */ m_dstbitmap = auto_bitmap_ind16_alloc(machine(), DSTBITMAP_WIDTH, DSTBITMAP_HEIGHT); diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c index b6936ac284e..039e79bf81d 100644 --- a/src/mame/video/dcon.c +++ b/src/mame/video/dcon.c @@ -292,7 +292,6 @@ UINT32 dcon_state::screen_update_dcon(screen_device &screen, bitmap_ind16 &bitma UINT32 dcon_state::screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); /* Gfx banking */ diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index ffdc9bd41d3..c8d089d5a79 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -224,14 +224,12 @@ void dday_state::video_start() WRITE8_MEMBER(dday_state::dday_bgvideoram_w) { - m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(dday_state::dday_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); m_fg_tilemap->mark_tile_dirty(offset ^ 0x1f); /* for flipx case */ @@ -239,7 +237,6 @@ WRITE8_MEMBER(dday_state::dday_fgvideoram_w) WRITE8_MEMBER(dday_state::dday_textvideoram_w) { - m_textvideoram[offset] = data; m_text_tilemap->mark_tile_dirty(offset); } @@ -264,7 +261,6 @@ READ8_MEMBER(dday_state::dday_colorram_r) WRITE8_MEMBER(dday_state::dday_sl_control_w) { - if (m_sl_image != data) { m_sl_image = data; @@ -275,7 +271,6 @@ WRITE8_MEMBER(dday_state::dday_sl_control_w) WRITE8_MEMBER(dday_state::dday_control_w) { - //if (data & 0xac) logerror("Control = %02X\n", data & 0xac); /* bit 0 is coin counter 1 */ @@ -304,7 +299,6 @@ WRITE8_MEMBER(dday_state::dday_control_w) UINT32 dday_state::screen_update_dday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(m_main_bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); m_fg_tilemap->draw(m_main_bitmap, cliprect, 0, 0); m_bg_tilemap->draw(m_main_bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c index 214b675408c..2cd99e9a1c5 100644 --- a/src/mame/video/ddragon.c +++ b/src/mame/video/ddragon.c @@ -95,7 +95,6 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info) VIDEO_START_MEMBER(ddragon_state,ddragon) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -108,7 +107,6 @@ VIDEO_START_MEMBER(ddragon_state,ddragon) VIDEO_START_MEMBER(ddragon_state,chinagat) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_bg_tile_info),this),tilemap_mapper_delegate(FUNC(ddragon_state::background_scan),this), 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon_state::get_fg_16color_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -235,7 +233,6 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap,const r UINT32 ddragon_state::screen_update_ddragon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int scrollx = (m_scrollx_hi << 8) | *m_scrollx_lo; int scrolly = (m_scrolly_hi << 8) | *m_scrolly_lo; diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c index 0652bb89ebc..31c3a72ed04 100644 --- a/src/mame/video/ddragon3.c +++ b/src/mame/video/ddragon3.c @@ -9,7 +9,6 @@ WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w) { - switch (offset) { case 0: COMBINE_DATA(&m_fg_scrollx); break; // Scroll X, BG1 @@ -28,7 +27,6 @@ WRITE16_MEMBER(ddragon3_state::ddragon3_scroll_w) READ16_MEMBER(ddragon3_state::ddragon3_scroll_r) { - switch (offset) { case 0: return m_fg_scrollx; @@ -76,7 +74,6 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_fg_tile_info) void ddragon3_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon3_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddragon3_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -157,7 +154,6 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap, const UINT32 ddragon3_state::screen_update_ddragon3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); m_fg_tilemap->set_scrollx(0, m_fg_scrollx); @@ -186,7 +182,6 @@ UINT32 ddragon3_state::screen_update_ddragon3(screen_device &screen, bitmap_ind1 UINT32 ddragon3_state::screen_update_ctribe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); m_fg_tilemap->set_scrollx(0, m_fg_scrollx); diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c index c35c05c174d..20b389f9f48 100644 --- a/src/mame/video/ddribble.c +++ b/src/mame/video/ddribble.c @@ -123,7 +123,6 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_bg_tile_info) void ddribble_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddribble_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ddribble_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(ddribble_state::tilemap_scan),this), 8, 8, 64, 32); diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c index 30845dc95bc..d0232164b38 100644 --- a/src/mame/video/dec0.c +++ b/src/mame/video/dec0.c @@ -46,7 +46,6 @@ WRITE16_MEMBER(dec0_state::dec0_paletteram_b_w) UINT32 dec0_state::screen_update_hbarrel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - flip_screen_set(m_tilegen1->get_flip_state()); m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); @@ -215,7 +214,6 @@ UINT32 dec0_automat_state::screen_update_automat(screen_device &screen, bitmap_i UINT32 dec0_automat_state::screen_update_secretab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // layer enables seem different... where are they? // the bootleg doesn't write these registers, I think they're hardcoded?, so fake them for compatibility with our implementation.. @@ -265,7 +263,6 @@ UINT32 dec0_automat_state::screen_update_secretab(screen_device &screen, bitmap_ UINT32 dec0_state::screen_update_birdtry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - flip_screen_set(m_tilegen1->get_flip_state()); /* This game doesn't have the extra playfield chip on the game board, but diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index dde81eaca78..3a50a74497b 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -136,7 +136,6 @@ WRITE8_MEMBER(dec8_state::dec8_scroll2_w) WRITE8_MEMBER(dec8_state::srdarwin_control_w) { - switch (offset) { case 0: /* Top 3 bits - bank switch, bottom 4 - scroll MSB */ @@ -152,7 +151,6 @@ WRITE8_MEMBER(dec8_state::srdarwin_control_w) WRITE8_MEMBER(dec8_state::lastmisn_control_w) { - /* Bit 0x0f - ROM bank switch. Bit 0x10 - Unused @@ -173,7 +171,6 @@ WRITE8_MEMBER(dec8_state::lastmisn_control_w) WRITE8_MEMBER(dec8_state::shackled_control_w) { - /* Bottom 4 bits - bank switch, Bits 4 & 5 - Scroll MSBs */ membank("bank1")->set_entry(data & 0x0f); diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c index 6755a14cddb..215e4f49184 100644 --- a/src/mame/video/decbac06.c +++ b/src/mame/video/decbac06.c @@ -183,7 +183,6 @@ void deco_bac06_device::device_start() void deco_bac06_device::device_reset() { - } @@ -271,8 +270,6 @@ void deco_bac06_device::custom_tilemap_draw(running_machine &machine, src_x++; if ((flags&TILEMAP_DRAW_OPAQUE) || (p&m_bppmask)) { - - if ((p&penmask)==pencondition) if((colpri&colprimask)==colpricondition) bitmap.pix16(y, x) = p+(colpri&m_gfxcolmask)*m_bppmult; @@ -371,7 +368,6 @@ WRITE16_DEVICE_HANDLER( deco_bac06_pf_control_1_w ) WRITE16_DEVICE_HANDLER( deco_bac06_pf_data_w ) { - deco_bac06_device *dev = (deco_bac06_device*)device; if (dev->m_rambank&1) offset+=0x1000; diff --git a/src/mame/video/deckarn.c b/src/mame/video/deckarn.c index 1867d64704b..ae63e9996cf 100644 --- a/src/mame/video/deckarn.c +++ b/src/mame/video/deckarn.c @@ -20,12 +20,10 @@ deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconf void deco_karnovsprites_device::device_start() { - } void deco_karnovsprites_device::device_reset() { - } void deco_karnovsprites_device::draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16* spriteram, int size, int priority ) diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c index a305aa3577c..2146c94af50 100644 --- a/src/mame/video/decmxc06.c +++ b/src/mame/video/decmxc06.c @@ -119,7 +119,6 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_ind16 &bi int draw = 0; if (!flash || (machine.primary_screen->frame_number() & 1)) { - if (m_priority_type==0) // most cases { if ((color & pri_mask) == pri_val) @@ -198,5 +197,4 @@ void deco_mxc06_device::device_start() void deco_mxc06_device::device_reset() { - } diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index 1cbc864d176..7e0341fe53c 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -650,7 +650,6 @@ static int deco16_pf_update( /* Rowscroll enable */ if (rowscroll_ptr && (control1 & 0x60) == 0x40) { - /* Several different rowscroll styles */ switch ((control0 >> 3) & 0xf) { @@ -688,7 +687,6 @@ static int deco16_pf_update( } else if (rowscroll_ptr && (control1 & 0x60) == 0x20) /* Column scroll */ { - /* Column scroll ranges from 8 pixel columns to 512 pixel columns */ int mask = (0x40 >> (control0 & 7)) - 1; if (mask == -1) diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 5ee49786eb5..9f523d51526 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -560,12 +560,10 @@ VIDEO_START_MEMBER(deco32_state,nslasher) void deco32_state::screen_eof_captaven(screen_device &screen, bool state) { - } void dragngun_state::screen_eof_dragngun(screen_device &screen, bool state) { - } diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c index 71ef09b7f56..90325e02bab 100644 --- a/src/mame/video/decospr.c +++ b/src/mame/video/decospr.c @@ -240,7 +240,6 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if (!m_alt_format) { - sprite = spriteram[offs + 1]; y = spriteram[offs]; flash = y & 0x1000; @@ -249,7 +248,6 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & if (!(flash && (machine().primary_screen->frame_number() & 1))) { - x = spriteram[offs + 2]; if (!m_sprite_bitmap.valid()) @@ -289,7 +287,6 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & } else { - x = x & 0x01ff; y = y & 0x01ff; if (x >= 256) x -= 512; @@ -462,7 +459,6 @@ void decospr_device::draw_sprites_common(_BitmapClass &bitmap, const rectangle & { for (int yy=0; yydraw(bitmap, cliprect, 0,0); m_fg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(machine(),bitmap,cliprect); diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c index b3c717b63e3..46977fc1e3c 100644 --- a/src/mame/video/djboy.c +++ b/src/mame/video/djboy.c @@ -31,7 +31,6 @@ TILE_GET_INFO_MEMBER(djboy_state::get_bg_tile_info) WRITE8_MEMBER(djboy_state::djboy_videoram_w) { - m_videoram[offset] = data; m_background->mark_tile_dirty(offset & 0x7ff); } diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index f84129ee024..d7e4b505944 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -241,7 +241,6 @@ PALETTE_INIT_MEMBER(dkong_state,dkong4b) for (i = 0;i < 256;i++) { - /* red component */ r = compute_res_net( (color_prom[256]>>1) & 0x07, 0, &radarscp_net_info ); /* green component */ @@ -280,7 +279,6 @@ PALETTE_INIT_MEMBER(dkong_state,radarscp) for (i = 0;i < 256;i++) { - /* red component */ r = compute_res_net( (color_prom[256]>>1) & 0x07, 0, &radarscp_net_info ); /* green component */ @@ -344,7 +342,6 @@ PALETTE_INIT_MEMBER(dkong_state,radarscp1) for (i = 0;i < 256;i++) { - /* red component */ r = compute_res_net( color_prom[512], 0, &radarscp1_net_info ); /* green component */ @@ -476,7 +473,6 @@ TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info) WRITE8_MEMBER(dkong_state::dkong_videoram_w) { - if (m_video_ram[offset] != data) { m_video_ram[offset] = data; @@ -486,7 +482,6 @@ WRITE8_MEMBER(dkong_state::dkong_videoram_w) WRITE8_MEMBER(dkong_state::dkongjr_gfxbank_w) { - if (m_gfx_bank != (data & 0x01)) { m_gfx_bank = data & 0x01; @@ -496,7 +491,6 @@ WRITE8_MEMBER(dkong_state::dkongjr_gfxbank_w) WRITE8_MEMBER(dkong_state::dkong3_gfxbank_w) { - if (m_gfx_bank != (~data & 0x01)) { m_gfx_bank = ~data & 0x01; @@ -524,26 +518,22 @@ WRITE8_MEMBER(dkong_state::dkong_palettebank_w) WRITE8_MEMBER(dkong_state::radarscp_grid_enable_w) { - m_grid_on = data & 0x01; } WRITE8_MEMBER(dkong_state::radarscp_grid_color_w) { - m_grid_col = (data & 0x07) ^ 0x07; /* popmessage("Gridcol: %d", m_grid_col); */ } WRITE8_MEMBER(dkong_state::dkong_flipscreen_w) { - m_flip = ~data & 0x01; } WRITE8_MEMBER(dkong_state::dkong_spritebank_w) { - m_sprite_bank = data & 0x01; } @@ -934,7 +924,6 @@ static void check_palette(running_machine &machine) VIDEO_START_MEMBER(dkong_state,dkong_base) { - m_cd4049_b = (log(0.0 - log(cd4049_al)) - log(0.0 - log((1.0-cd4049_al))) ) / log(cd4049_vh/cd4049_vl); m_cd4049_a = log(0.0 - log(cd4049_al)) - m_cd4049_b * log(cd4049_vh); @@ -954,7 +943,6 @@ VIDEO_START_MEMBER(dkong_state,dkong_base) VIDEO_START_MEMBER(dkong_state,dkong) { - VIDEO_START_CALL_MEMBER(dkong_base); m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(dkong_state::scanline_callback),this)); @@ -989,7 +977,6 @@ VIDEO_START_MEMBER(dkong_state,dkong) UINT32 dkong_state::screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().tilemap().set_flip_all(m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); m_bg_tilemap->set_scrollx(0, m_flip ? 0 : 0); m_bg_tilemap->set_scrolly(0, m_flip ? -8 : 0); @@ -1037,7 +1024,6 @@ UINT32 dkong_state::screen_update_pestplce(screen_device &screen, bitmap_ind16 & UINT32 dkong_state::screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); /* it uses sprite_ram[offs + 2] & 0x10 for sprite bank */ diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c index 3b1ad1ae70a..d8ed4f1222a 100644 --- a/src/mame/video/docastle.c +++ b/src/mame/video/docastle.c @@ -220,7 +220,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 docastle_state::screen_update_docastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(machine(), bitmap, cliprect); m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c index a90ec6b003a..d444f04878e 100644 --- a/src/mame/video/dogfgt.c +++ b/src/mame/video/dogfgt.c @@ -85,13 +85,11 @@ void dogfgt_state::video_start() WRITE8_MEMBER(dogfgt_state::dogfgt_plane_select_w) { - m_bm_plane = data; } READ8_MEMBER(dogfgt_state::dogfgt_bitmapram_r) { - if (m_bm_plane > 2) { popmessage("bitmapram_r offs %04x plane %d\n", offset, m_bm_plane); @@ -127,7 +125,6 @@ WRITE8_MEMBER(dogfgt_state::internal_bitmapram_w) WRITE8_MEMBER(dogfgt_state::dogfgt_bitmapram_w) { - if (m_bm_plane > 2) { popmessage("bitmapram_w offs %04x plane %d\n", offset, m_bm_plane); @@ -139,14 +136,12 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_bitmapram_w) WRITE8_MEMBER(dogfgt_state::dogfgt_bgvideoram_w) { - m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_MEMBER(dogfgt_state::dogfgt_scroll_w) { - m_scroll[offset] = data; m_bg_tilemap->set_scrollx(0, m_scroll[0] + 256 * m_scroll[1] + 256); m_bg_tilemap->set_scrolly(0, m_scroll[2] + 256 * m_scroll[3]); @@ -154,7 +149,6 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_scroll_w) WRITE8_MEMBER(dogfgt_state::dogfgt_1800_w) { - /* bits 0 and 1 are probably text color (not verified because PROM is missing) */ m_pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1); diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c index 66b19789c29..d0146da9142 100644 --- a/src/mame/video/dribling.c +++ b/src/mame/video/dribling.c @@ -44,7 +44,6 @@ void dribling_state::palette_init() WRITE8_MEMBER(dribling_state::dribling_colorram_w) { - /* it is very important that we mask off the two bits here */ m_colorram[offset & 0x1f9f] = data; } diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c index 8cf47fc1eb5..8212a978984 100644 --- a/src/mame/video/drmicro.c +++ b/src/mame/video/drmicro.c @@ -103,7 +103,6 @@ void drmicro_state::palette_init() void drmicro_state::video_start() { - m_videoram = auto_alloc_array(machine(), UINT8, 0x1000); save_pointer(NAME(m_videoram), 0x1000); diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 7053e3dbf94..165ed88f79b 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -150,7 +150,6 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_palette01_w) /* Layers 4&5 Palettes (Low Bits) */ WRITE8_MEMBER(dynax_state::dynax_blit_palette45_w) { - if (m_layer_layout == LAYOUT_HNORIDUR) m_blit2_palettes = (m_blit2_palettes & 0x00ff) | ((data & 0x0f) << 12) | ((data & 0xf0) << 4); else @@ -162,7 +161,6 @@ WRITE8_MEMBER(dynax_state::dynax_blit_palette45_w) /* Layer 2&3 Palettes (Low Bits) */ WRITE8_MEMBER(dynax_state::dynax_blit_palette23_w) { - if (m_layer_layout == LAYOUT_HNORIDUR) m_blit_palettes = (m_blit_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4); else @@ -180,7 +178,6 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_palette23_w) /* Layer 6&7 Palettes (Low Bits) */ WRITE8_MEMBER(dynax_state::dynax_blit_palette67_w) { - if (m_layer_layout == LAYOUT_HNORIDUR) m_blit2_palettes = (m_blit2_palettes & 0xff00) | ((data & 0x0f) << 4) | ((data & 0xf0) >> 4); else @@ -619,7 +616,6 @@ static void jantouki_blitter2_start( running_machine &machine, int flags ) WRITE8_MEMBER(dynax_state::dynax_blit_scroll_w) { - switch (m_blit_src & 0xc00000) { case 0x000000: m_blit_scroll_x = data; @@ -638,7 +634,6 @@ WRITE8_MEMBER(dynax_state::dynax_blit_scroll_w) // inverted scroll values WRITE8_MEMBER(dynax_state::tenkai_blit_scroll_w) { - switch (m_blit_src & 0xc00000) { case 0x000000: m_blit_scroll_x = ((data ^ 0xff) + 1) & 0xff; @@ -656,7 +651,6 @@ WRITE8_MEMBER(dynax_state::tenkai_blit_scroll_w) WRITE8_MEMBER(dynax_state::dynax_blit2_scroll_w) { - switch (m_blit2_src & 0xc00000) { case 0x000000: m_blit2_scroll_x = data; @@ -674,7 +668,6 @@ WRITE8_MEMBER(dynax_state::dynax_blit2_scroll_w) WRITE8_MEMBER(dynax_state::dynax_blitter_rev2_w) { - switch (offset) { case 0: dynax_blitter_start(machine(), data); break; @@ -690,7 +683,6 @@ WRITE8_MEMBER(dynax_state::dynax_blitter_rev2_w) // different scroll_w WRITE8_MEMBER(dynax_state::tenkai_blitter_rev2_w) { - switch (offset) { case 0: dynax_blitter_start(machine(), data); break; @@ -706,7 +698,6 @@ WRITE8_MEMBER(dynax_state::tenkai_blitter_rev2_w) WRITE8_MEMBER(dynax_state::jantouki_blitter_rev2_w) { - switch (offset) { case 0: jantouki_blitter_start(machine(), data); break; @@ -721,7 +712,6 @@ WRITE8_MEMBER(dynax_state::jantouki_blitter_rev2_w) WRITE8_MEMBER(dynax_state::jantouki_blitter2_rev2_w) { - switch (offset) { case 0: jantouki_blitter2_start(machine(),data); break; @@ -824,7 +814,6 @@ static void dynax_common_reset( running_machine &machine ) VIDEO_START_MEMBER(dynax_state,hanamai) { - m_pixmap[0][0] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[0][1] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[1][0] = auto_alloc_array(machine(), UINT8, 256 * 256); @@ -849,7 +838,6 @@ VIDEO_START_MEMBER(dynax_state,hanamai) VIDEO_START_MEMBER(dynax_state,hnoridur) { - m_pixmap[0][0] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[0][1] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[1][0] = auto_alloc_array(machine(), UINT8, 256 * 256); @@ -876,14 +864,12 @@ VIDEO_START_MEMBER(dynax_state,hnoridur) VIDEO_START_MEMBER(dynax_state,mcnpshnt) { - VIDEO_START_CALL_MEMBER(hnoridur); m_priority_table = priority_mcnpshnt; } VIDEO_START_MEMBER(dynax_state,sprtmtch) { - m_pixmap[0][0] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[0][1] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[1][0] = auto_alloc_array(machine(), UINT8, 256 * 256); @@ -904,7 +890,6 @@ VIDEO_START_MEMBER(dynax_state,sprtmtch) VIDEO_START_MEMBER(dynax_state,jantouki) { - m_pixmap[0][0] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[0][1] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[1][0] = auto_alloc_array(machine(), UINT8, 256 * 256); @@ -946,7 +931,6 @@ VIDEO_START_MEMBER(dynax_state,jantouki) VIDEO_START_MEMBER(dynax_state,mjdialq2) { - m_pixmap[0][0] = auto_alloc_array(machine(), UINT8, 256 * 256); m_pixmap[1][0] = auto_alloc_array(machine(), UINT8, 256 * 256); @@ -960,7 +944,6 @@ VIDEO_START_MEMBER(dynax_state,mjdialq2) VIDEO_START_MEMBER(dynax_state,mjelctrn) { - VIDEO_START_CALL_MEMBER(hnoridur); m_priority_table = priority_mjelctrn; @@ -969,7 +952,6 @@ VIDEO_START_MEMBER(dynax_state,mjelctrn) VIDEO_START_MEMBER(dynax_state,neruton) { - VIDEO_START_CALL_MEMBER(hnoridur); // m_priority_table = priority_mjelctrn; @@ -1211,7 +1193,6 @@ static int debug_mask( running_machine &machine ) R - move "tile" to the next 1/8th of the gfx */ static int debug_viewer( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) { - #ifdef MAME_DEBUG static int toggle; if (machine.input().code_pressed_once(KEYCODE_T)) toggle = 1 - toggle; diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c index 5cbf43d4ee6..b58c56c54f8 100644 --- a/src/mame/video/dynduke.c +++ b/src/mame/video/dynduke.c @@ -88,7 +88,6 @@ void dynduke_state::video_start() WRITE16_MEMBER(dynduke_state::dynduke_gfxbank_w) { - if (ACCESSING_BITS_0_7) { if (data&0x01) m_back_bankbase=0x1000; else m_back_bankbase=0; @@ -107,7 +106,6 @@ WRITE16_MEMBER(dynduke_state::dynduke_gfxbank_w) WRITE16_MEMBER(dynduke_state::dynduke_control_w) { - if (ACCESSING_BITS_0_7) { // bit 0x80 toggles, maybe sprite buffering? diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c index 61581f12be2..95d6ac17ab6 100644 --- a/src/mame/video/esd16.c +++ b/src/mame/video/esd16.c @@ -135,7 +135,6 @@ WRITE16_MEMBER(esd16_state::esd16_tilemap0_color_jumppop_w) void esd16_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(esd16_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x80, 0x40); diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c index 3b995d42c4c..ce3fb7e3ef8 100644 --- a/src/mame/video/espial.c +++ b/src/mame/video/espial.c @@ -87,7 +87,6 @@ TILE_GET_INFO_MEMBER(espial_state::get_tile_info) void espial_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); @@ -96,7 +95,6 @@ void espial_state::video_start() VIDEO_START_MEMBER(espial_state,netwars) { - /* Net Wars has a tile map that's twice as big as Espial's */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(espial_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 64); @@ -115,7 +113,6 @@ VIDEO_START_MEMBER(espial_state,netwars) WRITE8_MEMBER(espial_state::espial_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -123,7 +120,6 @@ WRITE8_MEMBER(espial_state::espial_videoram_w) WRITE8_MEMBER(espial_state::espial_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -131,7 +127,6 @@ WRITE8_MEMBER(espial_state::espial_colorram_w) WRITE8_MEMBER(espial_state::espial_attributeram_w) { - m_attributeram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -139,7 +134,6 @@ WRITE8_MEMBER(espial_state::espial_attributeram_w) WRITE8_MEMBER(espial_state::espial_scrollram_w) { - m_scrollram[offset] = data; m_bg_tilemap->set_scrolly(offset, data); } @@ -147,7 +141,6 @@ WRITE8_MEMBER(espial_state::espial_scrollram_w) WRITE8_MEMBER(espial_state::espial_flipscreen_w) { - m_flipscreen = data; m_bg_tilemap->set_flip(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0); } @@ -227,7 +220,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 espial_state::screen_update_espial(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index ae4fcc80e39..4e296ed802a 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -83,21 +83,18 @@ void exedexes_state::palette_init() WRITE8_MEMBER(exedexes_state::exedexes_videoram_w) { - m_videoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(exedexes_state::exedexes_colorram_w) { - m_colorram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(exedexes_state::exedexes_c804_w) { - /* bits 0 and 1 are coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -113,7 +110,6 @@ WRITE8_MEMBER(exedexes_state::exedexes_c804_w) WRITE8_MEMBER(exedexes_state::exedexes_gfxctrl_w) { - /* bit 4 is bg enable */ m_sc2on = data & 0x10; @@ -170,7 +166,6 @@ TILEMAP_MAPPER_MEMBER(exedexes_state::exedexes_fg_tilemap_scan) void exedexes_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_bg_tilemap_scan),this), 32, 32, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(exedexes_state::exedexes_fg_tilemap_scan),this), 16, 16, 128, 128); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exedexes_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 74eb3d1d621..e8426560367 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -185,7 +185,6 @@ void exerion_state::video_start() WRITE8_MEMBER(exerion_state::exerion_videoreg_w) { - /* bit 0 = flip screen and joystick input multiplexer */ m_cocktail_flip = data & 1; diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c index ec986a77f68..ba00d11fc3b 100644 --- a/src/mame/video/exidy.c +++ b/src/mame/video/exidy.c @@ -33,7 +33,6 @@ void exidy_video_config(running_machine &machine, UINT8 _collision_mask, UINT8 _ void exidy_state::video_start() { - machine().primary_screen->register_screen_bitmap(m_background_bitmap); m_motion_object_1_vid.allocate(16, 16); m_motion_object_2_vid.allocate(16, 16); diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index 551e391cfb9..7a2e84960c0 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -80,7 +80,6 @@ TILE_GET_INFO_MEMBER(exprraid_state::get_fg_tile_info) void exprraid_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exprraid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(exprraid_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index 28806123b4b..43688f1ffcf 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -45,7 +45,6 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) VIDEO_START_MEMBER(f1gp_state,f1gp) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -60,7 +59,6 @@ VIDEO_START_MEMBER(f1gp_state,f1gp) VIDEO_START_MEMBER(f1gp_state,f1gpb) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -93,7 +91,6 @@ UINT32 f1gp_state::f1gp_ol2_tile_callback( UINT32 code ) VIDEO_START_MEMBER(f1gp_state,f1gp2) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::f1gp2_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(f1gp_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -189,7 +186,6 @@ WRITE16_MEMBER(f1gp_state::f1gp2_gfxctrl_w) UINT32 f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 1); @@ -213,7 +209,6 @@ UINT32 f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitma UINT32 f1gp_state::screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_gfxctrl & 4) /* blank screen */ bitmap.fill(get_black_pen(machine()), cliprect); else diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c index d0dfafc1767..ff840847f51 100644 --- a/src/mame/video/fastlane.c +++ b/src/mame/video/fastlane.c @@ -111,7 +111,6 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info1) void fastlane_state::video_start() { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fastlane_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 614cdd86b0b..322159aab13 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -114,7 +114,6 @@ void fcombat_state::video_start() WRITE8_MEMBER(fcombat_state::fcombat_videoreg_w) { - /* bit 0 = flip screen and joystick input multiplexor */ m_cocktail_flip = data & 1; diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c index 55d9239ff03..1a8a302cbb1 100644 --- a/src/mame/video/finalizr.c +++ b/src/mame/video/finalizr.c @@ -66,7 +66,6 @@ TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info) void finalizr_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(finalizr_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); } diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c index c41d7b62d73..b7b3e2e5a0f 100644 --- a/src/mame/video/fitfight.c +++ b/src/mame/video/fitfight.c @@ -53,7 +53,6 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_bak_tile_info) WRITE16_MEMBER(fitfight_state::fof_bak_tileram_w) { - COMBINE_DATA(&m_fof_bak_tileram[offset]); m_fof_bak_tilemap->mark_tile_dirty(offset / 2); } @@ -71,7 +70,6 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_mid_tile_info) WRITE16_MEMBER(fitfight_state::fof_mid_tileram_w) { - COMBINE_DATA(&m_fof_mid_tileram[offset]); m_fof_mid_tilemap->mark_tile_dirty(offset / 2); } @@ -88,7 +86,6 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_txt_tile_info) WRITE16_MEMBER(fitfight_state::fof_txt_tileram_w) { - COMBINE_DATA(&m_fof_txt_tileram[offset]); m_fof_txt_tilemap->mark_tile_dirty(offset / 2); } @@ -109,7 +106,6 @@ void fitfight_state::video_start() UINT32 fitfight_state::screen_update_fitfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* scroll isn't right */ int vblank; diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c index 731107da062..0beea936938 100644 --- a/src/mame/video/flkatck.c +++ b/src/mame/video/flkatck.c @@ -82,7 +82,6 @@ void flkatck_state::video_start() WRITE8_MEMBER(flkatck_state::flkatck_k007121_w) { - m_k007121_ram[offset] = data; if (offset < 0x1000) /* tiles */ { @@ -95,7 +94,6 @@ WRITE8_MEMBER(flkatck_state::flkatck_k007121_w) WRITE8_MEMBER(flkatck_state::flkatck_k007121_regs_w) { - switch (offset) { case 0x04: /* ROM bank select */ diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 89bbc67fdab..7821da97575 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -381,7 +381,6 @@ WRITE16_MEMBER(fromanc2_state::fromanc4_gfxreg_2_w) VIDEO_START_MEMBER(fromanc2_state,fromanc2) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromanc2_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -430,7 +429,6 @@ VIDEO_START_MEMBER(fromanc2_state,fromanc2) VIDEO_START_MEMBER(fromanc2_state,fromancr) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -474,7 +472,6 @@ VIDEO_START_MEMBER(fromanc2_state,fromancr) VIDEO_START_MEMBER(fromanc2_state,fromanc4) { - m_tilemap[0][0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l0_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[0][1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l1_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); m_tilemap[0][2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromanc2_state::fromancr_get_v0_l2_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 256, 64); diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index 30cb68d4cc2..db9b25cc0ec 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -91,7 +91,6 @@ static void init_common( running_machine &machine ) VIDEO_START_MEMBER(fromance_state,fromance) { - /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_fromance_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -101,7 +100,6 @@ VIDEO_START_MEMBER(fromance_state,fromance) VIDEO_START_MEMBER(fromance_state,nekkyoku) { - /* allocate tilemaps */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(fromance_state::get_nekkyoku_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); @@ -111,14 +109,12 @@ VIDEO_START_MEMBER(fromance_state,nekkyoku) VIDEO_START_MEMBER(fromance_state,pipedrm) { - VIDEO_START_CALL_MEMBER(fromance); m_scrolly_ofs = 0x00; } VIDEO_START_MEMBER(fromance_state,hatris) { - VIDEO_START_CALL_MEMBER(fromance); m_scrollx_ofs = 0xB9; m_scrolly_ofs = 0x00; @@ -132,7 +128,6 @@ VIDEO_START_MEMBER(fromance_state,hatris) WRITE8_MEMBER(fromance_state::fromance_gfxreg_w) { - m_gfxreg = data; m_flipscreen = (data & 0x01); m_selected_videoram = (~data >> 1) & 1; @@ -155,7 +150,6 @@ WRITE8_MEMBER(fromance_state::fromance_gfxreg_w) READ8_MEMBER(fromance_state::fromance_paletteram_r) { - /* adjust for banking and read */ offset |= m_selected_paletteram << 11; return m_local_paletteram[offset]; @@ -294,7 +288,6 @@ WRITE8_MEMBER(fromance_state::fromance_crtc_register_w) UINT32 fromance_state::screen_update_fromance(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_scrollx[0]); m_bg_tilemap->set_scrolly(0, m_scrolly[0]); m_fg_tilemap->set_scrollx(0, m_scrollx[1]); diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c index 158a5fff917..07e60e84503 100644 --- a/src/mame/video/fuukifg3.c +++ b/src/mame/video/fuukifg3.c @@ -370,7 +370,6 @@ void fuuki32_state::screen_eof_fuuki32(screen_device &screen, bool state) // rising edge if (state) { - /* Buffer sprites and tilebank by 2 frames */ m_spr_buffered_tilebank[1] = m_spr_buffered_tilebank[0]; m_spr_buffered_tilebank[0] = m_tilebank[0]; diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 9ae28f7d4b1..8d995fc90e9 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -184,7 +184,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 gaelco_state::screen_update_maniacsq(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* set scroll registers */ m_tilemap[0]->set_scrolly(0, m_vregs[0]); m_tilemap[0]->set_scrollx(0, m_vregs[1] + 4); @@ -212,7 +211,6 @@ UINT32 gaelco_state::screen_update_maniacsq(screen_device &screen, bitmap_ind16 UINT32 gaelco_state::screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* set scroll registers */ m_tilemap[0]->set_scrolly(0, m_vregs[0]); m_tilemap[0]->set_scrollx(0, m_vregs[1] + 4); diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c index f0eab4a498f..882f329741d 100644 --- a/src/mame/video/gaelco3d.c +++ b/src/mame/video/gaelco3d.c @@ -67,7 +67,6 @@ gaelco3d_renderer::gaelco3d_renderer(gaelco3d_state &state) void gaelco3d_state::video_start() { - m_poly = auto_alloc(machine(), gaelco3d_renderer(*this)); m_palette = auto_alloc_array(machine(), rgb_t, 32768); diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c index 89c00dd7b2a..7b89b404480 100644 --- a/src/mame/video/gaiden.c +++ b/src/mame/video/gaiden.c @@ -70,7 +70,6 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_tx_tile_info) VIDEO_START_MEMBER(gaiden_state,gaiden) { - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -97,8 +96,6 @@ VIDEO_START_MEMBER(gaiden_state,gaiden) VIDEO_START_MEMBER(gaiden_state,mastninj) { - - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -120,7 +117,6 @@ VIDEO_START_MEMBER(gaiden_state,mastninj) VIDEO_START_MEMBER(gaiden_state,raiga) { - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -203,7 +199,6 @@ WRITE16_MEMBER(gaiden_state::gaiden_bgscrolly_w) WRITE16_MEMBER(gaiden_state::gaiden_txoffsety_w) { - if (ACCESSING_BITS_0_7) { m_tx_offset_y = data; m_text_layer->set_scrolly(0, (m_tx_scroll_y - m_tx_offset_y) & 0xffff); @@ -212,7 +207,6 @@ WRITE16_MEMBER(gaiden_state::gaiden_txoffsety_w) WRITE16_MEMBER(gaiden_state::gaiden_fgoffsety_w) { - if (ACCESSING_BITS_0_7) { m_fg_offset_y = data; m_foreground->set_scrolly(0, (m_fg_scroll_y - m_fg_offset_y) & 0xffff); @@ -221,7 +215,6 @@ WRITE16_MEMBER(gaiden_state::gaiden_fgoffsety_w) WRITE16_MEMBER(gaiden_state::gaiden_bgoffsety_w) { - if (ACCESSING_BITS_0_7) { m_bg_offset_y = data; m_background->set_scrolly(0, (m_bg_scroll_y - m_bg_offset_y) & 0xffff); @@ -230,7 +223,6 @@ WRITE16_MEMBER(gaiden_state::gaiden_bgoffsety_w) WRITE16_MEMBER(gaiden_state::gaiden_sproffsety_w) { - if (ACCESSING_BITS_0_7) { m_spr_offset_y = data; // handled in draw_sprites diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c index ee908deedd8..e93644d886e 100644 --- a/src/mame/video/galaga.c +++ b/src/mame/video/galaga.c @@ -33,7 +33,6 @@ There are 63 stars in each set, 126 displayed at any one time const struct star star_seed_tab[252]= { - /* also shared by Bosconian */ /* star set 0 */ @@ -453,14 +452,12 @@ VIDEO_START_MEMBER(galaga_state,galaga) WRITE8_MEMBER(galaga_state::galaga_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_MEMBER(galaga_state::gatsbee_bank_w) { - m_galaga_gfxbank = data & 0x1; m_fg_tilemap->mark_all_dirty(); } @@ -564,7 +561,6 @@ static void draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rec UINT32 galaga_state::screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); draw_stars(machine(),bitmap,cliprect); draw_sprites(machine(),bitmap,cliprect); diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c index 964934da2bc..099303d7ab7 100644 --- a/src/mame/video/galastrm.c +++ b/src/mame/video/galastrm.c @@ -341,7 +341,6 @@ static void tc0610_rotate_draw(running_machine &machine, bitmap_ind16 &bitmap, b if (state->m_tc0610_ctrl_reg[1][7]) { - if (ryx != 0 || ryy != 0) { while (sqrt(pow((float)pxx/4096.0, 2.0) + pow((float)pxy/4096.0, 2.0)) < (float)(lx / 2)) diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index a03c0acb40c..50899f2a547 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -1796,7 +1796,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, UINT8 * UINT32 galaxold_state::screen_update_galaxold(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - (*m_draw_background)(machine(), bitmap, cliprect); if (m_stars_on) diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index f17e125ad44..4c9bf898d95 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -181,7 +181,6 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info) VIDEO_START_MEMBER(galivan_state,galivan) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 128); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -190,7 +189,6 @@ VIDEO_START_MEMBER(galivan_state,galivan) VIDEO_START_MEMBER(galivan_state,ninjemak) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 512, 32); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(galivan_state::ninjemak_get_tx_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -214,7 +212,6 @@ WRITE8_MEMBER(galivan_state::galivan_videoram_w) /* Written through port 40 */ WRITE8_MEMBER(galivan_state::galivan_gfxbank_w) { - /* bits 0 and 1 coin counters */ coin_counter_w(machine(), 0,data & 1); coin_counter_w(machine(), 1,data & 2); @@ -232,7 +229,6 @@ WRITE8_MEMBER(galivan_state::galivan_gfxbank_w) WRITE8_MEMBER(galivan_state::ninjemak_gfxbank_w) { - /* bits 0 and 1 coin counters */ coin_counter_w(machine(), 0,data & 1); coin_counter_w(machine(), 1,data & 2); @@ -365,7 +361,6 @@ UINT32 galivan_state::screen_update_galivan(screen_device &screen, bitmap_ind16 UINT32 galivan_state::screen_update_ninjemak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* (scrollx[1] & 0x40) does something */ m_bg_tilemap->set_scrollx(0, m_scrollx); m_bg_tilemap->set_scrolly(0, m_scrolly); diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c index bc164598560..1f90fcad169 100644 --- a/src/mame/video/gameplan.c +++ b/src/mame/video/gameplan.c @@ -116,28 +116,24 @@ UINT32 gameplan_state::screen_update_leprechn(screen_device &screen, bitmap_rgb3 WRITE8_MEMBER(gameplan_state::video_data_w) { - m_video_data = data; } WRITE8_MEMBER(gameplan_state::gameplan_video_command_w) { - m_video_command = data & 0x07; } WRITE8_MEMBER(gameplan_state::leprechn_video_command_w) { - m_video_command = (data >> 3) & 0x07; } TIMER_CALLBACK_MEMBER(gameplan_state::clear_screen_done_callback) { - /* indicate that the we are done clearing the screen */ m_via_0->write_ca1(0); } @@ -145,7 +141,6 @@ TIMER_CALLBACK_MEMBER(gameplan_state::clear_screen_done_callback) WRITE_LINE_MEMBER(gameplan_state::video_command_trigger_w) { - if (state == 0) { switch (m_video_command) @@ -259,7 +254,6 @@ const via6522_interface trvquest_via_0_interface = TIMER_CALLBACK_MEMBER(gameplan_state::via_0_ca1_timer_callback) { - /* !VBLANK is connected to CA1 */ m_via_0->write_ca1(param); @@ -278,7 +272,6 @@ TIMER_CALLBACK_MEMBER(gameplan_state::via_0_ca1_timer_callback) VIDEO_START_MEMBER(gameplan_state,common) { - m_videoram_size = (HBSTART - HBEND) * (VBSTART - VBEND); m_videoram = auto_alloc_array(machine(), UINT8, m_videoram_size); diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index 44b987120e2..d593b155e3e 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -120,7 +120,6 @@ TILE_GET_INFO_MEMBER(gberet_state::get_bg_tile_info) VIDEO_START_MEMBER(gberet_state,gberet) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(gberet_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); colortable_configure_tilemap_groups(machine().colortable, m_bg_tilemap, machine().gfx[0], 0x10); m_bg_tilemap->set_scroll_rows(32); @@ -165,7 +164,6 @@ static void gberet_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, UINT32 gberet_state::screen_update_gberet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0); gberet_draw_sprites(machine(), bitmap, cliprect); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/gbusters.c b/src/mame/video/gbusters.c index 91d28ae9f59..082acade2e8 100644 --- a/src/mame/video/gbusters.c +++ b/src/mame/video/gbusters.c @@ -48,7 +48,6 @@ void gbusters_state::video_start() UINT32 gbusters_state::screen_update_gbusters(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); /* sprite priority 3 = disable */ diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c index 7f9a4ea9c6e..d0ec7b8fc7d 100644 --- a/src/mame/video/gng.c +++ b/src/mame/video/gng.c @@ -135,7 +135,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 gng_state::screen_update_gng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(machine(), bitmap, cliprect); m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0); diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 52a478a735f..ce3f1efc1b3 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -21,7 +21,6 @@ WRITE8_MEMBER(goldstar_state::cm_girl_scroll_w) { - m_cm_girl_scroll = data; /* xxxx ---- yscroll @@ -34,7 +33,6 @@ WRITE8_MEMBER(goldstar_state::cm_girl_scroll_w) WRITE8_MEMBER(goldstar_state::cm_outport0_w) { - m_cm_enable_reg = data; /* ---- ---x (global enable or irq enable?) @@ -50,14 +48,12 @@ WRITE8_MEMBER(goldstar_state::cm_outport0_w) WRITE8_MEMBER(goldstar_state::goldstar_fg_vidram_w) { - m_fg_vidram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(goldstar_state::goldstar_fg_atrram_w) { - m_fg_atrram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -104,7 +100,6 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_cherrym_fg_tile_info) WRITE8_MEMBER(goldstar_state::goldstar_reel1_ram_w) { - m_reel1_ram[offset] = data; m_reel1_tilemap->mark_tile_dirty(offset); } @@ -140,7 +135,6 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel2_tile_info) WRITE8_MEMBER(goldstar_state::goldstar_reel3_ram_w) { - m_reel3_ram[offset] = data; m_reel3_tilemap->mark_tile_dirty(offset); } @@ -158,14 +152,12 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info) WRITE8_MEMBER(goldstar_state::unkch_reel1_attrram_w) { - m_reel1_attrram[offset] = data; m_reel1_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(goldstar_state::unkch_reel2_attrram_w) { - m_reel2_attrram[offset] = data; m_reel2_tilemap->mark_tile_dirty(offset); } @@ -173,7 +165,6 @@ WRITE8_MEMBER(goldstar_state::unkch_reel2_attrram_w) WRITE8_MEMBER(goldstar_state::unkch_reel3_attrram_w) { - m_reel3_attrram[offset] = data; m_reel3_tilemap->mark_tile_dirty(offset); } @@ -220,7 +211,6 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_unkch_reel3_tile_info) VIDEO_START_MEMBER(goldstar_state,goldstar) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -238,7 +228,6 @@ VIDEO_START_MEMBER(goldstar_state,goldstar) VIDEO_START_MEMBER(goldstar_state,bingowng) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel1_tilemap->set_scroll_cols(64); @@ -252,7 +241,6 @@ VIDEO_START_MEMBER(goldstar_state,bingowng) VIDEO_START_MEMBER(goldstar_state,magical) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -270,7 +258,6 @@ VIDEO_START_MEMBER(goldstar_state,magical) VIDEO_START_MEMBER(goldstar_state,unkch) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_unkch_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -291,7 +278,6 @@ VIDEO_START_MEMBER(goldstar_state,unkch) VIDEO_START_MEMBER(goldstar_state,cherrym) { - m_reel1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel1_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel2_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); m_reel3_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(goldstar_state::get_goldstar_reel3_tile_info),this),TILEMAP_SCAN_ROWS,8,32, 64, 8); @@ -313,7 +299,6 @@ VIDEO_START_MEMBER(goldstar_state,cherrym) WRITE8_MEMBER(goldstar_state::goldstar_fa00_w) { - /* bit 1 toggles continuously - might be irq enable or watchdog reset */ /* bit 2 selects background gfx color (I think) */ @@ -325,7 +310,6 @@ WRITE8_MEMBER(goldstar_state::goldstar_fa00_w) WRITE8_MEMBER(goldstar_state::cm_background_col_w) { - //printf("cm_background_col_w %02x\n",data); /* cherry master writes diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c index 05fc695656d..a9fc7c3415d 100644 --- a/src/mame/video/gotya.c +++ b/src/mame/video/gotya.c @@ -76,7 +76,6 @@ WRITE8_MEMBER(gotya_state::gotya_colorram_w) WRITE8_MEMBER(gotya_state::gotya_video_control_w) { - /* bit 0 - scroll bit 8 bit 1 - flip screen bit 2 - sound disable ??? */ diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c index 6d9e2635b99..1dea6c7aefb 100644 --- a/src/mame/video/gp9001.c +++ b/src/mame/video/gp9001.c @@ -532,7 +532,6 @@ static void gp9001_set_sprite_scrolly_and_flip_reg(gp9001spritelayer* layer, UIN static void gp9001_scroll_reg_data_w(gp9001vdp_device *vdp, offs_t offset, UINT16 data, UINT16 mem_mask) { - /************************************************************************/ /***** layer X and Y flips can be set independently, so emulate it ******/ /************************************************************************/ diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index 14d6a5a07da..1144e565e51 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -92,13 +92,11 @@ extern const device_type GP9001_VDP; /* vdp map 0, gfx region 0 */ #define MCFG_DEVICE_ADD_VDP0 \ MCFG_DEVICE_ADD("gp9001vdp0", GP9001_VDP, 0) \ - gp9001vdp_device::static_set_gfx_region(*device, 0); \ - + gp9001vdp_device::static_set_gfx_region(*device, 0); /* vdp map 1, gfx region 2 */ #define MCFG_DEVICE_ADD_VDP1 \ MCFG_DEVICE_ADD("gp9001vdp1", GP9001_VDP, 0) \ - gp9001vdp_device::static_set_gfx_region(*device, 2); \ - + gp9001vdp_device::static_set_gfx_region(*device, 2); // access to VDP DECLARE_READ16_DEVICE_HANDLER( gp9001_vdp_r ); diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index 771c3b6e11b..f036386752d 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -123,7 +123,6 @@ WRITE16_MEMBER(gradius3_state::gradius3_gfxram_w) UINT32 gradius3_state::screen_update_gradius3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */ address_space &space = machine().driver_data()->generic_space(); k052109_w(m_k052109, space, 0x1d80, 0x10); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 1cf6f3c663e..87173cefc9d 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -98,7 +98,6 @@ TILEMAP_MAPPER_MEMBER(grchamp_state::get_memory_offset) void grchamp_state::video_start() { - m_work_bitmap.allocate(32,32); /* allocate tilemaps for each of the three sections */ diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c index 19b3a83d9ab..d95090dce39 100644 --- a/src/mame/video/gstriker.c +++ b/src/mame/video/gstriker.c @@ -364,7 +364,6 @@ UINT32 gstriker_state::screen_update_gstriker(screen_device &screen, bitmap_ind1 VIDEO_START_MEMBER(gstriker_state,gstriker) { - // Palette bases are hardcoded, but should be probably extracted from the mixer registers // Initalize the chip for the score plane @@ -382,7 +381,6 @@ VIDEO_START_MEMBER(gstriker_state,gstriker) VIDEO_START_MEMBER(gstriker_state,twrldc94) { - // Palette bases are hardcoded, but should be probably extracted from the mixer registers // Initalize the chip for the score plane @@ -400,7 +398,6 @@ VIDEO_START_MEMBER(gstriker_state,twrldc94) VIDEO_START_MEMBER(gstriker_state,vgoalsoc) { - // Palette bases are hardcoded, but should be probably extracted from the mixer registers // Initalize the chip for the score plane diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 15ef3e6745e..9a9ca1b0846 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -1526,11 +1526,9 @@ static void render_polygons(running_machine &machine) } else if (cmd == 0x80000000) { - } else if (cmd == 0x80000018) { - } else if ((cmd & 0xffff0000) == 0x80000000) { @@ -1552,7 +1550,6 @@ static void render_polygons(running_machine &machine) } else { - } } while (index < K001005_3d_fifo_ptr); diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index c2789f6191a..0bff28b640a 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -73,7 +73,6 @@ WRITE8_MEMBER(gunsmoke_state::gunsmoke_colorram_w) WRITE8_MEMBER(gunsmoke_state::gunsmoke_c804_w) { - /* bits 0 and 1 are for coin counters */ coin_counter_w(machine(), 1, data & 0x01); coin_counter_w(machine(), 0, data & 0x02); @@ -92,7 +91,6 @@ WRITE8_MEMBER(gunsmoke_state::gunsmoke_c804_w) WRITE8_MEMBER(gunsmoke_state::gunsmoke_d806_w) { - /* bits 0-2 select the sprite 3 bank */ m_sprite3bank = data & 0x07; diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c index 9549315a538..478738f0ae1 100644 --- a/src/mame/video/gyruss.c +++ b/src/mame/video/gyruss.c @@ -150,7 +150,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 gyruss_state::screen_update_gyruss(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (cliprect.min_y == screen.visible_area().min_y) { machine().tilemap().mark_all_dirty(); diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c index 3a9f035695a..e93d81144f2 100644 --- a/src/mame/video/hcastle.c +++ b/src/mame/video/hcastle.c @@ -129,7 +129,6 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_bg_tile_info) void hcastle_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hcastle_state::get_fg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hcastle_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(hcastle_state::tilemap_scan),this), 8, 8, 64, 32); @@ -168,7 +167,6 @@ READ8_MEMBER(hcastle_state::hcastle_gfxbank_r) WRITE8_MEMBER(hcastle_state::hcastle_pf1_control_w) { - if (offset == 3) { if ((data & 0x8) == 0) @@ -185,7 +183,6 @@ WRITE8_MEMBER(hcastle_state::hcastle_pf1_control_w) WRITE8_MEMBER(hcastle_state::hcastle_pf2_control_w) { - if (offset == 3) { if ((data & 0x8) == 0) diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index babe2ed4328..bb386bdabcd 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -89,8 +89,7 @@ do (PRIORITY) = 31; \ } \ } \ -while (0) \ - +while (0) static void pdrawgfx_transpen_additive(bitmap_rgb32 &dest, const rectangle &cliprect, gfx_element *gfx, UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty, @@ -361,7 +360,6 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r } else // inline chain mode, used by ss64 { - tileno=(source[4]&0x0007ffff); pal =(source[3]&0x00ff0000)>>16; @@ -566,9 +564,7 @@ static void transition_control(running_machine &machine, bitmap_rgb32 &bitmap, c SET_TILE_INFO_MEMBER(2,tileno>>2, pal,TILE_FLIPYX(flip)); \ } \ } \ -} \ - \ - +} TILE_GET_INFO_MEMBER(hng64_state::get_hng64_tile0_8x8_info) { int offset = 0x00000; @@ -1239,7 +1235,6 @@ static void hng64_drawtilemap(running_machine& machine, bitmap_rgb32 &bitmap, co for (yy=0;yy<448;yy++) { - dstptr = &bitmap.pix32(yy); tmp = xtopleft; @@ -1309,7 +1304,6 @@ static void hng64_drawtilemap(running_machine& machine, bitmap_rgb32 &bitmap, co } else { - xtopleft = (hng64_videoram[(0x40000+(scrollbase<<4))/4]); xmiddle = (hng64_videoram[(0x40004+(scrollbase<<4))/4]); // middle screen point ytopleft = (hng64_videoram[(0x40008+(scrollbase<<4))/4]); @@ -3291,7 +3285,6 @@ static void RasterizeTriangle_SMOOTH_TEX_PC(running_machine &machine, // First work on the bottom half of the triangle // I'm using y_min as the incrementer because it saves space and we don't need it anymore for (; y_min < y_mid; y_min++) { - // We always want to fill left to right, so we have 2 main cases // Compute the integer starting and ending points and the appropriate z by // interpolating. Remember the pixels are in the middle of the grid, i.e. (0.5,0.5,0.5) @@ -3374,7 +3367,6 @@ static void RasterizeTriangle_SMOOTH_TEX_PC(running_machine &machine, // We've seen this loop before haven't we? // I'm using y_mid as the incrementer because it saves space and we don't need it anymore for (; y_mid <= y_max; y_mid++) { - if (x1_interp < x2_interp) { x_start = ((((int)x1_interp) + 0.5) >= x1_interp) ? (int)x1_interp : ((int)x1_interp) + 1; x_end = ((((int)x2_interp) + 0.5) < x2_interp) ? (int)x2_interp : ((int)x2_interp) - 1; diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c index 39da678d3a1..adf9e80ee64 100644 --- a/src/mame/video/homerun.c +++ b/src/mame/video/homerun.c @@ -37,7 +37,6 @@ WRITE8_MEMBER(homerun_state::homerun_scrollx_w) WRITE8_MEMBER(homerun_state::homerun_banking_w) { - // games do mid-screen gfx bank switching int vpos = machine().primary_screen->vpos(); machine().primary_screen->update_partial(vpos); @@ -141,7 +140,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 homerun_state::screen_update_homerun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap->set_scrolly(0, m_scrolly); m_tilemap->set_scrollx(0, m_scrollx); diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c index 4f61f5da8d3..f9b9c281435 100644 --- a/src/mame/video/hyperspt.c +++ b/src/mame/video/hyperspt.c @@ -122,7 +122,6 @@ TILE_GET_INFO_MEMBER(hyperspt_state::get_bg_tile_info) void hyperspt_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyperspt_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); } @@ -199,7 +198,6 @@ TILE_GET_INFO_MEMBER(hyperspt_state::roadf_get_bg_tile_info) VIDEO_START_MEMBER(hyperspt_state,roadf) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(hyperspt_state::roadf_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 9514c77bc5f..0ec8d80b02c 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -391,7 +391,6 @@ VIDEO_START_MEMBER(hyprduel_state,common_14220) VIDEO_START_MEMBER(hyprduel_state,hyprduel_14220) { - m_sprite_yoffs_sub = 2; VIDEO_START_CALL_MEMBER(common_14220); @@ -399,7 +398,6 @@ VIDEO_START_MEMBER(hyprduel_state,hyprduel_14220) VIDEO_START_MEMBER(hyprduel_state,magerror_14220) { - m_sprite_yoffs_sub = 0; VIDEO_START_CALL_MEMBER(common_14220); diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index 00b8ece0898..ba9a817b9b5 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -117,7 +117,6 @@ UINT32 inufuku_state::inufuku_tile_callback( UINT32 code ) void inufuku_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(inufuku_state::get_inufuku_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index ba50166da74..7c89741c05e 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -30,7 +30,6 @@ VIDEO_START_MEMBER(jedi_state,jedi) { - /* register for saving */ save_item(NAME(m_vscroll)); save_item(NAME(m_hscroll)); @@ -109,14 +108,12 @@ static void do_pen_lookup(jedi_state *state, bitmap_rgb32 &bitmap, const rectang WRITE8_MEMBER(jedi_state::jedi_vscroll_w) { - m_vscroll = data | (offset << 8); } WRITE8_MEMBER(jedi_state::jedi_hscroll_w) { - m_hscroll = data | (offset << 8); } @@ -326,7 +323,6 @@ static void draw_sprites(running_machine &machine, jedi_state *state, bitmap_rgb UINT32 jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - /* if no video, clear it all to black */ if (*m_video_off & 0x01) bitmap.fill(RGB_BLACK, cliprect); diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index bee4367c78e..6d13a5ade9a 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -26,7 +26,6 @@ VIDEO_START_MEMBER(kaneko16_state,kaneko16) static void kaneko16_fill_bitmap(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect) { - kaneko16_state *state = machine.driver_data(); if (state->m_kaneko_spr) if(state->m_kaneko_spr->get_sprite_type()== 1) diff --git a/src/mame/video/kaneko_grap2.c b/src/mame/video/kaneko_grap2.c index 9fffc2f1f5a..d29a3b9e120 100644 --- a/src/mame/video/kaneko_grap2.c +++ b/src/mame/video/kaneko_grap2.c @@ -67,7 +67,6 @@ void kaneko_grap2_device::device_reset() READ16_MEMBER(kaneko_grap2_device::galpani3_regs1_r) { - switch (offset) { case 0x2: diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h index d83eaa2e4a5..e35682cfd6f 100644 --- a/src/mame/video/kaneko_grap2.h +++ b/src/mame/video/kaneko_grap2.h @@ -14,8 +14,7 @@ AM_RANGE(_BASE+0x000c1e, _BASE+0x000c1f) AM_DEVWRITE(name,kaneko_grap2_device,galpani3_regs1_go_w) \ AM_RANGE(_BASE+0x000c00, _BASE+0x000c1f) AM_DEVREAD(name,kaneko_grap2_device,galpani3_regs1_r) \ AM_RANGE(_BASE+0x080000, _BASE+0x0801ff) AM_DEVREADWRITE(name,kaneko_grap2_device, pal_r, galpani3_framebuffer1_palette_w ) \ - AM_RANGE(_BASE+0x100000, _BASE+0x17ffff) AM_DEVREADWRITE(name,kaneko_grap2_device, framebuffer_r, framebuffer_w ) \ - + AM_RANGE(_BASE+0x100000, _BASE+0x17ffff) AM_DEVREADWRITE(name,kaneko_grap2_device, framebuffer_r, framebuffer_w ) class kaneko_grap2_device : public device_t diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h index 36120acfcc0..4ecb74fb042 100644 --- a/src/mame/video/kaneko_spr.h +++ b/src/mame/video/kaneko_spr.h @@ -3,12 +3,10 @@ /* berlwall, blazeon etc. */ #define MCFG_DEVICE_ADD_VU002_SPRITES \ - MCFG_DEVICE_ADD("kan_spr", KANEKO_VU002_SPRITE, 0) \ - + MCFG_DEVICE_ADD("kan_spr", KANEKO_VU002_SPRITE, 0) /* gtmr, gtmr2, bloodwar etc. */ #define MCFG_DEVICE_ADD_KC002_SPRITES \ - MCFG_DEVICE_ADD("kan_spr", KANEKO_KC002_SPRITE, 0) \ - + MCFG_DEVICE_ADD("kan_spr", KANEKO_KC002_SPRITE, 0) struct kaneko16_priority_t diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index cef409bdfbf..4234c199008 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -18,7 +18,6 @@ static void blitter_execute(running_machine &machine); void kangaroo_state::video_start() { - /* video RAM is accessed 32 bits at a time (two planes, 4bpp each, 4 pixels) */ m_videoram = auto_alloc_array(machine(), UINT32, 256 * 64); save_pointer(NAME(m_videoram), 256 * 64); diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index 9ec5afa735b..3446cb024e7 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -161,7 +161,6 @@ WRITE16_MEMBER(karnov_state::karnov_playfield_swap_w) VIDEO_START_MEMBER(karnov_state,karnov) { - /* Allocate bitmap & tilemap */ m_bitmap_f = auto_bitmap_ind16_alloc(machine(), 512, 512); m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -173,7 +172,6 @@ VIDEO_START_MEMBER(karnov_state,karnov) VIDEO_START_MEMBER(karnov_state,wndrplnt) { - /* Allocate bitmap & tilemap */ m_bitmap_f = auto_bitmap_ind16_alloc(machine(), 512, 512); m_fix_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(karnov_state::get_fix_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c index b88fb121b31..dd21f4a9c00 100644 --- a/src/mame/video/kchamp.c +++ b/src/mame/video/kchamp.c @@ -126,7 +126,6 @@ static void kchampvs_draw_sprites( running_machine &machine, bitmap_ind16 &bitma UINT32 kchamp_state::screen_update_kchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kchamp_draw_sprites(machine(), bitmap, cliprect); return 0; @@ -134,7 +133,6 @@ UINT32 kchamp_state::screen_update_kchamp(screen_device &screen, bitmap_ind16 &b UINT32 kchamp_state::screen_update_kchampvs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kchampvs_draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 186dd73e49c..b32de34b912 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -118,7 +118,6 @@ static void kickgoal_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap VIDEO_START_MEMBER(kickgoal_state,kickgoal) { - m_sprbase = 0x0000; m_fg_base = 0x7000; @@ -139,7 +138,6 @@ VIDEO_START_MEMBER(kickgoal_state,kickgoal) VIDEO_START_MEMBER(kickgoal_state,actionhw) { - m_sprbase = 0x4000; m_fg_base = 0x7000 * 2; @@ -162,7 +160,6 @@ VIDEO_START_MEMBER(kickgoal_state,actionhw) UINT32 kickgoal_state::screen_update_kickgoal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* set scroll */ m_fgtm->set_scrollx(0, m_scrram[0]); m_fgtm->set_scrolly(0, m_scrram[1]); diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index 77466a8a04d..de33e59531d 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -242,7 +242,6 @@ static void kingofb_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, UINT32 kingofb_state::screen_update_kingofb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrolly(0, -(*m_scroll_y)); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); kingofb_draw_sprites(machine(), bitmap, cliprect); @@ -301,7 +300,6 @@ static void ringking_draw_sprites( running_machine &machine, bitmap_ind16 &bitma UINT32 kingofb_state::screen_update_ringking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrolly(0, -(*m_scroll_y)); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); ringking_draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index b10783b1c71..851785113c3 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -236,7 +236,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 kncljoe_state::screen_update_kncljoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index fe94a1b8ed7..6231322ac32 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -2477,7 +2477,6 @@ UINT32 konamigx_state::screen_update_konamigx(screen_device &screen, bitmap_rgb3 // make it flicker, to compare positioning //if (screen.frame_number() & 1) { - for (y=0;y<256;y++) { //UINT16* src = &gxtype1_roz_dstbitmap->pix16(y); @@ -2549,14 +2548,12 @@ UINT32 konamigx_state::screen_update_konamigx_left(screen_device &screen, bitmap UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (konamigx_current_frame==1) { copybitmap(bitmap, *dualscreen_right_tempbitmap, 0, 0, 0, 0, cliprect); } else { - int offset=0; if (konamigx_palformat==1) diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 0d96a5112f5..10826326915 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -2565,13 +2565,11 @@ WRITE16_HANDLER( K056832_b_word_w ) static int K056832_update_linemap(running_machine &machine, bitmap_rgb32 &bitmap, int page, int flags) { - if (K056832_PageTileMode[page]) return(0); if (!K056832_linemap_enabled) return(1); { - rectangle zerorect; tilemap_t *tmap; UINT32 *dirty; @@ -2608,8 +2606,6 @@ static int K056832_update_linemap(running_machine &machine, bitmap_rgb32 &bitmap */ { - - bitmap_ind16 *pixmap; UINT8 code_transparent, code_opaque; @@ -2641,8 +2637,6 @@ static int K056832_update_linemap(running_machine &machine, bitmap_rgb32 &bitmap for (line=0; line<256; line++) { - - tile_data tileinfo = {0}; dst_ptr = &pixmap->pix16(line); diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index fb251d44152..d822b75c5b6 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1334,7 +1334,6 @@ void konami_sortlayers5( int *layer, int *pri ) struct k007121_state { - UINT8 ctrlram[8]; int flipscreen; }; @@ -3017,7 +3016,6 @@ WRITE8_DEVICE_HANDLER( k051937_w ) if (offset == 0) { - //if (data & 0xc2) popmessage("051937 reg 00 = %02x",data); /* bit 0 is IRQ enable */ @@ -7446,7 +7444,6 @@ static int k056832_update_linemap( device_t *device, _BitmapClass &bitmap, int p */ { - bitmap_ind16 *pixmap; running_machine &machine = device->machine(); @@ -8205,7 +8202,6 @@ void k056832_device::device_config_complete() void k056832_device::device_start() { - /* TODO: understand which elements MUST be init here (to keep correct layer associations) and which ones can can be init at RESET, if any */ k056832_state *k056832 = k056832_get_safe_token(this); @@ -9961,7 +9957,6 @@ static void k001005_render_polygons( device_t *device ) } else if (k001005->_3d_fifo[i] == 0x80000000) { - } else if ((k001005->_3d_fifo[i] & 0xffffff00) == 0x80000000) { diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c index ad2fb29f124..9366a7ce0f0 100644 --- a/src/mame/video/kopunch.c +++ b/src/mame/video/kopunch.c @@ -92,7 +92,6 @@ void kopunch_state::video_start() UINT32 kopunch_state::screen_update_kopunch(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index 1df27cc32e5..aebc16de53c 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -122,7 +122,6 @@ void ksayakyu_state::video_start() UINT32 ksayakyu_state::screen_update_ksayakyu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); if (m_video_ctrl & 1) diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 15dc32a0aae..cea96df53e6 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -43,7 +43,6 @@ TILE_GET_INFO_MEMBER(kyugo_state::get_bg_tile_info) void kyugo_state::video_start() { - m_color_codes = memregion("proms")->base() + 0x300; m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(kyugo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -64,7 +63,6 @@ void kyugo_state::video_start() WRITE8_MEMBER(kyugo_state::kyugo_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -72,7 +70,6 @@ WRITE8_MEMBER(kyugo_state::kyugo_fgvideoram_w) WRITE8_MEMBER(kyugo_state::kyugo_bgvideoram_w) { - m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -80,7 +77,6 @@ WRITE8_MEMBER(kyugo_state::kyugo_bgvideoram_w) WRITE8_MEMBER(kyugo_state::kyugo_bgattribram_w) { - m_bgattribram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -88,7 +84,6 @@ WRITE8_MEMBER(kyugo_state::kyugo_bgattribram_w) READ8_MEMBER(kyugo_state::kyugo_spriteram_2_r) { - // only the lower nibble is connected return m_spriteram_2[offset] | 0xf0; } @@ -102,7 +97,6 @@ WRITE8_MEMBER(kyugo_state::kyugo_scroll_x_lo_w) WRITE8_MEMBER(kyugo_state::kyugo_gfxctrl_w) { - /* bit 0 is scroll MSB */ m_scroll_x_hi = data & 0x01; @@ -134,7 +128,6 @@ WRITE8_MEMBER(kyugo_state::kyugo_scroll_y_w) WRITE8_MEMBER(kyugo_state::kyugo_flipscreen_w) { - if (m_flipscreen != (data & 0x01)) { m_flipscreen = (data & 0x01); @@ -211,7 +204,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 kyugo_state::screen_update_kyugo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_flipscreen) m_bg_tilemap->set_scrollx(0, -(m_scroll_x_lo + (m_scroll_x_hi * 256))); else diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c index aff17d31dd5..6e4cc427b30 100644 --- a/src/mame/video/labyrunr.c +++ b/src/mame/video/labyrunr.c @@ -131,7 +131,6 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info1) void labyrunr_state::video_start() { - m_layer0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_layer1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(labyrunr_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c index 7c9dc0f2887..fe026389ea2 100644 --- a/src/mame/video/ladybug.c +++ b/src/mame/video/ladybug.c @@ -160,7 +160,6 @@ WRITE8_MEMBER(ladybug_state::ladybug_flipscreen_w) WRITE8_MEMBER(ladybug_state::sraider_io_w) { - // bit7 = flip // bit6 = grid red // bit5 = grid green @@ -209,7 +208,6 @@ TILE_GET_INFO_MEMBER(ladybug_state::get_grid_tile_info) VIDEO_START_MEMBER(ladybug_state,ladybug) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); m_bg_tilemap->set_transparent_pen(0); @@ -217,7 +215,6 @@ VIDEO_START_MEMBER(ladybug_state,ladybug) VIDEO_START_MEMBER(ladybug_state,sraider) { - m_grid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_grid_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_grid_tilemap->set_scroll_rows(32); m_grid_tilemap->set_transparent_pen(0); @@ -310,7 +307,6 @@ void ladybug_state::screen_eof_sraider(screen_device &screen, bool state)/* upda UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // this part is boilerplate from ladybug, not sure if hardware does this, // since it's not used diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index 0ee5b6139b0..964a69b034b 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -43,7 +43,6 @@ READ8_MEMBER(ladyfrog_state::ladyfrog_videoram_r) WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w) { - if (offset & 0x100) paletteram_xxxxBBBBGGGGRRRR_byte_split_hi_w(space, (offset & 0xff) + (m_palette_bank << 8), data); else @@ -52,7 +51,6 @@ WRITE8_MEMBER(ladyfrog_state::ladyfrog_palette_w) READ8_MEMBER(ladyfrog_state::ladyfrog_palette_r) { - if (offset & 0x100) return m_generic_paletteram2_8[(offset & 0xff) + (m_palette_bank << 8)]; else @@ -87,7 +85,6 @@ READ8_MEMBER(ladyfrog_state::ladyfrog_scrlram_r) WRITE8_MEMBER(ladyfrog_state::ladyfrog_scrlram_w) { - m_scrlram[offset] = data; m_bg_tilemap->set_scrolly(offset, data); } @@ -129,7 +126,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) { - m_spriteram = auto_alloc_array(machine(), UINT8, 160); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladyfrog_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -143,7 +139,6 @@ VIDEO_START_MEMBER(ladyfrog_state,ladyfrog_common) void ladyfrog_state::video_start() { - // weird, there are sprite tiles at 0x000 and 0x400, but they don't contain all the sprites! m_spritetilebase = 0x800; VIDEO_START_CALL_MEMBER(ladyfrog_common); @@ -151,7 +146,6 @@ void ladyfrog_state::video_start() VIDEO_START_MEMBER(ladyfrog_state,toucheme) { - m_spritetilebase = 0x000; VIDEO_START_CALL_MEMBER(ladyfrog_common); } @@ -159,7 +153,6 @@ VIDEO_START_MEMBER(ladyfrog_state,toucheme) UINT32 ladyfrog_state::screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 73967572950..8a4462830b9 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -165,7 +165,6 @@ TILE_GET_INFO_MEMBER(lasso_state::pinbo_get_bg_tile_info) void lasso_state::video_start() { - /* create tilemap */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -174,7 +173,6 @@ void lasso_state::video_start() VIDEO_START_MEMBER(lasso_state,wwjgtin) { - /* create tilemaps */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::lasso_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_track_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::wwjgtin_get_track_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 128, 64); @@ -184,7 +182,6 @@ VIDEO_START_MEMBER(lasso_state,wwjgtin) VIDEO_START_MEMBER(lasso_state,pinbo) { - /* create tilemap */ m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lasso_state::pinbo_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -250,7 +247,6 @@ WRITE8_MEMBER(lasso_state::wwjgtin_video_control_w) WRITE8_MEMBER(lasso_state::pinbo_video_control_w) { - /* no need to dirty the tilemap -- only the sprites use the global bank */ m_gfxbank = (data & 0x0c) >> 2; diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index ffaaa886b5e..dc40391217e 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -132,7 +132,6 @@ WRITE16_MEMBER(lastduel_state::lastduel_flip_w) WRITE16_MEMBER(lastduel_state::lastduel_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) { @@ -149,42 +148,36 @@ WRITE16_MEMBER(lastduel_state::lastduel_scroll_w) WRITE16_MEMBER(lastduel_state::lastduel_scroll1_w) { - COMBINE_DATA(&m_scroll1[offset]); m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(lastduel_state::lastduel_scroll2_w) { - COMBINE_DATA(&m_scroll2[offset]); m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(lastduel_state::lastduel_vram_w) { - COMBINE_DATA(&m_vram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(lastduel_state::madgear_scroll1_w) { - COMBINE_DATA(&m_scroll1[offset]); m_fg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE16_MEMBER(lastduel_state::madgear_scroll2_w) { - COMBINE_DATA(&m_scroll2[offset]); m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } WRITE16_MEMBER(lastduel_state::lastduel_palette_word_w) { - int red, green, blue, bright; data = COMBINE_DATA(&m_paletteram[offset]); @@ -257,7 +250,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 lastduel_state::screen_update_lastduel(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); draw_sprites(machine(), bitmap, cliprect, 0); @@ -269,7 +261,6 @@ UINT32 lastduel_state::screen_update_lastduel(screen_device &screen, bitmap_ind1 UINT32 lastduel_state::screen_update_madgear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_tilemap_priority) { m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c index f609766389f..315e3f2c6da 100644 --- a/src/mame/video/legionna.c +++ b/src/mame/video/legionna.c @@ -262,7 +262,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re if (state->m_has_extended_priority) { - cur_pri = (spriteram16[offs+1] & 0xc000) >> 14; if(data & 0x0040) diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index 19e677d52ec..bf8c02c0077 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -62,7 +62,6 @@ void lemmings_state::screen_eof_lemmings(screen_device &screen, bool state) // RAM based WRITE16_MEMBER(lemmings_state::lemmings_pixel_0_w) { - int sx, sy, src, old; old = m_pixel_0_data[offset]; diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c index 7009a815730..d2e73d40003 100644 --- a/src/mame/video/lethal.c +++ b/src/mame/video/lethal.c @@ -49,7 +49,6 @@ void lethalen_tile_callback( running_machine &machine, int layer, int *code, int void lethal_state::video_start() { - // this game uses external linescroll RAM k056832_SetExtLinescroll(m_k056832); @@ -77,7 +76,6 @@ void lethal_state::video_start() WRITE8_MEMBER(lethal_state::lethalen_palette_control) { - switch (offset) { case 0: // 40c8 - PCU1 from schematics @@ -102,7 +100,6 @@ WRITE8_MEMBER(lethal_state::lethalen_palette_control) UINT32 lethal_state::screen_update_lethalen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(7168, cliprect); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c index 12cd3ea94f2..83865384a83 100644 --- a/src/mame/video/lkage.c +++ b/src/mame/video/lkage.c @@ -43,7 +43,6 @@ WRITE8_MEMBER(lkage_state::lkage_videoram_w) { - m_videoram[offset] = data; switch (offset / 0x400) @@ -85,7 +84,6 @@ TILE_GET_INFO_MEMBER(lkage_state::get_tx_tile_info) void lkage_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lkage_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index 429a2411830..f803dc9a238 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -64,7 +64,6 @@ WRITE16_MEMBER(lockon_state::lockon_crtc_w) TIMER_CALLBACK_MEMBER(lockon_state::cursor_callback) { - if (m_main_inten) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); @@ -604,7 +603,6 @@ static void objects_draw( running_machine &machine ) /* The mechanism used by the object CPU to update the object ASICs palette RAM */ WRITE16_MEMBER(lockon_state::lockon_tza112_w) { - if (m_iden) { m_obj_pal_latch = data & 0xff; @@ -615,7 +613,6 @@ WRITE16_MEMBER(lockon_state::lockon_tza112_w) READ16_MEMBER(lockon_state::lockon_obj_4000_r) { - m_object->execute().set_input_line(NEC_INPUT_LINE_POLL, CLEAR_LINE); return 0xffff; } @@ -659,7 +656,6 @@ WRITE16_MEMBER(lockon_state::lockon_fb_clut_w) /* Rotation control register */ WRITE16_MEMBER(lockon_state::lockon_rotate_w) { - switch (offset & 7) { case 0: m_xsal = data & 0x1ff; break; @@ -895,7 +891,6 @@ static void hud_draw( running_machine &machine, bitmap_ind16 &bitmap, const rect void lockon_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lockon_state::get_lockon_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_tilemap->set_transparent_pen(0); @@ -920,7 +915,6 @@ void lockon_state::video_start() UINT32 lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* If screen output is disabled, fill with black */ if (!BIT(m_ctrl_reg, 7)) { @@ -945,7 +939,6 @@ void lockon_state::screen_eof_lockon(screen_device &screen, bool state) // on falling edge if (!state) { - /* Swap the frame buffers */ bitmap_ind16 *tmp = m_front_buffer; m_front_buffer = m_back_buffer; diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index c5ca11cb943..da81f0e3192 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -80,7 +80,6 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info) void lwings_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::lwings_get_bg1_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 32, 32); @@ -89,7 +88,6 @@ void lwings_state::video_start() VIDEO_START_MEMBER(lwings_state,trojan) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::trojan_get_bg1_tile_info),this),TILEMAP_SCAN_COLS, 16, 16, 32, 32); m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(lwings_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(lwings_state::get_bg2_memory_offset),this), 16, 16, 32, 16); @@ -103,7 +101,6 @@ VIDEO_START_MEMBER(lwings_state,trojan) VIDEO_START_MEMBER(lwings_state,avengers) { - VIDEO_START_CALL_MEMBER(trojan); m_bg2_avenger_hw = 1; } @@ -146,7 +143,6 @@ WRITE8_MEMBER(lwings_state::trojan_bg2_scrollx_w) WRITE8_MEMBER(lwings_state::trojan_bg2_image_w) { - if (m_bg2_image != data) { m_bg2_image = data; @@ -259,7 +255,6 @@ static void trojan_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, UINT32 lwings_state::screen_update_lwings(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg1_tilemap->draw(bitmap, cliprect, 0, 0); lwings_draw_sprites(machine(), bitmap, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -268,7 +263,6 @@ UINT32 lwings_state::screen_update_lwings(screen_device &screen, bitmap_ind16 &b UINT32 lwings_state::screen_update_trojan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0); trojan_draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index baf7ac1faa4..a77e44d9582 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -56,7 +56,6 @@ TILE_GET_INFO_MEMBER(m10_state::get_tile_info) WRITE8_MEMBER(m10_state::m10_colorram_w) { - if (m_colorram[offset] != data) { m_tx_tilemap->mark_tile_dirty(offset); @@ -67,7 +66,6 @@ WRITE8_MEMBER(m10_state::m10_colorram_w) WRITE8_MEMBER(m10_state::m10_chargen_w) { - if (m_chargen[offset] != data) { m_chargen[offset] = data; @@ -78,7 +76,6 @@ WRITE8_MEMBER(m10_state::m10_chargen_w) WRITE8_MEMBER(m10_state::m15_chargen_w) { - if (m_chargen[offset] != data) { m_chargen[offset] = data; @@ -100,7 +97,6 @@ INLINE void plot_pixel_m10( running_machine &machine, bitmap_ind16 &bm, int x, i VIDEO_START_MEMBER(m10_state,m10) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this), tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); m_tx_tilemap->set_transparent_pen(0); m_tx_tilemap->set_scrolldx(0, 62); @@ -114,7 +110,6 @@ VIDEO_START_MEMBER(m10_state,m10) VIDEO_START_MEMBER(m10_state,m15) { - machine().gfx[0] = auto_alloc(machine(), gfx_element(machine(), charlayout, m_chargen, 8, 0)); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m10_state::get_tile_info),this),tilemap_mapper_delegate(FUNC(m10_state::tilemap_scan),this), 8, 8, 32, 32); diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c index 1216d808261..8f35cb2119a 100644 --- a/src/mame/video/m52.c +++ b/src/mame/video/m52.c @@ -148,7 +148,6 @@ TILE_GET_INFO_MEMBER(m52_state::get_tile_info) void m52_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m52_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_transparent_pen(0); @@ -196,7 +195,6 @@ WRITE8_MEMBER(m52_state::m52_scroll_w) WRITE8_MEMBER(m52_state::m52_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -204,7 +202,6 @@ WRITE8_MEMBER(m52_state::m52_videoram_w) WRITE8_MEMBER(m52_state::m52_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c index 45c4b9f10eb..da653a928b5 100644 --- a/src/mame/video/m57.c +++ b/src/mame/video/m57.c @@ -112,7 +112,6 @@ void m57_state::palette_init() TILE_GET_INFO_MEMBER(m57_state::get_tile_info) { - UINT8 attr = m_videoram[tile_index * 2 + 0]; UINT16 code = m_videoram[tile_index * 2 + 1] | ((attr & 0xc0) << 2); @@ -128,7 +127,6 @@ TILE_GET_INFO_MEMBER(m57_state::get_tile_info) WRITE8_MEMBER(m57_state::m57_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -142,7 +140,6 @@ WRITE8_MEMBER(m57_state::m57_videoram_w) void m57_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m57_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(256); @@ -158,7 +155,6 @@ void m57_state::video_start() WRITE8_MEMBER(m57_state::m57_flipscreen_w) { - /* screen flip is handled both by software and hardware */ m_flipscreen = (data & 0x01) ^ (~ioport("DSW2")->read() & 0x01); m_bg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c index 339c0f7841f..967d022b4cc 100644 --- a/src/mame/video/m58.c +++ b/src/mame/video/m58.c @@ -106,7 +106,6 @@ void m58_state::palette_init() WRITE8_MEMBER(m58_state::yard_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -114,7 +113,6 @@ WRITE8_MEMBER(m58_state::yard_videoram_w) WRITE8_MEMBER(m58_state::yard_scroll_panel_w) { - int sx,sy,i; sx = ( offset % 16 ); @@ -146,7 +144,6 @@ WRITE8_MEMBER(m58_state::yard_scroll_panel_w) TILE_GET_INFO_MEMBER(m58_state::yard_get_bg_tile_info) { - int offs = tile_index * 2; int attr = m_videoram[offs + 1]; int code = m_videoram[offs] + ((attr & 0xc0) << 2); @@ -176,7 +173,6 @@ TILEMAP_MAPPER_MEMBER(m58_state::yard_tilemap_scan_rows) void m58_state::video_start() { - int width = machine().primary_screen->width(); int height = machine().primary_screen->height(); const rectangle &visarea = machine().primary_screen->visible_area(); @@ -302,7 +298,6 @@ static void draw_panel( running_machine &machine, bitmap_ind16 &bitmap, const re UINT32 m58_state::screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, (*m_yard_scroll_x_high * 0x100) + *m_yard_scroll_x_low); m_bg_tilemap->set_scrolly(0, *m_yard_scroll_y_low); diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c index 6a158597a21..96af66c9883 100644 --- a/src/mame/video/m62.c +++ b/src/mame/video/m62.c @@ -483,7 +483,6 @@ UINT32 m62_state::screen_update_kungfum(screen_device &screen, bitmap_ind16 &bit TILE_GET_INFO_MEMBER(m62_state::get_ldrun_bg_tile_info) { - int code; int color; int flags; @@ -503,7 +502,6 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun_bg_tile_info) void m62_state::video_start() { - m62_start(machine(), tilemap_get_info_delegate(FUNC(m62_state::get_ldrun_bg_tile_info),this), 1, 1, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ @@ -738,7 +736,6 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_fg_tile_info) VIDEO_START_MEMBER(m62_state,kidniki) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(m62_state::get_kidniki_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transmask(0, 0xffff, 0x0000); /* split type 0 is totally transparent in front half */ m_bg_tilemap->set_transmask(1, 0x0001, 0xfffe); /* split type 1 has pen 0 transparent in front half */ diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c index 5d6c9686a14..81a2e9ae5be 100644 --- a/src/mame/video/m90.c +++ b/src/mame/video/m90.c @@ -361,7 +361,6 @@ UINT32 m90_state::screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap, if (video_enable) { - if (pf2_enable) { // use the playfield 2 y-offset table for each scanline diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index ca93a70e5da..4a6c38bd955 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -8,7 +8,6 @@ WRITE32_MEMBER(macrossp_state::macrossp_scra_videoram_w) { - COMBINE_DATA(&m_scra_videoram[offset]); m_scra_tilemap->mark_tile_dirty(offset); @@ -44,7 +43,6 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scra_tile_info) WRITE32_MEMBER(macrossp_state::macrossp_scrb_videoram_w) { - COMBINE_DATA(&m_scrb_videoram[offset]); m_scrb_tilemap->mark_tile_dirty(offset); @@ -80,7 +78,6 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrb_tile_info) WRITE32_MEMBER(macrossp_state::macrossp_scrc_videoram_w) { - COMBINE_DATA(&m_scrc_videoram[offset]); m_scrc_tilemap->mark_tile_dirty(offset); @@ -116,7 +113,6 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrc_tile_info) WRITE32_MEMBER(macrossp_state::macrossp_text_videoram_w) { - COMBINE_DATA(&m_text_videoram[offset]); m_text_tilemap->mark_tile_dirty(offset); @@ -139,7 +135,6 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_text_tile_info) void macrossp_state::video_start() { - m_spriteram_old = auto_alloc_array_clear(machine(), UINT32, m_spriteram.bytes() / 4); m_spriteram_old2 = auto_alloc_array_clear(machine(), UINT32, m_spriteram.bytes() / 4); @@ -174,7 +169,6 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r while (source < finish) { - /* --hh hhyy yyyy yyyy CCww wwxx xxxx xxxx @@ -424,7 +418,6 @@ void macrossp_state::screen_eof_macrossp(screen_device &screen, bool state) // rising edge if (state) { - /* looks like sprites are *two* frames ahead, like nmk16 */ memcpy(m_spriteram_old2, m_spriteram_old, m_spriteram.bytes()); memcpy(m_spriteram_old, m_spriteram, m_spriteram.bytes()); diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c index cc91d0b060c..64b9cfe495f 100644 --- a/src/mame/video/mainevt.c +++ b/src/mame/video/mainevt.c @@ -93,7 +93,6 @@ VIDEO_START_MEMBER(mainevt_state,dv) UINT32 mainevt_state::screen_update_mainevt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); machine().priority_bitmap.fill(0, cliprect); @@ -108,7 +107,6 @@ UINT32 mainevt_state::screen_update_mainevt(screen_device &screen, bitmap_ind16 UINT32 mainevt_state::screen_update_dv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); k052109_tilemap_draw(m_k052109, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 0); diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c index be6ffee24d6..cf05f527731 100644 --- a/src/mame/video/mainsnk.c +++ b/src/mame/video/mainsnk.c @@ -69,7 +69,6 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_bg_tile_info) void mainsnk_state::video_start() { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mainsnk_state::get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(mainsnk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mainsnk_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -106,14 +105,12 @@ WRITE8_MEMBER(mainsnk_state::mainsnk_c600_w) WRITE8_MEMBER(mainsnk_state::mainsnk_fgram_w) { - m_fgram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(mainsnk_state::mainsnk_bgram_w) { - m_bgram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -165,7 +162,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 mainsnk_state::screen_update_mainsnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect, 0, 0); m_tx_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c index 83a3cfd5dc2..b40cf2bc5d3 100644 --- a/src/mame/video/mappy.c +++ b/src/mame/video/mappy.c @@ -320,7 +320,6 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info) VIDEO_START_MEMBER(mappy_state,superpac) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::superpac_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); machine().primary_screen->register_screen_bitmap(m_sprite_bitmap); @@ -329,7 +328,6 @@ VIDEO_START_MEMBER(mappy_state,superpac) VIDEO_START_MEMBER(mappy_state,phozon) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::phozon_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::superpac_tilemap_scan),this),8,8,36,28); colortable_configure_tilemap_groups(machine().colortable, m_bg_tilemap, machine().gfx[0], 15); @@ -339,7 +337,6 @@ VIDEO_START_MEMBER(mappy_state,phozon) VIDEO_START_MEMBER(mappy_state,mappy) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mappy_state::mappy_get_tile_info),this),tilemap_mapper_delegate(FUNC(mappy_state::mappy_tilemap_scan),this),8,8,36,60); colortable_configure_tilemap_groups(machine().colortable, m_bg_tilemap, machine().gfx[0], 31); @@ -356,14 +353,12 @@ VIDEO_START_MEMBER(mappy_state,mappy) WRITE8_MEMBER(mappy_state::superpac_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); } WRITE8_MEMBER(mappy_state::mappy_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } @@ -381,7 +376,6 @@ READ8_MEMBER(mappy_state::superpac_flipscreen_r) WRITE8_MEMBER(mappy_state::mappy_scroll_w) { - m_scroll = offset >> 3; } @@ -563,7 +557,6 @@ UINT32 mappy_state::screen_update_superpac(screen_device &screen, bitmap_ind16 & UINT32 mappy_state::screen_update_phozon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* flip screen control is embedded in RAM */ flip_screen_set(m_spriteram[0x1f7f-0x800] & 1); diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c index b677bc907e1..7357f664b5e 100644 --- a/src/mame/video/marineb.c +++ b/src/mame/video/marineb.c @@ -47,7 +47,6 @@ void marineb_state::palette_init() TILE_GET_INFO_MEMBER(marineb_state::get_tile_info) { - UINT8 code = m_videoram[tile_index]; UINT8 col = m_colorram[tile_index]; @@ -67,7 +66,6 @@ TILE_GET_INFO_MEMBER(marineb_state::get_tile_info) void marineb_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(marineb_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); @@ -87,7 +85,6 @@ void marineb_state::video_start() WRITE8_MEMBER(marineb_state::marineb_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -95,7 +92,6 @@ WRITE8_MEMBER(marineb_state::marineb_videoram_w) WRITE8_MEMBER(marineb_state::marineb_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -135,7 +131,6 @@ WRITE8_MEMBER(marineb_state::marineb_palette_bank_1_w) WRITE8_MEMBER(marineb_state::marineb_flipscreen_x_w) { - m_flipscreen_x = data ^ m_marineb_active_low_flipscreen; m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0)); } @@ -143,7 +138,6 @@ WRITE8_MEMBER(marineb_state::marineb_flipscreen_x_w) WRITE8_MEMBER(marineb_state::marineb_flipscreen_y_w) { - m_flipscreen_y = data ^ m_marineb_active_low_flipscreen; m_bg_tilemap->set_flip((m_flipscreen_x ? TILEMAP_FLIPX : 0) | (m_flipscreen_y ? TILEMAP_FLIPY : 0)); } diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c index a426bf800bd..31be10e0528 100644 --- a/src/mame/video/mario.c +++ b/src/mame/video/mario.c @@ -80,14 +80,12 @@ void mario_state::palette_init() WRITE8_MEMBER(mario_state::mario_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(mario_state::mario_gfxbank_w) { - if (m_gfx_bank != (data & 0x01)) { m_gfx_bank = data & 0x01; @@ -97,7 +95,6 @@ WRITE8_MEMBER(mario_state::mario_gfxbank_w) WRITE8_MEMBER(mario_state::mario_palettebank_w) { - if (m_palette_bank != (data & 0x01)) { m_palette_bank = data & 0x01; @@ -107,13 +104,11 @@ WRITE8_MEMBER(mario_state::mario_palettebank_w) WRITE8_MEMBER(mario_state::mario_scroll_w) { - m_gfx_scroll = data + 17; } WRITE8_MEMBER(mario_state::mario_flip_w) { - if (m_flip != (data & 0x01)) { m_flip = data & 0x01; @@ -137,7 +132,6 @@ TILE_GET_INFO_MEMBER(mario_state::get_bg_tile_info) void mario_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mario_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index ab0c939b737..824dc90ab26 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -25,7 +25,6 @@ TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info1) WRITE16_MEMBER(mcatadv_state::mcatadv_videoram1_w) { - COMBINE_DATA(&m_videoram1[offset]); m_tilemap1->mark_tile_dirty(offset / 2); } @@ -42,7 +41,6 @@ TILE_GET_INFO_MEMBER(mcatadv_state::get_mcatadv_tile_info2) WRITE16_MEMBER(mcatadv_state::mcatadv_videoram2_w) { - COMBINE_DATA(&m_videoram2[offset]); m_tilemap2->mark_tile_dirty(offset / 2); } diff --git a/src/mame/video/mcd212.c b/src/mame/video/mcd212.c index 1b48833436f..c97c1fe89f4 100644 --- a/src/mame/video/mcd212.c +++ b/src/mame/video/mcd212.c @@ -1650,7 +1650,6 @@ void mcd212_ab_init(mcd212_ab_t *mcd212_ab) void cdi_state::video_start() { - mcd212_ab_init(&m_mcd212_ab); mcd212_init(machine(), &m_mcd212_regs); m_mcd212_regs.scan_timer = machine().scheduler().timer_alloc(FUNC(mcd212_perform_scan)); diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 463a396f3b6..484ecfc2a97 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -167,7 +167,6 @@ TILE_GET_INFO_MEMBER(mermaid_state::get_fg_tile_info) void mermaid_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mermaid_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); @@ -223,7 +222,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 mermaid_state::screen_update_mermaid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 656d03407e8..133e95faa63 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -24,7 +24,6 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_rambank_w) { - if (data & 1) { m_write_mask = 0; @@ -39,7 +38,6 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_rambank_w) WRITE8_MEMBER(metlclsh_state::metlclsh_gfxbank_w) { - if (!(data & 4) && (m_gfxbank != data)) { m_bg_tilemap->mark_all_dirty(); @@ -76,7 +74,6 @@ TILE_GET_INFO_MEMBER(metlclsh_state::get_bg_tile_info) WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w) { - /* This ram is banked: it's either the tilemap (e401 = 1) or bit n of another area (e401 = n << 1)? (that I don't understand) */ if (m_write_mask) @@ -134,7 +131,6 @@ WRITE8_MEMBER(metlclsh_state::metlclsh_fgram_w) void metlclsh_state::video_start() { - m_otherram = auto_alloc_array(machine(), UINT8, 0x800); // banked ram m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(metlclsh_state::get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(metlclsh_state::metlclsh_bgtilemap_scan),this), 16, 16, 32, 16); @@ -237,7 +233,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 metlclsh_state::screen_update_metlclsh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0x10, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 1, 0); // low priority tiles of foreground diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index 14876bcf36d..66a54555897 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -4,7 +4,6 @@ WRITE8_MEMBER(mexico86_state::mexico86_bankswitch_w) { - if ((data & 7) > 5) popmessage("Switching to invalid bank!"); diff --git a/src/mame/video/micro3d.c b/src/mame/video/micro3d.c index eda84ab16ad..bb33502cb91 100644 --- a/src/mame/video/micro3d.c +++ b/src/mame/video/micro3d.c @@ -37,7 +37,6 @@ enum void micro3d_state::video_start() { - /* Allocate 512x12 x 2 3D frame buffers */ m_frame_buffers[0] = auto_alloc_array(machine(), UINT16, 1024 * 512); m_frame_buffers[1] = auto_alloc_array(machine(), UINT16, 1024 * 512); @@ -47,7 +46,6 @@ void micro3d_state::video_start() void micro3d_state::video_reset() { - m_pipeline_state = 0; m_creg = 0; diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c index fb83b753038..838adca02d1 100644 --- a/src/mame/video/mikie.c +++ b/src/mame/video/mikie.c @@ -90,21 +90,18 @@ void mikie_state::palette_init() WRITE8_MEMBER(mikie_state::mikie_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(mikie_state::mikie_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(mikie_state::mikie_palettebank_w) { - if (m_palettebank != (data & 0x07)) { m_palettebank = data & 0x07; diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c index 29ef40a0de5..34d89651181 100644 --- a/src/mame/video/mitchell.c +++ b/src/mame/video/mitchell.c @@ -35,7 +35,6 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info) VIDEO_START_MEMBER(mitchell_state,pang) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mitchell_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); @@ -62,14 +61,12 @@ VIDEO_START_MEMBER(mitchell_state,pang) WRITE8_MEMBER(mitchell_state::pang_video_bank_w) { - /* Bank handler (sets base pointers for video write) (doesn't apply to mgakuen) */ m_video_bank = data; } WRITE8_MEMBER(mitchell_state::mstworld_video_bank_w) { - /* Monsters World seems to freak out if more bits are used.. */ m_video_bank = data & 1; } @@ -77,7 +74,6 @@ WRITE8_MEMBER(mitchell_state::mstworld_video_bank_w) WRITE8_MEMBER(mitchell_state::mgakuen_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -99,7 +95,6 @@ READ8_MEMBER(mitchell_state::mgakuen_objram_r) WRITE8_MEMBER(mitchell_state::pang_videoram_w) { - if (m_video_bank) mgakuen_objram_w(space, offset, data); else @@ -108,7 +103,6 @@ WRITE8_MEMBER(mitchell_state::pang_videoram_w) READ8_MEMBER(mitchell_state::pang_videoram_r) { - if (m_video_bank) return mgakuen_objram_r(space, offset); else @@ -121,7 +115,6 @@ READ8_MEMBER(mitchell_state::pang_videoram_r) WRITE8_MEMBER(mitchell_state::pang_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -137,7 +130,6 @@ READ8_MEMBER(mitchell_state::pang_colorram_r) WRITE8_MEMBER(mitchell_state::pang_gfxctrl_w) { - logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); { #if 0 @@ -176,7 +168,6 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); WRITE8_MEMBER(mitchell_state::pangbl_gfxctrl_w) { - logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); { #if 0 @@ -213,7 +204,6 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); WRITE8_MEMBER(mitchell_state::mstworld_gfxctrl_w) { - logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); { char baf[40]; @@ -248,7 +238,6 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); WRITE8_MEMBER(mitchell_state::pang_paletteram_w) { - if (m_paletteram_bank) paletteram_xxxxRRRRGGGGBBBB_byte_le_w(space, offset + 0x800, data); else @@ -257,7 +246,6 @@ WRITE8_MEMBER(mitchell_state::pang_paletteram_w) READ8_MEMBER(mitchell_state::pang_paletteram_r) { - if (m_paletteram_bank) return m_generic_paletteram_8[offset + 0x800]; @@ -312,7 +300,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 mitchell_state::screen_update_pang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 9a66613cdb7..729d8ea242c 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -10,7 +10,6 @@ TILE_GET_INFO_MEMBER(mjkjidai_state::get_tile_info) { - int attr = m_videoram[tile_index + 0x800]; int code = m_videoram[tile_index] + ((attr & 0x1f) << 8); int color = m_videoram[tile_index + 0x1000]; @@ -40,7 +39,6 @@ void mjkjidai_state::video_start() WRITE8_MEMBER(mjkjidai_state::mjkjidai_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset & 0x7ff); } diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index ba716b49d4e..65d002657b8 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -1033,7 +1033,6 @@ static void model2_3d_frame_end( model2_state *state, bitmap_rgb32 &bitmap, cons { for( i = 0; i < raster->tri_list_index; i++ ) { - fprintf( f, "index: %d\n", i ); fprintf( f, "v0.x = %f, v0.y = %f, v0.z = %f\n", raster->tri_list[i].v[0].x, raster->tri_list[i].v[0].y, raster->tri_list[i].v[0].pz ); fprintf( f, "v1.x = %f, v1.y = %f, v1.z = %f\n", raster->tri_list[i].v[1].x, raster->tri_list[i].v[1].y, raster->tri_list[i].v[1].pz ); diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c index b7b5278304f..3316597062b 100644 --- a/src/mame/video/model3.c +++ b/src/mame/video/model3.c @@ -115,7 +115,6 @@ static void model3_exit(running_machine &machine) void model3_state::video_start() { - m_poly = poly_alloc(machine(), 4000, sizeof(poly_extra_data), 0); machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(model3_exit), &machine())); @@ -809,7 +808,6 @@ void real3d_vrom_texture_dma(address_space &space, UINT32 src, UINT32 dst, int l { model3_state *state = space.machine().driver_data(); if((dst & 0xff) == 0) { - UINT32 address, header; if (byteswap) { diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c index 4297b9f8086..5d318575cd8 100644 --- a/src/mame/video/moo.c +++ b/src/mame/video/moo.c @@ -37,7 +37,6 @@ void moo_tile_callback( running_machine &machine, int layer, int *code, int *col VIDEO_START_MEMBER(moo_state,moo) { - assert(machine().primary_screen->format() == BITMAP_FORMAT_RGB32); m_alpha_enabled = 0; diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c index 465ebb42c1b..dbda5d19168 100644 --- a/src/mame/video/mosaic.c +++ b/src/mame/video/mosaic.c @@ -45,7 +45,6 @@ TILE_GET_INFO_MEMBER(mosaic_state::get_bg_tile_info) void mosaic_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mosaic_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mosaic_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -61,14 +60,12 @@ void mosaic_state::video_start() WRITE8_MEMBER(mosaic_state::mosaic_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_MEMBER(mosaic_state::mosaic_bgvideoram_w) { - m_bgvideoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -77,7 +74,6 @@ WRITE8_MEMBER(mosaic_state::mosaic_bgvideoram_w) UINT32 mosaic_state::screen_update_mosaic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 343d03b4dea..dace0f462f6 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -164,7 +164,6 @@ TILE_GET_INFO_MEMBER(mrdo_state::get_fg_tile_info) void mrdo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mrdo_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mrdo_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,32,32); @@ -209,7 +208,6 @@ WRITE8_MEMBER(mrdo_state::mrdo_scrollx_w) WRITE8_MEMBER(mrdo_state::mrdo_scrolly_w) { - /* This is NOT affected by flipscreen (so stop it happening) */ if (m_flipscreen) m_bg_tilemap->set_scrolly(0,((256 - data) & 0xff)); @@ -220,7 +218,6 @@ WRITE8_MEMBER(mrdo_state::mrdo_scrolly_w) WRITE8_MEMBER(mrdo_state::mrdo_flipscreen_w) { - /* bits 1-3 control the playfield priority, but they are not used by */ /* Mr. Do! so we don't emulate them */ @@ -256,7 +253,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const r UINT32 mrdo_state::screen_update_mrdo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index 793dd4b350e..51e365f9f4d 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -29,7 +29,6 @@ WRITE8_MEMBER(mrflea_state::mrflea_videoram_w) WRITE8_MEMBER(mrflea_state::mrflea_spriteram_w) { - if (offset & 2) { /* tile_number */ diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c index 06140bbab78..5d1f6bee19e 100644 --- a/src/mame/video/ms32.c +++ b/src/mame/video/ms32.c @@ -64,7 +64,6 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_extra_tile_info) void ms32_state::video_start() { - m_priram_8 = auto_alloc_array_clear(machine(), UINT8, 0x2000); m_palram_16 = auto_alloc_array_clear(machine(), UINT16, 0x20000); m_rozram_16 = auto_alloc_array_clear(machine(), UINT16, 0x10000); @@ -506,7 +505,6 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma if (primask == 0x00) { - if (src_tilepri==0x00) { if (spridat & 0xff) diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c index a026280a75f..9422a47807e 100644 --- a/src/mame/video/mugsmash.c +++ b/src/mame/video/mugsmash.c @@ -5,7 +5,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) { - /* Each Sprite takes 16 bytes, 5 used? */ /* ---- ---- xxxx xxxx ---- ---- aaaa aaaa ---- ---- NNNN NNNN ---- ---- nnnn nnnn ---- ---- yyyy yyyy (rest unused?) */ @@ -61,7 +60,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info1) { - /* fF-- cccc nnnn nnnn */ /* c = colour? @@ -81,14 +79,12 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info1) WRITE16_MEMBER(mugsmash_state::mugsmash_videoram1_w) { - m_videoram1[offset] = data; m_tilemap1->mark_tile_dirty(offset / 2); } TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info2) { - /* fF-- cccc nnnn nnnn */ /* c = colour? @@ -108,14 +104,12 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info2) WRITE16_MEMBER(mugsmash_state::mugsmash_videoram2_w) { - m_videoram2[offset] = data; m_tilemap2->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(mugsmash_state::mugsmash_reg_w) { - m_regs1[offset] = data; // popmessage ("Regs %04x, %04x, %04x, %04x", mugsmash_regs1[0], mugsmash_regs1[1],mugsmash_regs1[2], mugsmash_regs1[3]); @@ -138,7 +132,6 @@ WRITE16_MEMBER(mugsmash_state::mugsmash_reg_w) void mugsmash_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mugsmash_state::get_mugsmash_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tilemap1->set_transparent_pen(0); @@ -147,7 +140,6 @@ void mugsmash_state::video_start() UINT32 mugsmash_state::screen_update_mugsmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap2->draw(bitmap, cliprect, 0, 0); m_tilemap1->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c index e07ab8fdf60..eb0bbd88f30 100644 --- a/src/mame/video/mw8080bw.c +++ b/src/mame/video/mw8080bw.c @@ -313,7 +313,6 @@ void mw8080bw_state::screen_eof_phantom2(screen_device &screen, bool state) // falling edge if (!state) { - m_phantom2_cloud_counter += MW8080BW_VTOTAL; if (m_phantom2_cloud_counter >= PHANTOM2_CLOUD_COUNTER_END) diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 9e75eec17e8..b93913792cc 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -124,7 +124,6 @@ static void set_palette(running_machine &machine, mystston_state *state) WRITE8_MEMBER(mystston_state::mystston_video_control_w) { - *m_video_control = data; /* D0-D1 - foreground text color */ @@ -149,7 +148,6 @@ WRITE8_MEMBER(mystston_state::mystston_video_control_w) TILE_GET_INFO_MEMBER(mystston_state::get_bg_tile_info) { - int page = (*m_video_control & 0x04) << 8; int code = ((m_bg_videoram[page | 0x200 | tile_index] & 0x01) << 8) | m_bg_videoram[page | tile_index]; int flags = (tile_index & 0x10) ? TILE_FLIPY : 0; @@ -160,7 +158,6 @@ TILE_GET_INFO_MEMBER(mystston_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(mystston_state::get_fg_tile_info) { - int code = ((m_fg_videoram[0x400 | tile_index] & 0x07) << 8) | m_fg_videoram[tile_index]; int color = ((*m_video_control & 0x01) << 1) | ((*m_video_control & 0x02) >> 1); @@ -216,7 +213,6 @@ static void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_el VIDEO_START_MEMBER(mystston_state,mystston) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystston_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(mystston_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 8, 8, 32, 32); @@ -236,7 +232,6 @@ VIDEO_START_MEMBER(mystston_state,mystston) VIDEO_RESET_MEMBER(mystston_state,mystston) { - m_interrupt_timer->adjust(machine().primary_screen->time_until_pos(FIRST_INT_VPOS - 1, INT_HPOS), FIRST_INT_VPOS); } @@ -250,7 +245,6 @@ VIDEO_RESET_MEMBER(mystston_state,mystston) UINT32 mystston_state::screen_update_mystston(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int flip = (*m_video_control & 0x80) ^ ((machine().root_device().ioport("DSW1")->read() & 0x20) << 2); set_palette(machine(), this); diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index 9a92fbbfb8e..fb17d06deb2 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -254,7 +254,6 @@ VIDEO_START_MEMBER(mystwarr_state,mystwarr) VIDEO_START_MEMBER(mystwarr_state,metamrph) { - m_gametype = 0; K055555_vh_start(machine()); diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c index 4b44598e7f5..6a647db862c 100644 --- a/src/mame/video/n64.c +++ b/src/mame/video/n64.c @@ -3824,7 +3824,6 @@ n64_rdp::n64_rdp(n64_state &state) : poly_managerSetMachine(machine()); diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c index 86e2e6cac1b..25d8c02424d 100644 --- a/src/mame/video/n8080.c +++ b/src/mame/video/n8080.c @@ -10,7 +10,6 @@ WRITE8_MEMBER(n8080_state::n8080_video_control_w) { - m_sheriff_color_mode = (data >> 3) & 3; m_sheriff_color_data = (data >> 0) & 7; flip_screen_set_no_update(data & 0x20); @@ -56,7 +55,6 @@ void spacefev_start_red_cannon( running_machine &machine ) TIMER_CALLBACK_MEMBER(n8080_state::spacefev_stop_red_cannon) { - m_spacefev_red_cannon = 0; m_cannon_timer->adjust(attotime::never); } @@ -89,7 +87,6 @@ static void helifire_next_line( running_machine &machine ) VIDEO_START_MEMBER(n8080_state,spacefev) { - m_cannon_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(n8080_state::spacefev_stop_red_cannon),this)); flip_screen_set_no_update(0); @@ -101,7 +98,6 @@ VIDEO_START_MEMBER(n8080_state,spacefev) VIDEO_START_MEMBER(n8080_state,sheriff) { - flip_screen_set_no_update(0); save_item(NAME(m_sheriff_color_mode)); diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index dfb8ee36f5d..d2daf483092 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -155,7 +155,6 @@ WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_gfxflag_w) WRITE8_MEMBER(nbmj8891_state::nbmj8891_taiwanmb_mcu_w) { - m_param_old[m_param_cnt & 0x0f] = data; if (data == 0x00) diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index 5b3bac55aeb..948df54bb63 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -94,7 +94,6 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_fg_tile_info) WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipx_word_w) { - if (ACCESSING_BITS_0_7) { m_flipscreen = data & 0x01; @@ -116,7 +115,6 @@ WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipx_word_w) WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipy_word_w) { - if (ACCESSING_BITS_0_7) { if (data & 0x01) @@ -131,7 +129,6 @@ WRITE16_MEMBER(nemesis_state::nemesis_gfx_flipy_word_w) WRITE16_MEMBER(nemesis_state::salamand_control_port_word_w) { - if (ACCESSING_BITS_0_7) { UINT8 accessing_bits = data ^ m_irq_port_last; @@ -212,7 +209,6 @@ WRITE16_MEMBER(nemesis_state::nemesis_palette_word_w) WRITE16_MEMBER(nemesis_state::salamander_palette_word_w) { - COMBINE_DATA(m_paletteram + offset); offset &= ~1; @@ -223,28 +219,24 @@ WRITE16_MEMBER(nemesis_state::salamander_palette_word_w) WRITE16_MEMBER(nemesis_state::nemesis_videoram1_word_w) { - COMBINE_DATA(m_videoram1 + offset); m_foreground->mark_tile_dirty(offset); } WRITE16_MEMBER(nemesis_state::nemesis_videoram2_word_w) { - COMBINE_DATA(m_videoram2 + offset); m_background->mark_tile_dirty(offset); } WRITE16_MEMBER(nemesis_state::nemesis_colorram1_word_w) { - COMBINE_DATA(m_colorram1 + offset); m_foreground->mark_tile_dirty(offset); } WRITE16_MEMBER(nemesis_state::nemesis_colorram2_word_w) { - COMBINE_DATA(m_colorram2 + offset); m_background->mark_tile_dirty(offset); } @@ -293,7 +285,6 @@ static void nemesis_postload(running_machine &machine) /* claim a palette dirty array */ void nemesis_state::video_start() { - m_spriteram_words = m_spriteram.bytes() / 2; m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nemesis_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c index 4ce8e98d7df..4ee1ad746f9 100644 --- a/src/mame/video/neogeo.c +++ b/src/mame/video/neogeo.c @@ -845,7 +845,6 @@ WRITE16_MEMBER(neogeo_state::neogeo_video_register_w) void neogeo_state::video_start() { - /* allocate memory not directly mapped */ m_palettes[0] = auto_alloc_array(machine(), UINT16, NUM_PENS); m_palettes[1] = auto_alloc_array(machine(), UINT16, NUM_PENS); @@ -917,7 +916,6 @@ void neogeo_state::video_reset() UINT32 neogeo_state::screen_update_neogeo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - /* fill with background color first */ bitmap.fill(m_pens[0x0fff], cliprect); diff --git a/src/mame/video/news.c b/src/mame/video/news.c index f8df3bec725..6453977a1b9 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -44,7 +44,6 @@ TILE_GET_INFO_MEMBER(news_state::get_bg_tile_info) void news_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(news_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); @@ -61,21 +60,18 @@ void news_state::video_start() WRITE8_MEMBER(news_state::news_fgram_w) { - m_fgram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_MEMBER(news_state::news_bgram_w) { - m_bgram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE8_MEMBER(news_state::news_bgpic_w) { - if (m_bgpic != data) { m_bgpic = data; diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index 5ad00c82dc4..e9037602741 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -6,7 +6,6 @@ void ninjaw_state::video_start() { - /* Ensure palette from correct TC0110PCR used for each screen */ tc0100scn_set_colbanks(m_tc0100scn_1, 0x0, 0x100, 0x200); } diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c index e022624186e..7af92291296 100644 --- a/src/mame/video/nitedrvr.c +++ b/src/mame/video/nitedrvr.c @@ -9,14 +9,12 @@ WRITE8_MEMBER(nitedrvr_state::nitedrvr_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(nitedrvr_state::nitedrvr_hvc_w) { - m_hvc[offset & 0x3f] = data; if ((offset & 0x30) == 0x30) @@ -71,7 +69,6 @@ static void draw_roadway( running_machine &machine, bitmap_ind16 &bitmap ) UINT32 nitedrvr_state::screen_update_nitedrvr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_roadway(machine(), bitmap); return 0; diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index e8ae05546ae..b19261db30a 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -276,7 +276,6 @@ WRITE16_MEMBER(nmk16_state::mustang_scroll_w) WRITE16_MEMBER(nmk16_state::bioshipbg_scroll_w) { - if (ACCESSING_BITS_8_15) { m_scroll[offset] = (data >> 8) & 0xff; @@ -292,7 +291,6 @@ WRITE16_MEMBER(nmk16_state::nmk_scroll_w) { if (ACCESSING_BITS_0_7) { - m_scroll[offset] = data & 0xff; if (offset & 2) @@ -306,7 +304,6 @@ WRITE16_MEMBER(nmk16_state::nmk_scroll_2_w) { if (ACCESSING_BITS_0_7) { - m_scroll_2[offset] = data & 0xff; if (offset & 2) @@ -318,7 +315,6 @@ WRITE16_MEMBER(nmk16_state::nmk_scroll_2_w) WRITE16_MEMBER(nmk16_state::vandyke_scroll_w) { - m_vscroll[offset] = data; m_bg_tilemap0->set_scrollx(0,m_vscroll[0] * 256 + (m_vscroll[1] >> 8)); @@ -327,7 +323,6 @@ WRITE16_MEMBER(nmk16_state::vandyke_scroll_w) WRITE16_MEMBER(nmk16_state::vandykeb_scroll_w) { - switch (offset) { case 0: COMBINE_DATA(&m_vscroll[3]); break; @@ -951,7 +946,6 @@ static void video_update(running_machine &machine, bitmap_ind16 &bitmap, const r if (dsw_flipscreen) { - state->flip_screen_x_set(~state->ioport("DSW1")->read() & 0x0100); state->flip_screen_y_set(~state->ioport("DSW1")->read() & 0x0200); } diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index b3f98ccf742..aa9c5d3156c 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -73,7 +73,6 @@ TILE_GET_INFO_MEMBER(nycaptor_state::get_tile_info) void nycaptor_state::video_start() { - m_spriteram = auto_alloc_array(machine(), UINT8, 160); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(nycaptor_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32 ); @@ -102,7 +101,6 @@ READ8_MEMBER(nycaptor_state::nycaptor_videoram_r) WRITE8_MEMBER(nycaptor_state::nycaptor_palette_w) { - if (m_gametype == 2) //colt return; @@ -114,7 +112,6 @@ WRITE8_MEMBER(nycaptor_state::nycaptor_palette_w) READ8_MEMBER(nycaptor_state::nycaptor_palette_r) { - if (offset & 0x100) return m_generic_paletteram2_8[(offset & 0xff) + (m_palette_bank << 8)]; else @@ -123,7 +120,6 @@ READ8_MEMBER(nycaptor_state::nycaptor_palette_r) WRITE8_MEMBER(nycaptor_state::nycaptor_gfxctrl_w) { - if (m_gfxctrl == data) return; @@ -239,7 +235,6 @@ static void nycaptor_setmask( running_machine &machine ) UINT32 nycaptor_state::screen_update_nycaptor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - #if NYCAPTOR_DEBUG nycaptor_setmask(machine()); if (m_mask & 0x1000) diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index aa5686913d0..3dac3b9d15a 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -101,7 +101,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 ohmygod_state::screen_update_ohmygod(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index af06b2b0fd7..7ba0b5d45d0 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -122,7 +122,6 @@ WRITE8_MEMBER(ojankohs_state::ojankohs_colorram_w) WRITE8_MEMBER(ojankohs_state::ojankohs_gfxreg_w) { - if (m_gfxreg != data) { m_gfxreg = data; @@ -132,10 +131,8 @@ WRITE8_MEMBER(ojankohs_state::ojankohs_gfxreg_w) WRITE8_MEMBER(ojankohs_state::ojankohs_flipscreen_w) { - if (m_flipscreen != BIT(data, 0)) { - m_flipscreen = BIT(data, 0); machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -259,7 +256,6 @@ WRITE8_MEMBER(ojankohs_state::ojankoc_videoram_w) VIDEO_START_MEMBER(ojankohs_state,ojankohs) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ojankohs_state::ojankohs_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = auto_alloc_array(machine(), UINT8, 0x1000); // m_colorram = auto_alloc_array(machine(), UINT8, 0x1000); @@ -268,7 +264,6 @@ VIDEO_START_MEMBER(ojankohs_state,ojankohs) VIDEO_START_MEMBER(ojankohs_state,ojankoy) { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ojankohs_state::ojankoy_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 4, 64, 64); // m_videoram = auto_alloc_array(machine(), UINT8, 0x2000); // m_colorram = auto_alloc_array(machine(), UINT8, 0x1000); @@ -276,7 +271,6 @@ VIDEO_START_MEMBER(ojankohs_state,ojankoy) VIDEO_START_MEMBER(ojankohs_state,ojankoc) { - machine().primary_screen->register_screen_bitmap(m_tmpbitmap); m_videoram.allocate(0x8000); m_paletteram.allocate(0x20); @@ -293,7 +287,6 @@ VIDEO_START_MEMBER(ojankohs_state,ojankoc) UINT32 ojankohs_state::screen_update_ojankohs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap->set_scrollx(0, m_scrollx); m_tilemap->set_scrolly(0, m_scrolly); diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 74302a7bb4f..3c85b731022 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -49,7 +49,6 @@ WRITE16_MEMBER(oneshot_state::oneshot_fg_videoram_w) void oneshot_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_mid_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_mid_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(oneshot_state::get_oneshot_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -151,7 +150,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 oneshot_state::screen_update_oneshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); m_mid_tilemap->set_scrollx(0, m_scroll[0] - 0x1f5); @@ -167,7 +165,6 @@ UINT32 oneshot_state::screen_update_oneshot(screen_device &screen, bitmap_ind16 UINT32 oneshot_state::screen_update_maddonna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); m_mid_tilemap->set_scrolly(0, m_scroll[1]); // other registers aren't used so we don't know which layers they relate to diff --git a/src/mame/video/opwolf.c b/src/mame/video/opwolf.c index 630ad743d97..da8d7fb58ec 100644 --- a/src/mame/video/opwolf.c +++ b/src/mame/video/opwolf.c @@ -12,7 +12,6 @@ WRITE16_MEMBER(opwolf_state::opwolf_spritectrl_w) { - if (offset == 0) { /* bits 0 and 1 always set */ diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c index 3aa89fa357d..4fa51627aa5 100644 --- a/src/mame/video/orbit.c +++ b/src/mame/video/orbit.c @@ -78,7 +78,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 orbit_state::screen_update_orbit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_flip_screen = machine().root_device().ioport("DSW2")->read() & 8; m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index be76aea42be..5830d2ab78e 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -53,7 +53,6 @@ TILE_GET_INFO_MEMBER(othldrby_state::get_tile_info2) void othldrby_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(othldrby_state::get_tile_info0),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(othldrby_state::get_tile_info1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap[2] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(othldrby_state::get_tile_info2),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -85,7 +84,6 @@ WRITE16_MEMBER(othldrby_state::othldrby_videoram_addr_w) READ16_MEMBER(othldrby_state::othldrby_videoram_r) { - if (m_vram_addr < VIDEORAM_SIZE) return m_vram[m_vram_addr++]; else @@ -97,7 +95,6 @@ READ16_MEMBER(othldrby_state::othldrby_videoram_r) WRITE16_MEMBER(othldrby_state::othldrby_videoram_w) { - if (m_vram_addr < VIDEORAM_SIZE) { if (m_vram_addr < SPRITERAM_START) @@ -115,7 +112,6 @@ WRITE16_MEMBER(othldrby_state::othldrby_vreg_addr_w) WRITE16_MEMBER(othldrby_state::othldrby_vreg_w) { - if (m_vreg_addr < OTHLDRBY_VREG_SIZE) m_vreg[m_vreg_addr++] = data; else @@ -222,7 +218,6 @@ void othldrby_state::screen_eof_othldrby(screen_device &screen, bool state) // rising edge if (state) { - /* sprites need to be delayed two frames */ memcpy(m_buf_spriteram, m_buf_spriteram2, SPRITERAM_SIZE * sizeof(m_buf_spriteram[0])); memcpy(m_buf_spriteram2, &m_vram[SPRITERAM_START], SPRITERAM_SIZE * sizeof(m_buf_spriteram[0])); diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c index a9f6c41e4fd..2eab68c4697 100644 --- a/src/mame/video/overdriv.c +++ b/src/mame/video/overdriv.c @@ -52,7 +52,6 @@ void overdriv_zoom_callback_1( running_machine &machine, int *code, int *color, UINT32 overdriv_state::screen_update_overdriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_sprite_colorbase = k053251_get_palette_index(m_k053251, K053251_CI0); m_road_colorbase[1] = k053251_get_palette_index(m_k053251, K053251_CI1); m_road_colorbase[0] = k053251_get_palette_index(m_k053251, K053251_CI2); diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 55966bdade8..d039b8e75a1 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -183,7 +183,6 @@ VIDEO_START_MEMBER(pacman_state,pacman) VIDEO_START_MEMBER(pacman_state,birdiy) { - VIDEO_START_CALL_MEMBER( pacman ); m_xoffsethack = 0; m_inv_spr = 1; // sprites are mirrored in X-axis compared to normal behaviour diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c index a18501e9d65..a5090d64adf 100644 --- a/src/mame/video/pandoras.c +++ b/src/mame/video/pandoras.c @@ -120,27 +120,23 @@ void pandoras_state::video_start() WRITE8_MEMBER(pandoras_state::pandoras_vram_w) { - m_layer0->mark_tile_dirty(offset); m_videoram[offset] = data; } WRITE8_MEMBER(pandoras_state::pandoras_cram_w) { - m_layer0->mark_tile_dirty(offset); m_colorram[offset] = data; } WRITE8_MEMBER(pandoras_state::pandoras_scrolly_w) { - m_layer0->set_scrolly(0, data); } WRITE8_MEMBER(pandoras_state::pandoras_flipscreen_w) { - m_flipscreen = data; machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); } diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index a481e1d127a..4df188ef248 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -153,7 +153,6 @@ WRITE8_MEMBER(paradise_state::paradise_pixmap_w) void paradise_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); m_tilemap_2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(paradise_state::get_tile_info_2),this), TILEMAP_SCAN_ROWS, 8, 8, 0x20, 0x20); @@ -282,7 +281,6 @@ if (machine().input().code_pressed(KEYCODE_Z)) /* no pix layer, no tilemap_0, different priority bits */ UINT32 paradise_state::screen_update_torus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); if (!(m_priority & 2)) /* Screen blanking */ @@ -313,7 +311,6 @@ UINT32 paradise_state::screen_update_torus(screen_device &screen, bitmap_ind16 & /* I don't know how the priority bits work on this one */ UINT32 paradise_state::screen_update_madball(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); m_tilemap_0->draw(bitmap, cliprect, 0, 0); m_tilemap_1->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c index 7d8d7845879..d628e355a5c 100644 --- a/src/mame/video/pass.c +++ b/src/mame/video/pass.c @@ -17,7 +17,6 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_bg_tile_info) WRITE16_MEMBER(pass_state::pass_bg_videoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -45,7 +44,6 @@ WRITE16_MEMBER(pass_state::pass_fg_videoram_w) void pass_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pass_state::get_pass_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pass_state::get_pass_fg_tile_info),this), TILEMAP_SCAN_ROWS, 4, 4, 128, 64); @@ -54,7 +52,6 @@ void pass_state::video_start() UINT32 pass_state::screen_update_pass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c index 2fefb6460f6..c5f54fba9da 100644 --- a/src/mame/video/pbaction.c +++ b/src/mame/video/pbaction.c @@ -126,7 +126,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 pbaction_state::screen_update_pbaction(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 0d6137bfb41..6b03364e911 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -18,7 +18,6 @@ INLINE void pgm_draw_pix( int xdrawpos, int pri, UINT16* dest, UINT8* destpri, UINT16 srcdat) { - if ((xdrawpos >= 0) && (xdrawpos < 448)) { if (!(destpri[xdrawpos]&1)) @@ -452,7 +451,6 @@ static void draw_sprite_new_basic( pgm_state *state, running_machine &machine, i while (ycnt < high) { - if (!(flip & 0x02)) ydrawpos = ypos + ycntdraw; else @@ -563,7 +561,6 @@ WRITE16_MEMBER(pgm_state::pgm_tx_videoram_w) TILE_GET_INFO_MEMBER(pgm_state::get_pgm_tx_tilemap_tile_info) { - /* 0x904000 - 0x90ffff is the Text Overlay Ram (pgm_tx_videoram) each tile uses 4 bytes, the tilemap is 64x128? @@ -671,7 +668,6 @@ void pgm_state::screen_eof_pgm(screen_device &screen, bool state) // rising edge if (state) { - /* first 0xa00 of main ram = sprites, seems to be buffered, DMA? */ memcpy(m_spritebufferram, m_mainram, 0xa00); } diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index a6db60775aa..8a4d86dc781 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -180,7 +180,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r for (offs = 0 ; offs < 0x100; offs+=4) { - pal=spriteram[offs+2]&0x3; sy = 256-spriteram[offs+0]-16; diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index 81e6d1f98de..1815aa48f75 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -160,7 +160,6 @@ UINT32 playch10_state::screen_update_playch10_top(screen_device &screen, bitmap_ UINT32 playch10_state::screen_update_playch10_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* Single Monitor version */ if (m_pc10_bios != 1) return screen_update_playch10_single(screen, bitmap, cliprect); diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c index 8d6258f964b..f983fa0c705 100644 --- a/src/mame/video/playmark.c +++ b/src/mame/video/playmark.c @@ -106,7 +106,6 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info) VIDEO_START_MEMBER(playmark_state,bigtwin) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -124,7 +123,6 @@ VIDEO_START_MEMBER(playmark_state,bigtwin) VIDEO_START_MEMBER(playmark_state,bigtwinb) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwinb_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -146,7 +144,6 @@ VIDEO_START_MEMBER(playmark_state,bigtwinb) VIDEO_START_MEMBER(playmark_state,wbeachvl) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::wbeachvl_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 32); @@ -165,7 +162,6 @@ VIDEO_START_MEMBER(playmark_state,wbeachvl) VIDEO_START_MEMBER(playmark_state,excelsr) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::bigtwin_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -182,7 +178,6 @@ VIDEO_START_MEMBER(playmark_state,excelsr) VIDEO_START_MEMBER(playmark_state,hotmind) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -205,7 +200,6 @@ VIDEO_START_MEMBER(playmark_state,hotmind) VIDEO_START_MEMBER(playmark_state,hrdtimes) { - m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_tx_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8, 64, 64); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_fg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(playmark_state::hrdtimes_get_bg_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -234,42 +228,36 @@ VIDEO_START_MEMBER(playmark_state,hrdtimes) WRITE16_MEMBER(playmark_state::wbeachvl_txvideoram_w) { - COMBINE_DATA(&m_videoram1[offset]); m_tx_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(playmark_state::wbeachvl_fgvideoram_w) { - COMBINE_DATA(&m_videoram2[offset]); m_fg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(playmark_state::wbeachvl_bgvideoram_w) { - COMBINE_DATA(&m_videoram3[offset]); m_bg_tilemap->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(playmark_state::hrdtimes_txvideoram_w) { - COMBINE_DATA(&m_videoram1[offset]); m_tx_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(playmark_state::hrdtimes_fgvideoram_w) { - COMBINE_DATA(&m_videoram2[offset]); m_fg_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(playmark_state::hrdtimes_bgvideoram_w) { - COMBINE_DATA(&m_videoram3[offset]); m_bg_tilemap->mark_tile_dirty(offset); } @@ -295,7 +283,6 @@ WRITE16_MEMBER(playmark_state::bigtwin_paletteram_w) WRITE16_MEMBER(playmark_state::bigtwin_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) @@ -314,7 +301,6 @@ WRITE16_MEMBER(playmark_state::bigtwin_scroll_w) WRITE16_MEMBER(playmark_state::wbeachvl_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) @@ -332,7 +318,6 @@ WRITE16_MEMBER(playmark_state::wbeachvl_scroll_w) WRITE16_MEMBER(playmark_state::excelsr_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) @@ -351,7 +336,6 @@ WRITE16_MEMBER(playmark_state::excelsr_scroll_w) WRITE16_MEMBER(playmark_state::hrdtimes_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) @@ -495,7 +479,6 @@ static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 playmark_state::screen_update_bigtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -509,7 +492,6 @@ UINT32 playmark_state::screen_update_bigtwin(screen_device &screen, bitmap_ind16 UINT32 playmark_state::screen_update_bigtwinb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // video enabled if (m_scroll[6] & 1) { @@ -525,7 +507,6 @@ UINT32 playmark_state::screen_update_bigtwinb(screen_device &screen, bitmap_ind1 UINT32 playmark_state::screen_update_excelsr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0, 1); @@ -538,7 +519,6 @@ UINT32 playmark_state::screen_update_excelsr(screen_device &screen, bitmap_ind16 UINT32 playmark_state::screen_update_wbeachvl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_fg_rowscroll_enable) { int i; @@ -564,7 +544,6 @@ UINT32 playmark_state::screen_update_wbeachvl(screen_device &screen, bitmap_ind1 UINT32 playmark_state::screen_update_hrdtimes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); // video enabled diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index af8e85f1b43..3bd8724e89d 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -290,7 +290,6 @@ WRITE8_MEMBER(polepos_state::polepos_view_w) WRITE16_MEMBER(polepos_state::polepos_view16_hscroll_w) { - COMBINE_DATA(&m_scroll); m_bg_tilemap->set_scrollx(0,m_scroll); } diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c index eaef72f93c4..7553b6bfecd 100644 --- a/src/mame/video/pooyan.c +++ b/src/mame/video/pooyan.c @@ -191,7 +191,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 pooyan_state::screen_update_pooyan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c index 9c995aa8537..dbb7fcfa9b8 100644 --- a/src/mame/video/popper.c +++ b/src/mame/video/popper.c @@ -57,7 +57,6 @@ void popper_state::palette_init() WRITE8_MEMBER(popper_state::popper_ol_videoram_w) { - m_ol_videoram[offset] = data; m_ol_p123_tilemap->mark_tile_dirty(offset); m_ol_p0_tilemap->mark_tile_dirty(offset); @@ -65,7 +64,6 @@ WRITE8_MEMBER(popper_state::popper_ol_videoram_w) WRITE8_MEMBER(popper_state::popper_videoram_w) { - m_videoram[offset] = data; m_p123_tilemap->mark_tile_dirty(offset); m_p0_tilemap->mark_tile_dirty(offset); @@ -73,7 +71,6 @@ WRITE8_MEMBER(popper_state::popper_videoram_w) WRITE8_MEMBER(popper_state::popper_ol_attribram_w) { - m_ol_attribram[offset] = data; m_ol_p123_tilemap->mark_tile_dirty(offset); m_ol_p0_tilemap->mark_tile_dirty(offset); @@ -81,7 +78,6 @@ WRITE8_MEMBER(popper_state::popper_ol_attribram_w) WRITE8_MEMBER(popper_state::popper_attribram_w) { - m_attribram[offset] = data; m_p123_tilemap->mark_tile_dirty(offset); m_p0_tilemap->mark_tile_dirty(offset); @@ -89,7 +85,6 @@ WRITE8_MEMBER(popper_state::popper_attribram_w) WRITE8_MEMBER(popper_state::popper_flipscreen_w) { - m_flipscreen = data; machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -106,7 +101,6 @@ WRITE8_MEMBER(popper_state::popper_e002_w) WRITE8_MEMBER(popper_state::popper_gfx_bank_w) { - if (m_gfx_bank != data) { m_gfx_bank = data; diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 17fb740b321..fe8571066b0 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -291,7 +291,6 @@ inline void ppu2c0x_device::writebyte(offs_t address, UINT8 data) void ppu2c0x_device::init_palette( running_machine &machine, int first_entry ) { - /* This routine builds a palette using a transformation from */ /* the YUV (Y, B-Y, R-Y) to the RGB color space */ @@ -646,7 +645,6 @@ void ppu2c0x_device::draw_background( UINT8 *line_priority ) plane2 = plane2 << 1; if ((start_x + i) >= 0 && (start_x + i) < VISIBLE_SCREEN_WIDTH) { - if (pix) { pen = paldata[pix]; @@ -1054,7 +1052,6 @@ READ8_MEMBER( ppu2c0x_device::palette_read ) READ8_MEMBER( ppu2c0x_device::read ) { - if (offset >= PPU_MAX_REG) { logerror("PPU %s: Attempting to read past the chip: offset %x\n", this->tag(), offset); @@ -1305,7 +1302,6 @@ void ppu2c0x_device::render( bitmap_ind16 &bitmap, int flipx, int flipy, int sx, int ppu2c0x_device::get_pixel( int x, int y ) { - if (x >= VISIBLE_SCREEN_WIDTH) x = VISIBLE_SCREEN_WIDTH - 1; diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index 1271c4d4aa4..0f9cc8dd3a1 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -87,29 +87,21 @@ enum MCFG_DEVICE_CONFIG(_intrf) #define MCFG_PPU2C02_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C02, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C02, _intrf) #define MCFG_PPU2C03B_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C03B, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C03B, _intrf) #define MCFG_PPU2C04_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C04, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C04, _intrf) #define MCFG_PPU2C07_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C07, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C07, _intrf) #define MCFG_PPU2C05_01_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C05_01, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C05_01, _intrf) #define MCFG_PPU2C05_02_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C05_02, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C05_02, _intrf) #define MCFG_PPU2C05_03_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C05_03, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C05_03, _intrf) #define MCFG_PPU2C05_04_ADD(_tag, _intrf) \ - MCFG_PPU2C0X_ADD(_tag, PPU_2C05_04, _intrf) \ - + MCFG_PPU2C0X_ADD(_tag, PPU_2C05_04, _intrf) ///************************************************************************* // TYPE DEFINITIONS diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index 686793b5c90..d73958614b9 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -12,21 +12,18 @@ WRITE16_MEMBER(prehisle_state::prehisle_bg_videoram16_w) { - COMBINE_DATA(&m_bg_videoram16[offset]); m_bg_tilemap->mark_tile_dirty(offset); } WRITE16_MEMBER(prehisle_state::prehisle_fg_videoram16_w) { - COMBINE_DATA(&m_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset); } READ16_MEMBER(prehisle_state::prehisle_control16_r) { - switch (offset) { case 0x08: return ioport("P2")->read(); // Player 2 @@ -91,7 +88,6 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_fg_tile_info) void prehisle_state::video_start() { - m_bg2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(prehisle_state::get_bg2_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 1024, 32); @@ -159,7 +155,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 prehisle_state::screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg2_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect, 0); m_bg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index f24c11bd89f..86bb44f445d 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -94,7 +94,6 @@ TILE_GET_INFO_MEMBER(psikyo_state::get_tile_info_1) WRITE32_MEMBER(psikyo_state::psikyo_vram_0_w) { - COMBINE_DATA(&m_vram_0[offset]); if (ACCESSING_BITS_16_31) { @@ -115,7 +114,6 @@ WRITE32_MEMBER(psikyo_state::psikyo_vram_0_w) WRITE32_MEMBER(psikyo_state::psikyo_vram_1_w) { - COMBINE_DATA(&m_vram_1[offset]); if (ACCESSING_BITS_16_31) { @@ -159,7 +157,6 @@ void psikyo_switch_banks( running_machine &machine, int tmap, int bank ) VIDEO_START_MEMBER(psikyo_state,psikyo) { - /* The Hardware is Capable of Changing the Dimensions of the Tilemaps, its safer to create the various sized tilemaps now as opposed to later */ diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index a4005d915e2..935b121ba63 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -90,8 +90,7 @@ do if (srcdata != 0) \ (DEST) = MAKE_ARGB_RGB(alpha,paldata[srcdata]); \ } \ -while (0) \ - +while (0) // combine in 'alphatable' value to store in ARGB #define PIXEL_OP_REMAP_TRANS0_ALPHATABLESTORE32(DEST, PRIORITY, SOURCE) \ do \ @@ -100,8 +99,7 @@ do if (srcdata != 0) \ (DEST) = MAKE_ARGB_RGB(alphatable[srcdata], paldata[srcdata]); \ } \ -while (0) \ - +while (0) // take ARGB pixel with stored alpha and blend in to RGB32 bitmap #define PIXEL_OP_COPY_TRANSPEN_ARGBRENDER32(DEST, PRIORITY, SOURCE) \ do \ @@ -110,8 +108,7 @@ do if (srcdata != transpen) \ (DEST) = alpha_blend_r32((DEST), srcdata, RGB_ALPHA(srcdata)); \ } \ -while (0) \ - +while (0) // take RGB pixel with separate alpha and blend in to RGB32 bitmap #define PIXEL_OP_COPY_TRANSPEN_ALPHARENDER32(DEST, PRIORITY, SOURCE) \ do \ @@ -120,8 +117,7 @@ do if (srcdata != transpen) \ (DEST) = alpha_blend_r32((DEST), srcdata, alpha); \ } \ -while (0) \ - +while (0) // take ARGB pixel with stored alpha and copy in to RGB32 bitmap, scipping BG_TRANSPEN #define PIXEL_OP_COPY_TRANSPEN_RENDER32(DEST, PRIORITY, SOURCE) \ do \ @@ -130,8 +126,7 @@ do if (srcdata != transpen) \ (DEST) = srcdata; \ } \ -while (0) \ - +while (0) // drawgfxm.h macro to render alpha into 32-bit buffer #define PIXEL_OP_REMAP_TRANS0_ALPHATABLE32(DEST, PRIORITY, SOURCE) \ do \ @@ -140,8 +135,7 @@ do if (srcdata != 0) \ (DEST) = alpha_blend_r32((DEST), paldata[srcdata], alphatable[srcdata]); \ } \ -while (0) \ - +while (0) /*------------------------------------------------- draw_scanline32_alpha - take an RGB-encoded UINT32 scanline and alpha-blend it into the destination bitmap @@ -1173,7 +1167,6 @@ static void psikyosh_prelineblend( running_machine &machine, bitmap_rgb32 &bitma g_profiler.start(PROFILER_USER8); for (y = cliprect.min_y; y <= cliprect.max_y; y += 1) { - dstline = &bitmap.pix32(y); /* linefill[y] & 0xff does what? */ @@ -1201,7 +1194,6 @@ static void psikyosh_postlineblend( running_machine &machine, bitmap_rgb32 &bitm g_profiler.start(PROFILER_USER8); for (y = cliprect.min_y; y <= cliprect.max_y; y += 1) { - dstline = &bitmap.pix32(y); if (lineblend[y] & 0x80) /* solid */ diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index f701b92cc32..df74d05358f 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -353,7 +353,6 @@ static void punchout_copy_bot_palette(running_machine &machine, int bank) UINT32 punchout_state::screen_update_punchout_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - punchout_copy_top_palette(machine(), BIT(*m_palettebank,1)); m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0); @@ -386,7 +385,6 @@ UINT32 punchout_state::screen_update_punchout_bottom(screen_device &screen, bitm UINT32 punchout_state::screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - punchout_copy_top_palette(machine(), BIT(*m_palettebank,1)); m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0); @@ -399,7 +397,6 @@ UINT32 punchout_state::screen_update_armwrest_top(screen_device &screen, bitmap_ UINT32 punchout_state::screen_update_armwrest_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - punchout_copy_bot_palette(machine(), BIT(*m_palettebank,0)); m_bg_bot_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index d95dbd2134b..ae2a711706a 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -28,7 +28,6 @@ TILE_GET_INFO_MEMBER(pushman_state::get_back_tile_info) TILE_GET_INFO_MEMBER(pushman_state::get_text_tile_info) { - int tile = m_videoram[tile_index]; SET_TILE_INFO_MEMBER( 0, @@ -47,7 +46,6 @@ TILE_GET_INFO_MEMBER(pushman_state::get_text_tile_info) void pushman_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pushman_state::get_back_tile_info),this), tilemap_mapper_delegate(FUNC(pushman_state::background_scan_rows),this), 32, 32, 128, 64); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(pushman_state::get_text_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -118,7 +116,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 pushman_state::screen_update_pushman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* Setup the tilemaps */ m_bg_tilemap->set_scrollx(0, m_control[0]); m_bg_tilemap->set_scrolly(0, 0xf00 - m_control[1]); diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c index a7c6a324cd1..401494cc93c 100644 --- a/src/mame/video/qix.c +++ b/src/mame/video/qix.c @@ -43,7 +43,6 @@ static MC6845_UPDATE_ROW( update_row ); VIDEO_START_MEMBER(qix_state,qix) { - /* allocate memory for the full video RAM */ m_videoram.allocate(256 * 256); @@ -63,7 +62,6 @@ VIDEO_START_MEMBER(qix_state,qix) WRITE_LINE_MEMBER(qix_state::display_enable_changed) { - /* on the rising edge, latch the scanline */ if (state) { @@ -85,7 +83,6 @@ WRITE_LINE_MEMBER(qix_state::display_enable_changed) WRITE8_MEMBER(qix_state::qix_flip_screen_w) { - m_flip = data; } @@ -108,7 +105,6 @@ WRITE8_MEMBER(qix_state::qix_flip_screen_w) READ8_MEMBER(qix_state::qix_videoram_r) { - /* add in the upper bit of the address latch */ offset += (m_videoram_address[0] & 0x80) << 8; return m_videoram[offset]; @@ -117,7 +113,6 @@ READ8_MEMBER(qix_state::qix_videoram_r) WRITE8_MEMBER(qix_state::qix_videoram_w) { - /* update the screen in case the game is writing "behind" the beam - Zookeeper likes to do this */ machine().primary_screen->update_now(); @@ -132,7 +127,6 @@ WRITE8_MEMBER(qix_state::qix_videoram_w) WRITE8_MEMBER(qix_state::slither_videoram_w) { - /* update the screen in case the game is writing "behind" the beam - Zookeeper likes to do this */ machine().primary_screen->update_now(); @@ -163,7 +157,6 @@ WRITE8_MEMBER(qix_state::slither_videoram_w) READ8_MEMBER(qix_state::qix_addresslatch_r) { - /* compute the value at the address latch */ offset = (m_videoram_address[0] << 8) | m_videoram_address[1]; return m_videoram[offset]; @@ -172,7 +165,6 @@ READ8_MEMBER(qix_state::qix_addresslatch_r) WRITE8_MEMBER(qix_state::qix_addresslatch_w) { - /* update the screen in case the game is writing "behind" the beam */ machine().primary_screen->update_now(); @@ -186,7 +178,6 @@ WRITE8_MEMBER(qix_state::qix_addresslatch_w) WRITE8_MEMBER(qix_state::slither_addresslatch_w) { - /* update the screen in case the game is writing "behind" the beam */ machine().primary_screen->update_now(); @@ -208,7 +199,6 @@ WRITE8_MEMBER(qix_state::slither_addresslatch_w) WRITE8_MEMBER(qix_state::qix_paletteram_w) { - UINT8 old_data = m_paletteram[offset]; /* set the palette RAM value */ @@ -223,7 +213,6 @@ WRITE8_MEMBER(qix_state::qix_paletteram_w) WRITE8_MEMBER(qix_state::qix_palettebank_w) { - /* set the bank value */ if (m_palette_bank != (data & 3)) { diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c index 2e7c2a01729..09addefc964 100644 --- a/src/mame/video/rainbow.c +++ b/src/mame/video/rainbow.c @@ -14,7 +14,6 @@ WRITE16_MEMBER(rbisland_state::rbisland_spritectrl_w) { - if (offset == 0) { /* bits 0 and 1 always set */ @@ -27,7 +26,6 @@ WRITE16_MEMBER(rbisland_state::rbisland_spritectrl_w) WRITE16_MEMBER(rbisland_state::jumping_spritectrl_w) { - if (offset == 0) { /* bits 0 and 1 are set after 15 seconds */ @@ -71,7 +69,6 @@ the Y settings are active low. VIDEO_START_MEMBER(rbisland_state,jumping) { - pc080sn_set_trans_pen(m_pc080sn, 1, 15); m_sprite_ctrl = 0; diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 81900a1815c..ec69e39e22e 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -341,7 +341,6 @@ static void rallyx_video_start_common( running_machine &machine ) VIDEO_START_MEMBER(rallyx_state,rallyx) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -356,7 +355,6 @@ VIDEO_START_MEMBER(rallyx_state,rallyx) VIDEO_START_MEMBER(rallyx_state,jungler) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::rallyx_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -369,7 +367,6 @@ VIDEO_START_MEMBER(rallyx_state,jungler) VIDEO_START_MEMBER(rallyx_state,locomotn) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -389,7 +386,6 @@ VIDEO_START_MEMBER(rallyx_state,locomotn) VIDEO_START_MEMBER(rallyx_state,commsega) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_bg_get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(rallyx_state::locomotn_fg_get_tile_info),this), tilemap_mapper_delegate(FUNC(rallyx_state::fg_tilemap_scan),this), 8, 8, 8, 32); @@ -416,7 +412,6 @@ VIDEO_START_MEMBER(rallyx_state,commsega) WRITE8_MEMBER(rallyx_state::rallyx_videoram_w) { - m_videoram[offset] = data; if (offset & 0x400) m_bg_tilemap->mark_tile_dirty(offset & 0x3ff); diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c index 75f0cf06398..15d267a214a 100644 --- a/src/mame/video/rastan.c +++ b/src/mame/video/rastan.c @@ -13,7 +13,6 @@ WRITE16_MEMBER(rastan_state::rastan_spritectrl_w) { - /* bits 5-7 are the sprite palette bank */ pc090oj_set_sprite_ctrl(m_pc090oj, (data & 0xe0) >> 5); diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c index cd49ade6831..9c30f71d0c9 100644 --- a/src/mame/video/redclash.c +++ b/src/mame/video/redclash.c @@ -178,7 +178,6 @@ TILE_GET_INFO_MEMBER(ladybug_state::get_fg_tile_info) VIDEO_START_MEMBER(ladybug_state,redclash) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ladybug_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap->set_transparent_pen(0); } @@ -426,7 +425,6 @@ void ladybug_state::screen_eof_redclash(screen_device &screen, bool state) UINT32 ladybug_state::screen_update_redclash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 0, 0x00, 0xff); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/rltennis.c b/src/mame/video/rltennis.c index 884e1a33bb9..6ce70857c74 100644 --- a/src/mame/video/rltennis.c +++ b/src/mame/video/rltennis.c @@ -112,7 +112,6 @@ enum WRITE16_MEMBER(rltennis_state::rlt_blitter_w) { - int old_data=m_blitter[offset]; COMBINE_DATA(&m_blitter[offset]); int new_data=m_blitter[offset]; @@ -196,7 +195,6 @@ WRITE16_MEMBER(rltennis_state::rlt_blitter_w) { for( y=dst_y0, idx_y=0 ; idx_y<=blit_h1;y+=y_dst_step, idx_y++) { - int xx=src_x0+(x_src_step*idx_x); int yy=src_y0+(y_src_step*idx_y); diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c index 17348b15c3d..fcdc102cd7d 100644 --- a/src/mame/video/rockrage.c +++ b/src/mame/video/rockrage.c @@ -98,7 +98,6 @@ WRITE8_MEMBER(rockrage_state::rockrage_vreg_w) UINT32 rockrage_state::screen_update_rockrage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - set_pens(machine()); k007342_tilemap_update(m_k007342); diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c index bb0516da37e..e2059e4986c 100644 --- a/src/mame/video/rollrace.c +++ b/src/mame/video/rollrace.c @@ -55,7 +55,6 @@ void rollrace_state::palette_init() WRITE8_MEMBER(rollrace_state::rollrace_charbank_w) { - m_ra_charbank[offset&1] = data; m_ra_chrbank = m_ra_charbank[0] | (m_ra_charbank[1] << 1) ; } @@ -73,7 +72,6 @@ WRITE8_MEMBER(rollrace_state::rollrace_spritebank_w) WRITE8_MEMBER(rollrace_state::rollrace_backgroundpage_w) { - m_ra_bkgpage = data & 0x1f; m_ra_bkgflip = ( data & 0x80 ) >> 7; @@ -150,7 +148,6 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1 if(sx && sy) { - if(m_ra_flipx) sx = 224 - sx; if(m_ra_flipy) @@ -178,7 +175,6 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1 /* draw foreground characters */ for (offs = 0x3ff; offs >= 0; offs--) { - sx = offs % 32; sy = offs / 32; diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index 68ea2b5f8c3..2e5d11bc57e 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -99,7 +99,6 @@ void rungun_state::video_start() UINT32 rungun_state::screen_update_rng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(get_black_pen(machine()), cliprect); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c index 94685191246..22a3f00dafa 100644 --- a/src/mame/video/sauro.c +++ b/src/mame/video/sauro.c @@ -13,35 +13,30 @@ WRITE8_MEMBER(sauro_state::tecfri_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sauro_state::tecfri_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sauro_state::tecfri_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sauro_state::tecfri_colorram2_w) { - m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sauro_state::tecfri_scroll_bg_w) { - m_bg_tilemap->set_scrollx(0, data); } @@ -70,7 +65,6 @@ static const int scroll2_map_flip[8] = {0, 7, 2, 1, 4, 3, 6, 5}; WRITE8_MEMBER(sauro_state::sauro_palette_bank_w) { - m_palette_bank = (data & 0x03) << 4; machine().tilemap().mark_all_dirty(); } @@ -85,7 +79,6 @@ WRITE8_MEMBER(sauro_state::sauro_scroll_fg_w) VIDEO_START_MEMBER(sauro_state,sauro) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -146,7 +139,6 @@ static void sauro_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, c UINT32 sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); sauro_draw_sprites(machine(), bitmap, cliprect); @@ -157,7 +149,6 @@ UINT32 sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &bit VIDEO_START_MEMBER(sauro_state,trckydoc) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sauro_state::get_tile_info_bg),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); } diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c index de1ca8aff32..99a35dca304 100644 --- a/src/mame/video/sbasketb.c +++ b/src/mame/video/sbasketb.c @@ -127,7 +127,6 @@ TILE_GET_INFO_MEMBER(sbasketb_state::get_bg_tile_info) void sbasketb_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sbasketb_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_cols(32); } diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c index 69aa5ea83d3..1c8236ef6e6 100644 --- a/src/mame/video/sbugger.c +++ b/src/mame/video/sbugger.c @@ -15,14 +15,12 @@ TILE_GET_INFO_MEMBER(sbugger_state::get_sbugger_tile_info) WRITE8_MEMBER(sbugger_state::sbugger_videoram_w) { - m_videoram[offset] = data; m_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sbugger_state::sbugger_videoram_attr_w) { - m_videoram_attr[offset] = data; m_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/scn2674.c b/src/mame/video/scn2674.c index 271cffcb443..777d472557f 100644 --- a/src/mame/video/scn2674.c +++ b/src/mame/video/scn2674.c @@ -504,7 +504,6 @@ READ16_MEMBER( scn2674_device::mpu4_vid_scn2674_r ) switch (offset) { - /* Status / Irq Register --RV ZSRs @@ -660,7 +659,6 @@ void scn2674_device::scn2674_line(running_machine &machine) if (m_linecounter==296)//front porch { - m_scn2674_status_register |= 0x10; if (m_scn2674_irq_mask&0x10) { diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c index b2ef70cc20b..23e13f4497c 100644 --- a/src/mame/video/scotrsht.c +++ b/src/mame/video/scotrsht.c @@ -39,21 +39,18 @@ void scotrsht_state::palette_init() WRITE8_MEMBER(scotrsht_state::scotrsht_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(scotrsht_state::scotrsht_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(scotrsht_state::scotrsht_charbank_w) { - if (m_charbank != (data & 0x01)) { m_charbank = data & 0x01; @@ -65,7 +62,6 @@ WRITE8_MEMBER(scotrsht_state::scotrsht_charbank_w) WRITE8_MEMBER(scotrsht_state::scotrsht_palettebank_w) { - if (m_palette_bank != ((data & 0x70) >> 4)) { m_palette_bank = ((data & 0x70) >> 4); @@ -127,7 +123,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r void scotrsht_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(scotrsht_state::scotrsht_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_scroll_cols(64); diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c index bd1a82d1fde..b3136506b3c 100644 --- a/src/mame/video/sderby.c +++ b/src/mame/video/sderby.c @@ -15,7 +15,6 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_tile_info) WRITE16_MEMBER(sderby_state::sderby_videoram_w) { - COMBINE_DATA(&m_videoram[offset]); m_tilemap->mark_tile_dirty(offset/2); } @@ -34,7 +33,6 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_md_tile_info) WRITE16_MEMBER(sderby_state::sderby_md_videoram_w) { - COMBINE_DATA(&m_md_videoram[offset]); m_md_tilemap->mark_tile_dirty(offset/2); } @@ -53,7 +51,6 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_fg_tile_info) WRITE16_MEMBER(sderby_state::sderby_fg_videoram_w) { - COMBINE_DATA(&m_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset/2); } @@ -91,7 +88,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re void sderby_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sderby_state::get_sderby_md_tile_info),this),TILEMAP_SCAN_ROWS, 16, 16,32,32); @@ -103,7 +99,6 @@ void sderby_state::video_start() UINT32 sderby_state::screen_update_sderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(machine(), bitmap,cliprect,0); m_md_tilemap->draw(bitmap, cliprect, 0,0); @@ -113,7 +108,6 @@ UINT32 sderby_state::screen_update_sderby(screen_device &screen, bitmap_ind16 &b UINT32 sderby_state::screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap->draw(bitmap, cliprect, 0,0); m_md_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(machine(), bitmap,cliprect,0); @@ -124,7 +118,6 @@ UINT32 sderby_state::screen_update_pmroulet(screen_device &screen, bitmap_ind16 WRITE16_MEMBER(sderby_state::sderby_scroll_w) { - data = COMBINE_DATA(&m_scroll[offset]); switch (offset) diff --git a/src/mame/video/sega16sp.h b/src/mame/video/sega16sp.h index eb50d8de94c..67d535f87c2 100644 --- a/src/mame/video/sega16sp.h +++ b/src/mame/video/sega16sp.h @@ -49,30 +49,22 @@ //************************************************************************** #define MCFG_SEGA_HANGON_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_HANGON_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_HANGON_SPRITES, 0) #define MCFG_SEGA_SHARRIER_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_SHARRIER_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_SHARRIER_SPRITES, 0) #define MCFG_SEGA_OUTRUN_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_OUTRUN_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_OUTRUN_SPRITES, 0) #define MCFG_SEGA_SYS16A_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_SYS16A_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_SYS16A_SPRITES, 0) #define MCFG_SEGA_SYS16B_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_SYS16B_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_SYS16B_SPRITES, 0) #define MCFG_SEGA_XBOARD_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_XBOARD_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_XBOARD_SPRITES, 0) #define MCFG_SEGA_YBOARD_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_YBOARD_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_YBOARD_SPRITES, 0) #define MCFG_BOOTLEG_SYS16A_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, BOOTLEG_SYS16A_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, BOOTLEG_SYS16A_SPRITES, 0) #define MCFG_BOOTLEG_SYS16A_SPRITES_REMAP(_0,_1,_2,_3,_4,_5,_6,_7) \ bootleg_sys16a_sprite_device::static_set_remap(*device, _0,_1,_2,_3,_4,_5,_6,_7); @@ -84,8 +76,7 @@ #define MCFG_BOOTLEG_SYS16B_SPRITES_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, SEGA_SYS16B_SPRITES, 0) \ - + MCFG_DEVICE_ADD(_tag, SEGA_SYS16B_SPRITES, 0) #define MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(_xorigin) \ bootleg_sys16a_sprite_device::static_set_xorigin(*device, _xorigin); diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index f149ee6e986..a1ad9d776e1 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -759,7 +759,6 @@ void segas24_sprite::draw(bitmap_ind16 &bitmap, const rectangle &cliprect, const ymod1 = ymod; ypos1 = y; for(zy=0; zy<8; zy++) { - ymod1 += zoomy; while(ymod1 >= 0x40) { if(ypos1 >= min_y && ypos1 <= max_y) { diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c index f2a79266fc6..76eb9dac61c 100644 --- a/src/mame/video/segas18.c +++ b/src/mame/video/segas18.c @@ -125,7 +125,6 @@ void segas18_state::set_vdp_mixing(UINT8 mixing) void segas18_state::draw_vdp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority) { - bitmap_ind8 &priority_bitmap = machine().priority_bitmap; for (int y = cliprect.min_y; y <= cliprect.max_y; y++) { diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c index 13e05f5f326..0d3b2974bb0 100644 --- a/src/mame/video/segas24.c +++ b/src/mame/video/segas24.c @@ -25,7 +25,6 @@ namespace { UINT32 segas24_state::screen_update_system24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if(vmixer->get_reg(13) & 1) { bitmap.fill(get_black_pen(machine())); return 0; diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c index 009facb83db..655b432a34b 100644 --- a/src/mame/video/seicross.c +++ b/src/mame/video/seicross.c @@ -56,7 +56,6 @@ void seicross_state::palette_init() WRITE8_MEMBER(seicross_state::seicross_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -87,7 +86,6 @@ TILE_GET_INFO_MEMBER(seicross_state::get_bg_tile_info) void seicross_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(seicross_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c index 9afdb79aa68..a42894cb07a 100644 --- a/src/mame/video/senjyo.c +++ b/src/mame/video/senjyo.c @@ -89,7 +89,6 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg3_tile_info) void senjyo_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(senjyo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); if (m_is_senjyo) @@ -122,38 +121,32 @@ void senjyo_state::video_start() WRITE8_MEMBER(senjyo_state::senjyo_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(senjyo_state::senjyo_fgcolorram_w) { - m_fgcolorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(senjyo_state::senjyo_bg1videoram_w) { - m_bg1videoram[offset] = data; m_bg1_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(senjyo_state::senjyo_bg2videoram_w) { - m_bg2videoram[offset] = data; m_bg2_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(senjyo_state::senjyo_bg3videoram_w) { - m_bg3videoram[offset] = data; m_bg3_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(senjyo_state::senjyo_bgstripes_w) { - *m_bgstripesram = data; } diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index d0e461b6da6..3797d2fcaa8 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -406,7 +406,6 @@ TILE_GET_INFO_MEMBER(seta_state::get_tile_info_3){ get_tile_info( machine(), til WRITE16_MEMBER(seta_state::seta_vram_0_w) { - COMBINE_DATA(&m_vram_0[offset]); if (offset & 0x1000) m_tilemap_1->mark_tile_dirty(offset & 0x7ff); @@ -416,7 +415,6 @@ WRITE16_MEMBER(seta_state::seta_vram_0_w) WRITE16_MEMBER(seta_state::seta_vram_2_w) { - COMBINE_DATA(&m_vram_2[offset]); if (offset & 0x1000) m_tilemap_3->mark_tile_dirty(offset & 0x7ff); @@ -442,7 +440,6 @@ WRITE16_MEMBER(seta_state::twineagl_tilebank_w) /* 2 layers */ VIDEO_START_MEMBER(seta_state,seta_2_layers) { - VIDEO_START_CALL_MEMBER( seta_no_layers ); /* Each layer consists of 2 tilemaps: only one can be displayed @@ -476,7 +473,6 @@ VIDEO_START_MEMBER(seta_state,seta_2_layers) /* 1 layer */ VIDEO_START_MEMBER(seta_state,seta_1_layer) { - VIDEO_START_CALL_MEMBER( seta_no_layers ); /* Each layer consists of 2 tilemaps: only one can be displayed @@ -497,7 +493,6 @@ VIDEO_START_MEMBER(seta_state,seta_1_layer) VIDEO_START_MEMBER(seta_state,twineagl_1_layer) { - VIDEO_START_CALL_MEMBER( seta_no_layers ); /* Each layer consists of 2 tilemaps: only one can be displayed @@ -527,7 +522,6 @@ int setac_gfxbank_callback( running_machine &machine, UINT16 code, UINT8 color ) /* NO layers, only sprites */ VIDEO_START_MEMBER(seta_state,seta_no_layers) { - m_tilemap_0 = 0; m_tilemap_1 = 0; m_tilemap_2 = 0; @@ -551,7 +545,6 @@ VIDEO_START_MEMBER(seta_state,seta_no_layers) VIDEO_START_MEMBER(seta_state,oisipuzl_2_layers) { - VIDEO_START_CALL_MEMBER(seta_2_layers); m_tilemaps_flip = 1; } diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c index ce5c2055d87..569222cacc9 100644 --- a/src/mame/video/seta001.c +++ b/src/mame/video/seta001.c @@ -75,7 +75,6 @@ void seta001_device::device_start() void seta001_device::device_reset() { - } READ16_DEVICE_HANDLER( spritectrl_r16 ) @@ -262,7 +261,6 @@ void seta001_device::seta001_draw_background( running_machine &machine, bitmap_i for (col = 0; col < numcol; col++) { - scrollx = scrollram[col * 0x10 + 4]; scrolly = scrollram[col * 0x10]; diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c index 3c9d8e2639c..6577899ec6f 100644 --- a/src/mame/video/seta2.c +++ b/src/mame/video/seta2.c @@ -444,7 +444,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re VIDEO_START_MEMBER(seta2_state,seta2) { - machine().gfx[2]->set_granularity(16); machine().gfx[3]->set_granularity(16); machine().gfx[4]->set_granularity(16); @@ -461,7 +460,6 @@ VIDEO_START_MEMBER(seta2_state,seta2) VIDEO_START_MEMBER(seta2_state,seta2_xoffset) { - VIDEO_START_CALL_MEMBER(seta2); m_xoffset = 0x200; @@ -469,7 +467,6 @@ VIDEO_START_MEMBER(seta2_state,seta2_xoffset) VIDEO_START_MEMBER(seta2_state,seta2_yoffset) { - VIDEO_START_CALL_MEMBER(seta2); m_yoffset = 0x10; @@ -477,7 +474,6 @@ VIDEO_START_MEMBER(seta2_state,seta2_yoffset) UINT32 seta2_state::screen_update_seta2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // Black or pen 0? bitmap.fill(machine().pens[0], cliprect); @@ -492,7 +488,6 @@ void seta2_state::screen_eof_seta2(screen_device &screen, bool state) // rising edge if (state) { - // Buffer sprites by 1 frame memcpy(m_buffered_spriteram, m_spriteram, m_spriteram.bytes()); } diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index ca697ffa1b7..03e0060b175 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -53,7 +53,6 @@ TILE_GET_INFO_MEMBER(sf_state::get_tx_tile_info) void sf_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_fg_tile_info),this), TILEMAP_SCAN_COLS, 16, 16, 2048, 16); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sf_state::get_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); @@ -214,7 +213,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,const r UINT32 sf_state::screen_update_sf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_sf_active & 0x20) m_bg_tilemap->draw(bitmap, cliprect, 0, 0); else diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c index 23cac08ca33..bf7173b096c 100644 --- a/src/mame/video/shadfrce.c +++ b/src/mame/video/shadfrce.c @@ -3,7 +3,6 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_fgtile_info) { - /* ---- ---- tttt tttt ---- ---- pppp TTTT */ int tileno, colour; @@ -15,14 +14,12 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_fgtile_info) WRITE16_MEMBER(shadfrce_state::shadfrce_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fgtilemap->mark_tile_dirty(offset/2); } TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_bg0tile_info) { - /* ---- ---- ---- cccc --TT TTTT TTTT TTTT */ int tileno, colour,fyx; @@ -36,7 +33,6 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_bg0tile_info) WRITE16_MEMBER(shadfrce_state::shadfrce_bg0videoram_w) { - m_bg0videoram[offset] = data; m_bg0tilemap->mark_tile_dirty(offset/2); } @@ -53,7 +49,6 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_shadfrce_bg1tile_info) WRITE16_MEMBER(shadfrce_state::shadfrce_bg1videoram_w) { - m_bg1videoram[offset] = data; m_bg1tilemap->mark_tile_dirty(offset); } @@ -63,7 +58,6 @@ WRITE16_MEMBER(shadfrce_state::shadfrce_bg1videoram_w) void shadfrce_state::video_start() { - m_fgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shadfrce_state::get_shadfrce_fgtile_info),this),TILEMAP_SCAN_ROWS, 8, 8,64,32); m_fgtilemap->set_transparent_pen(0); @@ -77,25 +71,21 @@ void shadfrce_state::video_start() WRITE16_MEMBER(shadfrce_state::shadfrce_bg0scrollx_w) { - m_bg0tilemap->set_scrollx(0, data & 0x1ff ); } WRITE16_MEMBER(shadfrce_state::shadfrce_bg0scrolly_w) { - m_bg0tilemap->set_scrolly(0, data & 0x1ff ); } WRITE16_MEMBER(shadfrce_state::shadfrce_bg1scrollx_w) { - m_bg1tilemap->set_scrollx(0, data & 0x1ff ); } WRITE16_MEMBER(shadfrce_state::shadfrce_bg1scrolly_w) { - m_bg1tilemap->set_scrolly(0, data & 0x1ff ); } @@ -104,7 +94,6 @@ WRITE16_MEMBER(shadfrce_state::shadfrce_bg1scrolly_w) static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect ) { - /* | ---- ---- hhhf Fe-Y | ---- ---- yyyy yyyy | ---- ---- TTTT TTTT | ---- ---- tttt tttt | | ---- ---- -pCc cccX | ---- ---- xxxx xxxx | ---- ---- ---- ---- | ---- ---- ---- ---- | */ @@ -175,7 +164,6 @@ void shadfrce_state::screen_eof_shadfrce(screen_device &screen, bool state) // rising edge if (state) { - /* looks like sprites are *two* frames ahead */ memcpy(m_spvideoram_old, m_spvideoram, m_spvideoram.bytes()); } diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c index 3398ca7e4eb..39127b75b48 100644 --- a/src/mame/video/shangha3.c +++ b/src/mame/video/shangha3.c @@ -97,7 +97,6 @@ WRITE16_MEMBER(shangha3_state::shangha3_flipscreen_w) WRITE16_MEMBER(shangha3_state::shangha3_gfxlist_addr_w) { - COMBINE_DATA(&m_gfxlist_addr); } @@ -257,7 +256,6 @@ else UINT32 shangha3_state::screen_update_shangha3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - copybitmap(bitmap, m_rawbitmap, 0, 0, 0, 0, cliprect); return 0; } diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index e72bf86b388..55688ed9f3a 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -106,7 +106,6 @@ static void draw_sprite(running_machine &machine, const UINT8 *source, bitmap_in } else { - /* Chinese Hero */ color >>= 1; diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c index e3fcc28f375..ac934c0afa0 100644 --- a/src/mame/video/shaolins.c +++ b/src/mame/video/shaolins.c @@ -91,21 +91,18 @@ void shaolins_state::palette_init() WRITE8_MEMBER(shaolins_state::shaolins_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(shaolins_state::shaolins_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(shaolins_state::shaolins_palettebank_w) { - if (m_palettebank != (data & 0x07)) { m_palettebank = data & 0x07; @@ -123,7 +120,6 @@ WRITE8_MEMBER(shaolins_state::shaolins_scroll_w) WRITE8_MEMBER(shaolins_state::shaolins_nmi_w) { - m_nmi_enable = data; if (flip_screen() != (data & 0x01)) @@ -145,7 +141,6 @@ TILE_GET_INFO_MEMBER(shaolins_state::get_bg_tile_info) void shaolins_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shaolins_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -188,7 +183,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 shaolins_state::screen_update_shaolins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index 548e075eaf7..6b98568ca33 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -3,7 +3,6 @@ WRITE8_MEMBER(shisen_state::sichuan2_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset / 2); } @@ -52,14 +51,12 @@ TILE_GET_INFO_MEMBER(shisen_state::get_bg_tile_info) void shisen_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shisen_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); } UINT32 shisen_state::screen_update_sichuan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // on Irem boards, screen flip is handled in both hardware and software. // this game doesn't have cocktail mode so if there's software control we don't // know where it is mapped. diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 94d7a13c522..9f2700cd158 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -67,21 +67,18 @@ TILE_GET_INFO_MEMBER(shootout_state::get_fg_tile_info) WRITE8_MEMBER(shootout_state::shootout_videoram_w) { - m_videoram[offset] = data; m_background->mark_tile_dirty(offset&0x3ff ); } WRITE8_MEMBER(shootout_state::shootout_textram_w) { - m_textram[offset] = data; m_foreground->mark_tile_dirty(offset&0x3ff ); } void shootout_state::video_start() { - m_background = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shootout_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_foreground = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(shootout_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_foreground->set_transparent_pen(0 ); @@ -169,7 +166,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 shootout_state::screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); m_background->draw(bitmap, cliprect, 0,0); @@ -180,7 +176,6 @@ UINT32 shootout_state::screen_update_shootout(screen_device &screen, bitmap_ind1 UINT32 shootout_state::screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); m_background->draw(bitmap, cliprect, 0,0); diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 683df28412f..a420f2c664e 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -11,21 +11,18 @@ WRITE8_MEMBER(sidearms_state::sidearms_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sidearms_state::sidearms_colorram_w) { - m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(sidearms_state::sidearms_c804_w) { - /* bits 0 and 1 are coin counters */ coin_counter_w(machine(), 0, data & 0x01); coin_counter_w(machine(), 1, data & 0x02); @@ -338,7 +335,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 sidearms_state::screen_update_sidearms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - sidearms_draw_starfield(machine(), bitmap); m_bg_tilemap->set_scrollx(0, m_bg_scrollx[0] + (m_bg_scrollx[1] << 8 & 0xf00)); diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 1c251c84b95..f6112f7b5b6 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -16,7 +16,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r while( source < finish ) { - int xpos = (source[0] & 0x01ff0000) >> 16; int ypos = (source[0] & 0x0000ffff); int tileno = (source[1] & 0xffff0000) >> 16; @@ -43,7 +42,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r } else { - for (wcount=width;wcount>0;wcount--) { pdrawgfx_transpen(bitmap,cliprect,gfx,tileno+(width-wcount),color,1,0,xpos+wcount*16-16+8,ypos,machine.priority_bitmap,pri_mask,0); @@ -74,7 +72,6 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg_tile_info) WRITE32_MEMBER(silkroad_state::silkroad_fgram_w) { - COMBINE_DATA(&m_vidram[offset]); m_fg_tilemap->mark_tile_dirty(offset); } @@ -96,7 +93,6 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg2_tile_info) WRITE32_MEMBER(silkroad_state::silkroad_fgram2_w) { - COMBINE_DATA(&m_vidram2[offset]); m_fg2_tilemap->mark_tile_dirty(offset); } @@ -118,7 +114,6 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_fg3_tile_info) WRITE32_MEMBER(silkroad_state::silkroad_fgram3_w) { - COMBINE_DATA(&m_vidram3[offset]); m_fg3_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c index 803d0e578cf..4083b4f1d63 100644 --- a/src/mame/video/simpl156.c +++ b/src/mame/video/simpl156.c @@ -10,7 +10,6 @@ void simpl156_state::video_start() { - /* allocate the ram as 16-bit (we do it here because the CPU is 32-bit) */ m_pf1_rowscroll = auto_alloc_array_clear(machine(), UINT16, 0x800/2); m_pf2_rowscroll = auto_alloc_array_clear(machine(), UINT16, 0x800/2); @@ -27,7 +26,6 @@ void simpl156_state::video_start() UINT32 simpl156_state::screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0); deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll); diff --git a/src/mame/video/sknsspr.c b/src/mame/video/sknsspr.c index ead680a1435..f93eae316fa 100644 --- a/src/mame/video/sknsspr.c +++ b/src/mame/video/sknsspr.c @@ -286,7 +286,6 @@ void sknsspr_device::skns_draw_sprites(running_machine &machine, bitmap_ind16 &b if ((!disabled)){ - group_enable = (sprite_regs[0x00/4] & 0x0040) >> 6; // RWR0 /* Sengekis uses global flip */ diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 73306d0302f..82c32c532a4 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -54,7 +54,6 @@ READ8_MEMBER(skyfox_state::skyfox_vregs_r)// for debug WRITE8_MEMBER(skyfox_state::skyfox_vregs_w) { - m_vreg[offset] = data; switch (offset) @@ -198,8 +197,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const (CODE), \ 0, \ flipx,flipy, \ - x + (DX),y + (DY), 0xff); \ - + x + (DX),y + (DY), 0xff); if (state->m_bg_ctrl & 1) // flipscreen { x = width - x - (n - 1) * 8; diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index b75a895ab0c..8498515d644 100644 --- a/src/mame/video/skyraid.c +++ b/src/mame/video/skyraid.c @@ -10,7 +10,6 @@ Atari Sky Raider video emulation void skyraid_state::video_start() { - m_helper.allocate(128, 240); } @@ -134,7 +133,6 @@ static void draw_trapezoid(running_machine &machine, bitmap_ind16& dst, bitmap_i UINT32 skyraid_state::screen_update_skyraid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); rectangle helper_clip = cliprect; diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c index da2b59fc970..c9f7c3510be 100644 --- a/src/mame/video/slapshot.c +++ b/src/mame/video/slapshot.c @@ -432,7 +432,6 @@ void slapshot_state::screen_eof_taito_no_buffer(screen_device &screen, bool stat // rising edge if (state) { - taito_update_sprites_active_area(machine()); m_prepare_sprites = 1; diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c index 6c2229a4c6f..97907b36b9d 100644 --- a/src/mame/video/snes.c +++ b/src/mame/video/snes.c @@ -2658,8 +2658,7 @@ WRITE8_HANDLER( snes_ppu_write ) { \ debug_settings = 0; \ popmessage MSG2; \ - } \ - + } static UINT8 snes_dbg_video( running_machine &machine, UINT16 curline ) { diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c index 6e1e0fb6476..9ed565de61c 100644 --- a/src/mame/video/snk.c +++ b/src/mame/video/snk.c @@ -220,7 +220,6 @@ VIDEO_START_MEMBER(snk_state,snk_4bpp_shadow) VIDEO_START_MEMBER(snk_state,marvins) { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); @@ -242,7 +241,6 @@ VIDEO_START_MEMBER(snk_state,marvins) VIDEO_START_MEMBER(snk_state,jcross) { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); @@ -262,7 +260,6 @@ VIDEO_START_MEMBER(snk_state,jcross) VIDEO_START_MEMBER(snk_state,sgladiat) { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); @@ -282,7 +279,6 @@ VIDEO_START_MEMBER(snk_state,sgladiat) VIDEO_START_MEMBER(snk_state,hal21) { - VIDEO_START_CALL_MEMBER(jcross); m_bg_tilemap->set_scrolldy(8, -32+256); @@ -293,7 +289,6 @@ VIDEO_START_MEMBER(snk_state,hal21) VIDEO_START_MEMBER(snk_state,aso) { - VIDEO_START_CALL_MEMBER(jcross); m_bg_tilemap->set_scrolldx(15+256, 24+256); @@ -305,7 +300,6 @@ VIDEO_START_MEMBER(snk_state,aso) VIDEO_START_MEMBER(snk_state,tnk3) { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::marvins_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); @@ -324,7 +318,6 @@ VIDEO_START_MEMBER(snk_state,tnk3) VIDEO_START_MEMBER(snk_state,ikari) { - VIDEO_START_CALL_MEMBER(snk_3bpp_shadow); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk_state::ikari_get_tx_tile_info),this), tilemap_mapper_delegate(FUNC(snk_state::marvins_tx_scan_cols),this), 8, 8, 36, 28); @@ -364,7 +357,6 @@ VIDEO_START_MEMBER(snk_state,gwar) VIDEO_START_MEMBER(snk_state,psychos) { - VIDEO_START_CALL_MEMBER(gwar); m_is_psychos = 1; } @@ -379,28 +371,24 @@ VIDEO_START_MEMBER(snk_state,tdfever) WRITE8_MEMBER(snk_state::snk_tx_videoram_w) { - m_tx_videoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(snk_state::marvins_fg_videoram_w) { - m_fg_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(snk_state::marvins_bg_videoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(snk_state::snk_bg_videoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset >> 1); } @@ -408,62 +396,52 @@ WRITE8_MEMBER(snk_state::snk_bg_videoram_w) WRITE8_MEMBER(snk_state::snk_fg_scrollx_w) { - m_fg_scrollx = (m_fg_scrollx & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_fg_scrolly_w) { - m_fg_scrolly = (m_fg_scrolly & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_bg_scrollx_w) { - m_bg_scrollx = (m_bg_scrollx & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_bg_scrolly_w) { - m_bg_scrolly = (m_bg_scrolly & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_sp16_scrollx_w) { - m_sp16_scrollx = (m_sp16_scrollx & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_sp16_scrolly_w) { - m_sp16_scrolly = (m_sp16_scrolly & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_sp32_scrollx_w) { - m_sp32_scrollx = (m_sp32_scrollx & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_sp32_scrolly_w) { - m_sp32_scrolly = (m_sp32_scrolly & ~0xff) | data; } WRITE8_MEMBER(snk_state::snk_sprite_split_point_w) { - m_sprite_split_point = data; } WRITE8_MEMBER(snk_state::marvins_palette_bank_w) { - m_bg_tilemap->set_palette_offset(data & 0x70); m_fg_tilemap->set_palette_offset((data & 0x07) << 4); } @@ -477,7 +455,6 @@ WRITE8_MEMBER(snk_state::marvins_flipscreen_w) WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w) { - flip_screen_set(data & 0x80); m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); @@ -487,7 +464,6 @@ WRITE8_MEMBER(snk_state::sgladiat_flipscreen_w) WRITE8_MEMBER(snk_state::hal21_flipscreen_w) { - flip_screen_set(data & 0x80); m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); @@ -502,7 +478,6 @@ WRITE8_MEMBER(snk_state::hal21_flipscreen_w) WRITE8_MEMBER(snk_state::marvins_scroll_msb_w) { - m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x04) << 6); m_fg_scrollx = (m_fg_scrollx & 0xff) | ((data & 0x02) << 7); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); @@ -510,7 +485,6 @@ WRITE8_MEMBER(snk_state::marvins_scroll_msb_w) WRITE8_MEMBER(snk_state::jcross_scroll_msb_w) { - m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x10) << 4); m_sp16_scrolly = (m_sp16_scrolly & 0xff) | ((data & 0x08) << 5); m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); @@ -519,7 +493,6 @@ WRITE8_MEMBER(snk_state::jcross_scroll_msb_w) WRITE8_MEMBER(snk_state::sgladiat_scroll_msb_w) { - m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x01) << 8); } @@ -578,7 +551,6 @@ WRITE8_MEMBER(snk_state::tnk3_videoattrs_w) WRITE8_MEMBER(snk_state::aso_bg_bank_w) { - m_bg_tilemap->set_palette_offset(((data & 0xf) ^ 8) << 4); if (m_bg_tile_offset != ((data & 0x30) << 4)) { @@ -589,14 +561,12 @@ WRITE8_MEMBER(snk_state::aso_bg_bank_w) WRITE8_MEMBER(snk_state::ikari_bg_scroll_msb_w) { - m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); m_bg_scrolly = (m_bg_scrolly & 0xff) | ((data & 0x01) << 8); } WRITE8_MEMBER(snk_state::ikari_sp_scroll_msb_w) { - m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4); m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x08) << 5); @@ -627,7 +597,6 @@ if (data != 0x20 && // normal WRITE8_MEMBER(snk_state::gwar_tx_bank_w) { - m_tx_tilemap->set_palette_offset((data & 0xf) << 4); if (m_tx_tile_offset != ((data & 0x30) << 4)) { @@ -641,7 +610,6 @@ WRITE8_MEMBER(snk_state::gwar_tx_bank_w) WRITE8_MEMBER(snk_state::gwar_videoattrs_w) { - flip_screen_set(data & 0x04); m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x80) << 1); @@ -654,7 +622,6 @@ WRITE8_MEMBER(snk_state::gwar_videoattrs_w) WRITE8_MEMBER(snk_state::gwara_videoattrs_w) { - flip_screen_set(data & 0x10); m_bg_scrollx = (m_bg_scrollx & 0xff) | ((data & 0x02) << 7); @@ -663,7 +630,6 @@ WRITE8_MEMBER(snk_state::gwara_videoattrs_w) WRITE8_MEMBER(snk_state::gwara_sp_scroll_msb_w) { - m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x20) << 3); m_sp16_scrollx = (m_sp16_scrollx & 0xff) | ((data & 0x10) << 4); m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x08) << 5); @@ -672,14 +638,12 @@ WRITE8_MEMBER(snk_state::gwara_sp_scroll_msb_w) WRITE8_MEMBER(snk_state::tdfever_sp_scroll_msb_w) { - m_sp32_scrolly = (m_sp32_scrolly & 0xff) | ((data & 0x80) << 1); m_sp32_scrollx = (m_sp32_scrollx & 0xff) | ((data & 0x40) << 2); } WRITE8_MEMBER(snk_state::tdfever_spriteram_w) { - /* partial updates avoid flickers in the fsoccer radar. */ if (offset < 0x80 && m_spriteram[offset] != data) { @@ -942,7 +906,6 @@ static void tdfever_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, UINT32 snk_state::screen_update_marvins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); m_fg_tilemap->set_scrollx(0, m_fg_scrollx); @@ -960,7 +923,6 @@ UINT32 snk_state::screen_update_marvins(screen_device &screen, bitmap_ind16 &bit UINT32 snk_state::screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); @@ -974,7 +936,6 @@ UINT32 snk_state::screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap UINT32 snk_state::screen_update_ikari(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); @@ -991,7 +952,6 @@ UINT32 snk_state::screen_update_ikari(screen_device &screen, bitmap_ind16 &bitma UINT32 snk_state::screen_update_gwar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); @@ -1009,7 +969,6 @@ UINT32 snk_state::screen_update_gwar(screen_device &screen, bitmap_ind16 &bitmap UINT32 snk_state::screen_update_tdfever(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_bg_scrollx); m_bg_tilemap->set_scrolly(0, m_bg_scrolly); diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c index daae59de9d6..1035ded5a77 100644 --- a/src/mame/video/snk6502.c +++ b/src/mame/video/snk6502.c @@ -76,21 +76,18 @@ PALETTE_INIT_MEMBER(snk6502_state,snk6502) WRITE8_MEMBER(snk6502_state::snk6502_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(snk6502_state::snk6502_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(snk6502_state::snk6502_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); m_fg_tilemap->mark_tile_dirty(offset); @@ -98,7 +95,6 @@ WRITE8_MEMBER(snk6502_state::snk6502_colorram_w) WRITE8_MEMBER(snk6502_state::snk6502_charram_w) { - if (m_charram[offset] != data) { m_charram[offset] = data; @@ -144,13 +140,11 @@ WRITE8_MEMBER(snk6502_state::snk6502_flipscreen_w) WRITE8_MEMBER(snk6502_state::snk6502_scrollx_w) { - m_bg_tilemap->set_scrollx(0, data); } WRITE8_MEMBER(snk6502_state::snk6502_scrolly_w) { - m_bg_tilemap->set_scrolly(0, data); } @@ -173,7 +167,6 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info) VIDEO_START_MEMBER(snk6502_state,snk6502) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -184,7 +177,6 @@ VIDEO_START_MEMBER(snk6502_state,snk6502) VIDEO_START_MEMBER(snk6502_state,pballoon) { - VIDEO_START_CALL_MEMBER( snk6502 ); m_bg_tilemap->set_scrolldy(-16, -16); @@ -194,7 +186,6 @@ VIDEO_START_MEMBER(snk6502_state,pballoon) UINT32 snk6502_state::screen_update_snk6502(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); return 0; @@ -272,7 +263,6 @@ WRITE8_MEMBER(snk6502_state::satansat_b002_w) WRITE8_MEMBER(snk6502_state::satansat_backcolor_w) { - /* bits 0-1 select background color. Other bits unused. */ if (m_backcolor != (data & 0x03)) @@ -304,7 +294,6 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info) VIDEO_START_MEMBER(snk6502_state,satansat) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk6502_state::satansat_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c index 7a260110d8b..a97858b04ee 100644 --- a/src/mame/video/snk68.c +++ b/src/mame/video/snk68.c @@ -60,7 +60,6 @@ static void common_video_start(running_machine &machine) void snk68_state::video_start() { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk68_state::get_pow_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_fg_tile_offset = 0; @@ -69,7 +68,6 @@ void snk68_state::video_start() VIDEO_START_MEMBER(snk68_state,searchar) { - m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(snk68_state::get_searchar_tile_info),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); common_video_start(machine()); @@ -83,7 +81,6 @@ VIDEO_START_MEMBER(snk68_state,searchar) READ16_MEMBER(snk68_state::pow_spriteram_r) { - // streetsj expects the MSB of every 32-bit word to be FF. Presumably RAM // exists only for 3 bytes out of 4 and the fourth is unmapped. if (!(offset & 1)) @@ -115,14 +112,12 @@ WRITE16_MEMBER(snk68_state::pow_spriteram_w) READ16_MEMBER(snk68_state::pow_fg_videoram_r) { - // RAM is only 8-bit return m_pow_fg_videoram[offset] | 0xff00; } WRITE16_MEMBER(snk68_state::pow_fg_videoram_w) { - data |= 0xff00; COMBINE_DATA(&m_pow_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset >> 1); @@ -130,7 +125,6 @@ WRITE16_MEMBER(snk68_state::pow_fg_videoram_w) WRITE16_MEMBER(snk68_state::searchar_fg_videoram_w) { - // RAM is full 16-bit, though only half of it is used by the hardware COMBINE_DATA(&m_pow_fg_videoram[offset]); m_fg_tilemap->mark_tile_dirty(offset >> 1); @@ -157,7 +151,6 @@ WRITE16_MEMBER(snk68_state::searchar_flipscreen16_w) { if (ACCESSING_BITS_0_7) { - m_flipscreen = data & 0x08; machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -278,7 +271,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 snk68_state::screen_update_pow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0x7ff, cliprect); /* This appears to be the correct priority order */ diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c index c34bd5f5574..0190dbd0d12 100644 --- a/src/mame/video/solomon.c +++ b/src/mame/video/solomon.c @@ -3,28 +3,24 @@ WRITE8_MEMBER(solomon_state::solomon_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(solomon_state::solomon_colorram_w) { - m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(solomon_state::solomon_videoram2_w) { - m_videoram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(solomon_state::solomon_colorram2_w) { - m_colorram2[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -59,7 +55,6 @@ TILE_GET_INFO_MEMBER(solomon_state::get_fg_tile_info) void solomon_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(solomon_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c index 333f883848c..82b082bd861 100644 --- a/src/mame/video/sonson.c +++ b/src/mame/video/sonson.c @@ -131,7 +131,6 @@ TILE_GET_INFO_MEMBER(sonson_state::get_bg_tile_info) void sonson_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sonson_state::get_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_bg_tilemap->set_scroll_rows(32); } diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c index e51f33716df..8093d9b5cc2 100644 --- a/src/mame/video/spbactn.c +++ b/src/mame/video/spbactn.c @@ -108,7 +108,6 @@ static int draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const re void spbactn_state::video_start() { - /* allocate bitmaps */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c index e9c14efec05..f4a64492fa0 100644 --- a/src/mame/video/speedatk.c +++ b/src/mame/video/speedatk.c @@ -55,24 +55,20 @@ void speedatk_state::palette_init() WRITE8_MEMBER(speedatk_state::speedatk_videoram_w) { - m_videoram[offset] = data; } WRITE8_MEMBER(speedatk_state::speedatk_colorram_w) { - m_colorram[offset] = data; } void speedatk_state::video_start() { - } WRITE8_MEMBER(speedatk_state::speedatk_6845_w) { - if(offset == 0) { m_crtc_index = data; diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c index 3d56d6a742a..fa9ce4ecba2 100644 --- a/src/mame/video/splash.c +++ b/src/mame/video/splash.c @@ -72,7 +72,6 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_splash_tilemap1) WRITE16_MEMBER(splash_state::splash_vram_w) { - COMBINE_DATA(&m_videoram[offset]); m_bg_tilemap[offset >> 11]->mark_tile_dirty(((offset << 1) & 0x0fff) >> 1); } @@ -167,7 +166,6 @@ static void draw_bitmap(running_machine &machine, bitmap_ind16 &bitmap, const re void splash_state::video_start() { - m_bg_tilemap[0] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap0),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap[1] = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(splash_state::get_tile_info_splash_tilemap1),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); @@ -256,7 +254,6 @@ static void funystrp_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap UINT32 splash_state::screen_update_splash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* set scroll registers */ m_bg_tilemap[0]->set_scrolly(0, m_vregs[0]); m_bg_tilemap[1]->set_scrolly(0, m_vregs[1]); @@ -271,7 +268,6 @@ UINT32 splash_state::screen_update_splash(screen_device &screen, bitmap_ind16 &b UINT32 splash_state::screen_update_funystrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* set scroll registers */ m_bg_tilemap[0]->set_scrolly(0, m_vregs[0]); m_bg_tilemap[1]->set_scrolly(0, m_vregs[1]); diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c index 5837d30ab6e..96fddd1b5dd 100644 --- a/src/mame/video/sprcros2.c +++ b/src/mame/video/sprcros2.c @@ -62,21 +62,18 @@ void sprcros2_state::palette_init() WRITE8_MEMBER(sprcros2_state::sprcros2_fgvideoram_w) { - m_fgvideoram[offset] = data; m_fgtilemap->mark_tile_dirty(offset&0x3ff); } WRITE8_MEMBER(sprcros2_state::sprcros2_bgvideoram_w) { - m_bgvideoram[offset] = data; m_bgtilemap->mark_tile_dirty(offset&0x3ff); } WRITE8_MEMBER(sprcros2_state::sprcros2_bgscrollx_w) { - if(m_port7&0x02) m_bgtilemap->set_scrollx(0, 0x100-data); else @@ -85,7 +82,6 @@ WRITE8_MEMBER(sprcros2_state::sprcros2_bgscrollx_w) WRITE8_MEMBER(sprcros2_state::sprcros2_bgscrolly_w) { - m_bgtilemap->set_scrolly(0, data); } @@ -133,7 +129,6 @@ TILE_GET_INFO_MEMBER(sprcros2_state::get_sprcros2_fgtile_info) void sprcros2_state::video_start() { - m_bgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_bgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); m_fgtilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sprcros2_state::get_sprcros2_fgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); @@ -149,7 +144,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re { if (state->m_spriteram[offs]) { - //offs //76543210 //x------- unused @@ -190,7 +184,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re UINT32 sprcros2_state::screen_update_sprcros2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bgtilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_fgtilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c index d4ad84ec99a..8f9444c979a 100644 --- a/src/mame/video/spy.c +++ b/src/mame/video/spy.c @@ -46,7 +46,6 @@ void spy_sprite_callback( running_machine &machine, int *code, int *color, int * void spy_state::video_start() { - m_layer_colorbase[0] = 48; m_layer_colorbase[1] = 0; m_layer_colorbase[2] = 16; @@ -63,7 +62,6 @@ void spy_state::video_start() UINT32 spy_state::screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c index 51451dc8f32..30ba54f7e8f 100644 --- a/src/mame/video/srumbler.c +++ b/src/mame/video/srumbler.c @@ -92,7 +92,6 @@ WRITE8_MEMBER(srumbler_state::srumbler_4009_w) WRITE8_MEMBER(srumbler_state::srumbler_scroll_w) { - m_scroll[offset] = data; m_bg_tilemap->set_scrollx(0,m_scroll[0] | (m_scroll[1] << 8)); diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index 1cd037e73fb..33aa87808e2 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -30,7 +30,6 @@ void sshangha_state::video_start() UINT32 sshangha_state::screen_update_sshangha(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - machine().device("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram, 0x800, true); // I'm pretty sure only the original has the 2nd spriteram, used for the Japanese text on the 2nd scene (non-scrolling text) in the intro of the quest (3rd in JPN) mode @@ -49,7 +48,6 @@ UINT32 sshangha_state::screen_update_sshangha(screen_device &screen, bitmap_rgb3 machine().device("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff); } else { - deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); machine().device("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff); deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c index 2dbaa5e9202..47679568bda 100644 --- a/src/mame/video/sslam.c +++ b/src/mame/video/sslam.c @@ -101,7 +101,6 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_tx_tile_info) WRITE16_MEMBER(sslam_state::sslam_tx_tileram_w) { - COMBINE_DATA(&m_tx_tileram[offset]); m_tx_tilemap->mark_tile_dirty(offset); } @@ -118,7 +117,6 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_md_tile_info) WRITE16_MEMBER(sslam_state::sslam_md_tileram_w) { - COMBINE_DATA(&m_md_tileram[offset]); m_md_tilemap->mark_tile_dirty(offset); } @@ -135,7 +133,6 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_bg_tile_info) WRITE16_MEMBER(sslam_state::sslam_bg_tileram_w) { - COMBINE_DATA(&m_bg_tileram[offset]); m_bg_tilemap->mark_tile_dirty(offset); } @@ -153,14 +150,12 @@ TILE_GET_INFO_MEMBER(sslam_state::get_powerbls_bg_tile_info) WRITE16_MEMBER(sslam_state::powerbls_bg_tileram_w) { - COMBINE_DATA(&m_bg_tileram[offset]); m_bg_tilemap->mark_tile_dirty(offset>>1); } VIDEO_START_MEMBER(sslam_state,sslam) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_md_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_md_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 32, 32); m_tx_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_sslam_tx_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); @@ -174,7 +169,6 @@ VIDEO_START_MEMBER(sslam_state,sslam) VIDEO_START_MEMBER(sslam_state,powerbls) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(sslam_state::get_powerbls_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,64); m_sprites_x_offset = -21; @@ -183,7 +177,6 @@ VIDEO_START_MEMBER(sslam_state,powerbls) UINT32 sslam_state::screen_update_sslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (!(m_regs[6] & 1)) { bitmap.fill(get_black_pen(machine()), cliprect); @@ -222,7 +215,6 @@ UINT32 sslam_state::screen_update_sslam(screen_device &screen, bitmap_ind16 &bit UINT32 sslam_state::screen_update_powerbls(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (!(m_regs[6] & 1)) { bitmap.fill(get_black_pen(machine()), cliprect); diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c index 1995d9b5141..db31c6a4f0e 100644 --- a/src/mame/video/ssozumo.c +++ b/src/mame/video/ssozumo.c @@ -43,28 +43,24 @@ void ssozumo_state::palette_init() WRITE8_MEMBER(ssozumo_state::ssozumo_videoram_w) { - m_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(ssozumo_state::ssozumo_colorram_w) { - m_colorram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(ssozumo_state::ssozumo_videoram2_w) { - m_videoram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } WRITE8_MEMBER(ssozumo_state::ssozumo_colorram2_w) { - m_colorram2[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -104,7 +100,6 @@ WRITE8_MEMBER(ssozumo_state::ssozumo_paletteram_w) WRITE8_MEMBER(ssozumo_state::ssozumo_scroll_w) { - m_bg_tilemap->set_scrolly(0, data); } @@ -132,7 +127,6 @@ TILE_GET_INFO_MEMBER(ssozumo_state::get_fg_tile_info) void ssozumo_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssozumo_state::get_bg_tile_info),this), TILEMAP_SCAN_COLS_FLIP_X, 16, 16, 16, 32); @@ -178,7 +172,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 ssozumo_state::screen_update_ssozumo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c index 0cf35247d5c..2e4016859f8 100644 --- a/src/mame/video/ssrj.c +++ b/src/mame/video/ssrj.c @@ -5,7 +5,6 @@ WRITE8_MEMBER(ssrj_state::ssrj_vram1_w) { - m_vram1[offset] = data; m_tilemap1->mark_tile_dirty(offset>>1); } @@ -25,7 +24,6 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info1) WRITE8_MEMBER(ssrj_state::ssrj_vram2_w) { - m_vram2[offset] = data; m_tilemap2->mark_tile_dirty(offset>>1); } @@ -45,7 +43,6 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info2) WRITE8_MEMBER(ssrj_state::ssrj_vram4_w) { - m_vram4[offset] = data; m_tilemap4->mark_tile_dirty(offset>>1); } @@ -65,7 +62,6 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info4) static const UINT8 fakecols[4*4][8][3]= { - {{0x00,0x00,0x00}, {42,87,140}, {0,0,0}, @@ -218,7 +214,6 @@ static const UINT8 fakecols[4*4][8][3]= void ssrj_state::video_start() { - m_tilemap1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info1),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tilemap2 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info2),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); m_tilemap4 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(ssrj_state::get_tile_info4),this), TILEMAP_SCAN_COLS, 8, 8, 32, 32); @@ -240,7 +235,6 @@ static void draw_objects(running_machine &machine, bitmap_ind16 &bitmap, const r x = state->m_buffer_spriteram[0x80+20*i+2]; if (!state->m_buffer_spriteram[0x80+20*i+3]) { - for(k=0;k<5;k++,x+=8) { for(j=0;j<0x20;j++) @@ -275,7 +269,6 @@ void ssrj_state::palette_init() UINT32 ssrj_state::screen_update_ssrj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap1->set_scrollx(0, 0xff-m_scrollram[2] ); m_tilemap1->set_scrolly(0, m_scrollram[0] ); m_tilemap1->draw(bitmap, cliprect, 0, 0); @@ -291,7 +284,6 @@ void ssrj_state::screen_eof_ssrj(screen_device &screen, bool state) // rising edge if (state) { - memcpy(m_buffer_spriteram, m_scrollram, 0x800); } } diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c index 257a10d40e2..f0567a7dffc 100644 --- a/src/mame/video/ssv.c +++ b/src/mame/video/ssv.c @@ -216,14 +216,12 @@ TILE_GET_INFO_MEMBER(ssv_state::get_tile_info_0) WRITE16_MEMBER(ssv_state::gdfs_tmapram_w) { - COMBINE_DATA(&m_gdfs_tmapram[offset]); m_gdfs_tmap->mark_tile_dirty(offset); } VIDEO_START_MEMBER(ssv_state,gdfs) { - ssv_state::video_start(); @@ -381,7 +379,6 @@ READ16_MEMBER(ssv_state::ssv_vblank_r) WRITE16_MEMBER(ssv_state::ssv_scroll_w) { - COMBINE_DATA(m_scroll + offset); /* offsets 60-7f: CRT Controller */ @@ -977,7 +974,6 @@ UINT32 ssv_state::screen_update_eaglshot(screen_device &screen, bitmap_ind16 &bi UINT32 ssv_state::screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - screen_update_ssv(screen, bitmap, cliprect); // draw zooming sprites diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index f5016efccdf..3c06522964e 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -74,7 +74,6 @@ READ8_MEMBER(st0016_state::st0016_sprite_ram_r) WRITE8_MEMBER(st0016_state::st0016_sprite_ram_w) { - st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr_bank+offset]=data; } @@ -548,12 +547,10 @@ static void draw_bgmap(running_machine &machine, bitmap_ind16 &bitmap,const rect if (cliprect.contains(drawxpos, drawypos)) { - if(st0016_vregs[j+7]==0x12) destline[drawxpos] = (destline[drawxpos] | (pixdata<<4))&0x3ff; else { - if(ISMACS2) { if(pixdata)// || destline[drawxpos]==UNUSED_PEN) @@ -593,7 +590,6 @@ void st0016_state::st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitma UINT32 st0016_state::screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - #ifdef MAME_DEBUG if(machine().input().code_pressed_once(KEYCODE_Z)) { diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h index 0e54a4e578d..a34a38705e5 100644 --- a/src/mame/video/st0020.h +++ b/src/mame/video/st0020.h @@ -44,9 +44,7 @@ private: }; #define ST0020_ST0032_BYTESWAP_DATA \ - if (m_is_st0032) data = ((data & 0x00ff)<<8) | ((data & 0xff00)>>8); \ - + if (m_is_st0032) data = ((data & 0x00ff)<<8) | ((data & 0xff00)>>8); #define ST0020_ST0032_BYTESWAP_MEM_MASK \ - if (m_is_st0032) mem_mask = ((mem_mask & 0x00ff)<<8) | ((mem_mask & 0xff00)>>8); \ - + if (m_is_st0032) mem_mask = ((mem_mask & 0x00ff)<<8) | ((mem_mask & 0xff00)>>8); extern const device_type ST0020_SPRITES; diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index ad18bc285da..1cb37572253 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -92,7 +92,6 @@ PALETTE_INIT_MEMBER(stactics_state,stactics) WRITE8_MEMBER(stactics_state::stactics_scroll_ram_w) { - if (data & 0x01) { switch (offset >> 8) @@ -114,7 +113,6 @@ WRITE8_MEMBER(stactics_state::stactics_scroll_ram_w) CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_frame_count_d3) { - return (m_frame_count >> 3) & 0x01; } @@ -128,7 +126,6 @@ CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_frame_count_d3) WRITE8_MEMBER(stactics_state::stactics_speed_latch_w) { - /* This writes to a shift register which is clocked by */ /* a 555 oscillator. This value determines the speed of */ /* the LED fire beams as follows: */ @@ -154,28 +151,24 @@ WRITE8_MEMBER(stactics_state::stactics_speed_latch_w) WRITE8_MEMBER(stactics_state::stactics_shot_trigger_w) { - m_shot_standby = 0; } WRITE8_MEMBER(stactics_state::stactics_shot_flag_clear_w) { - m_shot_arrive = 0; } CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_shot_standby) { - return m_shot_standby; } CUSTOM_INPUT_MEMBER(stactics_state::stactics_get_not_shot_arrive) { - return !m_shot_arrive; } @@ -361,7 +354,6 @@ static void update_artwork(running_machine &machine, stactics_state *state) VIDEO_START_MEMBER(stactics_state,stactics) { - m_y_scroll_d = 0; m_y_scroll_e = 0; m_y_scroll_f = 0; @@ -383,7 +375,6 @@ VIDEO_START_MEMBER(stactics_state,stactics) UINT32 stactics_state::screen_update_stactics(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - update_beam(this); draw_background(this, bitmap, cliprect); update_artwork(machine(), this); diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c index 58ea09be6ee..ad452e66177 100644 --- a/src/mame/video/starcrus.c +++ b/src/mame/video/starcrus.c @@ -402,7 +402,6 @@ static int collision_check_s2p1p2(running_machine &machine) UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); /* Draw ship 1 */ @@ -478,6 +477,5 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1 READ8_MEMBER(starcrus_state::starcrus_coll_det_r) { - return m_collision_reg ^ 0xff; } diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c index 68308a260c9..94c7d3c051d 100644 --- a/src/mame/video/stlforce.c +++ b/src/mame/video/stlforce.c @@ -17,7 +17,6 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_bg_tile_info) WRITE16_MEMBER(stlforce_state::stlforce_bg_videoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -39,7 +38,6 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_mlow_tile_info) WRITE16_MEMBER(stlforce_state::stlforce_mlow_videoram_w) { - m_mlow_videoram[offset] = data; m_mlow_tilemap->mark_tile_dirty(offset); } @@ -61,7 +59,6 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_mhigh_tile_info) WRITE16_MEMBER(stlforce_state::stlforce_mhigh_videoram_w) { - m_mhigh_videoram[offset] = data; m_mhigh_tilemap->mark_tile_dirty(offset); } @@ -84,7 +81,6 @@ TILE_GET_INFO_MEMBER(stlforce_state::get_stlforce_tx_tile_info) WRITE16_MEMBER(stlforce_state::stlforce_tx_videoram_w) { - m_tx_videoram[offset] = data; m_tx_tilemap->mark_tile_dirty(offset); } @@ -177,7 +173,6 @@ UINT32 stlforce_state::screen_update_stlforce(screen_device &screen, bitmap_ind1 void stlforce_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_bg_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); m_mlow_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mlow_tile_info),this), TILEMAP_SCAN_COLS, 16,16,64,16); m_mhigh_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(stlforce_state::get_stlforce_mhigh_tile_info),this),TILEMAP_SCAN_COLS, 16,16,64,16); diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c index 1195ae48e82..188ffe5dbf1 100644 --- a/src/mame/video/stvvdp1.c +++ b/src/mame/video/stvvdp1.c @@ -516,7 +516,6 @@ the rest are data used by it static struct stv_vdp2_sprite_list { - int CMDCTRL, CMDLINK, CMDPMOD, CMDCOLR, CMDSRCA, CMDSIZE, CMDGRDA; int CMDXA, CMDYA; int CMDXB, CMDYB; diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 730e100fef8..201ecf5c87d 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -3711,7 +3711,6 @@ static void stv_vdp2_draw_basic_tilemap(running_machine &machine, bitmap_rgb32 & /* 1 word per tile mode with supplement bits */ if (stv2_current_tilemap.pattern_data_size ==1) { - data = state->m_vdp2_vram[newbase + offs/2]; data = (offs&1) ? (data & 0x0000ffff) : ((data & 0xffff0000) >> 16); @@ -3737,7 +3736,6 @@ static void stv_vdp2_draw_basic_tilemap(running_machine &machine, bitmap_rgb32 & /* 2 words per tile, no supplement bits */ else { - data = state->m_vdp2_vram[newbase + offs]; tilecode = (data & 0x00007fff); pal = (data & 0x007f0000)>>16; @@ -5586,7 +5584,6 @@ static void refresh_palette_data(running_machine &machine) break; case 0: { - for(bank=0;bank<2;bank++) { for(c_i=0;c_i<0x400;c_i++) diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c index f92b70b0188..3ee07b6a142 100644 --- a/src/mame/video/suna16.c +++ b/src/mame/video/suna16.c @@ -91,19 +91,16 @@ WRITE16_MEMBER(suna16_state::bestbest_flipscreen_w) void suna16_state::video_start() { - m_paletteram = auto_alloc_array(machine(), UINT16, machine().total_colors()); } READ16_MEMBER(suna16_state::suna16_paletteram16_r) { - return m_paletteram[offset + m_color_bank * 256]; } WRITE16_MEMBER(suna16_state::suna16_paletteram16_w) { - offset += m_color_bank * 256; data = COMBINE_DATA(&m_paletteram[offset]); palette_set_color_rgb( machine(), offset, pal5bit(data >> 0),pal5bit(data >> 5),pal5bit(data >> 10)); @@ -219,7 +216,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 suna16_state::screen_update_suna16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* Suna Quiz indicates the background is the last pen */ bitmap.fill(0xff, cliprect); draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0); diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index ae40624f20e..14b1192eaea 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -43,7 +43,6 @@ static void suprnova_draw_roz(bitmap_ind16 &bitmap, bitmap_ind8& bitmapflags, co /* loop over rows */ while (sy <= ey) { - /* initialize X counters */ x = sx; cx = startx; @@ -348,7 +347,6 @@ WRITE32_MEMBER(skns_state::skns_v3_regs_w) void skns_state::video_start() { - m_spritegen = machine().device("spritegen"); m_tilemap_A = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(skns_state::get_tilemap_A_tile_info),this),TILEMAP_SCAN_ROWS,16,16,64, 64); @@ -446,7 +444,6 @@ static void supernova_draw_b( running_machine &machine, bitmap_ind16 &bitmap, bi UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - palette_update(machine()); bitmap.fill(get_black_pen(machine()), cliprect); @@ -553,10 +550,8 @@ UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitma // if the sprites are higher than the bg pixel if (pri3 > bgpri) { - if (pendata3&0xff) { - UINT16 palvalue = m_palette_ram[pendata3]; coldat = clut[pendata3]; @@ -629,5 +624,4 @@ UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitma void skns_state::screen_eof_skns(screen_device &screen, bool state) { - } diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c index 0f12f73737a..f2d2117933f 100644 --- a/src/mame/video/suprslam.c +++ b/src/mame/video/suprslam.c @@ -9,7 +9,6 @@ WRITE16_MEMBER(suprslam_state::suprslam_screen_videoram_w) { - m_screen_videoram[offset] = data; m_screen_tilemap->mark_tile_dirty(offset); } @@ -30,7 +29,6 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_tile_info) /* BG LAYER */ WRITE16_MEMBER(suprslam_state::suprslam_bg_videoram_w) { - m_bg_videoram[offset] = data; m_bg_tilemap->mark_tile_dirty(offset); } @@ -57,7 +55,6 @@ UINT32 suprslam_state::suprslam_tile_callback( UINT32 code ) void suprslam_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_bg_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); m_screen_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(suprslam_state::get_suprslam_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c index 44cd66c7225..15c9ced69b8 100644 --- a/src/mame/video/system16.c +++ b/src/mame/video/system16.c @@ -356,7 +356,6 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_text_tile_info) WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w) { - COMBINE_DATA(&m_textram[offset]); m_text_layer->mark_tile_dirty(offset); } @@ -365,7 +364,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_textram_w) VIDEO_START_MEMBER(segas1x_bootleg_state,system16) { - /* Normal colors */ compute_resistor_weights(0, 255, -1.0, 6, resistances_normal, m_weights[0][0], 0, 0, @@ -430,7 +428,6 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,system16) VIDEO_START_MEMBER(segas1x_bootleg_state,system18old) { - VIDEO_START_CALL_MEMBER(system16); m_bg1_trans = 1; @@ -549,7 +546,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_fgscrollx_w) WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w) { - COMBINE_DATA(&m_tilemapselect); //printf("system16 bootleg tilemapselect %04x\n", m_tilemapselect); } @@ -557,7 +553,6 @@ WRITE16_MEMBER(segas1x_bootleg_state::s16a_bootleg_tilemapselect_w) VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg) { - /* Normal colors */ compute_resistor_weights(0, 255, -1.0, 6, resistances_normal, m_weights[0][0], 0, 0, @@ -606,7 +601,6 @@ VIDEO_START_MEMBER(segas1x_bootleg_state,s16a_bootleg_passsht) // Passing Shot (2 player), Shinobi (Datsu), Wonderboy 3 UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // passing shot int offset_txtx = 192; int offset_txty = 0; @@ -694,7 +688,6 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg(screen_device &screen, /* The Passing Shot 4 Player bootleg has weird scroll registers (different offsets, ^0x7 xor) */ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg_passht4b(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // passing shot int offset_txtx = 192; int offset_txty = 0; @@ -767,7 +760,6 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg_passht4b(screen_device UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (!m_refreshenable) { bitmap.fill(0, cliprect); @@ -844,7 +836,6 @@ UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitm UINT32 segas1x_bootleg_state::screen_update_system18old(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (!m_refreshenable) { bitmap.fill(get_black_pen(machine()), cliprect); diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c index a51ced2f32a..0cf4067d277 100644 --- a/src/mame/video/tagteam.c +++ b/src/mame/video/tagteam.c @@ -105,7 +105,6 @@ WRITE8_MEMBER(tagteam_state::tagteam_mirrorcolorram_w) WRITE8_MEMBER(tagteam_state::tagteam_control_w) { - // d0-3: color for blank screen, applies to h/v borders too // (not implemented yet, and tagteam doesn't have a global screen on/off bit) diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 10383ad5848..609e5f2c062 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -55,7 +55,6 @@ static void tail2nos_postload(running_machine &machine) void tail2nos_state::video_start() { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tail2nos_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_bg_tilemap->set_transparent_pen(15); @@ -76,7 +75,6 @@ void tail2nos_state::video_start() WRITE16_MEMBER(tail2nos_state::tail2nos_bgvideoram_w) { - COMBINE_DATA(&m_bgvideoram[offset]); m_bg_tilemap->mark_tile_dirty(offset); } @@ -97,7 +95,6 @@ WRITE16_MEMBER(tail2nos_state::tail2nos_zoomdata_w) WRITE16_MEMBER(tail2nos_state::tail2nos_gfxbank_w) { - if (ACCESSING_BITS_0_7) { int bank; @@ -173,7 +170,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 tail2nos_state::screen_update_tail2nos(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_video_enable) { k051316_zoom_draw(m_k051316, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c index bf33bc99b9c..e995cd1c408 100644 --- a/src/mame/video/taito_b.c +++ b/src/mame/video/taito_b.c @@ -40,7 +40,6 @@ WRITE16_MEMBER(taitob_state::realpunc_video_ctrl_w) VIDEO_START_MEMBER(taitob_state,taitob_core) { - m_framebuffer[0] = auto_bitmap_ind16_alloc(machine(), 512, 256); m_framebuffer[1] = auto_bitmap_ind16_alloc(machine(), 512, 256); m_pixel_bitmap = NULL; /* only hitice needs this */ @@ -84,7 +83,6 @@ VIDEO_START_MEMBER(taitob_state,taitob_color_order2) VIDEO_START_MEMBER(taitob_state,hitice) { - VIDEO_START_CALL_MEMBER(taitob_color_order0); m_b_fg_color_base = 0x80; /* hitice also uses this for the pixel_bitmap */ @@ -103,7 +101,6 @@ VIDEO_RESET_MEMBER(taitob_state,hitice) VIDEO_START_MEMBER(taitob_state,realpunc) { - m_realpunc_bitmap = auto_bitmap_ind16_alloc(machine(), machine().primary_screen->width(), machine().primary_screen->height()); VIDEO_START_CALL_MEMBER(taitob_color_order0); diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c index 9de49d8080f..02ee6d107ed 100644 --- a/src/mame/video/taito_f2.c +++ b/src/mame/video/taito_f2.c @@ -137,7 +137,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_thundfox) VIDEO_START_MEMBER(taitof2_state,taitof2_mjnquest) { - taitof2_core_vh_start(machine(), 0, 0, 0); tc0100scn_set_bg_tilemask(m_tc0100scn, 0x7fff); @@ -145,7 +144,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_mjnquest) VIDEO_START_MEMBER(taitof2_state,taitof2_footchmp) { - taitof2_core_vh_start(machine(), 0, 3, 3); m_game = FOOTCHMP; @@ -153,7 +151,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_footchmp) VIDEO_START_MEMBER(taitof2_state,taitof2_hthero) { - taitof2_core_vh_start(machine(), 0, 3, 3); m_game = FOOTCHMP; @@ -191,7 +188,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_dinorex) VIDEO_START_MEMBER(taitof2_state,taitof2_dondokod)/* dondokod, cameltry */ { - m_pivot_xdisp = -16; m_pivot_ydisp = 0; taitof2_core_vh_start(machine(), 0, 3, 3); @@ -199,7 +195,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_dondokod)/* dondokod, cameltry */ VIDEO_START_MEMBER(taitof2_state,taitof2_pulirula) { - m_pivot_xdisp = -10; /* alignment seems correct (see level 2, falling */ m_pivot_ydisp = 16; /* block of ice after armour man) */ taitof2_core_vh_start(machine(), 2, 3, 3); @@ -207,7 +202,6 @@ VIDEO_START_MEMBER(taitof2_state,taitof2_pulirula) VIDEO_START_MEMBER(taitof2_state,taitof2_driftout) { - m_pivot_xdisp = -16; m_pivot_ydisp = 16; taitof2_core_vh_start(machine(), 0, 3, 3); @@ -887,7 +881,6 @@ void taitof2_state::screen_eof_taitof2_no_buffer(screen_device &screen, bool sta // rising edge if (state) { - taitof2_update_sprites_active_area(machine()); m_prepare_sprites = 1; @@ -997,7 +990,6 @@ UINT32 taitof2_state::screen_update_taitof2_ssi(screen_device &screen, bitmap_in UINT32 taitof2_state::screen_update_taitof2_yesnoj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - taitof2_handle_sprite_buffering(machine()); tc0100scn_tilemap_update(m_tc0100scn); @@ -1014,7 +1006,6 @@ UINT32 taitof2_state::screen_update_taitof2_yesnoj(screen_device &screen, bitmap UINT32 taitof2_state::screen_update_taitof2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - taitof2_handle_sprite_buffering(machine()); tc0100scn_tilemap_update(m_tc0100scn); diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index c2328bbf2b0..545910037fd 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -795,7 +795,6 @@ WRITE16_MEMBER(taito_f3_state::f3_videoram_w) READ16_MEMBER(taito_f3_state::f3_vram_r) { - return m_f3_vram[offset]; } diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c index 1ab7d01e527..32b9114905a 100644 --- a/src/mame/video/taito_h.c +++ b/src/mame/video/taito_h.c @@ -396,7 +396,6 @@ static void taitoh_log_vram(running_machine &machine) UINT32 taitoh_state::screen_update_syvalion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tc0080vco_tilemap_update(m_tc0080vco); taitoh_log_vram(machine()); @@ -414,7 +413,6 @@ UINT32 taitoh_state::screen_update_syvalion(screen_device &screen, bitmap_ind16 UINT32 taitoh_state::screen_update_recordbr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tc0080vco_tilemap_update(m_tc0080vco); taitoh_log_vram(machine()); @@ -444,7 +442,6 @@ UINT32 taitoh_state::screen_update_recordbr(screen_device &screen, bitmap_ind16 UINT32 taitoh_state::screen_update_dleague(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tc0080vco_tilemap_update(m_tc0080vco); taitoh_log_vram(machine()); diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c index fd3c4fa43c9..680e2735ea3 100644 --- a/src/mame/video/taito_l.c +++ b/src/mame/video/taito_l.c @@ -86,7 +86,6 @@ VIDEO_START_MEMBER(taitol_state,taitol) WRITE8_MEMBER(taitol_state::horshoes_bankg_w) { - if (m_horshoes_gfxbank != data) { m_horshoes_gfxbank = data; @@ -98,7 +97,6 @@ WRITE8_MEMBER(taitol_state::horshoes_bankg_w) WRITE8_MEMBER(taitol_state::taitol_bankc_w) { - if (m_bankc[offset] != data) { m_bankc[offset] = data; @@ -117,7 +115,6 @@ READ8_MEMBER(taitol_state::taitol_bankc_r) WRITE8_MEMBER(taitol_state::taitol_control_w) { - // logerror("Control Write %02x (%04x)\n", data, space.device().safe_pc()); m_cur_ctrl = data; @@ -138,7 +135,6 @@ WRITE8_MEMBER(taitol_state::taitol_control_w) READ8_MEMBER(taitol_state::taitol_control_r) { - // logerror("Control Read %02x (%04x)\n", cur_ctrl, space.device().safe_pc()); return m_cur_ctrl; } diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c index d2fcf3bd193..886b07a168b 100644 --- a/src/mame/video/taito_o.c +++ b/src/mame/video/taito_o.c @@ -141,7 +141,6 @@ static void parentj_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap UINT32 taitoo_state::screen_update_parentj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tc0080vco_tilemap_update(m_tc0080vco); bitmap.fill(0, cliprect); diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c index 3a06e61736e..60e2f7c119c 100644 --- a/src/mame/video/taitoair.c +++ b/src/mame/video/taitoair.c @@ -514,7 +514,6 @@ WRITE16_MEMBER(taitoair_state::dsp_rasterize_w) READ16_MEMBER(taitoair_state::dsp_x_return_r) { - /* Construct a frustum from the system's most recently set left and bottom extents */ float m[16]; airInfernoFrustum(m_frustumLeft, m_frustumBottom, m); @@ -534,7 +533,6 @@ READ16_MEMBER(taitoair_state::dsp_x_return_r) READ16_MEMBER(taitoair_state::dsp_y_return_r) { - /* Construct a frustum from the system's most recently set left and bottom extents */ float m[16]; airInfernoFrustum(m_frustumLeft, m_frustumBottom, m); @@ -565,7 +563,6 @@ void taitoair_state::video_start() UINT32 taitoair_state::screen_update_taitoair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - tc0080vco_tilemap_update(m_tc0080vco); bitmap.fill(0, cliprect); diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index ff1144ed585..5973bcc8ab6 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -1730,8 +1730,7 @@ do (PRIORITY) = privalue; \ } \ } \ -while (0) \ - +while (0) static void tc0080vco_bg1_tilemap_draw( device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, UINT32 priority ) { tc0080vco_state *tc0080vco = tc0080vco_get_safe_token(device); @@ -4798,7 +4797,6 @@ static void tc0110pcr_restore_colors(tc0110pcr_state *tc0110pcr) switch (tc0110pcr->type) { - case 0x00: { r = pal5bit(color >> 0); @@ -5323,7 +5321,6 @@ void tc0180vcu_device::device_config_complete() void tc0180vcu_device::device_start() { - tc0180vcu_state *tc0180vcu = tc0180vcu_get_safe_token(this); const tc0180vcu_interface *intf = tc0180vcu_get_interface(this); diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c index e9df564160e..71055ad6473 100644 --- a/src/mame/video/taitojc.c +++ b/src/mame/video/taitojc.c @@ -15,7 +15,6 @@ static const gfx_layout taitojc_char_layout = TILE_GET_INFO_MEMBER(taitojc_state::taitojc_tile_info) { - UINT32 val = m_tile_ram[tile_index]; int color = (val >> 22) & 0xff; int tile = (val >> 2) & 0x7f; @@ -300,7 +299,6 @@ static void taitojc_exit(running_machine &machine) void taitojc_state::video_start() { - machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(taitojc_exit), &machine())); /* find first empty slot to decode gfx */ @@ -331,7 +329,6 @@ void taitojc_state::video_start() UINT32 taitojc_state::screen_update_taitojc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); // low priority objects @@ -356,7 +353,6 @@ UINT32 taitojc_state::screen_update_taitojc(screen_device &screen, bitmap_ind16 UINT32 taitojc_state::screen_update_dendego(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // update controller state in artwork UINT8 btn = (ioport("BUTTONS")->read() & 0x77); int level; diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c index 7c20a25f6a7..78f71393296 100644 --- a/src/mame/video/tankbust.c +++ b/src/mame/video/tankbust.c @@ -211,7 +211,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r if ((spriteram[offs+1]!=4)) //otherwise - ghost sprites { - drawgfx_transpen(bitmap,cliprect,machine.gfx[0], code, color, flipx,flipy, diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 66ff0ddeac6..74bdc47c663 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -286,7 +286,6 @@ INLINE void roundupt_drawgfxzoomrotate(tatsumi_state *state, if (flipx) { - } @@ -466,7 +465,6 @@ static void mycopyrozbitmap_core(bitmap_rgb32 &bitmap,bitmap_rgb32 &srcbitmap, if (sx <= ex) { - while (sy <= ey) { x = sx; @@ -783,7 +781,6 @@ pos is 11.5 fixed point visible_line=0; for (/*y=0*/; y<256; y++) { - int shift=data[0]; int shift2=data[2]; int pal=4; //(data[3]>>8)&0xf; diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index bed32da608f..f67fd25d6eb 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -201,7 +201,6 @@ void tbowl_state::video_start() UINT32 tbowl_state::screen_update_tbowl_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_xscroll ); m_bg_tilemap->set_scrolly(0, m_yscroll ); m_bg2_tilemap->set_scrollx(0, m_bg2xscroll ); @@ -220,7 +219,6 @@ UINT32 tbowl_state::screen_update_tbowl_left(screen_device &screen, bitmap_ind16 UINT32 tbowl_state::screen_update_tbowl_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->set_scrollx(0, m_xscroll+32*8 ); m_bg_tilemap->set_scrolly(0, m_yscroll ); m_bg2_tilemap->set_scrollx(0, m_bg2xscroll+32*8 ); diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c index ddf29bf1afc..801c156e675 100644 --- a/src/mame/video/tecmo.c +++ b/src/mame/video/tecmo.c @@ -129,7 +129,6 @@ WRITE8_MEMBER(tecmo_state::tecmo_bgvideoram_w) WRITE8_MEMBER(tecmo_state::tecmo_fgscroll_w) { - m_fgscroll[offset] = data; m_fg_tilemap->set_scrollx(0, m_fgscroll[0] + 256 * m_fgscroll[1]); @@ -138,7 +137,6 @@ WRITE8_MEMBER(tecmo_state::tecmo_fgscroll_w) WRITE8_MEMBER(tecmo_state::tecmo_bgscroll_w) { - m_bgscroll[offset] = data; m_bg_tilemap->set_scrollx(0, m_bgscroll[0] + 256 * m_bgscroll[1]); diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c index c9c51316a4e..30a275a18b1 100644 --- a/src/mame/video/tecmo16.c +++ b/src/mame/video/tecmo16.c @@ -55,7 +55,6 @@ TILE_GET_INFO_MEMBER(tecmo16_state::tx_get_tile_info) void tecmo16_state::video_start() { - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -78,7 +77,6 @@ void tecmo16_state::video_start() VIDEO_START_MEMBER(tecmo16_state,ginkun) { - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -99,7 +97,6 @@ VIDEO_START_MEMBER(tecmo16_state,ginkun) VIDEO_START_MEMBER(tecmo16_state,riot) { - /* set up tile layers */ machine().primary_screen->register_screen_bitmap(m_tile_bitmap_bg); machine().primary_screen->register_screen_bitmap(m_tile_bitmap_fg); @@ -253,7 +250,6 @@ static void blendbitmaps(running_machine &machine, while (sh) { - #define BLENDPIXEL(x) if (sd3[x]) { \ if (sd2[x]) { \ dd[x] = paldata[sd2[x] | 0x0400] + paldata[sd3[x]]; \ diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c index 028cf3a76ac..00795acd127 100644 --- a/src/mame/video/tecmosys.c +++ b/src/mame/video/tecmosys.c @@ -10,7 +10,6 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg0tile_info) { - SET_TILE_INFO_MEMBER( 1, m_bg0tilemap_ram[2*tile_index+1], @@ -20,7 +19,6 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg0tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_bg1tile_info) { - SET_TILE_INFO_MEMBER( 2, m_bg1tilemap_ram[2*tile_index+1], @@ -30,7 +28,6 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg1tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_bg2tile_info) { - SET_TILE_INFO_MEMBER( 3, m_bg2tilemap_ram[2*tile_index+1], @@ -40,7 +37,6 @@ TILE_GET_INFO_MEMBER(tecmosys_state::get_bg2tile_info) TILE_GET_INFO_MEMBER(tecmosys_state::get_fg_tile_info) { - SET_TILE_INFO_MEMBER( 0, m_fgtilemap_ram[2*tile_index+1], @@ -287,7 +283,6 @@ static void tecmosys_do_final_mix(running_machine &machine, bitmap_rgb32 &bitmap UINT32 tecmosys_state::screen_update_tecmosys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(machine().pens[0x4000], cliprect); diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 11d106b304c..807e5753bf2 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -759,7 +759,6 @@ VIDEO_START_MEMBER(stepstag_state,stepstag) UINT32 stepstag_state::screen_update_stepstag_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); machine().priority_bitmap.fill(0); @@ -769,7 +768,6 @@ UINT32 stepstag_state::screen_update_stepstag_left(screen_device &screen, bitmap } UINT32 stepstag_state::screen_update_stepstag_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); machine().priority_bitmap.fill(0); @@ -780,7 +778,6 @@ UINT32 stepstag_state::screen_update_stepstag_right(screen_device &screen, bitma UINT32 stepstag_state::screen_update_stepstag_mid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - bitmap.fill(0, cliprect); machine().priority_bitmap.fill(0); diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c index 54efa5a5e2a..f71f5d0b5fd 100644 --- a/src/mame/video/thoop2.c +++ b/src/mame/video/thoop2.c @@ -177,7 +177,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r for (y = 0; y < spr_size; y++){ for (x = 0; x < spr_size; x++){ - ex = xflip ? (spr_size-1-x) : x; ey = yflip ? (spr_size-1-y) : y; diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c index d9c3f81a995..ed798b53059 100644 --- a/src/mame/video/thunderx.c +++ b/src/mame/video/thunderx.c @@ -67,7 +67,6 @@ void thunderx_state::video_start() UINT32 thunderx_state::screen_update_scontra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); machine().priority_bitmap.fill(0, cliprect); diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c index e4026d3508c..e969249d958 100644 --- a/src/mame/video/timeplt.c +++ b/src/mame/video/timeplt.c @@ -206,7 +206,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 timeplt_state::screen_update_timeplt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); m_bg_tilemap->draw(bitmap, cliprect, 1, 0); diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 5e4899bed2c..de6ead634ab 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -254,7 +254,6 @@ VIDEO_START_MEMBER(tmnt_state,tmnt) VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ { - k05324x_set_z_rejection(m_k053245, 0); m_dim_c = m_dim_v = m_lastdim = m_lasten = 0; @@ -267,7 +266,6 @@ VIDEO_START_MEMBER(tmnt_state,lgtnfght)/* also tmnt2, ssriders */ VIDEO_START_MEMBER(tmnt_state,glfgreat) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tmnt_state::glfgreat_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 512); m_roz_tilemap->set_transparent_pen(0); @@ -281,7 +279,6 @@ VIDEO_START_MEMBER(tmnt_state,glfgreat) VIDEO_START_MEMBER(tmnt_state,prmrsocr) { - m_roz_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tmnt_state::prmrsocr_get_roz_tile_info),this), TILEMAP_SCAN_ROWS, 16, 16, 512, 256); m_roz_tilemap->set_transparent_pen(0); @@ -293,7 +290,6 @@ VIDEO_START_MEMBER(tmnt_state,prmrsocr) VIDEO_START_MEMBER(tmnt_state,blswhstl) { - m_blswhstl_rombank = -1; save_item(NAME(m_blswhstl_rombank)); } @@ -318,7 +314,6 @@ WRITE16_MEMBER(tmnt_state::tmnt_paletteram_word_w) WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w) { - if (ACCESSING_BITS_0_7) { /* bit 0/1 = coin counters */ @@ -343,7 +338,6 @@ WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w) WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w) { - if (ACCESSING_BITS_0_7) { /* bit 0 = coin counter */ @@ -362,7 +356,6 @@ WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w) WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w) { - if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ @@ -382,7 +375,6 @@ WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w) WRITE16_MEMBER(tmnt_state::blswhstl_700300_w) { - if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ @@ -406,7 +398,6 @@ WRITE16_MEMBER(tmnt_state::blswhstl_700300_w) READ16_MEMBER(tmnt_state::glfgreat_rom_r) { - if (m_glfgreat_roz_rom_mode) return memregion("gfx3")->base()[m_glfgreat_roz_char_bank * 0x80000 + offset]; else if (offset < 0x40000) @@ -420,7 +411,6 @@ READ16_MEMBER(tmnt_state::glfgreat_rom_r) WRITE16_MEMBER(tmnt_state::glfgreat_122000_w) { - if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ @@ -452,7 +442,6 @@ WRITE16_MEMBER(tmnt_state::glfgreat_122000_w) WRITE16_MEMBER(tmnt_state::ssriders_eeprom_w) { - if (ACCESSING_BITS_0_7) { /* bit 0 is data */ @@ -472,7 +461,6 @@ WRITE16_MEMBER(tmnt_state::ssriders_eeprom_w) WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w) { - if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ @@ -489,7 +477,6 @@ WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w) WRITE16_MEMBER(tmnt_state::prmrsocr_122000_w) { - if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ @@ -512,7 +499,6 @@ WRITE16_MEMBER(tmnt_state::prmrsocr_122000_w) READ16_MEMBER(tmnt_state::prmrsocr_rom_r) { - if(m_glfgreat_roz_char_bank) return memregion("gfx3")->base()[offset]; else @@ -524,7 +510,6 @@ READ16_MEMBER(tmnt_state::prmrsocr_rom_r) WRITE16_MEMBER(tmnt_state::tmnt_priority_w) { - if (ACCESSING_BITS_0_7) { /* bit 2/3 = priority; other bits unused */ @@ -559,7 +544,6 @@ WRITE16_MEMBER(tmnt_state::tmnt_priority_w) UINT32 tmnt_state::screen_update_mia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); k052109_tilemap_draw(m_k052109, bitmap, cliprect, 2, TILEMAP_DRAW_OPAQUE,0); @@ -573,7 +557,6 @@ UINT32 tmnt_state::screen_update_mia(screen_device &screen, bitmap_ind16 &bitmap UINT32 tmnt_state::screen_update_tmnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k052109_tilemap_update(m_k052109); k052109_tilemap_draw(m_k052109, bitmap, cliprect, 2, TILEMAP_DRAW_OPAQUE,0); @@ -588,7 +571,6 @@ UINT32 tmnt_state::screen_update_tmnt(screen_device &screen, bitmap_ind16 &bitma UINT32 tmnt_state::screen_update_punkshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_sprite_colorbase = k053251_get_palette_index(m_k053251, K053251_CI1); m_layer_colorbase[0] = k053251_get_palette_index(m_k053251, K053251_CI2); m_layer_colorbase[1] = k053251_get_palette_index(m_k053251, K053251_CI4); @@ -649,7 +631,6 @@ UINT32 tmnt_state::screen_update_lgtnfght(screen_device &screen, bitmap_ind16 &b READ16_MEMBER(tmnt_state::glfgreat_ball_r) { - #ifdef MAME_DEBUG popmessage("%04x", m_glfgreat_pixel); #endif diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c index d22b6330a49..04ab04a75eb 100644 --- a/src/mame/video/toaplan1.c +++ b/src/mame/video/toaplan1.c @@ -331,7 +331,6 @@ static void register_common(running_machine &machine) VIDEO_START_MEMBER(toaplan1_state,rallybik) { - toaplan1_create_tilemaps(machine()); toaplan1_paletteram_alloc(machine()); toaplan1_vram_alloc(machine()); @@ -356,7 +355,6 @@ VIDEO_START_MEMBER(toaplan1_state,rallybik) VIDEO_START_MEMBER(toaplan1_state,toaplan1) { - toaplan1_create_tilemaps(machine()); toaplan1_paletteram_alloc(machine()); toaplan1_vram_alloc(machine()); @@ -391,7 +389,6 @@ READ16_MEMBER(toaplan1_state::toaplan1_frame_done_r) WRITE16_MEMBER(toaplan1_state::toaplan1_tile_offsets_w) { - if ( offset == 0 ) { COMBINE_DATA(&m_tiles_offsetx); @@ -408,7 +405,6 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_tile_offsets_w) WRITE16_MEMBER(toaplan1_state::rallybik_bcu_flipscreen_w) { - if (ACCESSING_BITS_0_7 && (data != m_bcu_flipscreen)) { logerror("Setting BCU controller flipscreen port to %04x\n",data); @@ -436,7 +432,6 @@ WRITE16_MEMBER(toaplan1_state::rallybik_bcu_flipscreen_w) WRITE16_MEMBER(toaplan1_state::toaplan1_bcu_flipscreen_w) { - if (ACCESSING_BITS_0_7 && (data != m_bcu_flipscreen)) { logerror("Setting BCU controller flipscreen port to %04x\n",data); @@ -469,7 +464,6 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_fcu_flipscreen_w) { if (ACCESSING_BITS_8_15) { - logerror("Setting FCU controller flipscreen port to %04x\n",data); m_fcu_flipscreen = data & 0x8000; /* 0x8000 = flip, 0x0000 = no flip */ } @@ -477,13 +471,11 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_fcu_flipscreen_w) READ16_MEMBER(toaplan1_state::toaplan1_spriteram_offs_r)/// this aint really needed ? { - return m_spriteram_offs; } WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram_offs_w) { - COMBINE_DATA(&m_spriteram_offs); } @@ -491,13 +483,11 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram_offs_w) /* tile palette */ READ16_MEMBER(toaplan1_state::toaplan1_colorram1_r) { - return m_colorram1[offset]; } WRITE16_MEMBER(toaplan1_state::toaplan1_colorram1_w) { - COMBINE_DATA(&m_colorram1[offset]); paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset, data, mem_mask); } @@ -505,26 +495,22 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_colorram1_w) /* sprite palette */ READ16_MEMBER(toaplan1_state::toaplan1_colorram2_r) { - return m_colorram2[offset]; } WRITE16_MEMBER(toaplan1_state::toaplan1_colorram2_w) { - COMBINE_DATA(&m_colorram2[offset]); paletteram_xBBBBBGGGGGRRRRR_word_w(space, offset+(m_colorram1.bytes()/2), data, mem_mask); } READ16_MEMBER(toaplan1_state::toaplan1_spriteram16_r) { - return m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)]; } WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram16_w) { - COMBINE_DATA(&m_spriteram[m_spriteram_offs & ((TOAPLAN1_SPRITERAM_SIZE/2)-1)]); #ifdef MAME_DEBUG @@ -540,13 +526,11 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_spriteram16_w) READ16_MEMBER(toaplan1_state::toaplan1_spritesizeram16_r) { - return m_spritesizeram16[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)]; } WRITE16_MEMBER(toaplan1_state::toaplan1_spritesizeram16_w) { - COMBINE_DATA(&m_spritesizeram16[m_spriteram_offs & ((TOAPLAN1_SPRITESIZERAM_SIZE/2)-1)]); #ifdef MAME_DEBUG @@ -564,7 +548,6 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_spritesizeram16_w) WRITE16_MEMBER(toaplan1_state::toaplan1_bcu_control_w) { - logerror("BCU tile controller register:%02x now = %04x\n",offset,data); /*** Hack for Zero Wing and OutZone, to reset the sound system on */ @@ -580,13 +563,11 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_bcu_control_w) READ16_MEMBER(toaplan1_state::toaplan1_tileram_offs_r) { - return m_pf_voffs; } WRITE16_MEMBER(toaplan1_state::toaplan1_tileram_offs_w) { - if (data >= 0x4000) logerror("Hmmm, unknown video layer being selected (%08x)\n",data); COMBINE_DATA(&m_pf_voffs); @@ -693,7 +674,6 @@ READ16_MEMBER(toaplan1_state::toaplan1_scroll_regs_r) WRITE16_MEMBER(toaplan1_state::toaplan1_scroll_regs_w) { - switch(offset) { case 00: COMBINE_DATA(&m_pf1_scrollx); /* 1D3h */ @@ -1189,7 +1169,6 @@ void toaplan1_state::screen_eof_rallybik(screen_device &screen, bool state) // rising edge if (state) { - memcpy(m_buffered_spriteram, m_spriteram, m_spriteram.bytes()); } } @@ -1199,7 +1178,6 @@ void toaplan1_state::screen_eof_toaplan1(screen_device &screen, bool state) // rising edge if (state) { - memcpy(m_buffered_spriteram, m_spriteram, m_spriteram.bytes()); memcpy(m_buffered_spritesizeram16, m_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE); } @@ -1210,7 +1188,6 @@ void toaplan1_state::screen_eof_samesame(screen_device &screen, bool state) // rising edge if (state) { - memcpy(m_buffered_spriteram, m_spriteram, m_spriteram.bytes()); memcpy(m_buffered_spritesizeram16, m_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE); machine().device("maincpu")->execute().set_input_line(M68K_IRQ_2, HOLD_LINE); /* Frame done */ diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index 66dd05623fd..effca5d7d63 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -80,7 +80,6 @@ static void truxton2_postload(running_machine &machine) VIDEO_START_MEMBER(toaplan2_state,toaplan2) { - /* cache the VDP device */ m_vdp0 = machine().device("gp9001vdp0"); m_vdp1 = machine().device("gp9001vdp1"); @@ -105,7 +104,6 @@ VIDEO_START_MEMBER(toaplan2_state,toaplan2) VIDEO_START_MEMBER(toaplan2_state,truxton2) { - VIDEO_START_CALL_MEMBER( toaplan2 ); /* Create the Text tilemap for this game */ @@ -118,7 +116,6 @@ VIDEO_START_MEMBER(toaplan2_state,truxton2) VIDEO_START_MEMBER(toaplan2_state,fixeightbl) { - VIDEO_START_CALL_MEMBER( toaplan2 ); /* Create the Text tilemap for this game */ @@ -144,7 +141,6 @@ VIDEO_START_MEMBER(toaplan2_state,fixeightbl) VIDEO_START_MEMBER(toaplan2_state,bgaregga) { - VIDEO_START_CALL_MEMBER( toaplan2 ); /* Create the Text tilemap for this game */ @@ -154,7 +150,6 @@ VIDEO_START_MEMBER(toaplan2_state,bgaregga) VIDEO_START_MEMBER(toaplan2_state,bgareggabl) { - VIDEO_START_CALL_MEMBER( toaplan2 ); /* Create the Text tilemap for this game */ @@ -182,7 +177,6 @@ VIDEO_START_MEMBER(toaplan2_state,batrider) WRITE16_MEMBER(toaplan2_state::toaplan2_txvideoram16_w) { - COMBINE_DATA(&m_txvideoram16[offset]); if (offset < m_txvideoram16.bytes()/4) m_tx_tilemap->mark_tile_dirty(offset); @@ -273,7 +267,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_unknown_dma_w) WRITE16_MEMBER(toaplan2_state::batrider_objectbank_w) { - if (ACCESSING_BITS_0_7) { data &= 0xf; @@ -288,7 +281,6 @@ WRITE16_MEMBER(toaplan2_state::batrider_objectbank_w) // Dogyuun doesn't appear to require fancy mixing? UINT32 toaplan2_state::screen_update_toaplan2_dual(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_vdp1) { bitmap.fill(0, cliprect); @@ -310,7 +302,6 @@ UINT32 toaplan2_state::screen_update_toaplan2_dual(screen_device &screen, bitmap // renders to 2 bitmaps, and mixes output UINT32 toaplan2_state::screen_update_toaplan2_mixed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // bitmap.fill(0, cliprect); // gp9001_custom_priority_bitmap->fill(0, cliprect); @@ -409,7 +400,6 @@ UINT32 toaplan2_state::screen_update_toaplan2_mixed(screen_device &screen, bitma UINT32 toaplan2_state::screen_update_toaplan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_vdp0) { bitmap.fill(0, cliprect); diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c index 446009ee041..0dad3dd11c2 100644 --- a/src/mame/video/toki.c +++ b/src/mame/video/toki.c @@ -221,7 +221,6 @@ static void tokib_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,co break; if (sprite_word[2]) { - x = sprite_word[3] & 0x1ff; if (x > 256) x -= 512; diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c index c3d4766c2d2..a5bfb59a950 100644 --- a/src/mame/video/toypop.c +++ b/src/mame/video/toypop.c @@ -157,7 +157,6 @@ READ16_MEMBER(toypop_state::toypop_merged_background_r) WRITE16_MEMBER(toypop_state::toypop_merged_background_w) { - // 0xabcd is written as 0x0a0b0c0d in the background image if (ACCESSING_BITS_8_15) m_bg_image[2*offset] = ((data & 0xf00) >> 8) | ((data & 0xf000) >> 4); diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c index a5c304d4a38..06209803bd6 100644 --- a/src/mame/video/travrusa.c +++ b/src/mame/video/travrusa.c @@ -221,7 +221,6 @@ TILE_GET_INFO_MEMBER(travrusa_state::get_tile_info) void travrusa_state::video_start() { - save_item(NAME(m_scrollx)); m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(travrusa_state::get_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index b58130c6016..09aa0b27f71 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -25,7 +25,6 @@ to switch between 8*8 tiles and 16*16 tiles. WRITE16_MEMBER(tumbleb_state::bcstory_tilebank_w) { - m_tilebank = data; m_pf1_tilemap->mark_all_dirty(); m_pf1_alt_tilemap->mark_all_dirty(); @@ -34,7 +33,6 @@ WRITE16_MEMBER(tumbleb_state::bcstory_tilebank_w) WRITE16_MEMBER(tumbleb_state::chokchok_tilebank_w) { - m_tilebank = data << 1; m_pf1_tilemap->mark_all_dirty(); m_pf1_alt_tilemap->mark_all_dirty(); @@ -43,7 +41,6 @@ WRITE16_MEMBER(tumbleb_state::chokchok_tilebank_w) WRITE16_MEMBER(tumbleb_state::wlstar_tilebank_w) { - /* it just writes 0000 or ffff */ m_tilebank = data & 0x4000; m_pf1_tilemap->mark_all_dirty(); @@ -54,7 +51,6 @@ WRITE16_MEMBER(tumbleb_state::wlstar_tilebank_w) WRITE16_MEMBER(tumbleb_state::suprtrio_tilebank_w) { - m_tilebank = data << 14; // shift it here, makes using bcstory_tilebank easier m_pf1_tilemap->mark_all_dirty(); m_pf1_alt_tilemap->mark_all_dirty(); @@ -64,7 +60,6 @@ WRITE16_MEMBER(tumbleb_state::suprtrio_tilebank_w) WRITE16_MEMBER(tumbleb_state::tumblepb_pf1_data_w) { - COMBINE_DATA(&m_pf1_data[offset]); m_pf1_tilemap->mark_tile_dirty(offset); m_pf1_alt_tilemap->mark_tile_dirty(offset); @@ -72,7 +67,6 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_pf1_data_w) WRITE16_MEMBER(tumbleb_state::tumblepb_pf2_data_w) { - COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset); @@ -82,7 +76,6 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_pf2_data_w) WRITE16_MEMBER(tumbleb_state::fncywld_pf1_data_w) { - COMBINE_DATA(&m_pf1_data[offset]); m_pf1_tilemap->mark_tile_dirty(offset / 2); m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); @@ -90,7 +83,6 @@ WRITE16_MEMBER(tumbleb_state::fncywld_pf1_data_w) WRITE16_MEMBER(tumbleb_state::fncywld_pf2_data_w) { - COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset / 2); } @@ -103,7 +95,6 @@ WRITE16_MEMBER(tumbleb_state::tumblepb_control_0_w) WRITE16_MEMBER(tumbleb_state::pangpang_pf1_data_w) { - COMBINE_DATA(&m_pf1_data[offset]); m_pf1_tilemap->mark_tile_dirty(offset / 2); m_pf1_alt_tilemap->mark_tile_dirty(offset / 2); @@ -111,7 +102,6 @@ WRITE16_MEMBER(tumbleb_state::pangpang_pf1_data_w) WRITE16_MEMBER(tumbleb_state::pangpang_pf2_data_w) { - COMBINE_DATA(&m_pf2_data[offset]); m_pf2_tilemap->mark_tile_dirty(offset / 2); @@ -235,7 +225,6 @@ static void tumbleb_tilemap_redraw(running_machine &machine) VIDEO_START_MEMBER(tumbleb_state,pangpang) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::pangpang_get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -249,7 +238,6 @@ VIDEO_START_MEMBER(tumbleb_state,pangpang) VIDEO_START_MEMBER(tumbleb_state,tumblepb) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -262,7 +250,6 @@ VIDEO_START_MEMBER(tumbleb_state,tumblepb) VIDEO_START_MEMBER(tumbleb_state,sdfight) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); // 64*64 to prevent bad tilemap wrapping? - check real behavior m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -275,7 +262,6 @@ VIDEO_START_MEMBER(tumbleb_state,sdfight) VIDEO_START_MEMBER(tumbleb_state,fncywld) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fncywld_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -289,7 +275,6 @@ VIDEO_START_MEMBER(tumbleb_state,fncywld) VIDEO_START_MEMBER(tumbleb_state,suprtrio) { - m_pf1_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); m_pf1_alt_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg1_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); m_pf2_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(tumbleb_state::get_bg2_tile_info),this), tilemap_mapper_delegate(FUNC(tumbleb_state::tumblep_scan),this), 16, 16, 64, 32); @@ -500,7 +485,6 @@ UINT32 tumbleb_state::screen_update_pangpang(screen_device &screen, bitmap_ind16 UINT32 tumbleb_state::screen_update_suprtrio(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_pf1_alt_tilemap->set_scrollx(0, -m_control[1] - 6); m_pf1_alt_tilemap->set_scrolly(0, -m_control[2]); m_pf2_tilemap->set_scrollx(0, -m_control[3] - 2); diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index fadbf0bad85..21ae3967eb4 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -50,7 +50,6 @@ WRITE8_MEMBER(tunhunt_state::tunhunt_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index 16dfae48dd2..1a018b9c519 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -173,7 +173,6 @@ TILE_GET_INFO_MEMBER(turbo_state::get_fg_tile_info) VIDEO_START_MEMBER(turbo_state,turbo) { - /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); } @@ -181,7 +180,6 @@ VIDEO_START_MEMBER(turbo_state,turbo) VIDEO_START_MEMBER(turbo_state,buckrog) { - /* initialize the foreground tilemap */ m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(turbo_state::get_fg_tile_info),this), TILEMAP_SCAN_ROWS, 8,8, 32,32); diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c index 9fb53c0dc08..cab60b44fe1 100644 --- a/src/mame/video/twincobr.c +++ b/src/mame/video/twincobr.c @@ -100,7 +100,6 @@ static void twincobr_create_tilemaps(running_machine &machine) VIDEO_START_MEMBER(twincobr_state,toaplan0) { - /* the video RAM is accessed via ports, it's not memory mapped */ m_txvideoram_size = 0x0800; m_bgvideoram_size = 0x2000; /* banked two times 0x1000 */ @@ -179,54 +178,45 @@ void twincobr_flipscreen(running_machine &machine, int flip) WRITE16_MEMBER(twincobr_state::twincobr_txoffs_w) { - COMBINE_DATA(&m_txoffs); m_txoffs %= m_txvideoram_size; } READ16_MEMBER(twincobr_state::twincobr_txram_r) { - return m_txvideoram16[m_txoffs]; } WRITE16_MEMBER(twincobr_state::twincobr_txram_w) { - COMBINE_DATA(&m_txvideoram16[m_txoffs]); m_tx_tilemap->mark_tile_dirty(m_txoffs); } WRITE16_MEMBER(twincobr_state::twincobr_bgoffs_w) { - COMBINE_DATA(&m_bgoffs); m_bgoffs %= (m_bgvideoram_size >> 1); } READ16_MEMBER(twincobr_state::twincobr_bgram_r) { - return m_bgvideoram16[m_bgoffs+m_bg_ram_bank]; } WRITE16_MEMBER(twincobr_state::twincobr_bgram_w) { - COMBINE_DATA(&m_bgvideoram16[m_bgoffs+m_bg_ram_bank]); m_bg_tilemap->mark_tile_dirty((m_bgoffs+m_bg_ram_bank)); } WRITE16_MEMBER(twincobr_state::twincobr_fgoffs_w) { - COMBINE_DATA(&m_fgoffs); m_fgoffs %= m_fgvideoram_size; } READ16_MEMBER(twincobr_state::twincobr_fgram_r) { - return m_fgvideoram16[m_fgoffs]; } WRITE16_MEMBER(twincobr_state::twincobr_fgram_w) { - COMBINE_DATA(&m_fgvideoram16[m_fgoffs]); m_fg_tilemap->mark_tile_dirty(m_fgoffs); } @@ -234,7 +224,6 @@ WRITE16_MEMBER(twincobr_state::twincobr_fgram_w) WRITE16_MEMBER(twincobr_state::twincobr_txscroll_w) { - if (offset == 0) { COMBINE_DATA(&m_txscrollx); m_tx_tilemap->set_scrollx(0,(m_txscrollx+m_scroll_x) & 0x1ff); @@ -247,7 +236,6 @@ WRITE16_MEMBER(twincobr_state::twincobr_txscroll_w) WRITE16_MEMBER(twincobr_state::twincobr_bgscroll_w) { - if (offset == 0) { COMBINE_DATA(&m_bgscrollx); m_bg_tilemap->set_scrollx(0,(m_bgscrollx+m_scroll_x) & 0x1ff); @@ -260,7 +248,6 @@ WRITE16_MEMBER(twincobr_state::twincobr_bgscroll_w) WRITE16_MEMBER(twincobr_state::twincobr_fgscroll_w) { - if (offset == 0) { COMBINE_DATA(&m_fgscrollx); m_fg_tilemap->set_scrollx(0,(m_fgscrollx+m_scroll_x) & 0x1ff); diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index 6a15eb17a6c..333dfa56ab6 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -1123,7 +1123,6 @@ void tx1_state::screen_eof_tx1(screen_device &screen, bool state) // rising edge if (state) { - /* /VSYNC: Update TZ113 */ m_vregs.slin_val += m_vregs.slin_inc; } @@ -1182,7 +1181,6 @@ static void tx1_combine_layers(running_machine &machine, bitmap_ind16 &bitmap, i UINT32 tx1_state::screen_update_tx1_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - memset(m_obj_bmp, 0, 768*240); tx1_draw_char(machine(), m_chr_bmp); @@ -1501,8 +1499,7 @@ static void buggyboy_get_roadpix(int screen, int ls161, UINT8 rva0_6, UINT8 sld, hp >>= 8; \ hps##NUM##0 = (BIT(hp, 0) || BIT(hp, 2)) && !BIT(hp, 3); \ hps##NUM##1 = (BIT(hp, 1) || BIT(hp, 2)) && !BIT(hp, 3); \ - hps##NUM##2 = BIT(hp, 2); \ - + hps##NUM##2 = BIT(hp, 2); #define UPDATE_HPOS(NUM) \ if (hp##NUM##_en) \ { \ @@ -1510,8 +1507,7 @@ static void buggyboy_get_roadpix(int screen, int ls161, UINT8 rva0_6, UINT8 sld, hp##NUM##_cy = 1; \ else \ hp##NUM = hp##NUM + 1; \ - } \ - + } static void buggyboy_draw_road(running_machine &machine, UINT8 *bitmap) { tx1_state *state = machine.driver_data(); @@ -3025,7 +3021,6 @@ void tx1_state::screen_eof_buggyboy(screen_device &screen, bool state) // rising edge if (state) { - /* /VSYNC: Update TZ113 @ 219 */ m_vregs.slin_val += m_vregs.slin_inc; @@ -3037,7 +3032,6 @@ void tx1_state::screen_eof_buggyboy(screen_device &screen, bool state) UINT32 tx1_state::screen_update_buggyboy_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - memset(m_obj_bmp, 0, 768*240); memset(m_rod_bmp, 0, 768*240); diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c index 2527592aa41..9fb624554fc 100644 --- a/src/mame/video/ultraman.c +++ b/src/mame/video/ultraman.c @@ -71,7 +71,6 @@ void ultraman_state::video_start() WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w) { - if (ACCESSING_BITS_0_7) { /* bit 0: enable wraparound for scr #1 @@ -122,7 +121,6 @@ WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w) UINT32 ultraman_state::screen_update_ultraman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k051316_zoom_draw(m_k051316_3, bitmap, cliprect, 0, 0); k051316_zoom_draw(m_k051316_2, bitmap, cliprect, 0, 0); k051960_sprites_draw(m_k051960, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c index d9cf96dbf82..22455df9a0c 100644 --- a/src/mame/video/vdc.c +++ b/src/mame/video/vdc.c @@ -373,7 +373,6 @@ static void vdc_advance_line(running_machine &machine, int which) /* handle frame events */ if(vdc[which].curline == 261 && ! vdc[which].vblank_triggered ) { - vdc[which].vblank_triggered = 1; if(vdc[which].vdc_data[CR].w & CR_VR) { /* generate IRQ1 if enabled */ @@ -872,7 +871,6 @@ static void pce_refresh_sprites(running_machine &machine, int which, int line, U if (obj_l < obj_h) { - sprites_drawn++; if(sprites_drawn > 16) { diff --git a/src/mame/video/vectrex.c b/src/mame/video/vectrex.c index 00f03bae555..4c0ccee3c42 100644 --- a/src/mame/video/vectrex.c +++ b/src/mame/video/vectrex.c @@ -417,7 +417,6 @@ WRITE8_MEMBER(vectrex_state::v_via_cb2_w) if (m_cb2 != data) { - /* Check lightpen */ if (m_lightpen_port != 0) { diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c index 5f86ce4fe22..46cf3426f80 100644 --- a/src/mame/video/volfied.c +++ b/src/mame/video/volfied.c @@ -30,7 +30,6 @@ READ16_MEMBER(volfied_state::volfied_video_ram_r) WRITE16_MEMBER(volfied_state::volfied_video_ram_w) { - mem_mask &= m_video_mask; COMBINE_DATA(&m_video_ram[offset]); @@ -124,7 +123,6 @@ static void refresh_pixel_layer( running_machine &machine, bitmap_ind16 &bitmap UINT32 volfied_state::screen_update_volfied(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - machine().priority_bitmap.fill(0, cliprect); refresh_pixel_layer(machine(), bitmap); pc090oj_draw_sprites(m_pc090oj, bitmap, cliprect, 0); diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c index 1a05c9b0e39..eb6473b941a 100644 --- a/src/mame/video/vrender0.c +++ b/src/mame/video/vrender0.c @@ -322,8 +322,7 @@ Clamped:\ y_tx += Quad->Txdy;\ y_ty += Quad->Tydy;\ }\ -}\ - +} TILETEMPL(16,0,0) TILETEMPL(16,0,1) TILETEMPL(16,0,2) TILETEMPL(16,1,0) TILETEMPL(16,1,1) TILETEMPL(16,1,2) diff --git a/src/mame/video/vsystem_spr.c b/src/mame/video/vsystem_spr.c index a5160cb4d78..e6410121c1a 100644 --- a/src/mame/video/vsystem_spr.c +++ b/src/mame/video/vsystem_spr.c @@ -149,7 +149,6 @@ void vsystem_spr_device::device_start() void vsystem_spr_device::device_reset() { - } void vsystem_spr_device::get_sprite_attributes(UINT16* ram) diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h index ee3fcef5372..dc91109873c 100644 --- a/src/mame/video/vsystem_spr.h +++ b/src/mame/video/vsystem_spr.h @@ -4,20 +4,15 @@ typedef device_delegate vsystem_tile_indirection_delegate; #define MCFG_VSYSTEM_SPR_SET_TILE_INDIRECT( _class, _method) \ - vsystem_spr_device::set_tile_indirect_cb(*device, vsystem_tile_indirection_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + vsystem_spr_device::set_tile_indirect_cb(*device, vsystem_tile_indirection_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_VSYSTEM_SPR_SET_GFXREGION( _rgn ) \ - vsystem_spr_device::set_gfx_region(*device, _rgn); \ - + vsystem_spr_device::set_gfx_region(*device, _rgn); #define MCFG_VSYSTEM_SPR_SET_PALBASE( _palbase ) \ - vsystem_spr_device::CG10103_set_pal_base(*device, _palbase); \ - + vsystem_spr_device::CG10103_set_pal_base(*device, _palbase); #define MCFG_VSYSTEM_SPR_SET_PALMASK( _palmask ) \ - vsystem_spr_device::set_pal_mask(*device, _palmask); \ - + vsystem_spr_device::set_pal_mask(*device, _palmask); #define MCFG_VSYSTEM_SPR_SET_TRANSPEN( _transpen ) \ - vsystem_spr_device::CG10103_set_transpen(*device, _transpen); \ - + vsystem_spr_device::CG10103_set_transpen(*device, _transpen); /*** CG10103 **********************************************/ diff --git a/src/mame/video/vsystem_spr2.c b/src/mame/video/vsystem_spr2.c index 2bf5b4e6f18..12331efa92a 100644 --- a/src/mame/video/vsystem_spr2.c +++ b/src/mame/video/vsystem_spr2.c @@ -76,7 +76,6 @@ void vsystem_spr2_device::device_start() void vsystem_spr2_device::device_reset() { - } diff --git a/src/mame/video/vsystem_spr2.h b/src/mame/video/vsystem_spr2.h index e05090ca5c3..b23b3d62aa0 100644 --- a/src/mame/video/vsystem_spr2.h +++ b/src/mame/video/vsystem_spr2.h @@ -3,17 +3,13 @@ typedef device_delegate vsystem_tile2_indirection_delegate; #define MCFG_VSYSTEM_SPR2_SET_TILE_INDIRECT( _class, _method) \ - vsystem_spr2_device::set_tile_indirect_cb(*device, vsystem_tile2_indirection_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); \ - + vsystem_spr2_device::set_tile_indirect_cb(*device, vsystem_tile2_indirection_delegate(&_class::_method, #_class "::" #_method, NULL, (_class *)0)); #define MCFG_VSYSTEM_SPR2_SET_PRITYPE( _val) \ - vsystem_spr2_device::set_pritype(*device, _val); \ - + vsystem_spr2_device::set_pritype(*device, _val); #define MCFG_VSYSTEM_SPR2_SET_GFXREGION( _rgn ) \ - vsystem_spr2_device::set_gfx_region(*device, _rgn); \ - + vsystem_spr2_device::set_gfx_region(*device, _rgn); #define MCFG_VSYSTEM_SPR2_SET_OFFSETS( _xoffs, _yoffs ) \ - vsystem_spr2_device::set_offsets(*device, _xoffs,_yoffs); \ - + vsystem_spr2_device::set_offsets(*device, _xoffs,_yoffs); class vsystem_spr2_device : public device_t { diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index 7d0c1f71106..1cdd744bc7d 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -6,7 +6,6 @@ void warriorb_state::video_start() { - /* Ensure palette from correct TC0110PCR used for each screen */ tc0100scn_set_colbanks(m_tc0100scn_1, 0x0, 0x100, 0x0); } diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c index 17e7df234e8..7abaf5ee132 100644 --- a/src/mame/video/wc90.c +++ b/src/mame/video/wc90.c @@ -201,7 +201,6 @@ static void draw_sprite_32x16(running_machine &machine, bitmap_ind16 &bitmap, co static void draw_sprite_32x32(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int code, int sx, int sy, int bank, int flags ) { - const char *p = p32x32[ bank&3 ]; WC90_DRAW_SPRITE( code+p[0], sx, sy ); @@ -212,7 +211,6 @@ static void draw_sprite_32x32(running_machine &machine, bitmap_ind16 &bitmap, co static void draw_sprite_32x64(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int code, int sx, int sy, int bank, int flags ) { - const char *p = p32x64[ bank&3 ]; WC90_DRAW_SPRITE( code+p[0], sx, sy ); @@ -242,7 +240,6 @@ static void draw_sprite_64x16(running_machine &machine, bitmap_ind16 &bitmap, co static void draw_sprite_64x32(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int code, int sx, int sy, int bank, int flags ) { - const char *p = p64x32[ bank&3 ]; WC90_DRAW_SPRITE( code+p[0], sx, sy ); @@ -257,7 +254,6 @@ static void draw_sprite_64x32(running_machine &machine, bitmap_ind16 &bitmap, co static void draw_sprite_64x64(running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, int code, int sx, int sy, int bank, int flags ) { - const char *p = p64x64[ bank&3 ]; WC90_DRAW_SPRITE( code+p[0], sx, sy ); @@ -316,7 +312,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r int bank = spriteram[offs+0]; if ( ( bank >> 4 ) == priority ) { - if ( bank & 4 ) { /* visible */ which = ( spriteram[offs+2] >> 2 ) + ( spriteram[offs+3] << 6 ); diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c index 8bf5621f63d..d273a67ef1d 100644 --- a/src/mame/video/welltris.c +++ b/src/mame/video/welltris.c @@ -22,7 +22,6 @@ WRITE16_MEMBER(welltris_state::welltris_palette_bank_w) { if (ACCESSING_BITS_0_7) { - if (m_charpalettebank != (data & 0x03)) { m_charpalettebank = (data & 0x03); @@ -40,7 +39,6 @@ WRITE16_MEMBER(welltris_state::welltris_gfxbank_w) { if (ACCESSING_BITS_0_7) { - setbank(0, (data & 0xf0) >> 4); setbank(1, data & 0x0f); } @@ -48,7 +46,6 @@ WRITE16_MEMBER(welltris_state::welltris_gfxbank_w) WRITE16_MEMBER(welltris_state::welltris_scrollreg_w) { - switch (offset) { case 0: m_scrollx = data - 14; break; case 1: m_scrolly = data + 0; break; @@ -69,7 +66,6 @@ TILE_GET_INFO_MEMBER(welltris_state::get_welltris_tile_info) WRITE16_MEMBER(welltris_state::welltris_charvideoram_w) { - COMBINE_DATA(&m_charvideoram[offset]); m_char_tilemap->mark_tile_dirty(offset); } diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c index 3f7c8c7d8f3..40b57d60f8f 100644 --- a/src/mame/video/wgp.c +++ b/src/mame/video/wgp.c @@ -129,7 +129,6 @@ READ16_MEMBER(wgp_state::wgp_pivram_word_r) WRITE16_MEMBER(wgp_state::wgp_pivram_word_w) { - COMBINE_DATA(&m_pivram[offset]); if (offset < 0x3000) diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c index a8cb69b9916..9d6826da895 100644 --- a/src/mame/video/wolfpack.c +++ b/src/mame/video/wolfpack.c @@ -282,7 +282,6 @@ void wolfpack_state::screen_eof_wolfpack(screen_device &screen, bool state) // rising edge if (state) { - int x; int y; diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c index 39f802d215a..6f32b94d3e0 100644 --- a/src/mame/video/wwfsstar.c +++ b/src/mame/video/wwfsstar.c @@ -17,14 +17,12 @@ WRITE16_MEMBER(wwfsstar_state::wwfsstar_fg0_videoram_w) { - COMBINE_DATA(&m_fg0_videoram[offset]); m_fg0_tilemap->mark_tile_dirty(offset/2); } WRITE16_MEMBER(wwfsstar_state::wwfsstar_bg0_videoram_w) { - COMBINE_DATA(&m_bg0_videoram[offset]); m_bg0_tilemap->mark_tile_dirty(offset/2); } @@ -207,7 +205,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r void wwfsstar_state::video_start() { - m_fg0_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(wwfsstar_state::get_fg0_tile_info),this),TILEMAP_SCAN_ROWS, 8, 8,32,32); m_fg0_tilemap->set_transparent_pen(0); @@ -217,7 +214,6 @@ void wwfsstar_state::video_start() UINT32 wwfsstar_state::screen_update_wwfsstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg0_tilemap->set_scrolly(0, m_scrolly ); m_bg0_tilemap->set_scrollx(0, m_scrollx ); diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c index 66cc0cf83c5..9ad27210505 100644 --- a/src/mame/video/xain.c +++ b/src/mame/video/xain.c @@ -122,28 +122,24 @@ WRITE8_MEMBER(xain_state::xain_charram_w) WRITE8_MEMBER(xain_state::xain_scrollxP0_w) { - m_scrollxP0[offset] = data; m_bgram0_tilemap->set_scrollx(0, m_scrollxP0[0]|(m_scrollxP0[1]<<8)); } WRITE8_MEMBER(xain_state::xain_scrollyP0_w) { - m_scrollyP0[offset] = data; m_bgram0_tilemap->set_scrolly(0, m_scrollyP0[0]|(m_scrollyP0[1]<<8)); } WRITE8_MEMBER(xain_state::xain_scrollxP1_w) { - m_scrollxP1[offset] = data; m_bgram1_tilemap->set_scrollx(0, m_scrollxP1[0]|(m_scrollxP1[1]<<8)); } WRITE8_MEMBER(xain_state::xain_scrollyP1_w) { - m_scrollyP1[offset] = data; m_bgram1_tilemap->set_scrolly(0, m_scrollyP1[0]|(m_scrollyP1[1]<<8)); } diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index 32ebd3a131b..a073e52275e 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -215,7 +215,6 @@ TILE_GET_INFO_MEMBER(xevious_state::get_bg_tile_info) VIDEO_START_MEMBER(xevious_state,xevious) { - m_bg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xevious_state::get_bg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); m_fg_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xevious_state::get_fg_tile_info),this),TILEMAP_SCAN_ROWS,8,8,64,32); @@ -497,7 +496,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re UINT32 xevious_state::screen_update_xevious(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0,0); draw_sprites(machine(), bitmap,cliprect); m_fg_tilemap->draw(bitmap, cliprect, 0,0); diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c index 3fdc92745d2..16a93a3fde5 100644 --- a/src/mame/video/xexex.c +++ b/src/mame/video/xexex.c @@ -33,7 +33,6 @@ void xexex_tile_callback(running_machine &machine, int layer, int *code, int *co void xexex_state::video_start() { - assert(machine().primary_screen->format() == BITMAP_FORMAT_RGB32); m_cur_alpha = 0; diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 1e74e9d0775..5123d97041d 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -53,7 +53,6 @@ void xmen_sprite_callback( running_machine &machine, int *code, int *color, int VIDEO_START_MEMBER(xmen_state,xmen6p) { - k053247_get_ram(m_k053246, &m_k053247_ram); m_screen_left = auto_bitmap_ind16_alloc(machine(), 64 * 8, 32 * 8); @@ -157,7 +156,6 @@ void xmen_state::screen_eof_xmen6p(screen_device &screen, bool state) address_space &space = machine().driver_data()->generic_space(); if (machine().primary_screen->frame_number() & 0x01) { - /* copy the desired spritelist to the chip */ memcpy(m_k053247_ram, m_xmen6p_spriteramright, 0x1000); diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c index 15d2fe0c22c..2bd9863f3ac 100644 --- a/src/mame/video/xyonix.c +++ b/src/mame/video/xyonix.c @@ -43,20 +43,17 @@ TILE_GET_INFO_MEMBER(xyonix_state::get_xyonix_tile_info) WRITE8_MEMBER(xyonix_state::xyonix_vidram_w) { - m_vidram[offset] = data; m_tilemap->mark_tile_dirty((offset-1)&0x0fff); } void xyonix_state::video_start() { - m_tilemap = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(xyonix_state::get_xyonix_tile_info),this), TILEMAP_SCAN_ROWS, 4, 8, 80, 32); } UINT32 xyonix_state::screen_update_xyonix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap->draw(bitmap, cliprect, 0, 0); return 0; } diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 4730a93069c..06f2eb3cfd3 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -591,7 +591,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r } switch( size ) { - case SZ_8X8 : code = ( (int)ygv608.regs.s.sba << 8 ) | (int)sa->sn; if (spf != 0) @@ -1320,7 +1319,6 @@ static void HandleRomTransfers(running_machine &machine) /* scroll table */ if( ygv608.ports.s.tl ) { - int dest = (int)ygv608.regs.s.sca; if( ygv608.regs.s.p2_b_a ) dest += 0x100; @@ -1337,7 +1335,6 @@ static void HandleRomTransfers(running_machine &machine) /* sprite attribute table */ if( ygv608.ports.s.ts ) { - int dest = (int)ygv608.regs.s.saa; /* fudge a transfer for now... */ @@ -1379,7 +1376,6 @@ void nvsram( offs_t offset, UINT16 data ) static void SetPreShortcuts( int reg, int data ) { switch( reg ) { - case 7 : if( ( ( data >> MD_SHIFT ) & MD_MASK ) != (ygv608.regs.s.r7 & r7_md)) ygv608.tilemap_resize = 1; diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index 9f9c1b5d874..ff3bb8b1be5 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -281,7 +281,6 @@ struct SPRITE_ATTR { struct YGV608 { - union { UINT8 b[8]; YGV_PORTS s; diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c index 952d171c316..0a1e3a5a768 100644 --- a/src/mame/video/yiear.c +++ b/src/mame/video/yiear.c @@ -140,7 +140,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 yiear_state::screen_update_yiear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_bg_tilemap->draw(bitmap, cliprect, 0, 0); draw_sprites(machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c index c8b9e1d8e18..69c76fa191f 100644 --- a/src/mame/video/yunsun16.c +++ b/src/mame/video/yunsun16.c @@ -71,14 +71,12 @@ TILE_GET_INFO_MEMBER(yunsun16_state::get_tile_info_1) WRITE16_MEMBER(yunsun16_state::yunsun16_vram_0_w) { - COMBINE_DATA(&m_vram_0[offset]); m_tilemap_0->mark_tile_dirty(offset / 2); } WRITE16_MEMBER(yunsun16_state::yunsun16_vram_1_w) { - COMBINE_DATA(&m_vram_1[offset]); m_tilemap_1->mark_tile_dirty(offset / 2); } @@ -94,7 +92,6 @@ WRITE16_MEMBER(yunsun16_state::yunsun16_vram_1_w) void yunsun16_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_0),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), 16,16, TILES_PER_PAGE_X*PAGES_PER_TMAP_X,TILES_PER_PAGE_Y*PAGES_PER_TMAP_Y); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsun16_state::get_tile_info_1),this),tilemap_mapper_delegate(FUNC(yunsun16_state::yunsun16_tilemap_scan_pages),this), @@ -197,7 +194,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const UINT32 yunsun16_state::screen_update_yunsun16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - m_tilemap_0->set_scrollx(0, m_scrollram_0[0]); m_tilemap_0->set_scrolly(0, m_scrollram_0[1]); diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 203dd72069f..1bdbb8cd4dc 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -64,7 +64,6 @@ READ8_MEMBER(yunsung8_state::yunsung8_videoram_r) WRITE8_MEMBER(yunsung8_state::yunsung8_videoram_w) { - if (offset < 0x0800) // c000-c7ff Banked Palette RAM { int bank = m_videobank & 2; @@ -171,7 +170,6 @@ TILE_GET_INFO_MEMBER(yunsung8_state::get_tile_info_1) void yunsung8_state::video_start() { - m_tilemap_0 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_0),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_0, DIM_NY_0 ); m_tilemap_1 = &machine().tilemap().create(tilemap_get_info_delegate(FUNC(yunsung8_state::get_tile_info_1),this), TILEMAP_SCAN_ROWS, 8, 8, DIM_NX_1, DIM_NY_1 ); diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index d9d11146e80..0a156737636 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -158,7 +158,6 @@ VIDEO_START_MEMBER(zaxxon_state,razmataz) VIDEO_START_MEMBER(zaxxon_state,congo) { - /* allocate our own spriteram since it is not accessible by the main CPU */ m_spriteram.allocate(0x100); @@ -180,7 +179,6 @@ VIDEO_START_MEMBER(zaxxon_state,congo) WRITE8_MEMBER(zaxxon_state::zaxxon_flipscreen_w) { - /* low bit controls flip; background and sprite flip are handled at render time */ flip_screen_set_no_update(~data & 1); m_fg_tilemap->set_flip(flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); @@ -189,7 +187,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_flipscreen_w) WRITE8_MEMBER(zaxxon_state::zaxxon_fg_color_w) { - /* low bit selects high color palette index */ m_fg_color = (data & 1) * 0x80; m_fg_tilemap->set_palette_offset(m_fg_color + (m_congo_color_bank << 8)); @@ -198,7 +195,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_fg_color_w) WRITE8_MEMBER(zaxxon_state::zaxxon_bg_position_w) { - /* 11 bits of scroll position are stored */ if (offset == 0) m_bg_position = (m_bg_position & 0x700) | ((data << 0) & 0x0ff); @@ -209,7 +205,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_bg_position_w) WRITE8_MEMBER(zaxxon_state::zaxxon_bg_color_w) { - /* low bit selects high color palette index */ m_bg_color = (data & 1) * 0x80; } @@ -217,7 +212,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_bg_color_w) WRITE8_MEMBER(zaxxon_state::zaxxon_bg_enable_w) { - /* low bit enables/disables the background layer */ m_bg_enable = data & 1; } @@ -225,7 +219,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_bg_enable_w) WRITE8_MEMBER(zaxxon_state::congo_fg_bank_w) { - /* low bit controls the topmost character bit */ m_congo_fg_bank = data & 1; m_fg_tilemap->mark_all_dirty(); @@ -234,7 +227,6 @@ WRITE8_MEMBER(zaxxon_state::congo_fg_bank_w) WRITE8_MEMBER(zaxxon_state::congo_color_bank_w) { - /* low bit controls the topmost bit into the color PROM */ m_congo_color_bank = data & 1; m_fg_tilemap->set_palette_offset(m_fg_color + (m_congo_color_bank << 8)); @@ -250,7 +242,6 @@ WRITE8_MEMBER(zaxxon_state::congo_color_bank_w) WRITE8_MEMBER(zaxxon_state::zaxxon_videoram_w) { - m_videoram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -258,7 +249,6 @@ WRITE8_MEMBER(zaxxon_state::zaxxon_videoram_w) WRITE8_MEMBER(zaxxon_state::congo_colorram_w) { - m_colorram[offset] = data; m_fg_tilemap->mark_tile_dirty(offset); } @@ -462,7 +452,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r UINT32 zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(machine(), bitmap, cliprect, TRUE); draw_sprites(machine(), bitmap, cliprect, 0x140, 0x180); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -472,7 +461,6 @@ UINT32 zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 &b UINT32 zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(machine(), bitmap, cliprect, TRUE); draw_sprites(machine(), bitmap, cliprect, 0x180, 0x180); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -482,7 +470,6 @@ UINT32 zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 &b UINT32 zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(machine(), bitmap, cliprect, FALSE); draw_sprites(machine(), bitmap, cliprect, 0x140, 0x180); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); @@ -492,7 +479,6 @@ UINT32 zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind16 UINT32 zaxxon_state::screen_update_congo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - draw_background(machine(), bitmap, cliprect, TRUE); draw_sprites(machine(), bitmap, cliprect, 0x280, 0x180); m_fg_tilemap->draw(bitmap, cliprect, 0, 0); diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c index 9137f1002ce..fb8b7b27d02 100644 --- a/src/mame/video/zodiack.c +++ b/src/mame/video/zodiack.c @@ -101,7 +101,6 @@ PALETTE_INIT_MEMBER(zodiack_state,zodiack) TILE_GET_INFO_MEMBER(zodiack_state::get_bg_tile_info) { - int code = m_videoram_2[tile_index]; int color = (m_attributeram[2 * (tile_index % 32) + 1] >> 4) & 0x07; @@ -110,7 +109,6 @@ TILE_GET_INFO_MEMBER(zodiack_state::get_bg_tile_info) TILE_GET_INFO_MEMBER(zodiack_state::get_fg_tile_info) { - int code = m_videoram[tile_index]; int color = m_attributeram[2 * (tile_index % 32) + 1] & 0x07; diff --git a/src/mess/audio/arcadia.c b/src/mess/audio/arcadia.c index 707d0ef7f75..96416c65fcf 100644 --- a/src/mess/audio/arcadia.c +++ b/src/mess/audio/arcadia.c @@ -102,7 +102,6 @@ void arcadia_sound_device::sound_stream_update(sound_stream &stream, stream_samp m_pos++; if (m_pos >= m_size){ - //calculate new noise bit ( taps: 0000T000T) unsigned char newBit = m_lfsr & 1; //first tap newBit = (newBit ^ ((m_lfsr & 0x10)?1:0) );//xor with second tap diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c index 1fffa607c6c..65220cc6109 100644 --- a/src/mess/audio/dave.c +++ b/src/mess/audio/dave.c @@ -346,7 +346,6 @@ static STREAM_UPDATE( dave_update_sound ) { if ((dave->Regs[7] & (1<level[i]) vol[i] += dave->Count[i]; dave->Count[i] -= STEP; /* Period[i] is the half period of the square wave. Here, in each */ diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c index 8b6b1960d2b..2e47c1a7195 100644 --- a/src/mess/audio/mea8000.c +++ b/src/mess/audio/mea8000.c @@ -72,7 +72,6 @@ struct filter_t struct mea8000_t { - /* configuration parameters */ const mea8000_interface* iface; @@ -552,7 +551,6 @@ READ8_DEVICE_HANDLER ( mea8000_r ) mea8000_t* mea8000 = get_safe_token( device ); switch ( offset ) { - case 0: /* status register */ case 1: /* ready to accept next frame */ @@ -572,7 +570,6 @@ WRITE8_DEVICE_HANDLER ( mea8000_w ) mea8000_t* mea8000 = get_safe_token( device ); switch ( offset ) { - case 0: /* data register */ if (mea8000->state == MEA8000_STOPPED) { diff --git a/src/mess/audio/t6721.h b/src/mess/audio/t6721.h index d24db20487f..cc040eb28ad 100644 --- a/src/mess/audio/t6721.h +++ b/src/mess/audio/t6721.h @@ -34,8 +34,7 @@ extern const device_type T6721; #define MCFG_T6721_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, T6721, 0) \ - + MCFG_DEVICE_ADD(_tag, T6721, 0) /*----------- defined in audio/t6721.c -----------*/ diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c index 63dfe2765ca..62ba02fbb4d 100644 --- a/src/mess/audio/upd1771.c +++ b/src/mess/audio/upd1771.c @@ -345,7 +345,6 @@ WRITE8_DEVICE_HANDLER( upd1771_w ) } switch(state->packet[0]){ - case 0: { state->state = STATE_SILENCE; @@ -451,12 +450,10 @@ static STREAM_UPDATE( upd1771c_update ) // (int)state->t_timbre,(int)state->t_offset,(int)state->t_volume,(int)state->t_period,(int)state->t_tpos); while ( --samples >= 0 ){ - *buffer++ = (WAVEFORMS[state->t_timbre][state->t_tpos])*state->t_volume * 2; state->t_ppos++; if (state->t_ppos >= state->t_period){ - state->t_tpos++; if (state->t_tpos == 32) state->t_tpos = state->t_offset; @@ -469,7 +466,6 @@ static STREAM_UPDATE( upd1771c_update ) case STATE_NOISE: { while (--samples >= 0 ){ - *buffer = 0; //"wavetable-LFSR" component @@ -486,7 +482,6 @@ static STREAM_UPDATE( upd1771c_update ) //mix in each of the noise's 3 pulse components char res[3]; for (size_t i=0;i<3;++i){ - res[i] = state->n_value[i]* 127; state->n_ppos[i]++; if (state->n_ppos[i] >= state->n_period[i]){ diff --git a/src/mess/devices/microdrv.c b/src/mess/devices/microdrv.c index db3bc55c01f..fb3e43fed72 100644 --- a/src/mess/devices/microdrv.c +++ b/src/mess/devices/microdrv.c @@ -45,7 +45,6 @@ microdrive_image_device::microdrive_image_device(const machine_config &mconfig, : device_t(mconfig, MICRODRIVE, "Microdrive", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/mess/drivers/altair.c b/src/mess/drivers/altair.c index f98d01b29d2..f256758f46a 100644 --- a/src/mess/drivers/altair.c +++ b/src/mess/drivers/altair.c @@ -53,7 +53,6 @@ READ8_MEMBER(altair_state::sio_status_r) WRITE8_MEMBER(altair_state::sio_command_w) { - } READ8_MEMBER(altair_state::sio_data_r) diff --git a/src/mess/drivers/amico2k.c b/src/mess/drivers/amico2k.c index ea2eca7d8f7..2c88725215a 100644 --- a/src/mess/drivers/amico2k.c +++ b/src/mess/drivers/amico2k.c @@ -100,7 +100,6 @@ INPUT_PORTS_END TIMER_CALLBACK_MEMBER(amico2k_state::led_refresh) { - if (m_ls145_p > 3) { output_set_digit_value(m_ls145_p - 4, m_segment); diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index 671c075e871..37541cecda8 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -768,7 +768,6 @@ void apc_state::machine_reset() void apc_state::palette_init() { - } static UPD7220_INTERFACE( hgdc_1_intf ) diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index c9ff007a4dd..c5093f900cf 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -358,7 +358,6 @@ static const pia6821_interface apf_imagination_pia_interface= void apf_state::machine_start() { - m_apf_ints = 0; if (m_cass) // apfimag only diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c index cb402c852ac..41dd3752547 100644 --- a/src/mess/drivers/apollo.c +++ b/src/mess/drivers/apollo.c @@ -464,7 +464,6 @@ READ32_MEMBER(apollo_state::ram_with_parity_r){ } WRITE32_MEMBER(apollo_state::ram_with_parity_w){ - COMBINE_DATA(m_messram_ptr+offset); if (apollo_csr_get_control_register() & APOLLO_CSR_CR_FORCE_BAD_PARITY) { diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 54297737dfe..36e68475fcc 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -186,7 +186,6 @@ static const wd17xx_interface apricot_wd17xx_intf = UINT32 apricot_state::screen_update_apricot(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (!m_display_on) m_crtc->screen_update( screen, bitmap, cliprect); else diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 5a62548ff4b..46c971b072a 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -165,7 +165,6 @@ WRITE8_MEMBER( fp_state::ls_w ) WRITE8_MEMBER( fp_state::contrast_w ) { - } diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index 63a283b264c..8be6b9598fc 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -481,7 +481,6 @@ void st_state::mouse_tick() TIMER_CALLBACK_MEMBER(st_state::st_mouse_tick) { - mouse_tick(); } @@ -777,7 +776,6 @@ void ste_state::dmasound_tick() TIMER_CALLBACK_MEMBER(ste_state::atariste_dmasound_tick) { - dmasound_tick(); } @@ -1027,7 +1025,6 @@ void ste_state::microwire_tick() TIMER_CALLBACK_MEMBER(ste_state::atariste_microwire_tick) { - microwire_tick(); } diff --git a/src/mess/drivers/atm.c b/src/mess/drivers/atm.c index 5047e5f5df3..471015876cb 100644 --- a/src/mess/drivers/atm.c +++ b/src/mess/drivers/atm.c @@ -92,7 +92,6 @@ static void atm_update_memory(running_machine &machine) WRITE8_MEMBER(atm_state::atm_port_7ffd_w) { - /* disable paging */ if (m_port_7ffd_data & 0x20) return; diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c index f10c5566f4f..82271fe4638 100644 --- a/src/mess/drivers/b16.c +++ b/src/mess/drivers/b16.c @@ -237,7 +237,6 @@ GFXDECODE_END void b16_state::machine_start() { - m_dma8237 = machine().device( "dma8237" ); m_mc6845 = machine().device("crtc"); } diff --git a/src/mess/drivers/babbage.c b/src/mess/drivers/babbage.c index 34b48de53e5..d2bdf2dbd9c 100644 --- a/src/mess/drivers/babbage.c +++ b/src/mess/drivers/babbage.c @@ -223,7 +223,6 @@ static const z80_daisy_config babbage_daisy_chain[] = TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback) { - UINT8 i, j, inp; char kbdrow[6]; UINT8 data = 0xff; diff --git a/src/mess/drivers/beta.c b/src/mess/drivers/beta.c index 0784194c5a2..97bb5c2f319 100644 --- a/src/mess/drivers/beta.c +++ b/src/mess/drivers/beta.c @@ -86,7 +86,6 @@ INPUT_PORTS_END TIMER_CALLBACK_MEMBER(beta_state::led_refresh) { - if (m_ls145_p < 6) { output_set_digit_value(m_ls145_p, m_segment); diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 4070197a778..f6b87389dac 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -409,7 +409,6 @@ const z80sio_interface sio_intf = TIMER_DEVICE_CALLBACK_MEMBER(bigbord2_state::ctc_tick) { - m_ctcb->trg0(1); m_ctcb->trg1(1); m_ctcb->trg0(0); diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c index d8fd6c1f6e4..f8b4c118766 100644 --- a/src/mess/drivers/bmjr.c +++ b/src/mess/drivers/bmjr.c @@ -385,7 +385,6 @@ ROM_END /* Driver */ DRIVER_INIT_MEMBER(bmjr_state,bmjr) { - } /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index 367200595da..00ab85725b8 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -613,7 +613,6 @@ INTERRUPT_GEN_MEMBER(bml3_state::bml3_irq) INTERRUPT_GEN_MEMBER(bml3_state::bml3_timer_firq) { - if(!m_firq_mask) { m_maincpu->set_input_line(M6809_FIRQ_LINE, ASSERT_LINE); @@ -631,7 +630,6 @@ void bml3_state::palette_init() void bml3_state::machine_start() { - beep_set_frequency(machine().device(BEEPER_TAG),1200); //guesswork beep_set_state(machine().device(BEEPER_TAG),0); m_extram = auto_alloc_array(machine(),UINT8,0x10000); diff --git a/src/mess/drivers/busicom.c b/src/mess/drivers/busicom.c index 2ffcb7bcccf..24b35c68e1b 100644 --- a/src/mess/drivers/busicom.c +++ b/src/mess/drivers/busicom.c @@ -68,7 +68,6 @@ WRITE8_MEMBER(busicom_state::printer_w) } } if (BIT(data,3)) { - for(j=0;j<10;j++) { for(i=0;i<17;i++) { m_printer_line[j][i] = m_printer_line[j+1][i]; diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c index 546801dd0e3..34b80ee5465 100644 --- a/src/mess/drivers/casloopy.c +++ b/src/mess/drivers/casloopy.c @@ -162,7 +162,6 @@ public: void casloopy_state::video_start() { - } UINT32 casloopy_state::screen_update_casloopy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index a5b85608bdf..d9edf36af37 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -312,7 +312,6 @@ static IRQ_CALLBACK(cat_int_ack) MACHINE_START_MEMBER(cat_state,cat) { - m_duart_inp = 0x0e; m_keyboard_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cat_state::keyboard_callback),this)); machine().device("nvram")->set_base(m_p_sram, 0x4000); diff --git a/src/mess/drivers/coleco.c b/src/mess/drivers/coleco.c index 76695dcc066..5c6e60800cf 100644 --- a/src/mess/drivers/coleco.c +++ b/src/mess/drivers/coleco.c @@ -176,14 +176,12 @@ WRITE_LINE_MEMBER(coleco_state::coleco_vdp_interrupt) TIMER_CALLBACK_MEMBER(coleco_state::paddle_d7reset_callback) { - m_joy_d7_state[param] = 0; m_joy_analog_state[param] = 0; } TIMER_CALLBACK_MEMBER(coleco_state::paddle_irqreset_callback) { - m_joy_irq_state[param] = 0; if (!m_joy_irq_state[param ^ 1]) @@ -192,7 +190,6 @@ TIMER_CALLBACK_MEMBER(coleco_state::paddle_irqreset_callback) TIMER_CALLBACK_MEMBER(coleco_state::paddle_pulse_callback) { - if (m_joy_analog_reload[param]) { m_joy_analog_state[param] = m_joy_analog_reload[param]; diff --git a/src/mess/drivers/cxhumax.c b/src/mess/drivers/cxhumax.c index a621b2ec639..8c634e03665 100644 --- a/src/mess/drivers/cxhumax.c +++ b/src/mess/drivers/cxhumax.c @@ -989,7 +989,6 @@ void cxhumax_state::machine_start() void cxhumax_state::machine_reset() { - m_i2c0_regs[0x08/4] = 0x08; // SDA high m_i2c2_regs[0x08/4] = 0x08; // SDA high diff --git a/src/mess/drivers/dm7000.c b/src/mess/drivers/dm7000.c index 19965dd83f4..31ac847f5bf 100644 --- a/src/mess/drivers/dm7000.c +++ b/src/mess/drivers/dm7000.c @@ -250,7 +250,6 @@ INPUT_PORTS_END void dm7000_state::machine_reset() { - dcr[DCRSTB045_CICVCR] = 0x00000001; dcr[DCRSTB045_SCCR] = 0x00420080 /* default for serial divs */ | 0x3f /* undocumented?? used to print clocks */; dcr[DCRSTB045_VIDEO_CNTL] = 0x00009000; diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c index 342e1ac5150..1787dc47c0e 100644 --- a/src/mess/drivers/eacc.c +++ b/src/mess/drivers/eacc.c @@ -143,7 +143,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(eacc_state::eacc_cb1) TIMER_DEVICE_CALLBACK_MEMBER(eacc_state::eacc_nmi) { - if (m_cb2) { m_nmi = true; diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index 1bb82bba8a7..433b036a92e 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -204,7 +204,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(einstein_state::einstein_keyboard_timer_callback) WRITE8_MEMBER(einstein_state::einstein_keyboard_line_write) { - if (VERBOSE_KEYBOARD) logerror("einstein_keyboard_line_write: %02x\n", data); @@ -216,7 +215,6 @@ WRITE8_MEMBER(einstein_state::einstein_keyboard_line_write) READ8_MEMBER(einstein_state::einstein_keyboard_data_read) { - /* re-scan the keyboard */ einstein_scan_keyboard(machine()); @@ -339,7 +337,6 @@ READ8_MEMBER(einstein_state::einstein_kybintmsk_r) WRITE8_MEMBER(einstein_state::einstein_kybintmsk_w) { - logerror("%s: einstein_kybintmsk_w %02x\n", machine().describe_context(), data); /* set mask from bit 0 */ @@ -359,7 +356,6 @@ WRITE8_MEMBER(einstein_state::einstein_kybintmsk_w) /* writing 0 enables the /ADC interrupt */ WRITE8_MEMBER(einstein_state::einstein_adcintmsk_w) { - logerror("%s: einstein_adcintmsk_w %02x\n", machine().describe_context(), data); if (data & 0x01) @@ -378,7 +374,6 @@ WRITE8_MEMBER(einstein_state::einstein_adcintmsk_w) /* writing 0 enables the /FIRE interrupt */ WRITE8_MEMBER(einstein_state::einstein_fire_int_w) { - logerror("%s: einstein_fire_int_w %02x\n", machine().describe_context(), data); if (data & 0x01) @@ -446,7 +441,6 @@ void einstein_state::machine_reset() MACHINE_RESET_MEMBER(einstein_state,einstein2) { - /* call standard initialization first */ einstein_state::machine_reset(); @@ -472,7 +466,6 @@ MACHINE_START_MEMBER(einstein_state,einstein2) UINT32 einstein_state::screen_update_einstein2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - if (&screen == m_color_screen) { tms9929a_device *tms9929a = machine().device( "tms9929a" ); diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index f6d5c46ca75..2736b0d2b30 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -1000,14 +1000,12 @@ DRIVER_INIT_MEMBER(esq5505_state,common) DRIVER_INIT_MEMBER(esq5505_state,eps) { - DRIVER_INIT_CALL(common); m_system_type = EPS; } DRIVER_INIT_MEMBER(esq5505_state,sq1) { - DRIVER_INIT_CALL(common); m_system_type = SQ1; } diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c index 23f71a9a298..e693df8b830 100644 --- a/src/mess/drivers/fidelz80.c +++ b/src/mess/drivers/fidelz80.c @@ -1083,13 +1083,11 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(fidelz80_state::fidelz80_trigger_reset) { - m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE); } INPUT_CHANGED_MEMBER(fidelz80_state::abc_trigger_reset) { - m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE); m_i8041->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c index a55003469f5..50e3af653fd 100644 --- a/src/mess/drivers/fk1.c +++ b/src/mess/drivers/fk1.c @@ -386,7 +386,6 @@ INPUT_PORTS_END TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::keyboard_callback) { - if (machine().root_device().ioport("LINE0")->read()) { m_int_vector = 6; @@ -415,7 +414,6 @@ static IRQ_CALLBACK (fk1_irq_callback) TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::vsync_callback) { - m_int_vector = 3; machine().device("maincpu")->execute().set_input_line(0, HOLD_LINE); } diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index 8e3b16b0976..462ed23dc65 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -1888,7 +1888,6 @@ MACHINE_START_MEMBER(fm7_state,fm11) MACHINE_START_MEMBER(fm7_state,fm16) { - m_type = SYS_FM16; beep_set_frequency(machine().device(BEEPER_TAG),1200); beep_set_state(machine().device(BEEPER_TAG),0); diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c index 0a005b74eb3..fee05e102cf 100644 --- a/src/mess/drivers/fp1100.c +++ b/src/mess/drivers/fp1100.c @@ -397,7 +397,6 @@ static const mc6845_interface mc6845_intf = INTERRUPT_GEN_MEMBER(fp1100_state::fp1100_vblank_irq) { - if(irq_mask & 0x10) machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xf0); } diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c index afab81b000f..ed254800ae8 100644 --- a/src/mess/drivers/fp6000.c +++ b/src/mess/drivers/fp6000.c @@ -142,27 +142,23 @@ UINT32 fp6000_state::screen_update_fp6000(screen_device &screen, bitmap_ind16 &b READ8_MEMBER(fp6000_state::fp6000_pcg_r) { - return m_char_rom[offset]; } WRITE8_MEMBER(fp6000_state::fp6000_pcg_w) { - m_char_rom[offset] = data; machine().gfx[0]->mark_dirty(offset >> 4); } WRITE8_MEMBER(fp6000_state::fp6000_6845_address_w) { - m_crtc_index = data; m_mc6845->address_w(space, offset, data); } WRITE8_MEMBER(fp6000_state::fp6000_6845_data_w) { - m_crtc_vreg[m_crtc_index] = data; m_mc6845->register_w(space, offset, data); } @@ -179,7 +175,6 @@ ADDRESS_MAP_END /* Hack until I understand what UART is this one ... */ READ8_MEMBER(fp6000_state::fp6000_key_r) { - if(offset) { switch(m_key.cmd) @@ -197,7 +192,6 @@ READ8_MEMBER(fp6000_state::fp6000_key_r) WRITE8_MEMBER(fp6000_state::fp6000_key_w) { - if(offset) m_key.cmd = (data & 0xff) | (m_key.cmd << 8); else @@ -278,7 +272,6 @@ GFXDECODE_END void fp6000_state::machine_start() { - m_char_rom = memregion("pcg")->base(); m_mc6845 = machine().device("crtc"); } diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index b410cdead8b..a1b6788443c 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -513,7 +513,6 @@ TIMER_CALLBACK_MEMBER(gba_state::timer_expire) TIMER_CALLBACK_MEMBER(gba_state::handle_irq) { - gba_request_irq(machine(), m_IF); m_irq_timer->adjust(attotime::never); @@ -877,7 +876,6 @@ READ32_MEMBER(gba_state::gba_io_r) } else { - time = m_tmr_timer[timer]->elapsed().as_double(); ticks = (double)(0x10000 - (m_timer_regs[timer] & 0xffff)); @@ -2169,7 +2167,6 @@ void gba_state::machine_reset() void gba_state::machine_start() { - /* add a hook for battery save */ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(gba_machine_stop),&machine())); @@ -2213,13 +2210,11 @@ ROM_END READ32_MEMBER(gba_state::sram_r) { - return m_gba_sram[offset]; } WRITE32_MEMBER(gba_state::sram_w) { - COMBINE_DATA(&m_gba_sram[offset]); } @@ -2239,7 +2234,6 @@ READ32_MEMBER(gba_state::flash_r) WRITE32_MEMBER(gba_state::flash_w) { - offset &= m_flash_mask; switch (mem_mask) { @@ -2317,7 +2311,6 @@ READ32_MEMBER(gba_state::eeprom_r) WRITE32_MEMBER(gba_state::eeprom_w) { - if (~mem_mask == 0x0000ffff) { data >>= 16; diff --git a/src/mess/drivers/glasgow.c b/src/mess/drivers/glasgow.c index ac3f8300a1e..83c643b43c4 100644 --- a/src/mess/drivers/glasgow.c +++ b/src/mess/drivers/glasgow.c @@ -287,7 +287,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(glasgow_state::update_nmi32) void glasgow_state::machine_start() { - mboard_key_selector = 0; m_irq_flag = 0; m_lcd_shift_counter = 3; @@ -299,7 +298,6 @@ void glasgow_state::machine_start() MACHINE_START_MEMBER(glasgow_state,dallas32) { - m_lcd_shift_counter = 3; beep_set_frequency(m_beep, 44); diff --git a/src/mess/drivers/h89.c b/src/mess/drivers/h89.c index 98670f12cad..e23044c7db2 100644 --- a/src/mess/drivers/h89.c +++ b/src/mess/drivers/h89.c @@ -100,7 +100,6 @@ void h89_state::machine_reset() TIMER_DEVICE_CALLBACK_MEMBER(h89_state::h89_irq_timer) { - if (m_port_f2 & 0x02) m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xcf); } diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c index 9ecd7802ca6..39b2910a214 100644 --- a/src/mess/drivers/homelab.c +++ b/src/mess/drivers/homelab.c @@ -124,7 +124,6 @@ WRITE8_MEMBER( homelab_state::cass_w ) MACHINE_RESET_MEMBER(homelab_state,homelab3) { - } MACHINE_RESET_MEMBER(homelab_state,brailab4) @@ -134,12 +133,10 @@ MACHINE_RESET_MEMBER(homelab_state,brailab4) WRITE8_MEMBER( homelab_state::port7f_w ) { - } WRITE8_MEMBER( homelab_state::portff_w ) { - } WRITE8_MEMBER( homelab_state::brailab4_port7f_w ) diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c index bee070f31de..30fb758c5b2 100644 --- a/src/mess/drivers/intv.c +++ b/src/mess/drivers/intv.c @@ -964,14 +964,12 @@ ROM_END DRIVER_INIT_MEMBER(intv_state,intv) { - m_x_scale = INTV_X_SCALE; m_y_scale = INTV_Y_SCALE; } DRIVER_INIT_MEMBER(intv_state,intvkbd) { - m_x_scale = INTVKBD_X_SCALE; m_y_scale = INTVKBD_Y_SCALE; } diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c index 3b6a544edcf..37ed62cff5a 100644 --- a/src/mess/drivers/ip20.c +++ b/src/mess/drivers/ip20.c @@ -556,7 +556,6 @@ TIMER_CALLBACK_MEMBER(ip20_state::ip20_timer) void ip20_state::machine_start() { - sgi_mc_init(machine()); m_HPC.nMiscStatus = 0; diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c index 62c6a3224a9..4c1aaccc886 100644 --- a/src/mess/drivers/ip22.c +++ b/src/mess/drivers/ip22.c @@ -1243,7 +1243,6 @@ void ip22_state::machine_reset() static void dump_chain(address_space &space, UINT32 ch_base) { - printf("node: %08x %08x %08x (len = %x)\n", space.read_dword(ch_base), space.read_dword(ch_base+4), space.read_dword(ch_base+8), space.read_dword(ch_base+4) & 0x3fff); if ((space.read_dword(ch_base+8) != 0) && !(space.read_dword(ch_base+4) & 0x80000000)) diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c index 710a6ed80a8..5ad6cf4efae 100644 --- a/src/mess/drivers/iq151.c +++ b/src/mess/drivers/iq151.c @@ -323,7 +323,6 @@ WRITE_LINE_MEMBER( iq151_state::pic_set_int_line ) INTERRUPT_GEN_MEMBER(iq151_state::iq151_vblank_interrupt) { - pic8259_ir6_w(m_pic, m_vblank_irq_state & 1); m_vblank_irq_state ^= 1; } @@ -337,7 +336,6 @@ static IRQ_CALLBACK(iq151_irq_callback) TIMER_DEVICE_CALLBACK_MEMBER(iq151_state::cassette_timer) { - m_cassette_clk ^= 1; m_cassette->output((m_cassette_data & 1) ^ (m_cassette_clk & 1) ? +1 : -1); @@ -345,7 +343,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(iq151_state::cassette_timer) DRIVER_INIT_MEMBER(iq151_state,iq151) { - UINT8 *RAM = memregion("maincpu")->base(); membank("boot")->configure_entry(0, RAM + 0xf800); membank("boot")->configure_entry(1, RAM + 0x0000); diff --git a/src/mess/drivers/korgm1.c b/src/mess/drivers/korgm1.c index 2814ff5b4fe..937c167f46f 100644 --- a/src/mess/drivers/korgm1.c +++ b/src/mess/drivers/korgm1.c @@ -41,7 +41,6 @@ protected: void korgm1_state::video_start() { - } UINT32 korgm1_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ) diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index b065571da50..c69e1350ce7 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -474,11 +474,9 @@ void m20_state::install_memory() state->membank("dram0_1c000")->set_base(memptr + 0x1c000); if (m_memsize > 128 * 1024) { - /* install memory expansions (DRAM1..DRAM3) */ if (m_memsize < 256 * 1024) { - /* 32K expansion cards */ /* DRAM1, 32K */ @@ -565,7 +563,6 @@ void m20_state::install_memory() } } else { - /* 128K expansion cards */ /* DRAM1, 128K */ diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c index eed1b33cbe1..2493c62a851 100644 --- a/src/mess/drivers/mac.c +++ b/src/mess/drivers/mac.c @@ -94,7 +94,6 @@ INTERRUPT_GEN_MEMBER(mac_state::mac_rbv_vbl) { - m_rbv_regs[2] &= ~0x40; // set vblank signal m_rbv_vbltime = 10; diff --git a/src/mess/drivers/mc10.c b/src/mess/drivers/mc10.c index 7aac09029c0..34d150fc45e 100644 --- a/src/mess/drivers/mc10.c +++ b/src/mess/drivers/mc10.c @@ -226,7 +226,6 @@ READ8_MEMBER( mc10_state::mc10_mc6847_videoram_r ) TIMER_DEVICE_CALLBACK_MEMBER(mc10_state::alice32_scanline) { - m_ef9345->update_scanline((UINT16)param); } diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c index cbbe66056a4..ac2b23e79f4 100644 --- a/src/mess/drivers/mc1000.c +++ b/src/mess/drivers/mc1000.c @@ -496,7 +496,6 @@ DIRECT_UPDATE_MEMBER(mc1000_state::mc1000_direct_update_handler) DRIVER_INIT_MEMBER(mc1000_state,mc1000) { - machine().device(Z80_TAG)->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mc1000_state::mc1000_direct_update_handler), this)); } diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index 96b2cc4519b..8e210823e95 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -489,8 +489,7 @@ MACHINE_CONFIG_END ROM_SYSTEM_BIOS( 1, "sdk", "Mars Version 1.0 (early sdk)" ) \ ROMX_LOAD( "32x_m_bios_sdk.bin", 0x000000, 0x000800, BAD_DUMP CRC(c7102c53) SHA1(ed73a47f186b373b8eff765f84ef26c3d9ef6cb0), ROM_BIOS(2) ) \ ROM_REGION32_BE( 0x400000, "slave", 0 ) /* SH2 Code */ \ - ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) \ - + ROM_LOAD( "32x_s_bios.bin", 0x000000, 0x000400, CRC(bfda1fe5) SHA1(4103668c1bbd66c5e24558e73d4f3f92061a109a) ) ROM_START( 32x ) _32X_ROMS diff --git a/src/mess/drivers/mikrosha.c b/src/mess/drivers/mikrosha.c index 961bf270f71..5e97126cb83 100644 --- a/src/mess/drivers/mikrosha.c +++ b/src/mess/drivers/mikrosha.c @@ -153,7 +153,6 @@ static const cassette_interface mikrosha_cassette_interface = WRITE_LINE_MEMBER(mikrosha_state::mikrosha_pit_out2) { - } static const struct pit8253_config mikrosha_pit8253_intf = diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index eb6c31deee6..40c495974ee 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -323,7 +323,6 @@ ROM_END DRIVER_INIT_MEMBER(mirage_state,mirage) { - floppy_connector *con = machine().device("wd1772:0"); floppy_image_device *floppy = con ? con->get_device() : 0; if (floppy) diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c index 611f729a42a..28ee15e02b0 100644 --- a/src/mess/drivers/mmodular.c +++ b/src/mess/drivers/mmodular.c @@ -273,7 +273,6 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO) WRITE8_MEMBER(polgar_state::write_LCD_polgar) { - lcd_char = data; logerror("LCD Data = %d %02x [%c]\n",data,data,(data&0xff)); @@ -636,7 +635,6 @@ WRITE8_MEMBER(polgar_state::monteciv_3006) WRITE8_MEMBER(polgar_state::academy_write_board) { - latch_data = data; // logerror("acad_write_latch %02x\n",data); if (data != 0xff) mboard_write_board_8(space,0, data); @@ -644,7 +642,6 @@ WRITE8_MEMBER(polgar_state::academy_write_board) WRITE8_MEMBER(polgar_state::milano_write_board) { - latch_data = data; } @@ -863,7 +860,6 @@ READ16_MEMBER(polgar_state::read_buttons_van16) WRITE32_MEMBER(polgar_state::write_LCD_data_32) { - // printf("Write LCD Data Latch %08x o: %08x\n",data,offset); logerror("Write LCD Data Latch %08x o: %08x\n",data,offset); lcd32_char = data>>24; @@ -873,13 +869,11 @@ WRITE32_MEMBER(polgar_state::write_LCD_data_32) WRITE16_MEMBER(polgar_state::write_LCD_data) { - lcd32_char = data>>8; } static void write_IOenable(unsigned char data,address_space &space) { - hd44780_device * hd44780 = space.machine().device("hd44780"); device_t *speaker = space.machine().device("beep"); @@ -912,7 +906,6 @@ static void write_IOenable(unsigned char data,address_space &space) { } WRITE32_MEMBER(polgar_state::write_IOenables_32){ - write_IOenable(data>>24,space); } diff --git a/src/mess/drivers/mpf1.c b/src/mess/drivers/mpf1.c index 6223483a0c6..fc495d3b74f 100644 --- a/src/mess/drivers/mpf1.c +++ b/src/mess/drivers/mpf1.c @@ -205,7 +205,6 @@ INPUT_PORTS_END TIMER_CALLBACK_MEMBER(mpf1_state::led_refresh) { - if (BIT(m_lednum, 5)) output_set_digit_value(0, param); if (BIT(m_lednum, 4)) output_set_digit_value(1, param); if (BIT(m_lednum, 3)) output_set_digit_value(2, param); @@ -475,7 +474,6 @@ DIRECT_UPDATE_MEMBER(mpf1_state::mpf1_direct_update_handler) DRIVER_INIT_MEMBER(mpf1_state,mpf1) { - m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this)); } diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index cbe6681da51..7c2b74d9edc 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -859,8 +859,7 @@ INPUT_PORTS_END PORT_BIT (0x0200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) \ PORT_BIT (0x0400, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(UCHAR_MAMEKEY(ASTERISK)) \ PORT_BIT (0x0800, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) \ - PORT_BIT (0xf000, IP_ACTIVE_LOW, IPT_UNUSED) \ - + PORT_BIT (0xf000, IP_ACTIVE_LOW, IPT_UNUSED) static INPUT_PORTS_START( expert11 ) PORT_START("KEY0") KEYB_EXPERT11_ROW0 diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index 06b98b5a2c8..f84de2bcf29 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -91,7 +91,6 @@ public: void multi8_state::video_start() { - m_keyb_press = m_keyb_press_flag = m_shift_press_flag = m_display_reg = 0; for (m_bw_mode = 0; m_bw_mode < 8; m_bw_mode++) diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 106e2a2496e..3091e540dd0 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -422,7 +422,6 @@ WRITE8_MEMBER( mycom_state::mycom_0a_w ) WRITE8_MEMBER(mycom_state::mycom_rtc_w) { - m_rtc->address_w(data & 0x0f); m_rtc->hold_w(BIT(data, 4)); diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index ab35b8b3f83..641871fcc4b 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -521,7 +521,6 @@ INPUT_PORTS_END void mz2000_state::machine_reset() { - m_ipl_enable = 1; m_tvram_enable = 0; m_gvram_enable = 0; @@ -751,7 +750,6 @@ READ8_MEMBER(mz2000_state::mz2000_pio1_portb_r) READ8_MEMBER(mz2000_state::mz2000_pio1_porta_r) { - return m_porta_latch; } diff --git a/src/mess/drivers/nakajies.c b/src/mess/drivers/nakajies.c index 005eee414eb..c49313034e2 100644 --- a/src/mess/drivers/nakajies.c +++ b/src/mess/drivers/nakajies.c @@ -677,7 +677,6 @@ UINT32 nakajies_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap TIMER_DEVICE_CALLBACK_MEMBER(nakajies_state::kb_timer) { - if (m_matrix > 0x09) { // reset the keyboard scan diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index b9484a50f44..c26d39aac68 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -362,7 +362,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(nanos_state::keyboard_callback) m_key_pressed = 0xff; for(i = 0; i < 7; i++) { - code = machine().root_device().ioport(keynames[i])->read(); if (code != 0) { diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c index f087ca62f4f..a1d6e9be1c3 100644 --- a/src/mess/drivers/newbrain.c +++ b/src/mess/drivers/newbrain.c @@ -1318,7 +1318,6 @@ void newbrain_state::machine_reset() INTERRUPT_GEN_MEMBER(newbrain_state::newbrain_interrupt) { - if (!(m_enrg1 & NEWBRAIN_ENRG1_CLK)) { m_clkint = 0; diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c index b831efc8a32..df390e0c929 100644 --- a/src/mess/drivers/ng_aes.c +++ b/src/mess/drivers/ng_aes.c @@ -303,7 +303,6 @@ READ16_MEMBER(ng_aes_state::neocd_control_r) UINT32 sekAddress = 0xff0000+ (offset*2); switch (sekAddress & 0xFFFF) { - case 0x0016: return m_tempcdc->nff0016_r(); @@ -330,7 +329,6 @@ READ16_MEMBER(ng_aes_state::neocd_control_r) WRITE16_MEMBER(ng_aes_state::neocd_control_w) { - UINT32 sekAddress = 0xff0000+ (offset*2); UINT16 wordValue = data; @@ -713,7 +711,6 @@ static INT32 SekIdle(INT32 nCycles) void ng_aes_state::NeoCDDoDMA(address_space& curr_space) { - // The LC8953 chip has a programmable DMA controller, which is not properly emulated. // Since the software only uses it in a limited way, we can apply a simple heuristic // to determnine the requested operation. @@ -725,7 +722,6 @@ void ng_aes_state::NeoCDDoDMA(address_space& curr_space) // bprintf(PRINT_IMPORTANT, _T(" - DMA controller transfer started (PC: 0x%06X)\n"), SekGetPC(-1)); switch (NeoCDDMAMode) { - case 0xCFFD: { // bprintf(PRINT_NORMAL, _T(" adr : 0x%08X - 0x%08X <- address, skip odd bytes\n"), NeoCDDMAAddress1, NeoCDDMAAddress1 + NeoCDDMACount * 8); @@ -1333,8 +1329,7 @@ ADDRESS_MAP_END PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* having this ACTIVE_HIGH causes you to start with 2 credits using USA bios roms */ \ PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SPECIAL ) /* what is this? */ \ PORT_BIT( 0x00c0, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, neogeo_state,get_calendar_status, NULL) \ - PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, neogeo_state,get_audio_result, NULL) \ - + PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, neogeo_state,get_audio_result, NULL) #define STANDARD_IN4 \ PORT_START("IN4") \ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_UNKNOWN ) \ diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c index 0b75b9d9813..31b7e863ef5 100644 --- a/src/mess/drivers/ngp.c +++ b/src/mess/drivers/ngp.c @@ -178,7 +178,6 @@ public: TIMER_CALLBACK_MEMBER(ngp_state::ngp_seconds_callback) { - m_io_reg[0x16] += 1; if ( ( m_io_reg[0x16] & 0x0f ) == 0x0a ) { @@ -563,7 +562,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(ngp_state::power_callback) { - if ( m_io_reg[0x33] & 0x04 ) { m_tlcs900->set_input_line(TLCS900_NMI, (machine().root_device().ioport("Power")->read() & 0x01 ) ? CLEAR_LINE : ASSERT_LINE ); @@ -627,7 +625,6 @@ void ngp_state::machine_reset() UINT32 ngp_state::screen_update_ngp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - k1ge_update( m_k1ge, bitmap, cliprect ); return 0; } diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c index 89cca1a446e..20557678f1d 100644 --- a/src/mess/drivers/osbexec.c +++ b/src/mess/drivers/osbexec.c @@ -124,7 +124,6 @@ public: WRITE8_MEMBER(osbexec_state::osbexec_0000_w) { - /* Font RAM writing is enabled when ROM bank is enabled */ if ( m_pia0_porta & 0x80 ) { @@ -153,7 +152,6 @@ READ8_MEMBER(osbexec_state::osbexec_c000_r) WRITE8_MEMBER(osbexec_state::osbexec_c000_w) { - m_ram_c000[offset] = data; if ( ( m_pia0_porta & 0x40 ) && offset < 0x1000 ) @@ -197,7 +195,6 @@ READ8_MEMBER(osbexec_state::osbexec_kbd_r) READ8_MEMBER(osbexec_state::osbexec_rtc_r) { - return m_rtc; } @@ -358,14 +355,12 @@ UINT32 osbexec_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, READ8_MEMBER(osbexec_state::osbexec_pia0_a_r) { - return m_pia0_porta; } WRITE8_MEMBER(osbexec_state::osbexec_pia0_a_w) { - logerror("osbexec_pia0_a_w: %02x\n", data ); m_pia0_porta = data; @@ -376,14 +371,12 @@ WRITE8_MEMBER(osbexec_state::osbexec_pia0_a_w) READ8_MEMBER(osbexec_state::osbexec_pia0_b_r) { - return m_pia0_portb; } WRITE8_MEMBER(osbexec_state::osbexec_pia0_b_w) { - m_pia0_portb = data; speaker_level_w( m_speaker, ( data & 0x08 ) ? 0 : 1 ); @@ -410,14 +403,12 @@ WRITE_LINE_MEMBER(osbexec_state::osbexec_pia0_ca2_w) WRITE_LINE_MEMBER(osbexec_state::osbexec_pia0_cb2_w) { - m_pia0_cb2 = state; } WRITE_LINE_MEMBER(osbexec_state::osbexec_pia0_irq) { - m_pia0_irq_state = state; update_irq_state(machine()); } @@ -442,7 +433,6 @@ static const pia6821_interface osbexec_pia0_config = WRITE_LINE_MEMBER(osbexec_state::osbexec_pia1_irq) { - m_pia1_irq_state = state; update_irq_state(machine()); } @@ -608,7 +598,6 @@ TIMER_CALLBACK_MEMBER(osbexec_state::osbexec_video_callback) DRIVER_INIT_MEMBER(osbexec_state,osbexec) { - m_fontram_region = machine().memory().region_alloc( "fontram", 0x1000, 1, ENDIANNESS_LITTLE); m_vram_region = machine().memory().region_alloc( "vram", 0x2000, 1, ENDIANNESS_LITTLE ); m_vram = m_vram_region->base(); @@ -624,7 +613,6 @@ DRIVER_INIT_MEMBER(osbexec_state,osbexec) void osbexec_state::machine_reset() { - m_pia0_porta = 0xC0; /* Enable ROM and VRAM on reset */ set_banks( machine() ); diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c index 15a0744fe16..cb294a620aa 100644 --- a/src/mess/drivers/osi.c +++ b/src/mess/drivers/osi.c @@ -369,7 +369,6 @@ WRITE_LINE_MEMBER(sb2m600_state::osi470_index_callback) READ8_MEMBER( c1pmf_state::osi470_pia_pa_r ) { - /* bit description diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index e271083191c..1c7e6623d81 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -1100,14 +1100,12 @@ ROM_END DRIVER_INIT_MEMBER(pasopia7_state,p7_raster) { - m_screen_type = 1; machine().scheduler().timer_pulse(attotime::from_hz(500), timer_expired_delegate(FUNC(pasopia7_state::pio_timer),this)); } DRIVER_INIT_MEMBER(pasopia7_state,p7_lcd) { - m_screen_type = 0; machine().scheduler().timer_pulse(attotime::from_hz(500), timer_expired_delegate(FUNC(pasopia7_state::pio_timer),this)); } diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c index 95ac5c637d0..81eaeb58a02 100644 --- a/src/mess/drivers/pc6001.c +++ b/src/mess/drivers/pc6001.c @@ -897,29 +897,21 @@ ADDRESS_MAP_END */ #define BASICROM(_v_) \ - 0x10000+0x2000*_v_ \ - + 0x10000+0x2000*_v_ #define VOICEROM(_v_) \ - 0x18000+0x2000*_v_ \ - + 0x18000+0x2000*_v_ #define TVROM(_v_) \ - 0x1c000+0x2000*_v_ \ - + 0x1c000+0x2000*_v_ #define KANJIROM(_v_) \ - 0x20000+0x2000*_v_ \ - + 0x20000+0x2000*_v_ #define WRAM(_v_) \ - 0x28000+0x2000*_v_ \ - + 0x28000+0x2000*_v_ #define EXWRAM(_v_) \ - 0x38000+0x2000*_v_ \ - + 0x38000+0x2000*_v_ #define EXROM(_v_) \ - 0x48000+0x2000*_v_ \ - + 0x48000+0x2000*_v_ #define INVALID(_v_) \ - 0x4c000+0x2000*_v_ \ - + 0x4c000+0x2000*_v_ /* FIXME: some comments aren't right */ static const UINT32 banksw_table_r0[0x10*4][4] = { /* 0 */ @@ -1499,29 +1491,21 @@ ADDRESS_MAP_END /* PC-6001 SR */ #define SR_SYSROM_1(_v_) \ - 0x10000+(0x1000*_v_) \ - + 0x10000+(0x1000*_v_) #define SR_SYSROM_2(_v_) \ - 0x20000+(0x1000*_v_) \ - + 0x20000+(0x1000*_v_) #define SR_CGROM1(_v_) \ - 0x30000+(0x1000*_v_) \ - + 0x30000+(0x1000*_v_) #define SR_EXROM0(_v_) \ - 0x40000+(0x1000*_v_) \ - + 0x40000+(0x1000*_v_) #define SR_EXROM1(_v_) \ - 0x50000+(0x1000*_v_) \ - + 0x50000+(0x1000*_v_) #define SR_EXRAM0(_v_) \ - 0x60000+(0x1000*_v_) \ - + 0x60000+(0x1000*_v_) #define SR_WRAM0(_v_) \ - 0x70000+(0x1000*_v_) \ - + 0x70000+(0x1000*_v_) #define SR_NULL(_v_) \ - 0x80000+(0x1000*_v_) \ - + 0x80000+(0x1000*_v_) READ8_MEMBER(pc6001_state::pc6001sr_bank_rn_r) { return m_sr_bank_r[offset]; @@ -1568,8 +1552,7 @@ WRITE8_MEMBER(pc6001_state::pc6001sr_bank_wn_w) ROM[offset+(SR_WRAM0(bank_num))] = data; \ else \ ROM[offset+(SR_EXRAM0(bank_num))] = data; \ -} \ - +} WRITE8_MEMBER(pc6001_state::sr_work_ram0_w){ SR_WRAM_BANK_W(0); } WRITE8_MEMBER(pc6001_state::sr_work_ram1_w){ SR_WRAM_BANK_W(1); } WRITE8_MEMBER(pc6001_state::sr_work_ram2_w){ SR_WRAM_BANK_W(2); } diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index c237e02410a..24f301c2b88 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -514,7 +514,6 @@ CRTC command params: void pc8801_state::video_start() { - } void pc8801_state::draw_bitmap_3bpp(bitmap_ind16 &bitmap,const rectangle &cliprect) @@ -2429,7 +2428,6 @@ INTERRUPT_GEN_MEMBER(pc8801_state::pc8801_vrtc_irq) void pc8801_state::machine_start() { - machine().device("maincpu")->execute().set_irq_acknowledge_callback(pc8801_irq_callback); machine().device("upd765")->setup_intrq_cb(upd765a_device::line_cb(FUNC(pc8801_state::fdc_irq_w), this)); @@ -2575,7 +2573,6 @@ void pc8801_state::fdc_irq_w(bool state) READ8_MEMBER(pc8801_state::opn_porta_r) { - if(machine().root_device().ioport("BOARD_CONFIG")->read() & 2) { UINT8 shift,res; diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index a7ef130187f..2c24cbd4486 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -157,7 +157,6 @@ public: void pc88va_state::video_start() { - } static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 46d5d30b3f1..0490faee60a 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -999,7 +999,6 @@ READ8_MEMBER(pc9801_state::pc9801_20_r) WRITE8_MEMBER(pc9801_state::pc9801_20_w) { - if((offset & 1) == 0) { if(offset == 0) @@ -1057,7 +1056,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_30_w) READ8_MEMBER(pc9801_state::pc9801_40_r) { - if((offset & 1) == 0) { return machine().device("ppi8255_prn")->read(space, (offset & 6) >> 1); @@ -1105,7 +1103,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_40_w) READ8_MEMBER(pc9801_state::pc9801_50_r) { - if((offset & 1) == 0) { if(offset & 4) @@ -1123,7 +1120,6 @@ READ8_MEMBER(pc9801_state::pc9801_50_r) WRITE8_MEMBER(pc9801_state::pc9801_50_w) { - if((offset & 1) == 0) { if(offset & 4) @@ -1140,7 +1136,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_50_w) READ8_MEMBER(pc9801_state::pc9801_60_r) { - if((offset & 1) == 0) { return m_hgdc1->read(space, (offset & 2) >> 1); // upd7220 character port @@ -1154,7 +1149,6 @@ READ8_MEMBER(pc9801_state::pc9801_60_r) WRITE8_MEMBER(pc9801_state::pc9801_60_w) { - if((offset & 1) == 0) { m_hgdc1->write(space, (offset & 2) >> 1,data); // upd7220 character port @@ -1167,7 +1161,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_60_w) WRITE8_MEMBER(pc9801_state::pc9801_vrtc_mask_w) { - if((offset & 1) == 0) { m_vrtc_irq_mask = 1; @@ -1297,7 +1290,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_sasi_w) READ8_MEMBER(pc9801_state::pc9801_a0_r) { - if((offset & 1) == 0) { switch(offset & 0xe) @@ -1343,7 +1335,6 @@ READ8_MEMBER(pc9801_state::pc9801_a0_r) WRITE8_MEMBER(pc9801_state::pc9801_a0_w) { - if((offset & 1) == 0) { switch(offset & 0xe) @@ -1419,7 +1410,6 @@ WRITE8_MEMBER(pc9801_state::pc9801_a0_w) READ8_MEMBER(pc9801_state::pc9801_fdc_2hd_r) { - if((offset & 1) == 0) { switch(offset & 6) @@ -1459,7 +1449,6 @@ void pc9801_state::pc9801_fdc_2hd_update_ready(floppy_image_device *, int) WRITE8_MEMBER(pc9801_state::pc9801_fdc_2hd_w) { - if((offset & 1) == 0) { switch(offset & 6) @@ -1513,7 +1502,6 @@ READ8_MEMBER(pc9801_state::pc9801_fdc_2dd_r) WRITE8_MEMBER(pc9801_state::pc9801_fdc_2dd_w) { - if((offset & 1) == 0) { switch(offset & 6) @@ -1849,7 +1837,6 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_bank_w) READ8_MEMBER(pc9801_state::pc9801rs_f0_r) { - if(offset == 0x02) return (m_gate_a20 ^ 1) | 0xfe; else if(offset == 0x06) @@ -2036,7 +2023,6 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_2hd_w) #if 0 READ8_MEMBER(pc9801_state::pc9801rs_2dd_r) { - // if(m_fdc_ctrl & 1) // return 0xff; @@ -2057,7 +2043,6 @@ READ8_MEMBER(pc9801_state::pc9801rs_2dd_r) WRITE8_MEMBER(pc9801_state::pc9801rs_2dd_w) { - // if(m_fdc_ctrl & 1) // return; @@ -2451,7 +2436,6 @@ READ8_MEMBER(pc9801_state::pc9821_a0_r) WRITE8_MEMBER(pc9801_state::pc9821_a0_w) { - if((offset & 1) == 0 && offset & 8 && m_ex_video_ff[ANALOG_256_MODE]) { switch(offset) @@ -3428,7 +3412,6 @@ MACHINE_START_MEMBER(pc9801_state,pc9821) MACHINE_RESET_MEMBER(pc9801_state,pc9801_common) { - /* this looks like to be some kind of backup ram, system will boot with green colors otherwise */ { int i; @@ -3775,8 +3758,7 @@ MACHINE_CONFIG_END ROM_IGNORE( 0x2000 ) \ ROM_IGNORE( 0x2000 ) \ ROM_IGNORE( 0x2000 ) \ - ROM_FILL( 0x0000, 0x2000, 0xcb ) \ - + ROM_FILL( 0x0000, 0x2000, 0xcb ) // all of these are half size :/ #define LOAD_KANJI_ROMS \ ROM_REGION( 0x80000, "raw_kanji", ROMREGION_ERASEFF ) \ @@ -3789,8 +3771,7 @@ MACHINE_CONFIG_END ROM_LOAD16_BYTE( "24256c-x04.bin", 0x40001, 0x4000, BAD_DUMP CRC(5dec0fc2) SHA1(41000da14d0805ed0801b31eb60623552e50e41c) ) \ ROM_CONTINUE( 0x60001, 0x4000 ) \ ROM_REGION( 0x100000, "kanji", ROMREGION_ERASEFF ) \ - ROM_REGION( 0x80000, "new_chargen", ROMREGION_ERASEFF ) \ - + ROM_REGION( 0x80000, "new_chargen", ROMREGION_ERASEFF ) /* F - 8086 5 */ @@ -4082,8 +4063,7 @@ DRIVER_INIT_MEMBER(pc9801_state,pc9801_kanji) { \ for(j=0;j<0x20;j++) \ kanji[j+(i << 5)] = _fill_type ? new_chargen[j+(k << 5)] : 0; \ - } \ - + } UINT32 i,j,k; UINT32 pcg_tile; UINT8 *kanji = machine().root_device().memregion("kanji")->base(); diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c index effb0260ae0..bfbd3204b21 100644 --- a/src/mess/drivers/pce220.c +++ b/src/mess/drivers/pce220.c @@ -618,7 +618,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(pce220_state::kb_irq) { - if (m_irq_mask & IRQ_FLAG_KEY) { m_maincpu->set_input_line(0, newval ? ASSERT_LINE : CLEAR_LINE ); @@ -629,7 +628,6 @@ INPUT_CHANGED_MEMBER(pce220_state::kb_irq) INPUT_CHANGED_MEMBER(pce220_state::on_irq) { - if (m_irq_mask & IRQ_FLAG_ON) { m_maincpu->set_input_line(0, newval ? ASSERT_LINE : CLEAR_LINE ); @@ -903,7 +901,6 @@ void pcg850v_state::machine_reset() TIMER_DEVICE_CALLBACK_MEMBER(pce220_state::pce220_timer_callback) { - m_timer_status = !m_timer_status; if (m_irq_mask & IRQ_FLAG_TIMER) diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c index 400c40dbc95..545d1dcc983 100644 --- a/src/mess/drivers/pcw.c +++ b/src/mess/drivers/pcw.c @@ -507,15 +507,12 @@ WRITE8_MEMBER(pcw_state::pcw_system_control_w) /* screen on */ case 7: { - - } break; /* screen off */ case 8: { - } break; @@ -593,7 +590,6 @@ READ8_MEMBER(pcw_state::pcw_expansion_r) case 0x09f: { - /* kempston joystick */ return ioport("KEMPSTON")->read(); } @@ -611,7 +607,6 @@ READ8_MEMBER(pcw_state::pcw_expansion_r) case 0x087: { - return 0x0ff; } @@ -704,7 +699,6 @@ READ8_MEMBER(pcw_state::pcw_printer_status_r) */ TIMER_CALLBACK_MEMBER(pcw_state::pcw_stepper_callback) { - //popmessage("PRN: P2 bits %s %s %s\nSerial: %02x\nHeadpos: %i",m_printer_p2 & 0x40 ? " " : "6",m_printer_p2 & 0x20 ? " " : "5",m_printer_p2 & 0x10 ? " " : "4",m_printer_shift_output,m_printer_headpos); if((m_printer_p2 & 0x10) == 0) // print head motor active { @@ -764,7 +758,6 @@ TIMER_CALLBACK_MEMBER(pcw_state::pcw_stepper_callback) TIMER_CALLBACK_MEMBER(pcw_state::pcw_pins_callback) { - pcw_printer_fire_pins(machine(),m_printer_pins); m_printer_p2 |= 0x40; } @@ -795,7 +788,6 @@ READ8_MEMBER(pcw_state::mcu_printer_p2_r) WRITE8_MEMBER(pcw_state::mcu_printer_p2_w) { - //logerror("PRN: MCU writing %02x to P2\n",data); m_printer_p2 = data & 0x70; @@ -835,7 +827,6 @@ READ8_MEMBER(pcw_state::mcu_printer_t1_r) // Print head location (0 if at left margin, otherwise 1) READ8_MEMBER(pcw_state::mcu_printer_t0_r) { - if(m_printer_headpos == 0) return 0; else diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c index c93acc44635..4c837d19efe 100644 --- a/src/mess/drivers/pcw16.c +++ b/src/mess/drivers/pcw16.c @@ -506,7 +506,6 @@ WRITE8_MEMBER(pcw16_state::pcw16_keyboard_control_w) /* just cleared? */ if ((m_keyboard_state & PCW16_KEYBOARD_FORCE_KEYBOARD_CLOCK)==0) { - /* write */ /* busy */ m_keyboard_state |= PCW16_KEYBOARD_BUSY_STATUS; diff --git a/src/mess/drivers/pdp11.c b/src/mess/drivers/pdp11.c index 5e6c59ad71b..96b9d52c7e9 100644 --- a/src/mess/drivers/pdp11.c +++ b/src/mess/drivers/pdp11.c @@ -167,8 +167,7 @@ PORT_CONFSETTING ( 0x1c, "'XL' DECNET 1/3 (DECnet DDCMP DL11-E)") \ PORT_CONFSETTING ( 0x1d, "'XL' DECNET 2/3 (DECnet DDCMP DL11-E)") \ PORT_CONFSETTING ( 0x1e, "'XL' DECNET 3/3 (DECnet DDCMP DL11-E)") \ PORT_CONFSETTING ( 0x1f, "'XE' DEUNA DECnet Ethernet") \ -PORT_CONFSETTING ( 0x20, "'MU' TMSCP tapes, including TK50, TU81") \ - +PORT_CONFSETTING ( 0x20, "'MU' TMSCP tapes, including TK50, TU81") /* Input ports */ static INPUT_PORTS_START( pdp11 ) PORT_START("S1") diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c index 5b3321adff1..25bf1d6207f 100644 --- a/src/mess/drivers/plus4.c +++ b/src/mess/drivers/plus4.c @@ -547,13 +547,11 @@ WRITE8_MEMBER( plus4_state::cpu_w ) INTERRUPT_GEN_MEMBER(plus4_state::c16_raster_interrupt) { - m_ted->raster_interrupt_gen(); } INTERRUPT_GEN_MEMBER(plus4_state::c16_frame_interrupt) { - int value, i; static const char *const c16ports[] = { "ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7" }; diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index 8bdaff22812..57c8b13b112 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -390,7 +390,6 @@ void pv1000_state::machine_start() void pv1000_state::machine_reset() { - m_io_regs[5] = 0; m_fd_data = 0; m_irq_on_timer->adjust( m_screen->time_until_pos(195, 0 ) ); diff --git a/src/mess/drivers/pv2000.c b/src/mess/drivers/pv2000.c index 72b258136d2..5bec0ab5409 100644 --- a/src/mess/drivers/pv2000.c +++ b/src/mess/drivers/pv2000.c @@ -369,7 +369,6 @@ void pv2000_state::machine_start() void pv2000_state::machine_reset() { - m_last_state = 0; m_key_pressed = 0; m_keyb_column = 0; diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index 6d013fe31c2..b21805144bc 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -321,7 +321,6 @@ TIMER_CALLBACK_MEMBER(px4_state::ext_cassette_read) // free running counter TIMER_DEVICE_CALLBACK_MEMBER(px4_state::frc_tick) { - m_frc_value++; if (m_frc_value == 0) @@ -703,7 +702,6 @@ TIMER_CALLBACK_MEMBER(px4_state::transmit_data) { if (ART_TX_ENABLED) { - } } @@ -711,7 +709,6 @@ TIMER_CALLBACK_MEMBER(px4_state::receive_data) { if (ART_RX_ENABLED) { - } } @@ -865,7 +862,6 @@ WRITE8_MEMBER(px4_state::px4_ioctlr_w) TIMER_DEVICE_CALLBACK_MEMBER(px4_state::upd7508_1sec_callback) { - // adjust interrupt status m_interrupt_status |= UPD7508_INT_ONE_SECOND; @@ -953,7 +949,6 @@ READ8_MEMBER(px4_state::px4_ramdisk_data_r) WRITE8_MEMBER(px4_state::px4_ramdisk_data_w) { - if (m_ramdisk_address < 0x20000) m_ramdisk[m_ramdisk_address] = data; diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index 9af4088827c..969e7378cd2 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -698,7 +698,6 @@ ADDRESS_MAP_END /* TODO: shift break */ INPUT_CHANGED_MEMBER(qx10_state::key_stroke) { - if(newval && !oldval) { m_keyb.rx = (UINT8)(FPTR)(param) & 0x7f; diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index 319063fcfd2..1127b7b011e 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -197,7 +197,6 @@ INPUT_PORTS_END void rainbow_state::machine_reset() { - m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_zflip = true; @@ -393,7 +392,6 @@ WRITE_LINE_MEMBER(rainbow_state::kbd_txready_w) TIMER_DEVICE_CALLBACK_MEMBER(rainbow_state::keyboard_tick) { - m_kbd8251->transmit_clock(); m_kbd8251->receive_clock(); } diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c index 0366fc999a9..78a46e33f72 100644 --- a/src/mess/drivers/rex6000.c +++ b/src/mess/drivers/rex6000.c @@ -412,7 +412,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(rex6000_state::trigger_irq) { - if (!(m_irq_mask & IRQ_FLAG_KEYCHANGE)) { m_irq_flag |= IRQ_FLAG_KEYCHANGE; @@ -517,7 +516,6 @@ UINT32 rex6000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::irq_timer1) { - if (!(m_irq_mask & IRQ_FLAG_IRQ2)) { m_irq_flag |= IRQ_FLAG_IRQ2; @@ -529,7 +527,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::irq_timer1) TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::irq_timer2) { - if (!(m_irq_mask & IRQ_FLAG_IRQ1)) { m_irq_flag |= IRQ_FLAG_IRQ1; @@ -540,7 +537,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::irq_timer2) TIMER_DEVICE_CALLBACK_MEMBER(rex6000_state::sec_timer) { - if (!(m_irq_mask & IRQ_FLAG_1HZ)) { m_irq_flag |= IRQ_FLAG_1HZ; diff --git a/src/mess/drivers/rt1715.c b/src/mess/drivers/rt1715.c index 4f090362674..318e826b979 100644 --- a/src/mess/drivers/rt1715.c +++ b/src/mess/drivers/rt1715.c @@ -131,7 +131,6 @@ WRITE8_MEMBER(rt1715_state::rt1715_rom_disable) static I8275_DISPLAY_PIXELS( rt1715_display_pixels ) { - } /* F4 Character Displayer */ diff --git a/src/mess/drivers/sc2.c b/src/mess/drivers/sc2.c index e61a3114fad..b27c2f7c8b9 100644 --- a/src/mess/drivers/sc2.c +++ b/src/mess/drivers/sc2.c @@ -94,7 +94,6 @@ INPUT_PORTS_END void sc2_state::machine_start() { - save_item(NAME(m_led_7seg_data)); save_item(NAME(m_kp_matrix)); save_item(NAME(m_led_selected)); @@ -104,7 +103,6 @@ void sc2_state::machine_start() void sc2_state::machine_reset() { - m_kp_matrix = 0; m_led_selected = 0; m_digit_data = 0; diff --git a/src/mess/drivers/scorpion.c b/src/mess/drivers/scorpion.c index a29c80bc9dd..a89bedbcfd4 100644 --- a/src/mess/drivers/scorpion.c +++ b/src/mess/drivers/scorpion.c @@ -275,7 +275,6 @@ DIRECT_UPDATE_MEMBER(scorpion_state::scorpion_direct) TIMER_DEVICE_CALLBACK_MEMBER(scorpion_state::nmi_check_callback) { - if ((machine().root_device().ioport("NMI")->read() & 1)==1) { m_port_1ffd_data |= 0x02; diff --git a/src/mess/drivers/scv.c b/src/mess/drivers/scv.c index d8d144ed171..9321cba0d18 100644 --- a/src/mess/drivers/scv.c +++ b/src/mess/drivers/scv.c @@ -750,14 +750,12 @@ WRITE_LINE_MEMBER( scv_state::scv_upd1771_ack_w ) void scv_state::machine_start() { - m_vb_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(scv_state::scv_vb_callback),this)); } void scv_state::machine_reset() { - m_vb_timer->adjust( machine().primary_screen->time_until_pos(0, 0 ) ); } diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 2a046bdf0ac..78a2d89d1e3 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -459,7 +459,6 @@ READ8_MEMBER(smc777_state::key_r) /* TODO: the packet commands strikes me as something I've already seen before, don't remember where however ... */ WRITE8_MEMBER(smc777_state::key_w) { - if(offset == 1) //keyboard command m_keyb_cmd = data; else @@ -479,7 +478,6 @@ WRITE8_MEMBER(smc777_state::border_col_w) READ8_MEMBER(smc777_state::system_input_r) { - printf("System FF R %02x\n",m_system_data & 0x0f); switch(m_system_data & 0x0f) @@ -516,13 +514,11 @@ WRITE8_MEMBER(smc777_state::system_output_w) /* presumably SMC-777 specific */ READ8_MEMBER(smc777_state::smc777_joystick_r) { - return ioport("JOY_1P")->read(); } WRITE8_MEMBER(smc777_state::smc777_color_mode_w) { - switch(data & 0x0f) { case 0x06: m_pal_mode = (data & 0x10) ^ 0x10; break; @@ -609,13 +605,11 @@ WRITE8_MEMBER(smc777_state::smc777_mem_w) READ8_MEMBER(smc777_state::smc777_irq_mask_r) { - return m_irq_mask; } WRITE8_MEMBER(smc777_state::smc777_irq_mask_w) { - if(data & 0xfe) printf("Irq mask = %02x\n",data & 0xfe); @@ -958,15 +952,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(smc777_state::keyboard_callback) void smc777_state::machine_start() { - - beep_set_frequency(machine().device(BEEPER_TAG),300); //guesswork beep_set_state(machine().device(BEEPER_TAG),0); } void smc777_state::machine_reset() { - m_raminh = 1; m_raminh_pending_change = 1; m_raminh_prefetch = 0xff; @@ -1049,7 +1040,6 @@ static const floppy_interface smc777_floppy_interface = INTERRUPT_GEN_MEMBER(smc777_state::smc777_vblank_irq) { - if(m_irq_mask) device.execute().set_input_line(0,HOLD_LINE); } diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c index 50b271940f6..1e9c0481127 100644 --- a/src/mess/drivers/supercon.c +++ b/src/mess/drivers/supercon.c @@ -398,7 +398,6 @@ READ8_MEMBER( supercon_state::supercon_port4_r ) if (key_data) { - /* Set or remove pieces */ i_AH=7-get_first_cleared_bit(key_data); @@ -459,7 +458,6 @@ WRITE8_MEMBER( supercon_state::supercon_port3_w ) if ( m_data_1F00) { - if (m_data_1F00 & LED_LINE_AH ) { m_last_LED = &m_LED_AH; /* save last value */ diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c index 84e53ad69c4..74ccce6c1f8 100644 --- a/src/mess/drivers/supracan.c +++ b/src/mess/drivers/supracan.c @@ -386,7 +386,6 @@ static void supracan_tilemap_get_info_roz(running_machine &machine, int layer, t TILE_GET_INFO_MEMBER(supracan_state::get_supracan_tilemap0_tile_info) { - supracan_tilemap_get_info_common(machine(), 0, tileinfo, tile_index); } @@ -397,13 +396,11 @@ TILE_GET_INFO_MEMBER(supracan_state::get_supracan_tilemap1_tile_info) TILE_GET_INFO_MEMBER(supracan_state::get_supracan_tilemap2_tile_info) { - supracan_tilemap_get_info_common(machine(), 2, tileinfo, tile_index); } TILE_GET_INFO_MEMBER(supracan_state::get_supracan_roz_tile_info) { - supracan_tilemap_get_info_roz(machine(), 3, tileinfo, tile_index); } @@ -527,7 +524,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r if((supracan_vram[i+0] & 0x4000)) { - #if 0 printf("%d (unk %02x) (enable %02x) (unk Y2 %02x, %02x) (y pos %02x) (bank %01x) (flip %01x) (unknown %02x) (x size %02x) (xscale %01x) (unk %01x) (xpos %02x) (code %04x)\n", i, (supracan_vram[i+0] & 0x8000) >> 15, @@ -683,7 +679,6 @@ static void supracan_suprnova_draw_roz(running_machine &machine, bitmap_ind16 &b /* loop over rows */ while (sy <= ey) { - /* initialize X counters */ x = sx; cx = startx; @@ -772,9 +767,6 @@ static void supracan_suprnova_draw_roz(running_machine &machine, bitmap_ind16 &b UINT32 supracan_state::screen_update_supracan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - - - // treat the sprites as frame-buffered and only update the buffer when drawing scanline 0 - this might not be true! if (0) @@ -791,7 +783,6 @@ UINT32 supracan_state::screen_update_supracan(screen_device &screen, bitmap_ind1 } else { - m_sprite_final_bitmap.fill(0x00, cliprect); bitmap.fill(0x80, cliprect); @@ -809,7 +800,6 @@ UINT32 supracan_state::screen_update_supracan(screen_device &screen, bitmap_ind1 for (int pri=7;pri>=0;pri--) { - for (int layer = 3; layer >=0; layer--) { // popmessage("%04x\n",m_video_flags); @@ -853,7 +843,6 @@ UINT32 supracan_state::screen_update_supracan(screen_device &screen, bitmap_ind1 { if (layer != 3) // standard layers, NOT roz { - int wrap = (m_tilemap_flags[layer] & 0x20); int scrollx = m_tilemap_scrollx[layer]; @@ -1494,7 +1483,6 @@ READ16_MEMBER( supracan_state::supracan_video_r ) TIMER_CALLBACK_MEMBER(supracan_state::supracan_hbl_callback) { - m_maincpu->set_input_line(3, HOLD_LINE); m_hbl_timer->adjust(attotime::never); @@ -1502,7 +1490,6 @@ TIMER_CALLBACK_MEMBER(supracan_state::supracan_hbl_callback) TIMER_CALLBACK_MEMBER(supracan_state::supracan_line_on_callback) { - m_maincpu->set_input_line(5, HOLD_LINE); m_line_on_timer->adjust(attotime::never); @@ -1510,7 +1497,6 @@ TIMER_CALLBACK_MEMBER(supracan_state::supracan_line_on_callback) TIMER_CALLBACK_MEMBER(supracan_state::supracan_line_off_callback) { - m_maincpu->set_input_line(5, CLEAR_LINE); m_line_on_timer->adjust(attotime::never); @@ -1773,7 +1759,6 @@ static DEVICE_IMAGE_LOAD( supracan_cart ) void supracan_state::machine_start() { - m_video_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(supracan_state::supracan_video_callback),this)); m_hbl_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(supracan_state::supracan_hbl_callback),this)); m_line_on_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(supracan_state::supracan_line_on_callback),this)); @@ -1783,7 +1768,6 @@ void supracan_state::machine_start() void supracan_state::machine_reset() { - machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_video_timer->adjust( machine().primary_screen->time_until_pos( 0, 0 ) ); @@ -1885,7 +1869,6 @@ INTERRUPT_GEN_MEMBER(supracan_state::supracan_irq) INTERRUPT_GEN_MEMBER(supracan_state::supracan_sound_irq) { - m_sound_irq_source_reg |= 0x80; if(m_sound_irq_enable_reg & m_sound_irq_source_reg) diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c index 8ebc41cde79..9453b8d42f9 100644 --- a/src/mess/drivers/tandy2k.c +++ b/src/mess/drivers/tandy2k.c @@ -38,7 +38,6 @@ enum void tandy2k_state::dma_request(int line, int state) { - } void tandy2k_state::speaker_update() diff --git a/src/mess/drivers/ti89.c b/src/mess/drivers/ti89.c index 89547fad280..9a8f7de95e0 100644 --- a/src/mess/drivers/ti89.c +++ b/src/mess/drivers/ti89.c @@ -233,7 +233,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(ti68k_state::ti68k_on_key) { - m_on_key = newval; if (m_on_key) diff --git a/src/mess/drivers/ti990_4.c b/src/mess/drivers/ti990_4.c index 85b1d452d7c..3098b3305d2 100644 --- a/src/mess/drivers/ti990_4.c +++ b/src/mess/drivers/ti990_4.c @@ -78,7 +78,6 @@ void ti990_4_state::machine_reset() INTERRUPT_GEN_MEMBER(ti990_4_state::ti990_4_line_interrupt) { - #if VIDEO_911 vdt911_keyboard(m_terminal); #else @@ -132,7 +131,6 @@ static const vdt911_init_params_t vdt911_intf = void ti990_4_state::video_start() { - m_terminal = machine().device("vdt911"); } @@ -151,7 +149,6 @@ static const asr733_init_params_t asr733_intf = void ti990_4_state::video_start() { - m_terminal = machine().device("asr733"); } diff --git a/src/mess/drivers/ti99_4p.c b/src/mess/drivers/ti99_4p.c index 1218eb650fa..a336b040634 100644 --- a/src/mess/drivers/ti99_4p.c +++ b/src/mess/drivers/ti99_4p.c @@ -812,7 +812,6 @@ static TMS99xx_CONFIG( sgcpu_cpuconf ) void ti99_4p_state::machine_start() { - m_cpu = static_cast(machine().device("maincpu")); m_peribox = static_cast(machine().device(PERIBOX_TAG)); m_sound = static_cast(machine().device(TISOUND_TAG)); diff --git a/src/mess/drivers/ti99_4x.c b/src/mess/drivers/ti99_4x.c index bffaf4317d4..f10336c2638 100644 --- a/src/mess/drivers/ti99_4x.c +++ b/src/mess/drivers/ti99_4x.c @@ -847,7 +847,6 @@ static JOYPORT_CONFIG( joyport4a_50 ) MACHINE_START_MEMBER(ti99_4x_state,ti99_4) { - m_cpu = static_cast(machine().device("maincpu")); m_tms9901 = static_cast(machine().device(TMS9901_TAG)); @@ -965,7 +964,6 @@ MACHINE_CONFIG_END MACHINE_START_MEMBER(ti99_4x_state,ti99_4a) { - m_cpu = static_cast(machine().device("maincpu")); m_tms9901 = static_cast(machine().device(TMS9901_TAG)); diff --git a/src/mess/drivers/ti99_8.c b/src/mess/drivers/ti99_8.c index 083fe4f3509..a22998d29d6 100644 --- a/src/mess/drivers/ti99_8.c +++ b/src/mess/drivers/ti99_8.c @@ -940,7 +940,6 @@ void ti99_8_state::machine_start() void ti99_8_state::machine_reset() { - m_cpu->set_hold(CLEAR_LINE); // Pulling down the line on RESET configures the CPU to insert one wait diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c index bc278ba6cdb..87f0cfb51eb 100644 --- a/src/mess/drivers/timex.c +++ b/src/mess/drivers/timex.c @@ -563,7 +563,6 @@ ADDRESS_MAP_END MACHINE_RESET_MEMBER(spectrum_state,ts2068) { - m_port_ff_data = 0; m_port_f4_data = 0; ts2068_update_memory(machine()); diff --git a/src/mess/drivers/tm990189.c b/src/mess/drivers/tm990189.c index e99618b535d..cab4a47d1bb 100644 --- a/src/mess/drivers/tm990189.c +++ b/src/mess/drivers/tm990189.c @@ -179,7 +179,6 @@ static TMS9928A_INTERFACE(tms9918_interface) MACHINE_START_MEMBER(tm990189_state,tm990_189_v) { - m_displayena_timer = machine().scheduler().timer_alloc(FUNC_NULL); m_joy1x_timer = machine().scheduler().timer_alloc(FUNC_NULL); @@ -476,7 +475,6 @@ void tm990_189_rs232_image_device::device_config_complete() void tm990_189_rs232_image_device::device_start() { - } void tm990_189_rs232_image_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c index 37e4f83c616..89036167d4f 100644 --- a/src/mess/drivers/tvc.c +++ b/src/mess/drivers/tvc.c @@ -21,15 +21,13 @@ space.install_read_bank(_start, _end, _tag); \ space.unmap_write(_start, _end); \ m_bank_type[_bank] = TVC_ROM_BANK; \ - } \ - + } #define TVC_INSTALL_RAM_BANK(_bank,_tag,_start,_end) \ if (m_bank_type[_bank] != TVC_RAM_BANK) \ { \ space.install_readwrite_bank(_start, _end, _tag); \ m_bank_type[_bank] = TVC_RAM_BANK; \ - } \ - + } void tvc_state::tvc_set_mem_page(UINT8 data) { address_space &space = m_maincpu->space(AS_PROGRAM); diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c index be670bd1368..f3f83d71b7e 100644 --- a/src/mess/drivers/vboy.c +++ b/src/mess/drivers/vboy.c @@ -41,7 +41,6 @@ struct vboy_regs_t struct vip_regs_t { - UINT16 INTPND; UINT16 INTENB; UINT16 DPSTTS; @@ -1157,7 +1156,6 @@ static void vboy_machine_stop(running_machine &machine) void vboy_state::machine_start() { - /* add a hook for battery save */ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(vboy_machine_stop),&machine())); @@ -1166,7 +1164,6 @@ void vboy_state::machine_start() void vboy_state::machine_reset() { - /* Initial values taken from Reality Boy, to be verified when emulation improves */ m_vboy_regs.lpc = 0x6d; m_vboy_regs.lpc2 = 0xff; @@ -1219,13 +1216,11 @@ void vboy_state::m_timer_tick() TIMER_DEVICE_CALLBACK_MEMBER(vboy_state::timer_main_tick) { - m_timer_tick(); } TIMER_DEVICE_CALLBACK_MEMBER(vboy_state::timer_pad_tick) { - if((m_vboy_regs.kcr & 0x80) == 0) m_maincpu->set_input_line(0, HOLD_LINE); } diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c index b4de4ac8130..6f5c19179bf 100644 --- a/src/mess/drivers/vii.c +++ b/src/mess/drivers/vii.c @@ -993,7 +993,6 @@ TIMER_CALLBACK_MEMBER(vii_state::tmb2_tick) void vii_state::machine_start() { - memset(m_video_regs, 0, 0x100 * sizeof(UINT16)); memset(m_io_regs, 0, 0x100 * sizeof(UINT16)); m_current_bank = 0; @@ -1156,28 +1155,24 @@ MACHINE_CONFIG_END DRIVER_INIT_MEMBER(vii_state,vii) { - m_spg243_mode = SPG243_VII; m_centered_coordinates = 1; } DRIVER_INIT_MEMBER(vii_state,batman) { - m_spg243_mode = SPG243_BATMAN; m_centered_coordinates = 1; } DRIVER_INIT_MEMBER(vii_state,vsmile) { - m_spg243_mode = SPG243_VSMILE; m_centered_coordinates = 1; } DRIVER_INIT_MEMBER(vii_state,walle) { - m_spg243_mode = SPG243_BATMAN; m_centered_coordinates = 0; } diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 9eefb8c9d2c..356e4df9940 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -563,7 +563,6 @@ READ8_MEMBER(vtech1_state::vtech1_keyboard_r) WRITE8_MEMBER(vtech1_state::vtech1_latch_w) { - if (LOG_VTECH1_LATCH) logerror("vtech1_latch_w $%02X\n", data); @@ -592,7 +591,6 @@ WRITE8_MEMBER(vtech1_state::vtech1_latch_w) WRITE8_MEMBER(vtech1_state::vtech1_memory_bank_w) { - logerror("vtech1_memory_bank_w $%02X\n", data); if (data >= 1) diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c index 30b833a0063..a2c92e86728 100644 --- a/src/mess/drivers/x07.c +++ b/src/mess/drivers/x07.c @@ -673,7 +673,6 @@ TIMER_CALLBACK_MEMBER(x07_state::cassette_tick) TIMER_CALLBACK_MEMBER(x07_state::cassette_poll) { - if ((m_cassette->get_state() & 0x03) == CASSETTE_PLAY) cassette_load(); else if ((m_cassette->get_state() & 0x03) == CASSETTE_RECORD) @@ -721,7 +720,6 @@ void x07_state::cassette_save() if (m_cass_clk % 10 == 0) { - if (m_bit_count < 4) { switch (m_bit_count & 3) @@ -1378,7 +1376,6 @@ TIMER_CALLBACK_MEMBER(x07_state::rstb_clear) TIMER_CALLBACK_MEMBER(x07_state::beep_stop) { - beep_set_state(m_beep, 0); } diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index 7033128a2ce..48e45c397a1 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -543,7 +543,6 @@ static void draw_gfxbitmap(running_machine &machine, bitmap_rgb32 &bitmap,const UINT32 x1_state::screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - bitmap.fill(MAKE_ARGB(0xff,0x00,0x00,0x00), cliprect); draw_gfxbitmap(machine(),bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri); diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index f6c66a47d4d..8c64a6e25c4 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -122,7 +122,6 @@ INPUT_CHANGED_MEMBER(x1twin_state::ipl_reset) /* Apparently most games doesn't support this (not even the Konami ones!), one that does is...177 :o */ INPUT_CHANGED_MEMBER(x1twin_state::nmi_reset) { - m_x1_cpu->set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 3003b1592f3..51b6bda740f 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -1222,7 +1222,6 @@ READ16_MEMBER(x68k_state::x68k_mfp_r) READ16_MEMBER(x68k_state::x68k_mfp_r) { - // Initial settings indicate that IRQs are generated for FM (YM2151), Receive buffer error or full, // MFP Timer C, and the power switch // logerror("MFP: [%08x] Reading offset %i\n",space.device().safe_pc(),offset); @@ -1286,7 +1285,6 @@ READ16_MEMBER(x68k_state::x68k_mfp_r) WRITE16_MEMBER(x68k_state::x68k_mfp_w) { - /* For the Interrupt registers, the bits are set out as such: Reg A - bit 7: GPIP7 (HSync) bit 6: GPIP6 (CRTC CIRQ) @@ -2375,7 +2373,6 @@ void x68k_state::floppy_unload(floppy_image_device *dev) TIMER_CALLBACK_MEMBER(x68k_state::x68k_net_irq) { - m_current_vector[2] = 0xf9; m_current_irq_line = 2; machine().device("maincpu")->execute().set_input_line_and_vector(2,ASSERT_LINE,m_current_vector[2]); diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index f5a8e9915f9..a50894a1888 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -228,7 +228,6 @@ public: void z100_state::video_start() { - m_gvram = auto_alloc_array_clear(machine(), UINT8, 0x30000); } @@ -423,7 +422,6 @@ ADDRESS_MAP_END INPUT_CHANGED_MEMBER(z100_state::key_stroke) { - if(newval && !oldval) { /* TODO: table */ @@ -751,7 +749,6 @@ void z100_state::palette_init() void z100_state::machine_start() { - machine().device("maincpu")->execute().set_irq_acknowledge_callback(z100_irq_callback); m_mc6845 = machine().device("crtc"); } diff --git a/src/mess/includes/alesis.h b/src/mess/includes/alesis.h index d24726628a3..db3ce2ff28c 100644 --- a/src/mess/includes/alesis.h +++ b/src/mess/includes/alesis.h @@ -24,7 +24,6 @@ class alesis_dm3ag_device : public device_t { - public: // construction/destruction alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h index e1631e8e266..060127da6d4 100644 --- a/src/mess/includes/genpc.h +++ b/src/mess/includes/genpc.h @@ -19,8 +19,7 @@ #define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \ - ibm5160_mb_device::static_set_cputag(*device, _cputag); \ - + ibm5160_mb_device::static_set_cputag(*device, _cputag); // ======================> ibm5160_mb_device class ibm5160_mb_device : public device_t { @@ -118,8 +117,7 @@ extern const device_type IBM5160_MOTHERBOARD; #define MCFG_IBM5150_MOTHERBOARD_ADD(_tag, _cputag) \ MCFG_DEVICE_ADD(_tag, IBM5150_MOTHERBOARD, 0) \ - ibm5150_mb_device::static_set_cputag(*device, _cputag); \ - + ibm5150_mb_device::static_set_cputag(*device, _cputag); // ======================> ibm5150_mb_device class ibm5150_mb_device : public ibm5160_mb_device diff --git a/src/mess/includes/msx_slot.h b/src/mess/includes/msx_slot.h index 5b5b88cb20c..5c7b8dfc21f 100644 --- a/src/mess/includes/msx_slot.h +++ b/src/mess/includes/msx_slot.h @@ -24,7 +24,6 @@ struct msx_slot_layout { #define MSX_LAYOUT_INIT(msx) \ static const msx_slot_layout msx_slot_layout_##msx[] = { - #define MSX_LAYOUT_SLOT(prim, sec, page, extend, type, size, option) \ { \ MSX_LAYOUT_SLOT_ENTRY, \ @@ -161,7 +160,6 @@ extern const msx_slot msx_slot_list[]; #define MSX_SLOT_START \ const msx_slot msx_slot_list[] = { - #define MSX_SLOT_ROM(type, ent) { \ type, \ MSX_MEM_ROM, \ diff --git a/src/mess/includes/psion.h b/src/mess/includes/psion.h index f46e4c84d46..27e747b94d1 100644 --- a/src/mess/includes/psion.h +++ b/src/mess/includes/psion.h @@ -22,7 +22,6 @@ class psion_custom_lcdc : public hd44780_device { - public: // construction/destruction psion_custom_lcdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/3c505.c b/src/mess/machine/3c505.c index 7aef5608ce3..956ff1c21f9 100644 --- a/src/mess/machine/3c505.c +++ b/src/mess/machine/3c505.c @@ -864,7 +864,6 @@ int threecom3c505_device::ethernet_packet_is_for_me(const UINT8 mac_address[]) void threecom3c505_device::recv_cb(UINT8 *data, int length) { - if (length < ETHERNET_ADDR_SIZE || !ethernet_packet_is_for_me(data)) { // skip packet diff --git a/src/mess/machine/a2bus.h b/src/mess/machine/a2bus.h index a0aec65e118..5fb717682c4 100644 --- a/src/mess/machine/a2bus.h +++ b/src/mess/machine/a2bus.h @@ -22,13 +22,11 @@ #define MCFG_A2BUS_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, A2BUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ - a2bus_device::static_set_cputag(*device, _cputag); \ - + a2bus_device::static_set_cputag(*device, _cputag); #define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - a2bus_slot_device::static_set_a2bus_slot(*device, _nbtag, _tag); \ - + a2bus_slot_device::static_set_a2bus_slot(*device, _nbtag, _tag); #define MCFG_A2BUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/a2eauxslot.h b/src/mess/machine/a2eauxslot.h index 48c00480db3..2e2df363f9a 100644 --- a/src/mess/machine/a2eauxslot.h +++ b/src/mess/machine/a2eauxslot.h @@ -21,13 +21,11 @@ #define MCFG_A2EAUXSLOT_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - a2eauxslot_device::static_set_cputag(*device, _cputag); \ - + a2eauxslot_device::static_set_cputag(*device, _cputag); #define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - a2eauxslot_slot_device::static_set_a2eauxslot_slot(*device, _nbtag, _tag); \ - + a2eauxslot_slot_device::static_set_a2eauxslot_slot(*device, _nbtag, _tag); #define MCFG_A2EAUXSLOT_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index f5254205a7c..4efc3b982fc 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -217,7 +217,6 @@ static UINT16 cpu_control_register = 0x0000; static int apollo_csr_get_servicemode() { - return cpu_status_register & APOLLO_CSR_SR_SERVICE ? 0 : 1; } @@ -506,7 +505,6 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){ } static READ8_DEVICE_HANDLER( apollo_dma8237_ctape_dack_r ) { - UINT8 data = sc499_dack_r(&space.machine()); DLOG2(("dma ctape dack read %02x",data)); @@ -1101,7 +1099,6 @@ WRITE8_DEVICE_HANDLER(apollo_sio_w) static TIMER_CALLBACK(kbd_timer_callback) { - #if defined(APOLLO_FOR_LINUX) device_t *device = (device_t *) ptr; address_space &space = device->machine().device(MAINCPU)->memory().space(AS_PROGRAM); @@ -1304,7 +1301,6 @@ static void apollo_3c505_set_irq(device_t *device, int state) { static int apollo_3c505_tx_data(device_t *device, const UINT8 tx_data_buffer[], int tx_data_length) { - // transmit all transmitted packets to the apollo_netserver apollo_netserver_receive(device, tx_data_buffer, tx_data_length); @@ -1319,13 +1315,11 @@ static int apollo_3c505_setfilter(device_t *device, int node_id) static int apollo_3c505_rx_data(device_t *device, const UINT8 rx_data_buffer[], int rx_data_length) { - // transmit all received packets to the threecom3c505 receiver return threecom3c505_receive(device, rx_data_buffer, rx_data_length); } static void apollo_3c505_tx_init(device_t *device) { - apollo_eth_init(device, apollo_3c505_rx_data); // setup to receive all packets from the apollo_netserver diff --git a/src/mess/machine/apollo_dbg.c b/src/mess/machine/apollo_dbg.c index ce4bcac5094..d50f2e68d59 100644 --- a/src/mess/machine/apollo_dbg.c +++ b/src/mess/machine/apollo_dbg.c @@ -797,7 +797,6 @@ static const char* trap7[] = { //------------------------------------------------------ static const char* trap8[] = { - /* 0x00 - 0x07 */"MST_$MAP", "u,x,x,x,x,x,x", /* 0x01 - 0x08 */"MST_$MAP_AT", "x,u,x,x,x,x,x,x", /* 0x02 - 0x07 */"MST_$MAP_GLOBAL", "u,x,x,x,x,x,x", @@ -1054,7 +1053,6 @@ static const char * disassemble(m68ki_cpu_core *m68k, offs_t pc, char* sb) oprom[i] = opram[i] = m68k->memory.read8(pc + i); if (m68k->mmu_tmp_buserror_occurred) { - sprintf(sb, "- (apollo_disassemble failed at %08x)", pc + i); // restore previous bus error state diff --git a/src/mess/machine/apollo_eth.c b/src/mess/machine/apollo_eth.c index 831465edf7e..2ed69b4541e 100644 --- a/src/mess/machine/apollo_eth.c +++ b/src/mess/machine/apollo_eth.c @@ -170,7 +170,6 @@ static TIMER_CALLBACK(receive_interrupt) ***************************************************************************/ int apollo_eth_transmit(device_t *device, const UINT8 data[], int length) { - if (eth_socket != -1) { if (memcmp(data, eth_hw_address, ETHERNET_ADDR_SIZE) == 0) diff --git a/src/mess/machine/apollo_kbd.c b/src/mess/machine/apollo_kbd.c index a2e83c7746c..606fa0b24ad 100644 --- a/src/mess/machine/apollo_kbd.c +++ b/src/mess/machine/apollo_kbd.c @@ -867,7 +867,6 @@ TIMER_CALLBACK( apollo_kbd_device::static_poll_callback ) } UINT16 apollo_kbd_device::m_code_table[] = { - /* Key | Keycap | Down | Up |Unshifted|Shifted|Control|Caps Lock|Up Trans|Auto */ /* Number| Legend | Code | Code|Code | Code | Code |Code | Code |Repeat*/ diff --git a/src/mess/machine/apollo_net.c b/src/mess/machine/apollo_net.c index f9b02730a6b..cfcfba8d8fd 100644 --- a/src/mess/machine/apollo_net.c +++ b/src/mess/machine/apollo_net.c @@ -478,7 +478,6 @@ static void log_data(const device_t *device, const char *type, } static UINT16 get_socket(const UINT8 rx_data_buffer[], int rx_data_length) { - const UINT8 * packet_buffer = rx_data_buffer + ETHERNET_HEADER_SIZE; int packet_length = rx_data_length - ETHERNET_HEADER_SIZE; @@ -622,7 +621,6 @@ static int ethernet_packet_is_for_me(const UINT8 ethernet_packet_header[], static int is_apollo_request(const UINT8 ethernet_header[], const int data_length) { - return data_length >= 0x30 && // get_word(ethernet_header + 0x0c) == ETHERNET_PACKET_TYPE_APOLLO; } @@ -677,7 +675,6 @@ static UINT16 in_checksum(UINT8 *ptr, UINT32 nbytes) static int arp_server(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - // static UINT8 arp_response[] = { // 0x08,0x00,0x1e,0x02,0x61,0x6d, // 0x00: Ethernet address of destination // 0x08,0x00,0x1e,0x04,0x20,0xe8, // 0x06: Ethernet address of sender @@ -724,7 +721,6 @@ static int arp_server(const device_t *device, static int echo_server(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - static const UINT32 ip_offset = sizeof(ethernet_header); static const UINT32 icmp_offset = ip_offset + sizeof(ip_header); @@ -763,7 +759,6 @@ static int echo_server(const device_t *device, static int netserver(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - if (!ethernet_packet_is_for_me(rx_data, rx_data_length)) return 0; // skip else if (is_apollo_request(rx_data, rx_data_length)) diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index a0bbb559a19..49a65e662d8 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -1881,7 +1881,6 @@ READ8_MEMBER(apple2gs_state::apple2gs_read_vector) MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) { - apple2gs_refresh_delegates(); m_cur_slot6_image = NULL; @@ -1929,7 +1928,6 @@ MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) MACHINE_START_MEMBER(apple2gs_state,apple2gscommon) { - apple2gs_refresh_delegates(); apple2_init_common(machine()); diff --git a/src/mess/machine/at45dbxx.h b/src/mess/machine/at45dbxx.h index d8f5ec81e33..96239474168 100644 --- a/src/mess/machine/at45dbxx.h +++ b/src/mess/machine/at45dbxx.h @@ -43,8 +43,7 @@ extern const device_type AT45DB041; #define MCFG_AT45DB041_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB041, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB041, 0) class at45db081_device : public at45db041_device { public: @@ -58,8 +57,7 @@ extern const device_type AT45DB081; #define MCFG_AT45DB081_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB081, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB081, 0) class at45db161_device : public at45db041_device { public: @@ -73,8 +71,7 @@ extern const device_type AT45DB161; #define MCFG_AT45DB161_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB161, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB161, 0) /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/mess/machine/at_keybc.h b/src/mess/machine/at_keybc.h index b4604e7ff84..01a5bb0f6ec 100644 --- a/src/mess/machine/at_keybc.h +++ b/src/mess/machine/at_keybc.h @@ -45,7 +45,6 @@ struct at_keyboard_controller_interface class at_keyboard_controller_device : public device_t, public at_keyboard_controller_interface { - public: // construction/destruction at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c index a0ff5378001..be13452bd8f 100644 --- a/src/mess/machine/b2m.c +++ b/src/mess/machine/b2m.c @@ -288,7 +288,6 @@ DRIVER_INIT_MEMBER(b2m_state,b2m) WRITE8_MEMBER(b2m_state::b2m_palette_w) { - UINT8 b = (3 - ((data >> 6) & 3)) * 0x55; UINT8 g = (3 - ((data >> 4) & 3)) * 0x55; UINT8 r = (3 - ((data >> 2) & 3)) * 0x55; diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index 05d1148f7a9..fe90477da4a 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1310,7 +1310,6 @@ static void MC6850_Receive_Clock(running_machine &machine, int new_clock) TIMER_CALLBACK_MEMBER(bbc_state::bbc_tape_timer_cb) { - double dev_val; dev_val=machine().device(CASSETTE_TAG)->input(); diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index 59b4ca81a6f..85a8bf05283 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -129,7 +129,6 @@ READ8_DEVICE_HANDLER(betadisk_sector_r) READ8_DEVICE_HANDLER(betadisk_data_r) { - beta_disk_state *beta = get_safe_token(device); if (beta->betadisk_active==1) { diff --git a/src/mess/machine/c1581.h b/src/mess/machine/c1581.h index 9bc3257fe42..64fd71ce8d6 100644 --- a/src/mess/machine/c1581.h +++ b/src/mess/machine/c1581.h @@ -39,7 +39,6 @@ class base_c1581_device : public device_t, public device_cbm_iec_interface { - public: // construction/destruction base_c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant); diff --git a/src/mess/machine/c2n.h b/src/mess/machine/c2n.h index 30507e42d40..d7049af1889 100644 --- a/src/mess/machine/c2n.h +++ b/src/mess/machine/c2n.h @@ -28,7 +28,6 @@ class c2n_device : public device_t, public device_pet_datassette_port_interface { - public: // construction/destruction c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/coco_vhd.c b/src/mess/machine/coco_vhd.c index bcf9cfe30f1..dfa1c95214f 100644 --- a/src/mess/machine/coco_vhd.c +++ b/src/mess/machine/coco_vhd.c @@ -73,7 +73,6 @@ coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, cons : device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/mess/machine/coco_vhd.h b/src/mess/machine/coco_vhd.h index 2c182ccdc6d..e68eabcb4b8 100644 --- a/src/mess/machine/coco_vhd.h +++ b/src/mess/machine/coco_vhd.h @@ -68,6 +68,5 @@ extern const device_type COCO_VHD; ***************************************************************************/ #define MCFG_COCO_VHD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, COCO_VHD, 0) \ - + MCFG_DEVICE_ADD(_tag, COCO_VHD, 0) #endif /* COCOVHD_H */ diff --git a/src/mess/machine/compis.c b/src/mess/machine/compis.c index 69ecf6c4ba8..e0a2274c86e 100644 --- a/src/mess/machine/compis.c +++ b/src/mess/machine/compis.c @@ -1302,7 +1302,6 @@ static IRQ_CALLBACK( compis_irq_callback ) DRIVER_INIT_MEMBER(compis_state,compis) { - machine().device("maincpu")->execute().set_irq_acknowledge_callback(compis_irq_callback); memset (&m_compis, 0, sizeof (m_compis) ); } diff --git a/src/mess/machine/corvushd.c b/src/mess/machine/corvushd.c index 169616cb23f..0045040b83d 100644 --- a/src/mess/machine/corvushd.c +++ b/src/mess/machine/corvushd.c @@ -395,7 +395,6 @@ static corvus_cmd_t corvus_prep_cmd[0x82]; // Prep Command sizes and their // nada // static void dump_buffer(UINT8 *buffer, UINT16 length) { - UINT16 offset; char ascii_dump[16]; @@ -436,7 +435,6 @@ static void dump_buffer(UINT8 *buffer, UINT16 length) { // Whether the command was invalid or not (TRUE = invalid command) // static UINT8 parse_hdc_command(UINT8 data) { - corvus_hdc_t *c = &corvus_hdc; c->awaiting_modifier = FALSE; // This is the case by definition @@ -545,7 +543,6 @@ static UINT8 parse_hdc_command(UINT8 data) { // status: Command status // static UINT8 corvus_write_sector(running_machine &machine, UINT8 drv, UINT32 sector, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; hard_disk_file @@ -606,7 +603,6 @@ static UINT8 corvus_write_sector(running_machine &machine, UINT8 drv, UINT32 sec // status: Corvus status // static UINT8 corvus_write_logical_sector(running_machine &machine, dadr_t *dadr, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; UINT8 status; // Status returned from Physical Sector read @@ -656,7 +652,6 @@ static UINT8 corvus_write_logical_sector(running_machine &machine, dadr_t *dadr, // status: Corvus status // static UINT8 corvus_read_sector(running_machine &machine, UINT8 drv, UINT32 sector, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; hard_disk_file @@ -706,7 +701,6 @@ static UINT8 corvus_read_sector(running_machine &machine, UINT8 drv, UINT32 sect // status: Corvus status // static UINT8 corvus_read_logical_sector(running_machine &machine, dadr_t *dadr, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; UINT8 status; // Status returned from Physical Sector read @@ -757,7 +751,6 @@ static UINT8 corvus_read_logical_sector(running_machine &machine, dadr_t *dadr, // Fills in the semaphore result code // static UINT8 corvus_lock_semaphore(running_machine &machine, UINT8 *name) { - corvus_hdc_t *c = &corvus_hdc; semaphore_table_block_t @@ -835,7 +828,6 @@ static UINT8 corvus_lock_semaphore(running_machine &machine, UINT8 *name) { // Fills in the semaphore result code // static UINT8 corvus_unlock_semaphore(running_machine &machine, UINT8 *name) { - corvus_hdc_t *c = &corvus_hdc; semaphore_table_block_t @@ -903,7 +895,6 @@ static UINT8 corvus_unlock_semaphore(running_machine &machine, UINT8 *name) { // // static UINT8 corvus_init_semaphore_table( running_machine &machine ) { - semaphore_table_block_t semaphore_table; UINT8 status; @@ -933,7 +924,6 @@ static UINT8 corvus_init_semaphore_table( running_machine &machine ) { // Status of command // static UINT8 corvus_get_drive_parameters(running_machine &machine, UINT8 drv) { - corvus_hdc_t *c = &corvus_hdc; UINT16 capacity; // Number of usable 512-byte blocks @@ -1042,7 +1032,6 @@ static UINT8 corvus_get_drive_parameters(running_machine &machine, UINT8 drv) { // status: Status of read operation // static UINT8 corvus_read_boot_block(running_machine &machine, UINT8 block) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure LOG(("corvus_read_boot_block: Reading boot block: %d\n", block)); @@ -1066,7 +1055,6 @@ static UINT8 corvus_read_boot_block(running_machine &machine, UINT8 block) { // Status of command // static UINT8 corvus_read_firmware_block(running_machine &machine, UINT8 head, UINT8 sector) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure UINT16 relative_sector; // Relative sector on drive for Physical Read @@ -1097,7 +1085,6 @@ static UINT8 corvus_read_firmware_block(running_machine &machine, UINT8 head, UI // Status of command // static UINT8 corvus_write_firmware_block(running_machine &machine, UINT8 head, UINT8 sector, UINT8 *buffer) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure UINT16 relative_sector; // Relative sector on drive for Physical Read @@ -1126,7 +1113,6 @@ static UINT8 corvus_write_firmware_block(running_machine &machine, UINT8 head, U // Status of command // static UINT8 corvus_format_drive(running_machine &machine, UINT8 *pattern, UINT16 len) { - corvus_hdc_t *c = &corvus_hdc; UINT32 sector; @@ -1206,7 +1192,6 @@ static hard_disk_file *corvus_hdc_file(running_machine &machine, int id) { // Nothing // static void corvus_process_command_packet(running_machine &machine, UINT8 invalid_command_flag) { - corvus_hdc_t *c = &corvus_hdc; if (VERBOSE_RESPONSES) @@ -1434,7 +1419,6 @@ static TIMER_CALLBACK(corvus_hdc_callback) // NULL if there's no file to attach to // UINT8 corvus_hdc_init(running_machine &machine) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure hard_disk_file *disk; // Structures for interface to CHD routines hard_disk_info *info; @@ -1577,7 +1561,6 @@ UINT8 corvus_hdc_init(running_machine &machine) { // Value in the controller status register // READ8_HANDLER ( corvus_hdc_status_r ) { - corvus_hdc_t *c = &corvus_hdc; return c->status; @@ -1599,7 +1582,6 @@ READ8_HANDLER ( corvus_hdc_status_r ) { // Value in the controller data register // READ8_HANDLER ( corvus_hdc_data_r ) { - corvus_hdc_t *c = &corvus_hdc; UINT8 result; @@ -1649,7 +1631,6 @@ READ8_HANDLER ( corvus_hdc_data_r ) { // Nothing // WRITE8_HANDLER ( corvus_hdc_data_w ) { - corvus_hdc_t *c = &corvus_hdc; // diff --git a/src/mess/machine/cpc_rom.c b/src/mess/machine/cpc_rom.c index 84fac10c88d..bc2350a3300 100644 --- a/src/mess/machine/cpc_rom.c +++ b/src/mess/machine/cpc_rom.c @@ -84,7 +84,6 @@ rom_image_device::rom_image_device(const machine_config &mconfig, const char *ta : device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/mess/machine/cpc_rom.h b/src/mess/machine/cpc_rom.h index daddbbf689a..9d0a8319041 100644 --- a/src/mess/machine/cpc_rom.h +++ b/src/mess/machine/cpc_rom.h @@ -54,8 +54,7 @@ extern const device_type ROMSLOT; #define MCFG_ROMSLOT_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, ROMSLOT, 0) \ - + MCFG_DEVICE_ADD(_tag, ROMSLOT, 0) /*** ROM box device ***/ diff --git a/src/mess/machine/d9060.h b/src/mess/machine/d9060.h index e7b9b46d557..9ea327a0a25 100644 --- a/src/mess/machine/d9060.h +++ b/src/mess/machine/d9060.h @@ -43,7 +43,6 @@ class base_d9060_device : public device_t, public device_ieee488_interface { - public: enum { diff --git a/src/mess/machine/dai.c b/src/mess/machine/dai.c index ea38b2e121e..67f72e08a2f 100644 --- a/src/mess/machine/dai.c +++ b/src/mess/machine/dai.c @@ -112,7 +112,6 @@ TIMER_CALLBACK_MEMBER(dai_state::dai_timer) void dai_state::machine_start() { - membank("bank2")->configure_entries(0, 4, memregion("maincpu")->base() + 0x010000, 0x1000); machine().scheduler().timer_set(attotime::zero, timer_expired_delegate(FUNC(dai_state::dai_bootstrap_callback),this)); machine().scheduler().timer_pulse(attotime::from_hz(100), timer_expired_delegate(FUNC(dai_state::dai_timer),this)); /* timer for tms5501 */ diff --git a/src/mess/machine/diag264_lb_tape.h b/src/mess/machine/diag264_lb_tape.h index de15ca236ac..4a2eafdb26e 100644 --- a/src/mess/machine/diag264_lb_tape.h +++ b/src/mess/machine/diag264_lb_tape.h @@ -27,7 +27,6 @@ class diag264_cassette_loopback_device : public device_t, public device_pet_datassette_port_interface { - public: // construction/destruction diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/fm_scsi.h b/src/mess/machine/fm_scsi.h index 179a825cdaa..b9dc4bb852f 100644 --- a/src/mess/machine/fm_scsi.h +++ b/src/mess/machine/fm_scsi.h @@ -34,11 +34,9 @@ MCFG_DEVICE_ADD(_tag, FMSCSI, 0) #define MCFG_FMSCSI_IRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_irq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &fmscsi_device::set_irq_handler(*device, DEVCB2_##_devcb); #define MCFG_FMSCSI_DRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_drq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &fmscsi_device::set_drq_handler(*device, DEVCB2_##_devcb); class fmscsi_device : public device_t { public: diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c index 79676a8e357..97c5c99c198 100644 --- a/src/mess/machine/gb.c +++ b/src/mess/machine/gb.c @@ -321,7 +321,6 @@ MACHINE_RESET_MEMBER(gb_state,gb) MACHINE_START_MEMBER(gb_state,sgb) { - m_sgb_packets = -1; m_sgb_tile_data = auto_alloc_array_clear(machine(), UINT8, 0x2000 ); diff --git a/src/mess/machine/hec2hrp.c b/src/mess/machine/hec2hrp.c index c0567ba384c..3c6524cc066 100644 --- a/src/mess/machine/hec2hrp.c +++ b/src/mess/machine/hec2hrp.c @@ -370,7 +370,6 @@ WRITE8_MEMBER(hec2hrp_state::hector_sn_3000_w) /* Color Interface */ WRITE8_MEMBER(hec2hrp_state::hector_color_a_w) { - if (data & 0x40) { /* Bit 6 => motor ON/OFF => for cassette state!*/ @@ -448,7 +447,6 @@ static cassette_image_device *cassette_device_image(running_machine &machine) /******************* READ PIO 8255 *******************/ READ8_MEMBER(hec2hrp_state::hector_io_8255_r) { - /* 8255 in mode 0 */ UINT8 data =0; UINT8 data_l=0; diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c index b4309af817b..a396110a3c7 100644 --- a/src/mess/machine/hp48.c +++ b/src/mess/machine/hp48.c @@ -369,7 +369,6 @@ WRITE8_MEMBER(hp48_state::hp48_io_w) switch( offset ) { - /* CRC register */ case 0x04: m_crc = (m_crc & 0xfff0) | data; break; case 0x05: m_crc = (m_crc & 0xff0f) | (data << 4); break; @@ -483,7 +482,6 @@ READ8_MEMBER(hp48_state::hp48_io_r) switch( offset ) { - /* CRC register */ case 0x04: data = m_crc & 0xf; break; case 0x05: data = (m_crc >> 4) & 0xf; break; diff --git a/src/mess/machine/i8271.c b/src/mess/machine/i8271.c index d05112e147f..d6ce2a37036 100644 --- a/src/mess/machine/i8271.c +++ b/src/mess/machine/i8271.c @@ -231,7 +231,6 @@ static void i8271_seek_to_track(device_t *device,int track) } else { - signed int SignedTracks; /* calculate number of tracks to seek */ @@ -573,7 +572,6 @@ static void i8271_command_continue(device_t *device) /* end command? */ if (i8271->Counter==0) { - i8271_timed_command_complete(device); return; } @@ -596,7 +594,6 @@ static void i8271_command_continue(device_t *device) /* end command? */ if (i8271->Counter==0) { - i8271_timed_command_complete(device); return; } @@ -1036,7 +1033,6 @@ static void i8271_command_execute(device_t *device) case I8271_SPECIAL_REGISTER_DRIVE_CONTROL_INPUT_PORT: { - FDC_LOG_COMMAND("Write Drive Control Input port\n"); // i8271->drive_control_input = i8271->CommandParameters[1]; @@ -1258,7 +1254,6 @@ static void i8271_command_execute(device_t *device) } else { - i8271->drive_control_output |=1; i8271_seek_to_track(device,i8271->CommandParameters[0]); @@ -1289,7 +1284,6 @@ static void i8271_command_execute(device_t *device) } else { - i8271->Counter = i8271->CommandParameters[2]; i8271_seek_to_track(device,i8271->CommandParameters[0]); @@ -1469,7 +1463,6 @@ READ8_DEVICE_HANDLER(i8271_r) case 1: { - if ((i8271->StatusRegister & I8271_STATUS_COMMAND_BUSY)==0) { /* clear IRQ */ diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c index d62729981b2..83221c8e330 100644 --- a/src/mess/machine/intv.c +++ b/src/mess/machine/intv.c @@ -547,7 +547,6 @@ static int intv_load_rom_file(device_image_interface &image) DEVICE_IMAGE_LOAD( intv_cart ) { - if (image.software_entry() == NULL) return intv_load_rom_file(image); else diff --git a/src/mess/machine/isa.h b/src/mess/machine/isa.h index ed27d0238fa..3cd295e99c5 100644 --- a/src/mess/machine/isa.h +++ b/src/mess/machine/isa.h @@ -75,23 +75,19 @@ #define MCFG_ISA8_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, ISA8, 0) \ MCFG_DEVICE_CONFIG(_config) \ - isa8_device::static_set_cputag(*device, _cputag); \ - + isa8_device::static_set_cputag(*device, _cputag); #define MCFG_ISA8_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA8_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ - isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag); \ - + isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag); #define MCFG_ISA16_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, ISA16, 0) \ MCFG_DEVICE_CONFIG(_config) \ - isa8_device::static_set_cputag(*device, _cputag); \ - + isa8_device::static_set_cputag(*device, _cputag); #define MCFG_ISA16_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA16_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ - isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); \ - + isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/mess/machine/isa_ide_cd.c b/src/mess/machine/isa_ide_cd.c index 9b03c3adc4e..1a693d5a298 100644 --- a/src/mess/machine/isa_ide_cd.c +++ b/src/mess/machine/isa_ide_cd.c @@ -93,7 +93,6 @@ READ16_MEMBER( isa16_ide_cd_device::atapi_r ) data |= ( m_atapi_data[m_atapi_data_ptr++] << 8 ); if( m_atapi_data_ptr >= m_atapi_data_len ) { - m_atapi_data_ptr = 0; m_atapi_data_len = 0; diff --git a/src/mess/machine/kc.c b/src/mess/machine/kc.c index 28a3be5b96e..3fb642e2f73 100644 --- a/src/mess/machine/kc.c +++ b/src/mess/machine/kc.c @@ -212,7 +212,6 @@ void kc_state::update_cassette(int state) TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_oneshot_timer) { - update_cassette(0); m_cassette_oneshot_timer->reset(); @@ -222,7 +221,6 @@ TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_oneshot_timer) // enabled only when cassette motor is on TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_timer_callback) { - // read cassette data int bit = (m_cassette->input() > 0.0038) ? 1 : 0; diff --git a/src/mess/machine/kc_keyb.h b/src/mess/machine/kc_keyb.h index 199f5fec8b9..47216c8de37 100644 --- a/src/mess/machine/kc_keyb.h +++ b/src/mess/machine/kc_keyb.h @@ -71,6 +71,5 @@ extern const device_type KC_KEYBOARD; #define MCFG_KC_KEYBOARD_ADD(_tag,_clock,_config) \ MCFG_DEVICE_ADD(_tag, KC_KEYBOARD, _clock) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #endif /* __KC_KEYB_H__ */ diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c index 05c94df14a5..981aee1d4e3 100644 --- a/src/mess/machine/lisa.c +++ b/src/mess/machine/lisa.c @@ -877,7 +877,6 @@ DIRECT_UPDATE_HANDLER (lisa_OPbaseoverride) switch ((mmu_entry_t)state->m_mmu_regs[the_seg][segment].type) { - case RAM_r: case RAM_rw: if (seg_offset > state->m_mmu_regs[the_seg][segment].slim) @@ -1408,7 +1407,6 @@ READ16_MEMBER(lisa_state::lisa_r) switch (m_mmu_regs[the_seg][segment].type) { - case RAM_stack_r: case RAM_stack_rw: if (address <= m_mmu_regs[the_seg][segment].slim) @@ -1612,7 +1610,6 @@ WRITE16_MEMBER(lisa_state::lisa_w) switch (m_mmu_regs[the_seg][segment].type) { - case RAM_stack_rw: if (address <= m_mmu_regs[the_seg][segment].slim) { diff --git a/src/mess/machine/mboard.c b/src/mess/machine/mboard.c index 7bdcd8a5e3f..9eb49144fe7 100644 --- a/src/mess/machine/mboard.c +++ b/src/mess/machine/mboard.c @@ -119,7 +119,6 @@ data: 0 0000 0000 all fields occupied void mboard_state::write_board(UINT8 data) { - Line18_REED=data; if (read_board_flag && !strcmp(machine().system().name,"glasgow") ) //HACK @@ -371,7 +370,6 @@ void mboard_state::check_board_buttons() if ((data != 0xff) && (!mouse_down) ) { - pos2num_res = pos_to_num(data); field=64-(board_row*8+8-pos2num_res); @@ -434,7 +432,6 @@ void mboard_state::check_board_buttons() /* check additional buttons */ if (data == 0xff) { - port_input=machine().root_device().ioport("B_BUTTONS")->read(); if (port_input==0x01) { diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c index 20da19f6eb2..a3a4660be3b 100644 --- a/src/mess/machine/mc6843.c +++ b/src/mess/machine/mc6843.c @@ -44,7 +44,6 @@ struct mc6843_t { - /* interface */ const mc6843_interface* iface; @@ -256,7 +255,6 @@ static int mc6843_address_search( device_t *device, chrn_id* id ) while ( 1 ) { - if ( ( ! floppy_drive_get_next_id( img, mc6843->side, id ) ) || ( id->flags & ID_FLAG_CRC_ERROR_IN_ID_FIELD ) || ( id->N != 0 ) ) { /* read address error */ @@ -421,7 +419,6 @@ READ8_DEVICE_HANDLER ( mc6843_r ) UINT8 data = 0; switch ( offset ) { - case 0: /* Data Input Register (DIR) */ { int cmd = mc6843->CMR & 0x0f; @@ -560,7 +557,6 @@ WRITE8_DEVICE_HANDLER ( mc6843_w ) { mc6843_t* mc6843 = get_safe_token( device ); switch ( offset ) { - case 0: /* Data Output Register (DOR) */ { int cmd = mc6843->CMR & 0x0f; diff --git a/src/mess/machine/mc6846.c b/src/mess/machine/mc6846.c index 77853441162..2db1709d9cd 100644 --- a/src/mess/machine/mc6846.c +++ b/src/mess/machine/mc6846.c @@ -30,7 +30,6 @@ struct mc6846_t { - const mc6846_interface* iface; /* registers */ @@ -179,7 +178,6 @@ INLINE void mc6846_timer_launch ( device_t *device ) switch( MODE ) { - case 0x00: case 0x10: /* continuous */ mc6846->cto = 0; diff --git a/src/mess/machine/mc6854.c b/src/mess/machine/mc6854.c index 8e6129dba08..f453647b60b 100644 --- a/src/mess/machine/mc6854.c +++ b/src/mess/machine/mc6854.c @@ -356,7 +356,6 @@ static TIMER_CALLBACK(mc6854_tfifo_cb) switch ( mc6854->tstate ) { - case 2: /* 8-bit address field */ if ( ( data & 1 ) || ( ! AEX ) ) mc6854->tstate = 3; @@ -464,7 +463,6 @@ static void mc6854_rfifo_push( device_t *device, UINT8 d ) switch ( mc6854->rstate ) { - case 0: case 1: case 2: /* 8-bit address field */ @@ -804,7 +802,6 @@ READ8_DEVICE_HANDLER ( mc6854_r ) mc6854_t* mc6854 = get_safe_token( device ); switch ( offset ) { - case 0: /* status register 1 */ mc6854_update_sr1( mc6854 ); LOG(( "%f $%04x mc6854_r: get SR1=$%02X (rda=%i,s2rq=%i,fd=%i,cts=%i,tu=%i,tdra=%i,irq=%i)\n", @@ -847,7 +844,6 @@ WRITE8_DEVICE_HANDLER ( mc6854_w ) mc6854_t* mc6854 = get_safe_token( device ); switch ( offset ) { - case 0: /* control register 1 */ mc6854->cr1 = data; LOG(( "%f $%04x mc6854_w: set CR1=$%02X (ac=%i,irq=%c%c,%sreset=%c%c)\n", diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c index 6ecc0d53e4a..7ed7a29b898 100644 --- a/src/mess/machine/msx.c +++ b/src/mess/machine/msx.c @@ -842,7 +842,6 @@ static void msx_memory_init (running_machine &machine) state->layout = layout; for (; layout->entry != MSX_LAYOUT_LAST; layout++) { - switch (layout->entry) { case MSX_LAYOUT_SLOT_ENTRY: prim = layout->slot_primary; @@ -895,7 +894,6 @@ static void msx_memory_init (running_machine &machine) if (!st) { switch (slot->mem_type) { - case MSX_MEM_HANDLER: case MSX_MEM_ROM: mem = machine.root_device().memregion("maincpu")->base() + option; diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c index 0051af8f718..7bcb209e0f0 100644 --- a/src/mess/machine/mz700.c +++ b/src/mess/machine/mz700.c @@ -99,7 +99,6 @@ DRIVER_INIT_MEMBER(mz_state,mz800) void mz_state::machine_start() { - m_pit = machine().device("pit8253"); m_ppi = machine().device("ppi8255"); @@ -374,7 +373,6 @@ WRITE8_MEMBER(mz_state::mz700_bank_5_w) WRITE8_MEMBER(mz_state::mz700_bank_6_w) { - if (m_mz700_mode) { m_mz700_ram_lock = FALSE; @@ -610,7 +608,6 @@ WRITE8_MEMBER(mz_state::mz800_read_format_w) */ WRITE8_MEMBER(mz_state::mz800_display_mode_w) { - m_mz700_mode = BIT(data, 3); m_hires_mode = BIT(data, 2); m_screen = data & 0x03; diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index f609d95f956..538a1be0540 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -110,7 +110,6 @@ READ8_MEMBER(nascom1_state::nascom1_port_00_r) WRITE8_MEMBER(nascom1_state::nascom1_port_00_w) { - machine().device(CASSETTE_TAG)->change_state( ( data & 0x10 ) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR ); diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index 476baa9c5b5..680e942b6b2 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -208,7 +208,6 @@ int nes_ppu_vidaccess( device_t *device, int address, int data ) void nes_state::machine_reset() { - /* Reset the mapper variables. Will also mark the char-gen ram as dirty */ if (m_disk_expansion && m_pcb_id == NO_BOARD) m_ppu->set_hblank_callback(fds_irq); @@ -1645,7 +1644,6 @@ READ8_MEMBER(nes_state::nes_fds_r) WRITE8_MEMBER(nes_state::nes_fds_w) { - switch (offset) { case 0x00: @@ -1714,7 +1712,6 @@ static void nes_unload_proc( device_image_interface &image ) DRIVER_INIT_MEMBER(nes_state,famicom) { - /* clear some of the variables we don't use */ m_trainer = 0; m_battery = 0; diff --git a/src/mess/machine/nes_mmc.c b/src/mess/machine/nes_mmc.c index ff4c741dc4a..f6fef2d7b12 100644 --- a/src/mess/machine/nes_mmc.c +++ b/src/mess/machine/nes_mmc.c @@ -211,7 +211,6 @@ READ8_MEMBER(nes_state::nes_nt_r) WRITE8_MEMBER(nes_state::nes_low_mapper_w) { - if (!m_mmc_write_low.isnull()) (m_mmc_write_low)(space, offset, data, mem_mask); else @@ -220,7 +219,6 @@ WRITE8_MEMBER(nes_state::nes_low_mapper_w) READ8_MEMBER(nes_state::nes_low_mapper_r) { - if (!m_mmc_read_low.isnull()) return (m_mmc_read_low)(space, offset, mem_mask); else diff --git a/src/mess/machine/nes_pcb.c b/src/mess/machine/nes_pcb.c index 75319b1ec50..6520fccaaca 100644 --- a/src/mess/machine/nes_pcb.c +++ b/src/mess/machine/nes_pcb.c @@ -1906,7 +1906,6 @@ READ8_MEMBER(nes_carts_state::exrom_l_r) WRITE8_MEMBER(nes_carts_state::exrom_l_w) { - // LOG_MMC(("Mapper 5 write, offset: %04x, data: %02x\n", offset + 0x4100, data)); /* Send $5000-$5015 to the sound chip */ if ((offset >= 0xf00) && (offset <= 0xf15)) @@ -2408,7 +2407,6 @@ static void ntbrom_mirror( running_machine &machine, int mirror, int mirr0, int WRITE8_MEMBER(nes_carts_state::ntbrom_w) { - LOG_MMC(("ntbrom_w, offset %04x, data: %02x\n", offset, data)); switch (offset & 0x7000) @@ -10695,7 +10693,6 @@ static void bmc_ball11_set_banks( running_machine &machine ) WRITE8_MEMBER(nes_carts_state::bmc_ball11_m_w) { - LOG_MMC(("bmc_ball11_m_w, offset: %04x, data: %02x\n", offset, data)); m_mmc_reg[0] = ((data >> 1) & 0x01) | ((data >> 3) & 0x02); @@ -10704,7 +10701,6 @@ WRITE8_MEMBER(nes_carts_state::bmc_ball11_m_w) WRITE8_MEMBER(nes_carts_state::bmc_ball11_w) { - LOG_MMC(("bmc_ball11_w, offset: %04x, data: %02x\n", offset, data)); switch (offset & 0x6000) @@ -11524,7 +11520,6 @@ static void someri_mmc1_set_chr( running_machine &machine ) WRITE8_MEMBER(nes_carts_state::someri_mmc1_w) { - assert(m_mmc_cmd1 == 2); if (data & 0x80) diff --git a/src/mess/machine/nubus.h b/src/mess/machine/nubus.h index 3e7661ef6e6..719fb244b9f 100644 --- a/src/mess/machine/nubus.h +++ b/src/mess/machine/nubus.h @@ -21,13 +21,11 @@ #define MCFG_NUBUS_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, NUBUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ - nubus_device::static_set_cputag(*device, _cputag); \ - + nubus_device::static_set_cputag(*device, _cputag); #define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - nubus_slot_device::static_set_nubus_slot(*device, _nbtag, _tag); \ - + nubus_slot_device::static_set_nubus_slot(*device, _nbtag, _tag); #define MCFG_NUBUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/omti8621.c b/src/mess/machine/omti8621.c index 6cbc513e534..c38a5d85514 100644 --- a/src/mess/machine/omti8621.c +++ b/src/mess/machine/omti8621.c @@ -424,7 +424,6 @@ static void set_data_transfer(omti8621_state *state, UINT8 *data, UINT16 length) static void read_sectors_from_disk(omti8621_state *state, INT32 diskaddr, UINT8 count, UINT8 lun) { - UINT8 *data_buffer = state->sector_buffer; device_image_interface *image = state->disk[lun]->image; @@ -445,7 +444,6 @@ static void read_sectors_from_disk(omti8621_state *state, INT32 diskaddr, static void write_sectors_to_disk(omti8621_state *state, INT32 diskaddr, UINT8 count, UINT8 lun) { - UINT8 *data_buffer = state->sector_buffer; device_image_interface *image = state->disk[lun]->image; @@ -671,7 +669,6 @@ static void log_data(const omti8621_state *state) { static void do_command(omti8621_state *state, const UINT8 cdb[], const UINT16 cdb_length) { - UINT8 lun = get_lun(cdb); disk_data *disk = state->disk[lun]; int command_duration = 0; // ms diff --git a/src/mess/machine/osborne1.c b/src/mess/machine/osborne1.c index 00e63944330..3cbb524ff40 100644 --- a/src/mess/machine/osborne1.c +++ b/src/mess/machine/osborne1.c @@ -445,7 +445,6 @@ void osborne1_state::machine_reset() DRIVER_INIT_MEMBER(osborne1_state,osborne1) { - m_empty_4K = auto_alloc_array(machine(), UINT8, 0x1000 ); memset( m_empty_4K, 0xFF, 0x1000 ); diff --git a/src/mess/machine/pc1350.c b/src/mess/machine/pc1350.c index 46e1f8e66b8..3227381a7f7 100644 --- a/src/mess/machine/pc1350.c +++ b/src/mess/machine/pc1350.c @@ -21,7 +21,6 @@ void pc1350_outb(device_t *device, int data) void pc1350_outc(device_t *device, int data) { - } int pc1350_ina(device_t *device) diff --git a/src/mess/machine/pc9801_118.c b/src/mess/machine/pc9801_118.c index 464e24ec0f4..9ea047f90f6 100644 --- a/src/mess/machine/pc9801_118.c +++ b/src/mess/machine/pc9801_118.c @@ -131,7 +131,6 @@ pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char * // m_maincpu(*owner, "maincpu"), m_opn3(*this, "opn3") { - } diff --git a/src/mess/machine/pc9801_26.c b/src/mess/machine/pc9801_26.c index 52375395ba5..497106b3358 100644 --- a/src/mess/machine/pc9801_26.c +++ b/src/mess/machine/pc9801_26.c @@ -123,7 +123,6 @@ pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *ta // m_maincpu(*owner, "maincpu"), m_opn(*this, "opn") { - } @@ -163,7 +162,6 @@ void pc9801_26_device::install_device(offs_t start, offs_t end, offs_t mask, off void pc9801_26_device::device_start() { - } diff --git a/src/mess/machine/pc9801_86.c b/src/mess/machine/pc9801_86.c index 66cf8cdd36d..f916fb4e5e0 100644 --- a/src/mess/machine/pc9801_86.c +++ b/src/mess/machine/pc9801_86.c @@ -131,7 +131,6 @@ pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *ta // m_maincpu(*owner, "maincpu"), m_opna(*this, "opna") { - } @@ -171,7 +170,6 @@ void pc9801_86_device::install_device(offs_t start, offs_t end, offs_t mask, off void pc9801_86_device::device_start() { - } diff --git a/src/mess/machine/pc9801_kbd.c b/src/mess/machine/pc9801_kbd.c index 4ec418becba..eb3119e2e3d 100644 --- a/src/mess/machine/pc9801_kbd.c +++ b/src/mess/machine/pc9801_kbd.c @@ -36,7 +36,6 @@ const device_type PC9801_KBD = &device_creator; pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock) { - } //------------------------------------------------- diff --git a/src/mess/machine/pc_joy.c b/src/mess/machine/pc_joy.c index 2350a0b622e..6406c54afd3 100644 --- a/src/mess/machine/pc_joy.c +++ b/src/mess/machine/pc_joy.c @@ -28,7 +28,6 @@ READ8_HANDLER ( pc_JOY_r ) /* timer overflow? Nope, otherwise some HWs can't verify the port properly */ //if ((new_time - JOY_time) > attotime::from_msec(10)) //{ - //} //else { diff --git a/src/mess/machine/pc_kbdc.h b/src/mess/machine/pc_kbdc.h index ad4b079e795..36a1c5adf1b 100644 --- a/src/mess/machine/pc_kbdc.h +++ b/src/mess/machine/pc_kbdc.h @@ -21,13 +21,11 @@ set the data line and then set the clock line. #define MCFG_PC_KBDC_ADD(_tag, _config) \ MCFG_DEVICE_ADD(_tag, PC_KBDC, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot, _def_inp ) \ MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) ); \ - + pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) ); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/pce220_ser.h b/src/mess/machine/pce220_ser.h index 5e51c6fc5e7..80782499200 100644 --- a/src/mess/machine/pce220_ser.h +++ b/src/mess/machine/pce220_ser.h @@ -89,6 +89,5 @@ extern const device_type PCE220SERIAL; #define PCE220SERIAL_TAG "serial" #define MCFG_PCE220_SERIAL_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PCE220SERIAL, 0) \ - + MCFG_DEVICE_ADD(_tag, PCE220SERIAL, 0) #endif /* __PCE220_SER_H__ */ diff --git a/src/mess/machine/pcf8593.h b/src/mess/machine/pcf8593.h index e2fc8fc6206..1837e5be2d8 100644 --- a/src/mess/machine/pcf8593.h +++ b/src/mess/machine/pcf8593.h @@ -38,8 +38,7 @@ extern const device_type PCF8593; #define MCFG_PCF8593_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PCF8593, 0) \ - + MCFG_DEVICE_ADD(_tag, PCF8593, 0) #define MCFG_PCF8593_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/pecom.c b/src/mess/machine/pecom.c index 24fc6ce0cd8..afe91a7ce08 100644 --- a/src/mess/machine/pecom.c +++ b/src/mess/machine/pecom.c @@ -14,7 +14,6 @@ TIMER_CALLBACK_MEMBER(pecom_state::reset_tick) { - m_reset = 1; } diff --git a/src/mess/machine/pet.c b/src/mess/machine/pet.c index 192530564e8..aa0522551e5 100644 --- a/src/mess/machine/pet.c +++ b/src/mess/machine/pet.c @@ -705,7 +705,6 @@ DRIVER_INIT_MEMBER(pet_state,superpet) void pet_state::machine_reset() { - if (m_superpet) { m_spet.rom = 0; diff --git a/src/mess/machine/poly88.c b/src/mess/machine/poly88.c index 64bdb8c3eaa..f3d59e126fb 100644 --- a/src/mess/machine/poly88.c +++ b/src/mess/machine/poly88.c @@ -50,7 +50,6 @@ TIMER_CALLBACK_MEMBER(poly88_state::keyboard_callback) for(i = 0; i < 7; i++) { - code = machine().root_device().ioport(keynames[i])->read(); if (code != 0) { diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c index e116bed7b42..aaf964b182c 100644 --- a/src/mess/machine/primo.c +++ b/src/mess/machine/primo.c @@ -170,7 +170,6 @@ WRITE8_MEMBER(primo_state::primo_ki_1_w) WRITE8_MEMBER(primo_state::primo_ki_2_w) { - // bit 7, 6 - not used // bit 5 - SCLK diff --git a/src/mess/machine/psion_pack.h b/src/mess/machine/psion_pack.h index 232eb030794..5760a427915 100644 --- a/src/mess/machine/psion_pack.h +++ b/src/mess/machine/psion_pack.h @@ -73,6 +73,5 @@ extern const device_type PSION_DATAPACK; ***************************************************************************/ #define MCFG_PSION_DATAPACK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PSION_DATAPACK, 0) \ - + MCFG_DEVICE_ADD(_tag, PSION_DATAPACK, 0) #endif /* __PSION_PACK_H__ */ diff --git a/src/mess/machine/psxcd.h b/src/mess/machine/psxcd.h index fdfb86c6f44..d0f4068f9db 100644 --- a/src/mess/machine/psxcd.h +++ b/src/mess/machine/psxcd.h @@ -32,8 +32,7 @@ const int num_commands=0x20; devcb = &psxcd_device::set_irq_handler(*device, DEVCB2_##_devcb); #define MCFG_PSXCD_DEVNAME(_name) \ - psxcd_device::static_set_devname(*device, _name); \ - + psxcd_device::static_set_devname(*device, _name); struct psxcd_interface { }; diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index f7fa24c04b2..b38f6269827 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -595,7 +595,6 @@ static void internal_timer_update(running_machine &machine, /* if we have real changes, update things */ if (diff != 0) { - /* if we're going off, make sure our timers are gone */ if ((diff & 0x8000) && !(new_control & 0x8000)) { @@ -1645,7 +1644,6 @@ static void decode_subbios(device_t *device,offs_t pc, UINT8 raw_flag) case 10 : { - set_type("t_acoustics"); switch(bx) @@ -2944,7 +2942,6 @@ TIMER_CALLBACK_MEMBER(rmnimbus_state::mouse_callback) if ((intstate_x==1) && (state->m_intstate_x==0)) // if (intstate_x!=state->m_intstate_x) { - xint=mxa ? EXTERNAL_INT_MOUSE_XR : EXTERNAL_INT_MOUSE_XL; external_int(machine(),0,xint); diff --git a/src/mess/machine/s100.h b/src/mess/machine/s100.h index f7b7c55a3e4..0ef291b191b 100644 --- a/src/mess/machine/s100.h +++ b/src/mess/machine/s100.h @@ -84,8 +84,7 @@ #define MCFG_S100_BUS_ADD(_cpu_tag, _config) \ MCFG_DEVICE_ADD(S100_TAG, S100, 0) \ MCFG_DEVICE_CONFIG(_config) \ - s100_device::static_set_cputag(*device, _cpu_tag); \ - + s100_device::static_set_cputag(*device, _cpu_tag); #define S100_INTERFACE(_name) \ const s100_bus_interface (_name) = @@ -94,8 +93,7 @@ #define MCFG_S100_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, S100_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - s100_slot_device::static_set_s100_slot(*device, S100_TAG); \ - + s100_slot_device::static_set_s100_slot(*device, S100_TAG); //************************************************************************** diff --git a/src/mess/machine/serialbox.h b/src/mess/machine/serialbox.h index 8422c53f549..2d13bcac689 100644 --- a/src/mess/machine/serialbox.h +++ b/src/mess/machine/serialbox.h @@ -36,7 +36,6 @@ class serial_box_device : public device_t, public device_cbm_iec_interface { - public: // construction/destruction serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c index acf1ea47d11..e506581e002 100644 --- a/src/mess/machine/sms.c +++ b/src/mess/machine/sms.c @@ -234,7 +234,6 @@ void sms_state::map_bios_8k( UINT16 address, UINT16 bank ) WRITE8_MEMBER(sms_state::sms_input_write) { - switch (offset) { case 0: @@ -488,7 +487,6 @@ static void lphaser2_sensor_check( running_machine &machine ) // if so, we turn on crosshair and the lightgun timer TIMER_CALLBACK_MEMBER(sms_state::lightgun_tick) { - if ((ioport("CTRLSEL")->read_safe(0x00) & 0x0f) == 0x01) { /* enable crosshair */ @@ -697,7 +695,6 @@ static void sms_get_inputs( address_space &space ) WRITE8_MEMBER(sms_state::sms_fm_detect_w) { - if (m_has_fm) m_fm_detect = (data & 0x01); } @@ -705,7 +702,6 @@ WRITE8_MEMBER(sms_state::sms_fm_detect_w) READ8_MEMBER(sms_state::sms_fm_detect_r) { - if (m_has_fm) { return m_fm_detect; @@ -758,7 +754,6 @@ WRITE8_MEMBER(sms_state::sms_io_control_w) READ8_MEMBER(sms_state::sms_count_r) { - if (offset & 0x01) return m_vdp->hcount_latch_read(*m_space, offset); else @@ -795,7 +790,6 @@ WRITE_LINE_MEMBER(sms_state::sms_pause_callback) READ8_MEMBER(sms_state::sms_input_port_0_r) { - if (m_bios_port & IO_CHIP) { return 0xff; @@ -810,7 +804,6 @@ READ8_MEMBER(sms_state::sms_input_port_0_r) READ8_MEMBER(sms_state::sms_input_port_1_r) { - if (m_bios_port & IO_CHIP) return 0xff; @@ -851,7 +844,6 @@ READ8_MEMBER(sms_state::sms_input_port_1_r) WRITE8_MEMBER(sms_state::sms_ym2413_register_port_0_w) { - if (m_has_fm) ym2413_w(m_ym, space, 0, (data & 0x3f)); } @@ -859,7 +851,6 @@ WRITE8_MEMBER(sms_state::sms_ym2413_register_port_0_w) WRITE8_MEMBER(sms_state::sms_ym2413_data_port_0_w) { - if (m_has_fm) { logerror("data_port_0_w %x %x\n", offset, data); @@ -870,7 +861,6 @@ WRITE8_MEMBER(sms_state::sms_ym2413_data_port_0_w) READ8_MEMBER(sms_state::gg_input_port_2_r) { - //logerror("joy 2 read, val: %02x, pc: %04x\n", ((m_is_region_japan ? 0x00 : 0x40) | (machine.root_device().ioport("START")->read() & 0x80)), activecpu_get_pc()); return ((m_is_region_japan ? 0x00 : 0x40) | (ioport("START")->read() & 0x80)); } @@ -936,7 +926,6 @@ READ8_MEMBER(sms_state::sms_tvdraw_data_r) WRITE8_MEMBER(sms_state::sms_93c46_w) { - if ( m_cartridge[m_current_cartridge].m_93c46_enabled ) { m_cartridge[m_current_cartridge].m_93c46_lines = data; @@ -1115,7 +1104,6 @@ WRITE8_MEMBER(sms_state::sms_mapper_w) WRITE8_MEMBER(sms_state::sms_korean_zemina_banksw_w) { - if (m_cartridge[m_current_cartridge].features & CF_KOREAN_ZEMINA_MAPPER) { if (!m_cartridge[m_current_cartridge].ROM) @@ -1142,7 +1130,6 @@ WRITE8_MEMBER(sms_state::sms_korean_zemina_banksw_w) WRITE8_MEMBER(sms_state::sms_codemasters_page0_w) { - if (m_cartridge[m_current_cartridge].ROM && m_cartridge[m_current_cartridge].features & CF_CODEMASTERS_MAPPER) { map_cart_16k( 0x0000, data ); @@ -1152,7 +1139,6 @@ WRITE8_MEMBER(sms_state::sms_codemasters_page0_w) WRITE8_MEMBER(sms_state::sms_codemasters_page1_w) { - if (m_cartridge[m_current_cartridge].ROM && m_cartridge[m_current_cartridge].features & CF_CODEMASTERS_MAPPER) { /* Check if we need to switch in some RAM */ @@ -1172,7 +1158,6 @@ WRITE8_MEMBER(sms_state::sms_codemasters_page1_w) WRITE8_MEMBER(sms_state::sms_4pak_page0_w) { - m_cartridge[m_current_cartridge].m_4pak_page0 = data; map_cart_16k( 0x0000, data ); @@ -1182,7 +1167,6 @@ WRITE8_MEMBER(sms_state::sms_4pak_page0_w) WRITE8_MEMBER(sms_state::sms_4pak_page1_w) { - m_cartridge[m_current_cartridge].m_4pak_page1 = data; map_cart_16k( 0x4000, data ); @@ -1191,7 +1175,6 @@ WRITE8_MEMBER(sms_state::sms_4pak_page1_w) WRITE8_MEMBER(sms_state::sms_4pak_page2_w) { - m_cartridge[m_current_cartridge].m_4pak_page2 = data; map_cart_16k( 0x8000, ( m_cartridge[m_current_cartridge].m_4pak_page0 & 0x30 ) + m_cartridge[m_current_cartridge].m_4pak_page2 ); @@ -1200,28 +1183,24 @@ WRITE8_MEMBER(sms_state::sms_4pak_page2_w) WRITE8_MEMBER(sms_state::sms_janggun_bank0_w) { - map_cart_8k( 0x4000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank1_w) { - map_cart_8k( 0x6000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank2_w) { - map_cart_8k( 0x8000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank3_w) { - map_cart_8k( 0xA000, data ); } @@ -1238,7 +1217,6 @@ WRITE8_MEMBER(sms_state::sms_bios_w) WRITE8_MEMBER(sms_state::sms_cartram2_w) { - if (m_mapper[0] & 0x08) { logerror("write %02X to cartram at offset #%04X\n", data, offset + 0x2000); @@ -1930,7 +1908,6 @@ static void setup_banks( running_machine &machine ) MACHINE_START_MEMBER(sms_state,sms) { - machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(sms_machine_stop),&machine())); m_rapid_fire_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sms_state::rapid_fire_callback),this)); m_rapid_fire_timer->adjust(attotime::from_hz(10), 0, attotime::from_hz(10)); diff --git a/src/mess/machine/softbox.h b/src/mess/machine/softbox.h index 463823911cc..344ee7ec4f8 100644 --- a/src/mess/machine/softbox.h +++ b/src/mess/machine/softbox.h @@ -31,7 +31,6 @@ class softbox_device : public device_t, public device_ieee488_interface { - public: // construction/destruction softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index 3f12728e00d..a5846060acb 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -209,7 +209,6 @@ WRITE8_MEMBER(svi318_state::svi318_ppi_port_c_w) /* cassette motor on/off */ if (svi318_cassette_present(machine(), 0)) { - machine().device(CASSETTE_TAG)->change_state( (data & 0x10) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MOTOR_DISABLED); diff --git a/src/mess/machine/thomflop.c b/src/mess/machine/thomflop.c index 4aaf006f97c..fd66f746e76 100644 --- a/src/mess/machine/thomflop.c +++ b/src/mess/machine/thomflop.c @@ -625,7 +625,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) data==0xA5 || data==0x5A ) && /* first byte of tentative field */ to7qdd->data_idx data_size ) { - /* this is the first byte of the field */ if ( to7qdd->start_idx == to7qdd->data_idx ) to7qdd->data_crc = 0; @@ -643,7 +642,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) to7qdd->data[ to7qdd->start_idx ] == 0xA5 && to7qdd->data[ to7qdd->start_idx + 3 ] == to7qdd->data_crc ) { - /* got an id field => format */ int sector = (int) to7qdd->data[ to7qdd->start_idx + 1 ] * 256 + (int) to7qdd->data[ to7qdd->start_idx + 2 ]; UINT8 filler = 0xff; @@ -662,7 +660,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) to7qdd->data[ to7qdd->start_idx ] == 0x5A && to7qdd->data[ to7qdd->start_idx + 129 ] == to7qdd->data_crc ) { - /* look backwards for previous id field */ for ( i = to7qdd->start_idx - 3; i >= 0; i-- ) { @@ -698,7 +695,6 @@ static READ8_HANDLER ( to7_qdd_r ) { switch ( offset ) { - case 0: /* MC6852 status */ to7_qdd_stat_update(space.machine()); VLOG(( "%f $%04x to7_qdd_r: STAT=$%02X irq=%i pe=%i ovr=%i und=%i tr=%i rd=%i ncts=%i\n", @@ -741,7 +737,6 @@ static WRITE8_HANDLER( to7_qdd_w ) { switch ( offset ) { - case 0: /* MC6852 control 1 */ /* reset */ if ( data & QDD_C1_RRESET ) @@ -763,7 +758,6 @@ static WRITE8_HANDLER( to7_qdd_w ) case 1: switch ( to7qdd->ctrl1 >> 6 ) { - case 0: /* MC6852 control 2 */ { #if 0 @@ -908,7 +902,6 @@ static void to7_qdd_init( running_machine &machine ) struct thmfc1_t { - UINT8 op; UINT8 sector; /* target sector, in [1,16] */ UINT32 sector_id; @@ -994,7 +987,6 @@ static int thmfc_floppy_find_sector ( running_machine &machine, chrn_id* dst ) /* scan track, try 4 revolutions */ while ( r < 4 ) { - if ( floppy_drive_get_next_id( img, thmfc1->side, &id ) ) { if ( id.C == thmfc1->track && @@ -1118,7 +1110,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) ( thmfc1->data_idx || data==0xA5 || data==0x5A ) && thmfc1->data_raw_idx < THOM_MAXBUF ) { - if ( ! thmfc1->data_raw_size ) { thmfc1->data_raw_size = thom_qdd_make_disk ( thmfc_floppy_image(machine), thmfc1->data ); @@ -1144,7 +1135,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) thmfc1->data[ thmfc1->data_idx - 1 ] == 0xA5 && thmfc1->data[ thmfc1->data_idx + 2 ] == thmfc1->data_crc ) { - /* got an id field => format */ int sector = (int) thmfc1->data[ thmfc1->data_idx ] * 256 + (int) thmfc1->data[ thmfc1->data_idx + 1 ]; UINT8 filler = 0xff; @@ -1160,7 +1150,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) thmfc1->data[ thmfc1->data_idx - 1 ] == 0x5A && thmfc1->data[ thmfc1->data_idx + 128 ] == thmfc1->data_crc ) { - /* look backwards for previous id field */ for ( i = thmfc1->data_idx - 4; i >= 0; i-- ) { @@ -1231,7 +1220,6 @@ static void thmfc_floppy_format_byte ( running_machine &machine, UINT8 data ) thmfc1->data_idx++; if ( thmfc1->data_idx > 11 ) { - if ( !memcmp ( thmfc1->data, header, sizeof( header ) ) ) { /* got id field => format */ @@ -1261,7 +1249,6 @@ READ8_HANDLER ( thmfc_floppy_r ) { switch ( offset ) { - case 0: /* STAT0 */ thmfc1->stat0 ^= THMFC1_STAT0_SYNCHRO | THMFC1_STAT0_BYTE_READY_POL; VLOG(( "%f $%04x thmfc_floppy_r: STAT0=$%02X\n", space.machine().time().as_double(), space.machine().device("maincpu")->safe_pcbase(), thmfc1->stat0 )); @@ -1329,7 +1316,6 @@ READ8_HANDLER ( thmfc_floppy_r ) WRITE8_HANDLER ( thmfc_floppy_w ) { switch ( offset ) { - case 0: /* CMD0 */ { int wsync = (data >> 4) & 1; @@ -1348,7 +1334,6 @@ WRITE8_HANDLER ( thmfc_floppy_w ) switch ( data & 3 ) { - case THMFC1_OP_RESET: thmfc1->stat0 = THMFC1_STAT0_FINISHED; break; @@ -1782,7 +1767,6 @@ void to7_floppy_reset ( running_machine &machine ) switch ( to7_controller_type ) { - case 1: to7_floppy_bank = 1; to7_5p14sd_reset(machine); @@ -1822,7 +1806,6 @@ READ8_HANDLER ( to7_floppy_r ) { switch ( to7_controller_type ) { - case 1: return to7_5p14sd_r( space, offset, mem_mask ); @@ -1848,7 +1831,6 @@ WRITE8_HANDLER ( to7_floppy_w ) { switch ( to7_controller_type ) { - case 1: to7_5p14sd_w( space, offset, data, mem_mask ); return; diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index e4065131d10..91f7ba6ec74 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -1272,7 +1272,6 @@ READ8_HANDLER ( to7_midi_r ) switch ( offset ) { - case 0: /* get status */ /* bit 0: data received */ /* bit 1: ready to transmit data */ @@ -1325,7 +1324,6 @@ WRITE8_HANDLER ( to7_midi_w ) switch ( offset ) { - case 0: /* set control */ /* bits 0-1: clock divide (ignored) or reset */ if ( (data & 3) == 3 ) @@ -2311,7 +2309,6 @@ READ8_HANDLER ( to9_vreg_r ) { switch ( offset ) { - case 0: /* palette data */ { UINT8 c = to9_palette_data[ to9_palette_idx ]; @@ -2343,7 +2340,6 @@ WRITE8_HANDLER ( to9_vreg_w ) switch ( offset ) { - case 0: /* palette data */ { UINT16 color, idx; @@ -2656,7 +2652,6 @@ READ8_HANDLER ( to9_kbd_r ) switch ( offset ) { - case 0: /* get status */ /* bit 0: data received */ /* bit 1: ready to transmit data (always 1) */ @@ -2704,7 +2699,6 @@ WRITE8_HANDLER ( to9_kbd_w ) switch ( offset ) { - case 0: /* set control */ /* bits 0-1: clock divide (ignored) or reset */ if ( (data & 3) == 3 ) @@ -2941,7 +2935,6 @@ static TIMER_CALLBACK(to9_kbd_timer_cb) switch ( to9_kbd_byte_count ) { - case 0: /* key */ to9_kbd_send( machine, to9_kbd_get_key(machine), 0 ); break; @@ -3882,7 +3875,6 @@ READ8_HANDLER ( to8_gatearray_r ) switch ( offset ) { - case 0: /* system 2 / lightpen register 1 */ if ( to7_lightpen ) res = (count >> 8) & 0xff; @@ -3937,7 +3929,6 @@ WRITE8_HANDLER ( to8_gatearray_w ) switch ( offset ) { - case 0: /* switch */ to7_lightpen = data & 1; break; @@ -3990,7 +3981,6 @@ READ8_HANDLER ( to8_vreg_r ) switch ( offset ) { - case 0: /* palette data */ { UINT8 c = to9_palette_data[ to9_palette_idx ]; @@ -4024,7 +4014,6 @@ WRITE8_HANDLER ( to8_vreg_w ) switch ( offset ) { - case 0: /* palette data */ { UINT16 color, idx; @@ -4533,7 +4522,6 @@ static void mo6_update_cart_bank (running_machine &machine) } else { - if (old_cart_bank < 12) { if ( bank_is_read_only ) @@ -4941,7 +4929,6 @@ READ8_HANDLER ( mo6_gatearray_r ) switch ( offset ) { - case 0: /* system 2 / lightpen register 1 */ if ( to7_lightpen ) res = (count >> 8) & 0xff; @@ -4996,7 +4983,6 @@ WRITE8_HANDLER ( mo6_gatearray_w ) switch ( offset ) { - case 0: /* switch */ to7_lightpen = data & 1; break; @@ -5041,7 +5027,6 @@ READ8_HANDLER ( mo6_vreg_r ) switch ( offset ) { - case 0: /* palette data */ case 1: /* palette address */ return to8_vreg_r( space, offset ); @@ -5066,7 +5051,6 @@ WRITE8_HANDLER ( mo6_vreg_w ) switch ( offset ) { - case 0: /* palette data */ case 1: /* palette address */ to8_vreg_w( space, offset, data ); diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c index 2ea2f39743d..e37bcca2178 100644 --- a/src/mess/machine/ti85.c +++ b/src/mess/machine/ti85.c @@ -287,7 +287,6 @@ READ8_MEMBER(ti85_state::ti85_port_0006_r) READ8_MEMBER(ti85_state::ti8x_serial_r) { - //ti85_update_serial(m_serial); return (m_white_out<<3) | (m_red_out<<2) @@ -339,7 +338,6 @@ READ8_MEMBER(ti85_state::ti83_port_0003_r ) READ8_MEMBER(ti85_state::ti8x_plus_serial_r) { - //ti85_update_serial(m_serial); return (m_white_out<<3) | (m_red_out<<2) @@ -403,7 +401,6 @@ WRITE8_MEMBER(ti85_state::ti85_port_0006_w) WRITE8_MEMBER(ti85_state::ti8x_serial_w) { - speaker_level_w(m_speaker, ( (data>>2)|(data>>3) ) & 0x01); m_red_out=(data>>2)&0x01; m_white_out=(data>>3)&0x01; @@ -456,7 +453,6 @@ WRITE8_MEMBER(ti85_state::ti83_port_0003_w) WRITE8_MEMBER(ti85_state::ti8x_plus_serial_w) { - speaker_level_w(m_speaker,( (data>>0)|(data>>1) )&0x01 ); m_red_out=(data>>0)&0x01; m_white_out=(data>>1)&0x01; diff --git a/src/mess/machine/ti99/mapper8.c b/src/mess/machine/ti99/mapper8.c index 40c17d6d975..215e0a2de6d 100644 --- a/src/mess/machine/ti99/mapper8.c +++ b/src/mess/machine/ti99/mapper8.c @@ -323,7 +323,6 @@ bool ti998_mapper_device::search_logically_addressed_w(address_space& space, off || ((dev->m_config->mode == TI99EM) && (m_CRUS==true)) || ((dev->m_config->mode == PATGEN) && (m_PTGE==true))) { - if ((offset & dev->m_config->address_mask)==(dev->m_config->select_pattern | dev->m_config->write_select)) { if (dev->m_device == MAP8_SRAM) diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c index 7bbfa535144..fc922b05889 100644 --- a/src/mess/machine/trs80.c +++ b/src/mess/machine/trs80.c @@ -452,7 +452,6 @@ WRITE8_MEMBER( trs80_state::trs80m4_ea_w ) } else { - /* not emulated d7,d6 Not used d5 Secondary Unassigned, pin 18 diff --git a/src/mess/machine/tvcexp.h b/src/mess/machine/tvcexp.h index b189460302c..819fdbc26be 100644 --- a/src/mess/machine/tvcexp.h +++ b/src/mess/machine/tvcexp.h @@ -128,6 +128,5 @@ extern const device_type TVCEXP_SLOT; #define MCFG_TVC64_EXPANSION_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ MCFG_DEVICE_ADD(_tag, TVCEXP_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) #endif /* __TVCEXP_H__ */ diff --git a/src/mess/machine/wangpc_wdc.c b/src/mess/machine/wangpc_wdc.c index 2b731504133..fe5de2d2444 100644 --- a/src/mess/machine/wangpc_wdc.c +++ b/src/mess/machine/wangpc_wdc.c @@ -295,7 +295,6 @@ UINT8 wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line) void wangpc_wdc_device::wangpcbus_dack_w(address_space &space, int line, UINT8 data) { - } diff --git a/src/mess/tools/imgtool/modules/thomson.c b/src/mess/tools/imgtool/modules/thomson.c index 6ae29f24155..2b27fa4a883 100644 --- a/src/mess/tools/imgtool/modules/thomson.c +++ b/src/mess/tools/imgtool/modules/thomson.c @@ -119,7 +119,6 @@ #define MAXSIZE 80*16*256*2 /* room for two faces, double-density, 80 tracks */ struct thom_floppy { - imgtool_stream *stream; UINT16 sector_size; /* 128 or 256 */ @@ -134,7 +133,6 @@ struct thom_floppy { enum thom_dirent_type { - THOM_DIRENT_END, THOM_DIRENT_FREE, THOM_DIRENT_FILE, @@ -144,7 +142,6 @@ enum thom_dirent_type { struct thom_dirent { - thom_dirent_type type; int index; @@ -189,7 +186,6 @@ static imgtoolerr_t thom_open_fd_qd(imgtool_image *img, imgtool_stream *stream) /* guess format */ switch ( size ) { - case 81920: f->tracks = 40; f->sector_size = 128; @@ -394,7 +390,6 @@ static void thom_close_sap(imgtool_image *img) for ( track = 0; track < f->tracks; track++ ) for ( sector = 1; sector <= 16; sector++ ) { - /* sector header & data */ buf[0] = ( f->tracks == 80 ) ? 2 : 1; buf[1] = 0; @@ -1155,7 +1150,6 @@ static imgtoolerr_t thom_create(imgtool_image* img, memset( f->data, 0xe5, sizeof( f->data ) ); for ( i = 0; i < f->heads; i++ ) { - /* disk info */ buf = thom_get_sector( f, i, 20, 1 ); memset( buf, 0xff, f->sector_size ); @@ -1556,7 +1550,6 @@ static void thom_basic_get_info(const imgtool_class *clas, union imgtoolinfo *info) { switch ( param ) { - case IMGTOOLINFO_INT_IMAGE_EXTRA_BYTES: info->i = sizeof(thom_floppy); break; case IMGTOOLINFO_INT_PARTITION_EXTRA_BYTES: diff --git a/src/mess/tools/imgtool/modules/ti99.c b/src/mess/tools/imgtool/modules/ti99.c index 04363533066..d0e643f3454 100644 --- a/src/mess/tools/imgtool/modules/ti99.c +++ b/src/mess/tools/imgtool/modules/ti99.c @@ -5141,7 +5141,6 @@ static imgtoolerr_t win_image_deletefile(imgtool_partition *partition, const cha { if (cursibFDR_index <= endsibFDR_index) { - for (i = 0; i < 54; i++) { cur_AU = get_UINT16BE(fdr.clusters[i][0]); diff --git a/src/mess/tools/imgtool/modules/vzdos.c b/src/mess/tools/imgtool/modules/vzdos.c index 2e72db249e8..c724d7901e2 100644 --- a/src/mess/tools/imgtool/modules/vzdos.c +++ b/src/mess/tools/imgtool/modules/vzdos.c @@ -245,7 +245,6 @@ static imgtoolerr_t vzdos_searchentry(imgtool_image *image, const char *fname, i *entry = -1; for (i = 0; i < MAX_DIRENTS; i++) { - ret = vzdos_get_dirent(image, i, &ent); if (ret) return (imgtoolerr_t)ret; @@ -402,11 +401,9 @@ static imgtoolerr_t vzdos_diskimage_nextenum(imgtool_directory *enumeration, img vz_iterator *iter = (vz_iterator *) imgtool_directory_extrabytes(enumeration); if (iter->eof == 1 || iter->index > MAX_DIRENTS) { - ent->eof = 1; } else { - const char *type; int ret, len; vzdos_dirent dirent; @@ -550,18 +547,15 @@ static imgtoolerr_t vzdos_diskimage_deletefile(imgtool_partition *partition, con ret = vzdos_get_dirent(img, index + 1, &next_entry); if (ret == IMGTOOLERR_FILENOTFOUND) { - /* we are the last directory entry, just delete it */ ret = vzdos_clear_dirent(img, index); if (ret) return ret; } else if (ret) { - /* an error occurred */ return ret; } else { - ret = vzdos_set_dirent(img, index++, next_entry); if (ret) return ret; @@ -578,7 +572,6 @@ static imgtoolerr_t vzdos_diskimage_deletefile(imgtool_partition *partition, con /* clear sectors and trackmap entries */ while (filesize > 0) { - filesize -= DATA_SIZE; /* clear trackmap entry */ @@ -672,7 +665,6 @@ static imgtoolerr_t vzdos_writefile(imgtool_partition *partition, int offset, im /* write data to disk */ while (filesize > 0) { - toread = filesize > DATA_SIZE ? DATA_SIZE : filesize; stream_read(sourcef, buffer, toread); @@ -754,7 +746,6 @@ static imgtoolerr_t vzdos_diskimage_suggesttransfer(imgtool_partition *partition vzdos_dirent entry; if (fname) { - ret = vzdos_get_dirent_fname(image, fname, &entry); if (ret) return ret; diff --git a/src/mess/video/911_chr.h b/src/mess/video/911_chr.h index dbc662aeea2..57e0c5f4b99 100644 --- a/src/mess/video/911_chr.h +++ b/src/mess/video/911_chr.h @@ -151,7 +151,6 @@ static const char_override_t frenchWP_overrides[9] = */ static const UINT8 char_defs[char_defs_count][10] = { - /* US character set: 128 7*10 character matrix */ { /* 0x00 */ 0x00, diff --git a/src/mess/video/a7800.c b/src/mess/video/a7800.c index 493f966b009..112fecfeecf 100644 --- a/src/mess/video/a7800.c +++ b/src/mess/video/a7800.c @@ -105,7 +105,6 @@ static void maria_draw_scanline(running_machine &machine) /* Step through DL's */ while ((READ_MEM(dl + 1) & 0x5F) != 0) { - /* Extended header */ if (!(READ_MEM(dl+1) & 0x1F)) { diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c index 3ca7fb68814..4c1d25413f7 100644 --- a/src/mess/video/apollo.c +++ b/src/mess/video/apollo.c @@ -120,7 +120,6 @@ INLINE screen_data_t *get_safe_token(device_t *device) { ***************************************************************************/ static void log_cr1(const char * text, device_t *device, screen_data_t *screen_data) { - DLOG1(("%s: cr0=%02x cr1=%02x sr=%02x pixel_clock=%3d/%3d bl=%d vb=%d vs=%d hs=%d hc=%d vck=%d hck=%d pck=%d vd=%d", text, screen_data->cr0, @@ -422,7 +421,6 @@ static UINT32 get_source_data(screen_data_t *screen_data, UINT32 src_data) { } static UINT16 rop(screen_data_t *screen_data, UINT16 dest_data) { - UINT32 src_data = get_source_data(screen_data, screen_data->guard_latch); if ((screen_data->cr1 & CR1_ROP_EN) diff --git a/src/mess/video/apple2gs.c b/src/mess/video/apple2gs.c index 4660473b187..ee45789666f 100644 --- a/src/mess/video/apple2gs.c +++ b/src/mess/video/apple2gs.c @@ -114,7 +114,6 @@ UINT32 apple2gs_state::screen_update_apple2gs(screen_device &screen, bitmap_ind1 /* call legacy Apple II video rendering at scanline 0 to draw into the off-screen buffer */ if (beamy == 0) { - // check if DHR should be monochrome 560x192 if (m_newvideo & 0x20) { diff --git a/src/mess/video/atarist.c b/src/mess/video/atarist.c index 368402a7f80..1331e59f818 100644 --- a/src/mess/video/atarist.c +++ b/src/mess/video/atarist.c @@ -168,7 +168,6 @@ void st_state::shifter_tick() TIMER_CALLBACK_MEMBER(st_state::atarist_shifter_tick) { - shifter_tick(); } @@ -299,7 +298,6 @@ void st_state::glue_tick() TIMER_CALLBACK_MEMBER(st_state::atarist_glue_tick) { - glue_tick(); } @@ -752,7 +750,6 @@ void st_state::blitter_tick() TIMER_CALLBACK_MEMBER(st_state::atarist_blitter_tick) { - blitter_tick(); } diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c index bb195d5f419..4ccca5f2370 100644 --- a/src/mess/video/bbc.c +++ b/src/mess/video/bbc.c @@ -109,7 +109,6 @@ static void set_pixel_lookup(bbc_state *state) WRITE8_MEMBER(bbc_state::bbc_videoULA_w) { - // Make sure vpos is never <0 2008-10-11 PHS. int vpos=machine().primary_screen->vpos(); if(vpos==0) @@ -320,7 +319,6 @@ WRITE8_MEMBER(bbc_state::bbc_6845_w) READ8_MEMBER(bbc_state::bbc_6845_r) { - mc6845_device *mc6845 = machine().device("mc6845"); switch (offset&1) diff --git a/src/mess/video/dai.c b/src/mess/video/dai.c index 8853ceac941..e1fe59dfc9b 100644 --- a/src/mess/video/dai.c +++ b/src/mess/video/dai.c @@ -113,11 +113,9 @@ UINT32 dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, switch (display_mode) { - case 0x00: /* 4 colour grahics modes */ switch (horizontal_resolution) { - case 0x00: /* 88 pixels */ switch (unit_mode) { @@ -278,7 +276,6 @@ UINT32 dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, case 0x01: /* 4 colour characters */ switch (horizontal_resolution) { - case 0x00: /* 11 chars */ switch (unit_mode) { @@ -444,7 +441,6 @@ UINT32 dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, case 0x02: /* 16 colour graphics */ switch (horizontal_resolution) { - case 0x00: /* 88 pixels */ switch (unit_mode) { @@ -604,7 +600,6 @@ UINT32 dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, case 0x03: /* 16 colour characters */ switch (horizontal_resolution) { - case 0x00: /* 11 chars */ switch (unit_mode) { diff --git a/src/mess/video/epnick.c b/src/mess/video/epnick.c index 8d0dc76bb0e..25ea72e6286 100644 --- a/src/mess/video/epnick.c +++ b/src/mess/video/epnick.c @@ -1007,7 +1007,6 @@ static void Nick_DoScreen(NICK_STATE *nick, bitmap_ind16 &bm) do { - /* set write address for line */ nick->dest = &bm.pix16(line); nick->dest_pos = 0; diff --git a/src/mess/video/gb.c b/src/mess/video/gb.c index 9ae01ea19e5..95622b1a5c2 100644 --- a/src/mess/video/gb.c +++ b/src/mess/video/gb.c @@ -661,7 +661,6 @@ static void sgb_update_scanline( running_machine &machine ) if ( cycles_to_go == 0 ) { - /* Does this belong here? or should it be moved to the else block */ /* Handle SGB mask */ switch( state->m_sgb_window_mask ) diff --git a/src/mess/video/gf4500.c b/src/mess/video/gf4500.c index 23e833289f2..9f4c0322c2a 100644 --- a/src/mess/video/gf4500.c +++ b/src/mess/video/gf4500.c @@ -132,7 +132,6 @@ WRITE32_HANDLER( gf4500_w ) } if ((offset >= (0x200 / 4)) && (offset < (0x280 / 4))) { - // 'maincpu' (02996998): (GFO) 34000304 <- 00F00140 // 'maincpu' (029969A8): (GFO) 34000308 <- 00000000 // 'maincpu' (029969B4): (GFO) 34000324 <- 00000000 diff --git a/src/mess/video/hd44780.h b/src/mess/video/hd44780.h index 9a80dd6f355..7b52f7ef1ad 100644 --- a/src/mess/video/hd44780.h +++ b/src/mess/video/hd44780.h @@ -42,7 +42,6 @@ struct hd44780_interface class hd44780_device : public device_t, public hd44780_interface { - public: // construction/destruction hd44780_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/video/hd66421.h b/src/mess/video/hd66421.h index 7a62b67bd23..5dfba09882c 100644 --- a/src/mess/video/hd66421.h +++ b/src/mess/video/hd66421.h @@ -29,8 +29,7 @@ ///************************************************************************* #define MCFG_HD66421_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, HD66421, 0) \ - + MCFG_DEVICE_ADD(_tag, HD66421, 0) ///************************************************************************* // TYPE DEFINITIONS diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c index d9b495afe4b..9d629c10ca1 100644 --- a/src/mess/video/mac.c +++ b/src/mess/video/mac.c @@ -337,7 +337,6 @@ VIDEO_RESET_MEMBER(mac_state,macsonora) VIDEO_START_MEMBER(mac_state,macsonora) { - memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); m_rbv_count = 0; @@ -358,7 +357,6 @@ VIDEO_START_MEMBER(mac_state,macsonora) VIDEO_START_MEMBER(mac_state,macv8) { - memset(m_rbv_regs, 0, sizeof(m_rbv_regs)); m_rbv_count = 0; @@ -869,7 +867,6 @@ static void dafb_recalc_ints(mac_state *mac) TIMER_CALLBACK_MEMBER(mac_state::dafb_vbl_tick) { - m_dafb_int_status |= 1; dafb_recalc_ints(this); @@ -878,7 +875,6 @@ TIMER_CALLBACK_MEMBER(mac_state::dafb_vbl_tick) TIMER_CALLBACK_MEMBER(mac_state::dafb_cursor_tick) { - m_dafb_int_status |= 4; dafb_recalc_ints(this); diff --git a/src/mess/video/mbc55x.c b/src/mess/video/mbc55x.c index 5641fb18d0c..f21fb04416d 100644 --- a/src/mess/video/mbc55x.c +++ b/src/mess/video/mbc55x.c @@ -136,7 +136,6 @@ static MC6845_UPDATE_ROW( vid_update_row ) for(pixelno=0; pixelno<8; pixelno++) { - rb=(rpx & bitno) >> shifts; gb=(gpx & bitno) >> shifts; bb=(bpx & bitno) >> shifts; diff --git a/src/mess/video/mc6847.h b/src/mess/video/mc6847.h index c9610790a5b..12ab6c080cc 100644 --- a/src/mess/video/mc6847.h +++ b/src/mess/video/mc6847.h @@ -29,16 +29,14 @@ MCFG_SCREEN_REFRESH_RATE(60) \ MCFG_SCREEN_SIZE(320, 243) \ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 1, 241-1) \ - MCFG_SCREEN_VBLANK_TIME(0) \ - + MCFG_SCREEN_VBLANK_TIME(0) #define MCFG_SCREEN_MC6847_PAL_ADD(_tag, _mctag) \ MCFG_SCREEN_ADD(_tag, RASTER) \ MCFG_SCREEN_UPDATE_DEVICE(_mctag, mc6847_base_device, screen_update) \ MCFG_SCREEN_REFRESH_RATE(50) \ MCFG_SCREEN_SIZE(320, 243) \ MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 1, 241-1) \ - MCFG_SCREEN_VBLANK_TIME(0) \ - + MCFG_SCREEN_VBLANK_TIME(0) /* interface */ struct mc6847_interface { diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c index 9e3bffd241c..c198238e14f 100644 --- a/src/mess/video/mz700.c +++ b/src/mess/video/mz700.c @@ -91,7 +91,6 @@ UINT32 mz_state::screen_update_mz800(screen_device &screen, bitmap_ind16 &bitmap { if (m_hires_mode) { - } else { diff --git a/src/mess/video/nes.c b/src/mess/video/nes.c index 3fe5e943318..a61ae9cf57b 100644 --- a/src/mess/video/nes.c +++ b/src/mess/video/nes.c @@ -19,7 +19,6 @@ static void nes_vh_reset( running_machine &machine ) void nes_state::video_start() { - m_last_frame_flip = 0; machine().add_notifier(MACHINE_NOTIFY_RESET, machine_notify_delegate(FUNC(nes_vh_reset),&machine())); @@ -39,7 +38,6 @@ void nes_state::palette_init() UINT32 nes_state::screen_update_nes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - /* render the ppu */ m_ppu->render(bitmap, 0, 0, 0, 0); diff --git a/src/mess/video/odyssey2.c b/src/mess/video/odyssey2.c index b3828e58068..af115e5bacf 100644 --- a/src/mess/video/odyssey2.c +++ b/src/mess/video/odyssey2.c @@ -219,8 +219,6 @@ WRITE8_MEMBER(odyssey2_state::video_write) m_sh_channel->update(); if (offset == 0xa0) { - - if ( m_o2_vdc.s.control & VDC_CONTROL_REG_STROBE_XY && !(data & VDC_CONTROL_REG_STROBE_XY)) { @@ -409,11 +407,8 @@ void odyssey2_state::i824x_scanline(int vpos) for ( j = 0; j < ARRAY_LENGTH( m_o2_vdc.s.quad[0].single ); j++, x += 8 ) { - - if ( y <= ( vpos - m_start_vpos ) && ( vpos - m_start_vpos ) < y + char_height * 2 ) { - UINT16 color = 16 + ( ( m_o2_vdc.s.quad[i].single[j].color & 0x0E ) >> 1 ); diff --git a/src/mess/video/pcw.c b/src/mess/video/pcw.c index 646ad940905..ff4ef0c02f7 100644 --- a/src/mess/video/pcw.c +++ b/src/mess/video/pcw.c @@ -167,7 +167,6 @@ UINT32 pcw_state::screen_update_pcw(screen_device &screen, bitmap_ind16 &bitmap, UINT32 pcw_state::screen_update_pcw_printer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - // printer output INT32 feed; rectangle rect(0, PCW_PRINTER_WIDTH - 1, 0, PCW_PRINTER_HEIGHT - 1); diff --git a/src/mess/video/pdp1.c b/src/mess/video/pdp1.c index d7a665eea93..7ce7f2a127f 100644 --- a/src/mess/video/pdp1.c +++ b/src/mess/video/pdp1.c @@ -64,7 +64,6 @@ void pdp1_state::screen_eof_pdp1(screen_device &screen, bool state) // rising edge if (state) { - crt_eof(m_crt); } } diff --git a/src/mess/video/pecom.c b/src/mess/video/pecom.c index 9dd8cf58d1a..06ddbe2ddd6 100644 --- a/src/mess/video/pecom.c +++ b/src/mess/video/pecom.c @@ -14,7 +14,6 @@ WRITE8_MEMBER(pecom_state::pecom_cdp1869_w) { - UINT16 ma = m_cdp1802->get_memory_address(); switch (offset + 3) @@ -94,7 +93,6 @@ static CDP1869_INTERFACE( pecom_cdp1869_intf ) VIDEO_START_MEMBER(pecom_state,pecom) { - /* allocate memory */ m_charram = auto_alloc_array(machine(), UINT8, PECOM_CHAR_RAM_SIZE); diff --git a/src/mess/video/rmnimbus.c b/src/mess/video/rmnimbus.c index b2b250dceb0..26196ca3f83 100644 --- a/src/mess/video/rmnimbus.c +++ b/src/mess/video/rmnimbus.c @@ -653,7 +653,6 @@ void rmnimbus_state::video_reset() void rmnimbus_state::screen_eof_nimbus(screen_device &screen, bool state) { - // logerror("SCREEN_VBLANK( nimbus )\n"); } diff --git a/src/mess/video/thomson.c b/src/mess/video/thomson.c index e8346e7ec60..1cefecbcb8c 100644 --- a/src/mess/video/thomson.c +++ b/src/mess/video/thomson.c @@ -835,7 +835,6 @@ static TIMER_CALLBACK( thom_scanline_start ) thom_scanline_timer->adjust(attotime::never); else { - if ( thom_vmodepage_changed ) { int x, m = 0; diff --git a/src/mess/video/tms3556.h b/src/mess/video/tms3556.h index fd8e7e28004..3a91009bb16 100644 --- a/src/mess/video/tms3556.h +++ b/src/mess/video/tms3556.h @@ -35,8 +35,7 @@ ///************************************************************************* #define MCFG_TMS3556_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, TMS3556, 0) \ - + MCFG_DEVICE_ADD(_tag, TMS3556, 0) ///************************************************************************* // TYPE DEFINITIONS diff --git a/src/mess/video/tx0.c b/src/mess/video/tx0.c index acf9b1818aa..88482c1a691 100644 --- a/src/mess/video/tx0.c +++ b/src/mess/video/tx0.c @@ -50,7 +50,6 @@ void tx0_state::screen_eof_tx0(screen_device &screen, bool state) // rising edge if (state) { - crt_eof(m_crt); } } diff --git a/src/mess/video/vc4000.c b/src/mess/video/vc4000.c index f2c4c3a966f..8b4f59f0d64 100644 --- a/src/mess/video/vc4000.c +++ b/src/mess/video/vc4000.c @@ -293,7 +293,6 @@ WRITE8_MEMBER( vc4000_state::vc4000_video_w ) switch (offset) { - case 0xc0: // Sprite size m_video.sprites[0].size=1<<(data&3); m_video.sprites[1].size=1<<((data>>2)&3); diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c index ba5887a1276..a37bbb44b55 100644 --- a/src/mess/video/vtvideo.c +++ b/src/mess/video/vtvideo.c @@ -185,7 +185,6 @@ static void vt_video_display_char(device_t *device,bitmap_ind16 &bitmap, UINT8 c for (i = 0; i < 10; i++) { - switch(display_type) { case 0 : // bottom half, double height j = (i >> 1)+5; break; @@ -295,7 +294,6 @@ static void rainbow_video_display_char(device_t *device,bitmap_ind16 &bitmap, UI for (i = 0; i < 10; i++) { - switch(display_type) { case 0 : // bottom half, double height j = (i >> 1)+5; break; diff --git a/src/mess/video/zx.c b/src/mess/video/zx.c index a933db7c38e..7977d31e879 100644 --- a/src/mess/video/zx.c +++ b/src/mess/video/zx.c @@ -106,7 +106,6 @@ TIMER_CALLBACK_MEMBER(zx_state::zx_ula_nmi) TIMER_CALLBACK_MEMBER(zx_state::zx_ula_irq) { - /* * An IRQ is issued on the ZX80/81 whenever the R registers * bit 6 goes low. In MESS this IRQ timed from the first read diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c index 997e7438b2a..526bca7f4b7 100644 --- a/src/osd/sdl/drawogl.c +++ b/src/osd/sdl/drawogl.c @@ -1792,7 +1792,6 @@ static void texture_compute_type_subroutine(sdl_info *sdl, const render_texinfo if( texture->type == TEXTURE_TYPE_NONE && sdl->usepbo && !texture->nocopy ) { - texture->type = TEXTURE_TYPE_DYNAMIC; texture->texTarget = (sdl->usetexturerect)?GL_TEXTURE_RECTANGLE_ARB:GL_TEXTURE_2D; texture->texpow2 = (sdl->usetexturerect)?0:sdl->texpoweroftwo; diff --git a/src/osd/sdl/dview.c b/src/osd/sdl/dview.c index 3ab70ec0eb4..8edec2b2520 100644 --- a/src/osd/sdl/dview.c +++ b/src/osd/sdl/dview.c @@ -48,7 +48,6 @@ static gboolean dview_expose(GtkWidget *wdv, GdkEventExpose *event) l++; if ( i == 0 || attr != viewdata[-1].attrib ) { - bg.red = bg.green = bg.blue = 0xffff; fg.red = fg.green = fg.blue = 0; diff --git a/src/osd/sdl/sdlos_unix.c b/src/osd/sdl/sdlos_unix.c index ff612f3e420..a4286a36b9d 100644 --- a/src/osd/sdl/sdlos_unix.c +++ b/src/osd/sdl/sdlos_unix.c @@ -202,7 +202,6 @@ char *osd_get_clipboard_text(void) for ( i = 0; i < ARRAY_LENGTH(types); i++ ) { - XConvertSelection( display, XA_PRIMARY, types[i], types[i], our_win, CurrentTime ); /* wait for SelectionNotify, but no more than 100 ms */ diff --git a/src/osd/sdl/window.c b/src/osd/sdl/window.c index 7dc903aa414..387daa96d44 100644 --- a/src/osd/sdl/window.c +++ b/src/osd/sdl/window.c @@ -961,7 +961,6 @@ static void pick_best_mode(sdl_window_info *window, int *fswidth, int *fsheight) void sdlwindow_video_window_update(running_machine &machine, sdl_window_info *window) { - osd_ticks_t event_wait_ticks; ASSERT_MAIN_THREAD(); diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c index 0b74fc60918..815e21ecf52 100644 --- a/src/osd/windows/debugwin.c +++ b/src/osd/windows/debugwin.c @@ -2941,7 +2941,6 @@ static int global_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar cassette_image_device* cassette = dynamic_cast(&img->device()); switch ((LOWORD(wparam) - ID_DEVICE_OPTIONS) % DEVOPTION_MAX) { - case DEVOPTION_CASSETTE_STOPPAUSE: cassette->change_state(CASSETTE_STOPPED, CASSETTE_MASK_UISTATE); return 1; -- cgit v1.2.3