summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-04-30 06:36:06 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2013-04-30 06:36:06 +0000
commit4bf717996f56eb03dc735c83dae5450b7fc98d75 (patch)
treea63a55bcc180e342382e9c9a680f0c643fd05248
parentf35b95a00e64c63422116039aeae272029b58e51 (diff)
Cleanups and version bumpmame0148u4
-rw-r--r--hash/megadriv.xml16
-rw-r--r--hash/nes.xml4
-rw-r--r--hash/svmu.xml40
-rw-r--r--src/emu/cpu/psx/gte.c2
-rw-r--r--src/emu/cpu/z8000/8000dasm.c4
-rw-r--r--src/emu/cpu/z8000/z8000.h4
-rw-r--r--src/emu/debug/debugcpu.c8
-rw-r--r--src/emu/emu.mak2
-rw-r--r--src/emu/machine/6850acia.h2
-rw-r--r--src/emu/machine/8042kbdc.c2
-rw-r--r--src/emu/machine/8042kbdc.h22
-rw-r--r--src/emu/machine/mcf5206e.c247
-rw-r--r--src/emu/machine/mcf5206e.h3
-rw-r--r--src/emu/machine/s3c2400.h2
-rw-r--r--src/emu/machine/s3c2410.h2
-rw-r--r--src/emu/machine/s3c2440.h2
-rw-r--r--src/emu/sound/spu.c2
-rw-r--r--src/emu/video/dl1416.c2
-rw-r--r--src/emu/video/psx.c3
-rw-r--r--src/emu/video/voodoo.c2
-rw-r--r--src/emu/video/voodoo.h2
-rw-r--r--src/lib/util/simple_set.h1780
-rw-r--r--src/mame/drivers/1942.c1
-rw-r--r--src/mame/drivers/2mindril.c1
-rw-r--r--src/mame/drivers/39in1.c2
-rw-r--r--src/mame/drivers/40love.c1
-rw-r--r--src/mame/drivers/alpha68k.c1
-rw-r--r--src/mame/drivers/amspdwy.c1
-rw-r--r--src/mame/drivers/angelkds.c1
-rw-r--r--src/mame/drivers/aquarium.c1
-rw-r--r--src/mame/drivers/ashnojoe.c1
-rw-r--r--src/mame/drivers/atarifb.c1
-rw-r--r--src/mame/drivers/atvtrack.c2
-rw-r--r--src/mame/drivers/battlane.c1
-rw-r--r--src/mame/drivers/bking.c1
-rw-r--r--src/mame/drivers/blockout.c1
-rw-r--r--src/mame/drivers/boxer.c1
-rw-r--r--src/mame/drivers/brkthru.c1
-rw-r--r--src/mame/drivers/btime.c1
-rw-r--r--src/mame/drivers/bwing.c1
-rw-r--r--src/mame/drivers/calchase.c4
-rw-r--r--src/mame/drivers/capbowl.c1
-rw-r--r--src/mame/drivers/cave.c1
-rw-r--r--src/mame/drivers/champbas.c1
-rw-r--r--src/mame/drivers/chanbara.c1
-rw-r--r--src/mame/drivers/chinagat.c4
-rw-r--r--src/mame/drivers/citycon.c1
-rw-r--r--src/mame/drivers/commando.c1
-rw-r--r--src/mame/drivers/cop01.c1
-rw-r--r--src/mame/drivers/cps2.c1
-rw-r--r--src/mame/drivers/crgolf.c1
-rw-r--r--src/mame/drivers/crospang.c1
-rw-r--r--src/mame/drivers/csplayh5.c2
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/ddayjlc.c1
-rw-r--r--src/mame/drivers/ddragon3.c1
-rw-r--r--src/mame/drivers/destroyr.c1
-rw-r--r--src/mame/drivers/discoboy.c1
-rw-r--r--src/mame/drivers/dlair.c2
-rw-r--r--src/mame/drivers/dogfgt.c1
-rw-r--r--src/mame/drivers/egghunt.c1
-rw-r--r--src/mame/drivers/espial.c1
-rw-r--r--src/mame/drivers/exerion.c1
-rw-r--r--src/mame/drivers/fcombat.c1
-rw-r--r--src/mame/drivers/fcrash.c1
-rw-r--r--src/mame/drivers/flyball.c1
-rw-r--r--src/mame/drivers/fruitpc.c10
-rw-r--r--src/mame/drivers/funkball.c2
-rw-r--r--src/mame/drivers/gaiden.c1
-rw-r--r--src/mame/drivers/gamecstl.c2
-rw-r--r--src/mame/drivers/gammagic.c8
-rw-r--r--src/mame/drivers/ghosteo.c4
-rw-r--r--src/mame/drivers/ginganin.c1
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/gluck2.c66
-rw-r--r--src/mame/drivers/gotcha.c1
-rw-r--r--src/mame/drivers/gridlee.c1
-rw-r--r--src/mame/drivers/hikaru.c50
-rw-r--r--src/mame/drivers/hvyunit.c2
-rw-r--r--src/mame/drivers/hyprduel.c1
-rw-r--r--src/mame/drivers/ironhors.c1
-rw-r--r--src/mame/drivers/iteagle.c93
-rw-r--r--src/mame/drivers/junofrst.c4
-rw-r--r--src/mame/drivers/karnov.c1
-rw-r--r--src/mame/drivers/kas89.c1
-rw-r--r--src/mame/drivers/kchamp.c1
-rw-r--r--src/mame/drivers/kncljoe.c1
-rw-r--r--src/mame/drivers/kopunch.c1
-rw-r--r--src/mame/drivers/kyugo.c1
-rw-r--r--src/mame/drivers/ladybug.c1
-rw-r--r--src/mame/drivers/ladyfrog.c1
-rw-r--r--src/mame/drivers/lasso.c1
-rw-r--r--src/mame/drivers/lazercmd.c2
-rw-r--r--src/mame/drivers/legionna.c2
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/liberate.c1
-rw-r--r--src/mame/drivers/m14.c1
-rw-r--r--src/mame/drivers/macrossp.c1
-rw-r--r--src/mame/drivers/madmotor.c1
-rw-r--r--src/mame/drivers/magtouch.c2
-rw-r--r--src/mame/drivers/mazerbla.c1
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/metlclsh.c1
-rw-r--r--src/mame/drivers/mgolf.c1
-rw-r--r--src/mame/drivers/midqslvr.c2
-rw-r--r--src/mame/drivers/mikie.c1
-rw-r--r--src/mame/drivers/mlanding.c18
-rw-r--r--src/mame/drivers/mouser.c1
-rw-r--r--src/mame/drivers/mrflea.c1
-rw-r--r--src/mame/drivers/msisaac.c3
-rw-r--r--src/mame/drivers/munchmo.c1
-rw-r--r--src/mame/drivers/n8080.c1
-rw-r--r--src/mame/drivers/naomi.c4
-rw-r--r--src/mame/drivers/nightgal.c1
-rw-r--r--src/mame/drivers/nmg5.c1
-rw-r--r--src/mame/drivers/norautp.c3
-rw-r--r--src/mame/drivers/ojankohs.c2
-rw-r--r--src/mame/drivers/oneshot.c1
-rw-r--r--src/mame/drivers/opwolf.c2
-rw-r--r--src/mame/drivers/orbit.c1
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/pbaction.c1
-rw-r--r--src/mame/drivers/pcat_nit.c2
-rw-r--r--src/mame/drivers/pgm.c9
-rw-r--r--src/mame/drivers/photoply.c2
-rw-r--r--src/mame/drivers/pinball2k.c91
-rw-r--r--src/mame/drivers/pipedrm.c1
-rw-r--r--src/mame/drivers/pooyan.c1
-rw-r--r--src/mame/drivers/popper.c1
-rw-r--r--src/mame/drivers/psikyo.c1
-rw-r--r--src/mame/drivers/psikyo4.c1
-rw-r--r--src/mame/drivers/psikyosh.c1
-rw-r--r--src/mame/drivers/queen.c2
-rw-r--r--src/mame/drivers/redclash.c1
-rw-r--r--src/mame/drivers/savquest.c2
-rw-r--r--src/mame/drivers/seattle.c2
-rw-r--r--src/mame/drivers/segac2.c2
-rw-r--r--src/mame/drivers/skyfox.c1
-rw-r--r--src/mame/drivers/snk.c4
-rw-r--r--src/mame/drivers/sonson.c1
-rw-r--r--src/mame/drivers/su2000.c2
-rw-r--r--src/mame/drivers/suna16.c80
-rw-r--r--src/mame/drivers/taito_l.c1
-rw-r--r--src/mame/drivers/taitojc.c44
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/topspeed.c2
-rw-r--r--src/mame/drivers/trvquest.c1
-rw-r--r--src/mame/drivers/unico.c2
-rw-r--r--src/mame/drivers/vlc.c2
-rw-r--r--src/mame/drivers/voyager.c4
-rw-r--r--src/mame/drivers/xtom3d.c2
-rw-r--r--src/mame/drivers/yunsun16.c1
-rw-r--r--src/mame/drivers/zn.c2
-rw-r--r--src/mame/includes/asuka.h2
-rw-r--r--src/mame/includes/bublbobl.h2
-rw-r--r--src/mame/includes/dec8.h2
-rw-r--r--src/mame/includes/deco32.h2
-rw-r--r--src/mame/includes/docastle.h2
-rw-r--r--src/mame/includes/dynax.h2
-rw-r--r--src/mame/includes/eprom.h2
-rw-r--r--src/mame/includes/exzisus.h2
-rw-r--r--src/mame/includes/galaga.h2
-rw-r--r--src/mame/includes/jaguar.h2
-rw-r--r--src/mame/includes/leland.h2
-rw-r--r--src/mame/includes/mario.h2
-rw-r--r--src/mame/includes/meadows.h2
-rw-r--r--src/mame/includes/metro.h2
-rw-r--r--src/mame/includes/mitchell.h2
-rw-r--r--src/mame/includes/namcos21.h2
-rw-r--r--src/mame/includes/nbmj8688.h2
-rw-r--r--src/mame/includes/nbmj9195.h2
-rw-r--r--src/mame/includes/niyanpai.h2
-rw-r--r--src/mame/includes/nmk16.h2
-rw-r--r--src/mame/includes/psikyo4.h2
-rw-r--r--src/mame/includes/rainbow.h2
-rw-r--r--src/mame/includes/scramble.h2
-rw-r--r--src/mame/includes/slapshot.h2
-rw-r--r--src/mame/includes/spdodgeb.h2
-rw-r--r--src/mame/includes/suna16.h4
-rw-r--r--src/mame/includes/taitojc.h1
-rw-r--r--src/mame/includes/tbowl.h2
-rw-r--r--src/mame/includes/thunderj.h2
-rw-r--r--src/mame/includes/toaplan1.h2
-rw-r--r--src/mame/includes/turbo.h2
-rw-r--r--src/mame/includes/xexex.h2
-rw-r--r--src/mame/machine/nitedrvr.c1
-rw-r--r--src/mame/machine/pcecommn.h2
-rw-r--r--src/mame/machine/pcshare.c4
-rw-r--r--src/mame/machine/pcshare.h4
-rw-r--r--src/mame/mame.lst38
-rw-r--r--src/mame/mame.mak6
-rw-r--r--src/mame/video/taitoic.h2
-rw-r--r--src/mess/audio/vrc6.c16
-rw-r--r--src/mess/audio/vrc6.h2
-rw-r--r--src/mess/drivers/bebox.c4
-rw-r--r--src/mess/drivers/bigbord2.c2
-rw-r--r--src/mess/drivers/coco3.c2
-rw-r--r--src/mess/drivers/dmv.c2
-rw-r--r--src/mess/drivers/fk1.c2
-rw-r--r--src/mess/drivers/fmtowns.c2
-rw-r--r--src/mess/drivers/ip22.c6
-rw-r--r--src/mess/drivers/kyocera.c6
-rw-r--r--src/mess/drivers/merlin.c2
-rw-r--r--src/mess/drivers/mini2440.c2
-rw-r--r--src/mess/drivers/mz3500.c2
-rw-r--r--src/mess/drivers/p8k.c2
-rw-r--r--src/mess/drivers/palmz22.c6
-rw-r--r--src/mess/drivers/pc9801.c2
-rw-r--r--src/mess/drivers/tsispch.c2
-rw-r--r--src/mess/includes/aim65.h2
-rw-r--r--src/mess/includes/amstr_pc.h10
-rw-r--r--src/mess/includes/apple2gs.h12
-rw-r--r--src/mess/includes/avigo.h2
-rw-r--r--src/mess/includes/bbc.h4
-rw-r--r--src/mess/includes/c128.h2
-rw-r--r--src/mess/includes/c64.h2
-rw-r--r--src/mess/includes/c65.h2
-rw-r--r--src/mess/includes/cgenie.h4
-rw-r--r--src/mess/includes/cosmicos.h2
-rw-r--r--src/mess/includes/electron.h2
-rw-r--r--src/mess/includes/enterp.h2
-rw-r--r--src/mess/includes/europc.h8
-rw-r--r--src/mess/includes/gb.h2
-rw-r--r--src/mess/includes/gp32.h2
-rw-r--r--src/mess/includes/hp48.h2
-rw-r--r--src/mess/includes/kc.h2
-rw-r--r--src/mess/includes/lviv.h2
-rw-r--r--src/mess/includes/mac.h2
-rw-r--r--src/mess/includes/nascom1.h2
-rw-r--r--src/mess/includes/nc.h2
-rw-r--r--src/mess/includes/nes.h4
-rw-r--r--src/mess/includes/partner.h2
-rw-r--r--src/mess/includes/pc.h4
-rw-r--r--src/mess/includes/pcw.h12
-rw-r--r--src/mess/includes/pet.h4
-rw-r--r--src/mess/includes/plus4.h2
-rw-r--r--src/mess/includes/tandy1t.h14
-rw-r--r--src/mess/includes/tmc1800.h2
-rw-r--r--src/mess/includes/trs80m2.h2
-rw-r--r--src/mess/includes/tvc.h2
-rw-r--r--src/mess/includes/vc4000.h2
-rw-r--r--src/mess/includes/vidbrain.h2
-rw-r--r--src/mess/includes/x1.h2
-rw-r--r--src/mess/includes/x68k.h2
-rw-r--r--src/mess/machine/apple2gs.c4
-rw-r--r--src/mess/machine/bebox.c2
-rw-r--r--src/mess/machine/cgenie.c22
-rw-r--r--src/mess/machine/dragon.c4
-rw-r--r--src/mess/machine/europc.c10
-rw-r--r--src/mess/machine/galaxy.c1
-rw-r--r--src/mess/machine/isa_ide8.c76
-rw-r--r--src/mess/machine/isa_ide8.h10
-rw-r--r--src/mess/machine/mac.c3
-rw-r--r--src/mess/machine/md_rom.c2
-rw-r--r--src/mess/machine/nes_ave.c6
-rw-r--r--src/mess/machine/nes_bandai.c28
-rw-r--r--src/mess/machine/nes_bandai.h2
-rw-r--r--src/mess/machine/nes_bootleg.c52
-rw-r--r--src/mess/machine/nes_bootleg.h20
-rw-r--r--src/mess/machine/nes_camerica.c2
-rw-r--r--src/mess/machine/nes_cony.c6
-rw-r--r--src/mess/machine/nes_cony.h4
-rw-r--r--src/mess/machine/nes_discrete.c8
-rw-r--r--src/mess/machine/nes_irem.c10
-rw-r--r--src/mess/machine/nes_irem.h2
-rw-r--r--src/mess/machine/nes_jaleco.c10
-rw-r--r--src/mess/machine/nes_jaleco.h4
-rw-r--r--src/mess/machine/nes_kaiser.c12
-rw-r--r--src/mess/machine/nes_kaiser.h4
-rw-r--r--src/mess/machine/nes_konami.c20
-rw-r--r--src/mess/machine/nes_konami.h6
-rw-r--r--src/mess/machine/nes_legacy.h4
-rw-r--r--src/mess/machine/nes_mmc1.c6
-rw-r--r--src/mess/machine/nes_mmc3.c4
-rw-r--r--src/mess/machine/nes_namcot.c8
-rw-r--r--src/mess/machine/nes_namcot.h4
-rw-r--r--src/mess/machine/nes_nxrom.c4
-rw-r--r--src/mess/machine/nes_pirate.c4
-rw-r--r--src/mess/machine/nes_pirate.h4
-rw-r--r--src/mess/machine/nes_sachen.c2
-rw-r--r--src/mess/machine/nes_slot.c169
-rw-r--r--src/mess/machine/nes_slot.h42
-rw-r--r--src/mess/machine/nes_somari.c10
-rw-r--r--src/mess/machine/nes_sunsoft.c8
-rw-r--r--src/mess/machine/nes_sunsoft.h6
-rw-r--r--src/mess/machine/nes_taito.c4
-rw-r--r--src/mess/machine/nes_txc.c4
-rw-r--r--src/mess/machine/nes_waixing.c2
-rw-r--r--src/mess/machine/pc.c6
-rw-r--r--src/mess/machine/primo.c2
-rw-r--r--src/mess/machine/psxcd.c2
-rw-r--r--src/mess/machine/rmnimbus.c3
-rw-r--r--src/mess/machine/s3c44b0.c4
-rw-r--r--src/mess/machine/sms.c1
-rw-r--r--src/mess/machine/upd71071.c4
-rw-r--r--src/mess/machine/upd71071.h4
-rw-r--r--src/mess/machine/vtech2.c2
-rw-r--r--src/mess/video/cgenie.c6
-rw-r--r--src/mess/video/fm7.c2
-rw-r--r--src/mess/video/pc_aga.h2
-rw-r--r--src/mess/video/rmnimbus.c4
-rw-r--r--src/mess/video/tx0.c1
-rw-r--r--src/mess/video/vic4567.h6
-rw-r--r--src/osd/sdl/debugqtdasmwindow.h6
-rw-r--r--src/osd/sdl/debugqtlogwindow.h4
-rw-r--r--src/osd/sdl/debugqtmainwindow.c2
-rw-r--r--src/osd/sdl/debugqtmainwindow.h6
-rw-r--r--src/osd/sdl/debugqtmemorywindow.h4
-rw-r--r--src/osd/sdl/debugqtwindow.h8
-rw-r--r--src/osd/sdl/sdldir.c2
-rw-r--r--src/version.c2
312 files changed, 1849 insertions, 1960 deletions
diff --git a/hash/megadriv.xml b/hash/megadriv.xml
index 7ac324dbff8..0a2e187a75a 100644
--- a/hash/megadriv.xml
+++ b/hash/megadriv.xml
@@ -4028,7 +4028,7 @@ Info on Sega chip labels (from Sunbeam / Digital Corruption)
<part name="cart" interface="megadriv_cart">
<feature name="pcb" value="670115 REV 3" />
<feature name="ic1" value="MORTAL KOMBAT VER 1.00 S220, MORTAL KOMBAT S215 VER 1.00" />
- <!-- USA cart, on a REV 4 PCB has chip labeled as MPR-15748-SM -->
+ <!-- USA cart, on a REV 4 PCB has chip labeled as MPR-15748-SM -->
<dataarea name="rom" size="2097152">
<rom name="mortal kombat ver 1.00 s220.ic1" size="2097152" crc="1aa3a207" sha1="c098bf38ddd755ab7caa4612d025be2039009eb2" offset="000000" loadflag="load16_word_swap" />
</dataarea>
@@ -7882,10 +7882,10 @@ but dumps still have to be confirmed.
<part name="cart" interface="megadriv_cart">
<!-- The PCB contains 4 different ROMs, but it is unknown how the dump should be split (maybe we can reconstruct that from the checksums?) -->
<feature name="pcb" value="" />
- <feature name="u1" value="MO 1 6/26 56 CE41" /> <!-- The 56 might be a 95 written upside down -->
+ <feature name="u1" value="MO 1 6/26 56 CE41" /> <!-- The 56 might be a 95 written upside down -->
<feature name="u2" value="Real Monsters 7-7-95" />
<feature name="u3" value="(unmarked eeprom)" />
- <feature name="u4" value="MO 2 6/26 56 FD68" /> <!-- The 56 might be a 95 written upside down -->
+ <feature name="u4" value="MO 2 6/26 56 FD68" /> <!-- The 56 might be a 95 written upside down -->
<feature name="u5" value="MC74HC139N" />
<dataarea name="rom" size="2097152">
<rom name="killertomatoes.5b74.bin" size="2097152" crc="f4b44b82" sha1="b0f1885e74e5aa39872f09444d82c8ebf284eba1" offset="000000" loadflag="load16_word_swap" />
@@ -30580,11 +30580,11 @@ rockman x3 (unl).bin [2/2] xxx3.bin [2/2] IDENTICAL
<!--
Investigation by Eke:
-this dump has the PC pointing to $1FE1DE, which does not hold any valid 68k program data in the ROM,
-so the game actually does not even starts when the 68k resets => either the dump is incomplete or it
-is a bad dump, there is no way bankswitching can be "triggered" before the CPU has reseted and
-fetches the PC, only possibility would be that this ROM area is only activated if some signal conditions
-is met (I know that some pirate carts will need to have the !RESET lines set HIGH like with the real console,
+this dump has the PC pointing to $1FE1DE, which does not hold any valid 68k program data in the ROM,
+so the game actually does not even starts when the 68k resets => either the dump is incomplete or it
+is a bad dump, there is no way bankswitching can be "triggered" before the CPU has reseted and
+fetches the PC, only possibility would be that this ROM area is only activated if some signal conditions
+is met (I know that some pirate carts will need to have the !RESET lines set HIGH like with the real console,
which most dumpers ignore)
This dump is either a bad dump or a wrongly patched one.
-->
diff --git a/hash/nes.xml b/hash/nes.xml
index f5ab5bf152a..d93721e0e63 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -51007,7 +51007,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<info name="alt_title" value="中國大亨"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="txrom" />
- <feature name="pcb" value="NES-TLROM" /> <!-- Original header was mapper 116, but it's not a SOMARI pcb... -->
+ <feature name="pcb" value="NES-TLROM" /> <!-- Original header was mapper 116, but it's not a SOMARI pcb... -->
<dataarea name="chr" size="131072">
<rom name="chuugoku taitei (asia) (unl).chr" size="131072" crc="d9203c08" sha1="b32ef62e4583b216aea84f7d0da0269c01b61e26" offset="00000" status="baddump" />
</dataarea>
@@ -54017,7 +54017,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
<info name="serial" value="ES-1109"/>
<info name="alt_title" value="神鬼传奇"/>
<part name="cart" interface="nes_cart">
- <feature name="slot" value="hengg_srich" /> <!-- it seems to work even with FS-304... investigate relation between the two... -->
+ <feature name="slot" value="hengg_srich" /> <!-- it seems to work even with FS-304... investigate relation between the two... -->
<feature name="pcb" value="HENGGEDIANZI" /> <!-- header says mapper 162, which should be a modified version of 163... -->
<dataarea name="prg" size="1048576">
<rom name="mummy (es-1109) (c).prg" size="1048576" crc="08fbf3f0" sha1="6dc200340d4b7b9397e4d4f28fa307059ce834ec" offset="00000" status="baddump" />
diff --git a/hash/svmu.xml b/hash/svmu.xml
index 57342f20a13..b977d9a97b4 100644
--- a/hash/svmu.xml
+++ b/hash/svmu.xml
@@ -7,7 +7,7 @@
<description>Chao Adventure</description>
<year>1999</year>
<publisher>Sega</publisher>
- <info name="source" value="Sonic Adventure" />
+ <info name="source" value="Sonic Adventure" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="chao adventure (1999)(sega)[sonic adventure].vms" size="65536" crc="09e93592" sha1="f35738795fd1799bbffb6c3df8d4f208ccf437b5" offset="0" />
@@ -19,7 +19,7 @@
<description>Chao Adventure 2</description>
<year>2001</year>
<publisher>Sega</publisher>
- <info name="source" value="Sonic Adventure 2" />
+ <info name="source" value="Sonic Adventure 2" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="chao adventure 2 (sega)(2001)[sonic adventure 2].vms" size="65536" crc="9c464d76" sha1="4190654ed0cede2d852fbe7c7f612a4c1b4a45b3" offset="0" />
@@ -31,7 +31,7 @@
<description>Chao Adventure 2 (Fra)</description>
<year>2001</year>
<publisher>Sega</publisher>
- <info name="source" value="Sonic Adventure 2" />
+ <info name="source" value="Sonic Adventure 2" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="chao adventure 2 (2001)(sega)(fr)[sonic adventure 2].vms" size="65536" crc="20f25e00" sha1="6e57f9447fdbcf69fddbb3b7a187f7043dcd9de0" offset="0" />
@@ -43,7 +43,7 @@
<description>Linear Watch</description>
<year>2000</year>
<publisher>ESP Software</publisher>
- <info name="source" value="Evolution 2" />
+ <info name="source" value="Evolution 2" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="15360">
<rom name="linear watch (2000)(esp software)[evolution 2].vms" size="15360" crc="16b6f34c" sha1="556b7d4235c08e03e1eec0bb6527f63dc5ec78a4" offset="0" />
@@ -55,7 +55,7 @@
<description>Marvel VS. Capcom 2 vs. Com (Jpn)</description>
<year>2000</year>
<publisher>Capcom</publisher>
- <info name="source" value="Marvel vs. Capcom 2" />
+ <info name="source" value="Marvel vs. Capcom 2" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="32768">
<rom name="marvel vs. capcom 2 vs. com (2000)(capcom)(jp)[marvel vs. capcom 2].vms" size="32768" crc="3f621910" sha1="b52bed579019bec07b818c802b72277be0c4430c" offset="0" />
@@ -67,7 +67,7 @@
<description>Pop 'n Music Vol. 1 (Jpn)</description>
<year>1999</year>
<publisher>Konami</publisher>
- <info name="source" value="Pop 'n Music" />
+ <info name="source" value="Pop 'n Music" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="28672">
<rom name="pop 'n music vol. 1 (1999)(konami)(jp)[pop 'n music].vms" size="28672" crc="7ce75350" sha1="339ebf13c557c14851e171202d3b105dee9fce6b" offset="0" />
@@ -79,7 +79,7 @@
<description>Pop 'n Music Vol. 2 (Jpn)</description>
<year>2000</year>
<publisher>Konami</publisher>
- <info name="source" value="Pop 'n Music" />
+ <info name="source" value="Pop 'n Music" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="30720">
<rom name="pop 'n music vol. 2 (2000)(konami)(jp)[pop 'n music].vms" size="30720" crc="c2a1cd70" sha1="3dfbd8cf625728040676e17409b10914cb9917e7" offset="0" />
@@ -91,7 +91,7 @@
<description>Pop 'n Music Vol. 3 (Jpn)</description>
<year>2000</year>
<publisher>Konami</publisher>
- <info name="source" value="Pop 'n Music" />
+ <info name="source" value="Pop 'n Music" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="30720">
<rom name="pop 'n music vol. 3 (2000)(konami)(jp)[pop 'n music].vms" size="30720" crc="96fef522" sha1="56a46d89187a04d26fe20cc4b697b23eebedb96e" offset="0" />
@@ -103,7 +103,7 @@
<description>Powerstone Mini</description>
<year>1999</year>
<publisher>Capcom</publisher>
- <info name="source" value="Power Stone" />
+ <info name="source" value="Power Stone" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="powerstone mini (1999)(capcom)[power stone].vms" size="65536" crc="04d6a41f" sha1="177781ab7023de28216b33d237d2ee7e57b66205" offset="0" />
@@ -115,7 +115,7 @@
<description>Power Stone 2 Mini Store (Jpn)</description>
<year>2000</year>
<publisher>Capcom</publisher>
- <info name="source" value="Power Stone 2" />
+ <info name="source" value="Power Stone 2" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="power stone 2 mini store (2000)(capcom)(jp)[power stone 2].vms" size="65536" crc="81d456d2" sha1="6ff653848c3dc3205d72363357fc63db4cbf359c" offset="0" />
@@ -127,7 +127,7 @@
<description>Sega GT Pocket America</description>
<year>2000</year>
<publisher>Sega</publisher>
- <info name="source" value="Sega GT" />
+ <info name="source" value="Sega GT" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="sega gt pocket america (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="20084dc1" sha1="5268f5a02bc21239fd0ea2d25b08cbc00bc83220" offset="0" />
@@ -139,7 +139,7 @@
<description>Sega GT (Jpn)</description>
<year>2000</year>
<publisher>Sega</publisher>
- <info name="source" value="Sega GT" />
+ <info name="source" value="Sega GT" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="sega gt (2000)(sega)(jp)[sega gt].vms" size="65536" crc="9eed83ea" sha1="8ea70e846a9a42877a62a790d8329dd72fe4749f" offset="0" />
@@ -151,7 +151,7 @@
<description>Sega GT Pocket Europe</description>
<year>2000</year>
<publisher>Sega</publisher>
- <info name="source" value="Sega GT" />
+ <info name="source" value="Sega GT" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="sega gt pocket europe (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="c8490720" sha1="e82dce08ad914ff275f1cfcf64e90d4c8c00d58a" offset="0" />
@@ -163,7 +163,7 @@
<description>Sega GT Pocket Japan</description>
<year>2000</year>
<publisher>Sega</publisher>
- <info name="source" value="Sega GT" />
+ <info name="source" value="Sega GT" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="65536">
<rom name="sega gt pocket japan (2000)(sega - wow-ent)[sega gt].vms" size="65536" crc="7d4b5c34" sha1="32e0dae07dd17de9981c84de9e12b2af6677353d" offset="0" />
@@ -175,7 +175,7 @@
<description>Shenmue (Jpn)</description>
<year>1999</year>
<publisher>Sega</publisher>
- <info name="source" value="Shenmue" />
+ <info name="source" value="Shenmue" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="25600">
<rom name="shenmue (1999)(sega)(jp)[shenmue].vms" size="25600" crc="3fcab726" sha1="ea52613cf39b965266ad32501d8caa6286de4e57" offset="0" />
@@ -187,7 +187,7 @@
<description>Soul Calibur 3-1 Mini (Jpn)</description>
<year>1999</year>
<publisher>Namco</publisher>
- <info name="source" value="SoulCalibur" />
+ <info name="source" value="SoulCalibur" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="50176">
<rom name="soul calibur 3-1 mini (1999)(namco)(jp)[soulcalibur].vms" size="50176" crc="d23dfe42" sha1="bf34e85fb481a3e920dab7517dd170c28f5c4ad5" offset="0" />
@@ -199,7 +199,7 @@
<description>SoulCalibur Text Adventure (Jpn)</description>
<year>1999</year>
<publisher>Namco</publisher>
- <info name="source" value="SoulCalibur" />
+ <info name="source" value="SoulCalibur" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="50688">
<rom name="soulcalibur text adventure (1999)(namco)(jp)[soulcalibur].vms" size="50688" crc="eedc89ee" sha1="3783708b76cdfd2a5f027c39ff45236c1244baa4" offset="0" />
@@ -211,7 +211,7 @@
<description>SoulCalibur VMU Game Pack </description>
<year>1999</year>
<publisher>Namco</publisher>
- <info name="source" value="SoulCalibur" />
+ <info name="source" value="SoulCalibur" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="50176">
<rom name="soulcalibur vmu game pack (1999)(namco)[soulcalibur].vms" size="50176" crc="6068eb49" sha1="b3d87d67b8ca59887e9680b4213239881bb4360c" offset="0" />
@@ -223,7 +223,7 @@
<description>TrickStyle Junior</description>
<year>1999</year>
<publisher>Acclaim</publisher>
- <info name="source" value="TrickStyle" />
+ <info name="source" value="TrickStyle" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="3584">
<rom name="trickstyle junior (1999)(acclaim)[trickstyle].vms" size="3584" crc="966659f9" sha1="5b46e07f30ecf53ebdfc17eb4accaf3e3d4fa92a" offset="0" />
@@ -247,7 +247,7 @@
<description>Zombie Revenge Training Game</description>
<year>1999</year>
<publisher>Sega</publisher>
- <info name="source" value="Zombie Revenge" />
+ <info name="source" value="Zombie Revenge" />
<part name="quik" interface="svmu_quik">
<dataarea name="rom" size="56320">
<rom name="zombie revenge training game (1999)(sega)[zombie revenge].vms" size="56320" crc="7b4ce3c7" sha1="68b584f7c5c7ac119c12641e8b1f01a726c58881" offset="0" />
diff --git a/src/emu/cpu/psx/gte.c b/src/emu/cpu/psx/gte.c
index 20fe25088d7..1783b1df341 100644
--- a/src/emu/cpu/psx/gte.c
+++ b/src/emu/cpu/psx/gte.c
@@ -296,7 +296,7 @@ INT32 gte::BOUNDS( int44 value, int max_flag, int min_flag )
{
FLAG |= max_flag;
}
-
+
if( value.negative_overflow() )
{
FLAG |= min_flag;
diff --git a/src/emu/cpu/z8000/8000dasm.c b/src/emu/cpu/z8000/8000dasm.c
index 51580e8af39..3752683ce36 100644
--- a/src/emu/cpu/z8000/8000dasm.c
+++ b/src/emu/cpu/z8000/8000dasm.c
@@ -81,8 +81,8 @@ static const char *const ints[4] = {
"", "vi", "nvi", "vi,nvi"
};
-int z8k_segm; /* Current disassembler mode: 0 - non-segmented, 1 - segmented */
-int z8k_segm_mode = Z8K_SEGM_MODE_AUTO; /* User disassembler mode setting: segmented, non-segmented, auto */
+int z8k_segm; /* Current disassembler mode: 0 - non-segmented, 1 - segmented */
+int z8k_segm_mode = Z8K_SEGM_MODE_AUTO; /* User disassembler mode setting: segmented, non-segmented, auto */
void z8k_disass_mode(running_machine &machine, int ref, int params, const char *param[])
{
diff --git a/src/emu/cpu/z8000/z8000.h b/src/emu/cpu/z8000/z8000.h
index 97ce36c0188..5cd6a3d325a 100644
--- a/src/emu/cpu/z8000/z8000.h
+++ b/src/emu/cpu/z8000/z8000.h
@@ -38,7 +38,7 @@ extern void z8k_disass_mode(running_machine &machine, int ref, int params, const
/* possible values for z8k_segm_mode */
#define Z8K_SEGM_MODE_NONSEG 0
-#define Z8K_SEGM_MODE_SEG 1
-#define Z8K_SEGM_MODE_AUTO 2
+#define Z8K_SEGM_MODE_SEG 1
+#define Z8K_SEGM_MODE_AUTO 2
#endif /* __Z8000_H__ */
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 23dc2d7ede4..d73acee4e13 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -2672,7 +2672,7 @@ bool device_debug::comment_remove(offs_t addr)
const char *device_debug::comment_text(offs_t addr) const
{
- const UINT32 crc = compute_opcode_crc32(addr);
+ const UINT32 crc = compute_opcode_crc32(addr);
dasm_comment* comment = m_comment_set.find(dasm_comment(addr, crc, "", 0));
if (comment == NULL) return NULL;
return comment->m_text;
@@ -3523,7 +3523,7 @@ void device_debug::tracer::flush()
device_debug::dasm_pc_tag::dasm_pc_tag(const offs_t& address, const UINT32& crc)
: m_address(address),
- m_crc(crc)
+ m_crc(crc)
{
}
@@ -3533,7 +3533,7 @@ device_debug::dasm_pc_tag::dasm_pc_tag(const offs_t& address, const UINT32& crc)
device_debug::dasm_comment::dasm_comment(offs_t address, UINT32 crc, const char *text, rgb_t color)
: dasm_pc_tag(address, crc),
- m_text(text),
- m_color(color)
+ m_text(text),
+ m_color(color)
{
}
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index b15166e50f8..1d765a36a92 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -251,7 +251,7 @@ EMUMACHINEOBJS = \
$(EMUMACHINE)/pc16552d.o \
$(EMUMACHINE)/pcf8593.o \
$(EMUMACHINE)/pci.o \
- $(EMUMACHINE)/pckeybrd.o \
+ $(EMUMACHINE)/pckeybrd.o \
$(EMUMACHINE)/pd4990a.o \
$(EMUMACHINE)/pic8259.o \
$(EMUMACHINE)/pit8253.o \
diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h
index 52f323d2164..2f188b1e11b 100644
--- a/src/emu/machine/6850acia.h
+++ b/src/emu/machine/6850acia.h
@@ -173,7 +173,7 @@ private:
serial_state m_rx_state;
serial_state m_tx_state;
int m_irq;
- bool m_dcd_triggered;
+ bool m_dcd_triggered;
emu_timer *m_rx_timer;
emu_timer *m_tx_timer;
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index a23597d8445..abf880c50bf 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -225,7 +225,7 @@ void kbdc8042_device::device_config_complete()
memset(&m_gate_a20_cb, 0, sizeof(m_gate_a20_cb));
memset(&m_input_buffer_full_func, 0, sizeof(m_input_buffer_full_func));
memset(&m_output_buffer_empty_cb, 0, sizeof(m_output_buffer_empty_cb));
- memset(&m_speaker_cb, 0, sizeof(m_speaker_cb));
+ memset(&m_speaker_cb, 0, sizeof(m_speaker_cb));
}
}
diff --git a/src/emu/machine/8042kbdc.h b/src/emu/machine/8042kbdc.h
index 67b1013104f..142ce8534a4 100644
--- a/src/emu/machine/8042kbdc.h
+++ b/src/emu/machine/8042kbdc.h
@@ -34,18 +34,18 @@ enum kbdc8042_type_t
struct kbdc8042_interface
{
- kbdc8042_type_t m_keybtype;
+ kbdc8042_type_t m_keybtype;
// interface to the host pc
devcb_write_line m_system_reset_cb;
devcb_write_line m_gate_a20_cb;
devcb_write_line m_input_buffer_full_cb;
devcb_write_line m_output_buffer_empty_cb;
-
- devcb_write8 m_speaker_cb;
- devcb_read8 m_getout2_cb;
+
+ devcb_write8 m_speaker_cb;
+ devcb_read8 m_getout2_cb;
};
-// ======================> kbdc8042_device
+// ======================> kbdc8042_device
class kbdc8042_device : public device_t,
public kbdc8042_interface
@@ -53,7 +53,7 @@ class kbdc8042_device : public device_t,
public:
// construction/destruction
kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
@@ -68,7 +68,7 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_config_complete();
-
+
UINT8 m_inport, m_outport, m_data, m_command;
struct {
@@ -93,14 +93,14 @@ protected:
int m_offset1;
int m_poll_delay;
-
+
devcb_resolved_write_line m_system_reset_func;
devcb_resolved_write_line m_gate_a20_func;
devcb_resolved_write_line m_input_buffer_full_func;
devcb_resolved_write_line m_output_buffer_empty_func;
-
- devcb_resolved_write8 m_speaker_func;
- devcb_resolved_read8 m_getout2_func;
+
+ devcb_resolved_write8 m_speaker_func;
+ devcb_resolved_read8 m_getout2_func;
};
// device type definition
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index 87ab12f599d..80f17bbe803 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -30,7 +30,6 @@ mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mco
void mcf5206e_peripheral_device::device_config_complete()
{
-
}
@@ -40,7 +39,6 @@ void mcf5206e_peripheral_device::device_config_complete()
void mcf5206e_peripheral_device::device_start()
{
-
}
@@ -52,7 +50,6 @@ READ32_MEMBER(mcf5206e_peripheral_device::dev_r)
WRITE32_MEMBER(mcf5206e_peripheral_device::dev_w)
{
-
}
@@ -86,133 +83,133 @@ READ32_MEMBER(mcf5206e_peripheral_device::seta2_coldfire_regs_r)
ADDRESS REG WIDTH NAME/DESCRIPTION INIT VALUE (MR=Master Reset, NR=Normal Reset) Read or Write access
-op MOVEC with $C0F MBAR 32 Module Base Address Register uninit (except V=0) W
-$003 SIMR 8 SIM Configuration Register C0 R/W
-$014 ICR1 8 Interrupt Control Register 1 - External IRQ1/IPL1 04 R/W
-$015 ICR2 8 Interrupt Control Register 2 - External IPL2 08 R/W
-$016 ICR3 8 Interrupt Control Register 3 - External IPL3 0C R/W
-$017 ICR4 8 Interrupt Control Register 4 - External IRQ4/IPL4 10 R/W
-$018 ICR5 8 Interrupt Control Register 5 - External IPL5 14 R/W
-$019 ICR6 8 Interrupt Control Register 6 - External IPL6 18 R/W
-$01A ICR7 8 Interrupt Control Register 7 - External IRQ7/IPL7 1C R/W
-$01B ICR8 8 Interrupt Control Register 8 - SWT 1C R/W
-$01C ICR9 8 Interrupt Control Register 9 - Timer 1 Interrupt 80 R/W
-$01D ICR10 8 Interrupt Control Register 10 - Timer 2 Interrupt 80 R/W
-$01E ICR11 8 Interrupt Control Register 11 - MBUS Interrupt 80 R/W
-$01F ICR12 8 Interrupt Control Register 12 - UART 1 Interrupt 00 R/W
-$020 ICR13 8 Interrupt Control Register 13 - UART 2 Interrupt 00 R/W
-$036 IMR 16 Interrupt Mask Register 3FFE R/W
-$03A IPR 16 Interrupt Pending Register 0000 R
-$040 RSR 8 Reset Status Register 80 / 20 R/W
-$041 SYPCR 8 System Protection Control Register 00 R/W
-$042 SWIVR 8 Software Watchdog Interrupt Vector Register 0F R/W
-$043 SWSR 8 Software Watchdog Service Register uninit W
-$046 DCRR 16 DRAM Controller Refresh MR 0000 - NR uninit R/W
-$04A DCTR 16 DRAM Controller Timing Register MR 0000 - NR uninit R/W
-$04C DCAR0 16 DRAM Controller 0 Address Register MR uninit - NR uninit R/W
-$050 DCMR0 32 DRAM Controller 0 Mask Register MR uninit - NR uninit R/W
-$057 DCCR0 8 DRAM Controller 0 Control Register MR 00 - NR 00 R/W
-$058 DCAR1 16 DRAM Controller 1 Address Register MR uninit - NR uninit R/W
-$05C DCMR1 32 DRAM Controller 1 Mask Register MR uninit - NR uninit R/W
-$063 DCCR1 8 DRAM Controller 1 Control Register MR 00 - NR 00 R/W
+op MOVEC with $C0F MBAR 32 Module Base Address Register uninit (except V=0) W
+$003 SIMR 8 SIM Configuration Register C0 R/W
+$014 ICR1 8 Interrupt Control Register 1 - External IRQ1/IPL1 04 R/W
+$015 ICR2 8 Interrupt Control Register 2 - External IPL2 08 R/W
+$016 ICR3 8 Interrupt Control Register 3 - External IPL3 0C R/W
+$017 ICR4 8 Interrupt Control Register 4 - External IRQ4/IPL4 10 R/W
+$018 ICR5 8 Interrupt Control Register 5 - External IPL5 14 R/W
+$019 ICR6 8 Interrupt Control Register 6 - External IPL6 18 R/W
+$01A ICR7 8 Interrupt Control Register 7 - External IRQ7/IPL7 1C R/W
+$01B ICR8 8 Interrupt Control Register 8 - SWT 1C R/W
+$01C ICR9 8 Interrupt Control Register 9 - Timer 1 Interrupt 80 R/W
+$01D ICR10 8 Interrupt Control Register 10 - Timer 2 Interrupt 80 R/W
+$01E ICR11 8 Interrupt Control Register 11 - MBUS Interrupt 80 R/W
+$01F ICR12 8 Interrupt Control Register 12 - UART 1 Interrupt 00 R/W
+$020 ICR13 8 Interrupt Control Register 13 - UART 2 Interrupt 00 R/W
+$036 IMR 16 Interrupt Mask Register 3FFE R/W
+$03A IPR 16 Interrupt Pending Register 0000 R
+$040 RSR 8 Reset Status Register 80 / 20 R/W
+$041 SYPCR 8 System Protection Control Register 00 R/W
+$042 SWIVR 8 Software Watchdog Interrupt Vector Register 0F R/W
+$043 SWSR 8 Software Watchdog Service Register uninit W
+$046 DCRR 16 DRAM Controller Refresh MR 0000 - NR uninit R/W
+$04A DCTR 16 DRAM Controller Timing Register MR 0000 - NR uninit R/W
+$04C DCAR0 16 DRAM Controller 0 Address Register MR uninit - NR uninit R/W
+$050 DCMR0 32 DRAM Controller 0 Mask Register MR uninit - NR uninit R/W
+$057 DCCR0 8 DRAM Controller 0 Control Register MR 00 - NR 00 R/W
+$058 DCAR1 16 DRAM Controller 1 Address Register MR uninit - NR uninit R/W
+$05C DCMR1 32 DRAM Controller 1 Mask Register MR uninit - NR uninit R/W
+$063 DCCR1 8 DRAM Controller 1 Control Register MR 00 - NR 00 R/W
--------- CHIP SELECTS -----------
-$064 CSAR0 16 Chip-Select 0 Address Register 0000 R/W
-$068 CSMR0 32 Chip-Select 0 Mask Register 00000000 R/W
-$06E CSCR0 16 Chip-Select 0 Control Register 3C1F, 3C5F, 3C9F, 3CDF, 3D1F, 3D5F, 3D9F, 3DDF R/W
- AA set by IRQ 7 at reset
- PS1 set by IRQ 4 at reset
- PS0 set by IRQ 1 at reset
-$070 CSAR1 16 Chip-Select 1 Address Register uninit R/W
-$074 CSMR1 32 Chip-Select 1 Mask Register uninit R/W
-$07A CSCR1 16 Chip-Select 1 Control Register uninit *1 R/W
-$07C CSAR2 16 Chip-Select 2 Address Register uninit R/W
-$080 CSMR2 32 Chip-Select 2 Mask Register uninit R/W
-$086 CSCR2 16 Chip-Select 2 Control Register uninit *1 R/W
-$088 CSAR3 16 Chip-Select 3 Address Register uninit R/W
-$08C CSMR3 32 Chip-Select 3 Mask Register uninit R/W
-$092 CSCR3 16 Chip-Select 3 Control Register uninit *1 R/W
-$094 CSAR4 16 Chip-Select 4 Address Register uninit R/W
-$098 CSMR4 32 Chip-Select 4 Mask Register uninit R/W
-$09E CSCR4 16 Chip-Select 4 Control Register uninit *1 R/W
-$0A0 CSAR5 16 Chip-Select 5 Address Register uninit R/W
-$0A4 CSMR5 32 Chip-Select 5 Mask Register uninit R/W
-$0AA CSCR5 16 Chip-Select 5 Control Register uninit *1 R/W
-$0AC CSAR6 16 Chip-Select 6 Address Register uninit R/W
-$0B0 CSMR6 32 Chip-Select 6 Mask Register uninit R/W
-$0B6 CSCR6 16 Chip-Select 6 Control Register uninit *1 R/W
-$0B8 CSAR7 16 Chip-Select 7 Address Register uninit R/W
-$0BC CSMR7 32 Chip-Select 7 Mask Register uninit R/W
-$0C2 CSCR7 16 Chip-Select 7 Control Register uninit *1 R/W
-$0C6 DMCR 16 Default Memory Control Register 0000 R/W
-$0CA PAR 16 Pin Assignment Register 00 R/W
+$064 CSAR0 16 Chip-Select 0 Address Register 0000 R/W
+$068 CSMR0 32 Chip-Select 0 Mask Register 00000000 R/W
+$06E CSCR0 16 Chip-Select 0 Control Register 3C1F, 3C5F, 3C9F, 3CDF, 3D1F, 3D5F, 3D9F, 3DDF R/W
+ AA set by IRQ 7 at reset
+ PS1 set by IRQ 4 at reset
+ PS0 set by IRQ 1 at reset
+$070 CSAR1 16 Chip-Select 1 Address Register uninit R/W
+$074 CSMR1 32 Chip-Select 1 Mask Register uninit R/W
+$07A CSCR1 16 Chip-Select 1 Control Register uninit *1 R/W
+$07C CSAR2 16 Chip-Select 2 Address Register uninit R/W
+$080 CSMR2 32 Chip-Select 2 Mask Register uninit R/W
+$086 CSCR2 16 Chip-Select 2 Control Register uninit *1 R/W
+$088 CSAR3 16 Chip-Select 3 Address Register uninit R/W
+$08C CSMR3 32 Chip-Select 3 Mask Register uninit R/W
+$092 CSCR3 16 Chip-Select 3 Control Register uninit *1 R/W
+$094 CSAR4 16 Chip-Select 4 Address Register uninit R/W
+$098 CSMR4 32 Chip-Select 4 Mask Register uninit R/W
+$09E CSCR4 16 Chip-Select 4 Control Register uninit *1 R/W
+$0A0 CSAR5 16 Chip-Select 5 Address Register uninit R/W
+$0A4 CSMR5 32 Chip-Select 5 Mask Register uninit R/W
+$0AA CSCR5 16 Chip-Select 5 Control Register uninit *1 R/W
+$0AC CSAR6 16 Chip-Select 6 Address Register uninit R/W
+$0B0 CSMR6 32 Chip-Select 6 Mask Register uninit R/W
+$0B6 CSCR6 16 Chip-Select 6 Control Register uninit *1 R/W
+$0B8 CSAR7 16 Chip-Select 7 Address Register uninit R/W
+$0BC CSMR7 32 Chip-Select 7 Mask Register uninit R/W
+$0C2 CSCR7 16 Chip-Select 7 Control Register uninit *1 R/W
+$0C6 DMCR 16 Default Memory Control Register 0000 R/W
+$0CA PAR 16 Pin Assignment Register 00 R/W
--------- TIMER MODULE -----------
-$100 TMR1 16 Timer 1 Mode Register 0000 R/W
-$104 TRR1 16 Timer 1 Reference Register FFFF R/W
-$108 TCR1 16 Timer 1 Capture Register 0000 R
-$10C TCN1 16 Timer 1 Counter 0000 R/W
-$111 TER1 8 Timer 1 Event Register 00 R/W
-$120 TMR2 16 Timer 2 Mode Register 0000 R/W
-$124 TRR2 16 Timer 2 Reference Register FFFF R/W
-$128 TCR2 16 Timer 2 Capture Register 0000 R
-$12C TCN2 16 Timer 2 Counter 0000 R/W
-$131 TER2 8 Timer 2 Event Register 00 R/W
+$100 TMR1 16 Timer 1 Mode Register 0000 R/W
+$104 TRR1 16 Timer 1 Reference Register FFFF R/W
+$108 TCR1 16 Timer 1 Capture Register 0000 R
+$10C TCN1 16 Timer 1 Counter 0000 R/W
+$111 TER1 8 Timer 1 Event Register 00 R/W
+$120 TMR2 16 Timer 2 Mode Register 0000 R/W
+$124 TRR2 16 Timer 2 Reference Register FFFF R/W
+$128 TCR2 16 Timer 2 Capture Register 0000 R
+$12C TCN2 16 Timer 2 Counter 0000 R/W
+$131 TER2 8 Timer 2 Event Register 00 R/W
------------ UART SERIAL PORTS -----------
-$140 UMR1,2 8 UART 1 Mode Registers 00 R/W
-$144 USR 8 UART 1 Status Register 00 R
- UCSR 8 UART 1 Clock-Select Register DD W
-$148 UCR 8 UART 1 Command Register 00 W
-$14C URB 8 UART 1 Receive Buffer FF R
- UTB 8 UART 1 Transmit Buffer 00 W
-$150 UIPCR 8 UART Input Port Change Register 0F R
- UACR 8 UART 1 Auxilary Control Register 00 W
-$154 UISR 8 UART 1 Interrupt Status Register 00 R
- UIMR 8 UART 1 Interrupt Mask Register 00 W
-$158 UBG1 8 UART 1 Baud Rate Generator Prescale MSB uninit W
-$15C UBG2 8 UART 1 Baud Rate Generator Prescale LSB uninit W
-$170 UIVR 8 UART 1 Interrupt Vector Register 0F R/W
-$174 UIP 8 UART 1 Input Port Register FF R
-$178 UOP1 8 UART 1 Output Port Bit Set CMD UOP1[7-1]=undef; UOP1=0 W
-$17C UOP0 8 UART 1 Output Port Bit Reset CMD uninit W
-
-$180 UMR1,2 8 UART 2 Mode Registers 00 R/W
-$184 USR 8 UART 2 Status Register 00 R
- UCSR 8 UART 2 Clock-Select Register DD W
-$188 UCR 8 UART 2 Command Register 00 W
-$18C URB 8 UART 2 Receive Buffer FF R
- UTB 8 UART 2 Transmit Buffer 00 W
-$190 UIPCR 8 UART 2 Input Port Change Register 0F R
- UACR 8 UART 2 Auxilary Control Register 00 W
-$194 UISR 8 UART 2 Interrupt Status Register 00 R
- UIMR 8 UART 2 Interrupt Mask Register 00 W
-$198 UBG1 8 UART 2 Baud Rate Generator Prescale MSB uninit R/W
-$19C UBG2 8 UART 2 Barud Rate Generator Prescale LSB uninit R/W
-$1B0 UIVR 8 UART 2 Interrupt Vector Register 0F R/W
-$1B4 UIP 8 UART 2 Input Port Register FF R
-$1B8 UOP1 8 UART 2 Output Port Bit Set CMD UOP1[7-1]=undef; UOP1=0 W
-$1BC UOP0 8 UART 2 Output Port Bit Reset CMD uninit W
-
-$1C5 PPDDR 8 Port A Data Direction Register 00 R/W
-$1C9 PPDAT 8 Port A Data Register 00 R/W
+$140 UMR1,2 8 UART 1 Mode Registers 00 R/W
+$144 USR 8 UART 1 Status Register 00 R
+ UCSR 8 UART 1 Clock-Select Register DD W
+$148 UCR 8 UART 1 Command Register 00 W
+$14C URB 8 UART 1 Receive Buffer FF R
+ UTB 8 UART 1 Transmit Buffer 00 W
+$150 UIPCR 8 UART Input Port Change Register 0F R
+ UACR 8 UART 1 Auxilary Control Register 00 W
+$154 UISR 8 UART 1 Interrupt Status Register 00 R
+ UIMR 8 UART 1 Interrupt Mask Register 00 W
+$158 UBG1 8 UART 1 Baud Rate Generator Prescale MSB uninit W
+$15C UBG2 8 UART 1 Baud Rate Generator Prescale LSB uninit W
+$170 UIVR 8 UART 1 Interrupt Vector Register 0F R/W
+$174 UIP 8 UART 1 Input Port Register FF R
+$178 UOP1 8 UART 1 Output Port Bit Set CMD UOP1[7-1]=undef; UOP1=0 W
+$17C UOP0 8 UART 1 Output Port Bit Reset CMD uninit W
+
+$180 UMR1,2 8 UART 2 Mode Registers 00 R/W
+$184 USR 8 UART 2 Status Register 00 R
+ UCSR 8 UART 2 Clock-Select Register DD W
+$188 UCR 8 UART 2 Command Register 00 W
+$18C URB 8 UART 2 Receive Buffer FF R
+ UTB 8 UART 2 Transmit Buffer 00 W
+$190 UIPCR 8 UART 2 Input Port Change Register 0F R
+ UACR 8 UART 2 Auxilary Control Register 00 W
+$194 UISR 8 UART 2 Interrupt Status Register 00 R
+ UIMR 8 UART 2 Interrupt Mask Register 00 W
+$198 UBG1 8 UART 2 Baud Rate Generator Prescale MSB uninit R/W
+$19C UBG2 8 UART 2 Barud Rate Generator Prescale LSB uninit R/W
+$1B0 UIVR 8 UART 2 Interrupt Vector Register 0F R/W
+$1B4 UIP 8 UART 2 Input Port Register FF R
+$1B8 UOP1 8 UART 2 Output Port Bit Set CMD UOP1[7-1]=undef; UOP1=0 W
+$1BC UOP0 8 UART 2 Output Port Bit Reset CMD uninit W
+
+$1C5 PPDDR 8 Port A Data Direction Register 00 R/W
+$1C9 PPDAT 8 Port A Data Register 00 R/W
------------ MBUS -----------
-$1E0 MADR 8 M-Bus Address Register 00 R/W
-$1E4 MFDR 8 M-Bus Frequency Divider Register 00 R/W
-$1E8 MBCR 8 M-Bus Control Register 00 R/W
-$1EC MBSR 8 M-Bus Status Register 00 R/W
-$1F0 MBDR 8 M-Bus Data I/O Register 00 R/W
+$1E0 MADR 8 M-Bus Address Register 00 R/W
+$1E4 MFDR 8 M-Bus Frequency Divider Register 00 R/W
+$1E8 MBCR 8 M-Bus Control Register 00 R/W
+$1EC MBSR 8 M-Bus Status Register 00 R/W
+$1F0 MBDR 8 M-Bus Data I/O Register 00 R/W
------------ DMA Controller -----------
-$200 DMASAR0 32 Source Address Register 0 00 R/W
-$204 DMADAR0 32 Destination Address Register 0 00 R/W
-$208 DCR0 16 DMA Control Register 0 00 R/W
-$20C BCR0 16 Byte Count Register 0 00 R/W
-$210 DSR0 8 Status Register 0 00 R/W
-$214 DIVR0 8 Interrupt Vector Register 0 0F R/W
-$240 DMASAR1 32 Source Address Register 1 00 R/W
-$244 DMADAR1 32 Destination Address Register 1 00 R/W
-$248 DCR1 16 DMA Control Register 1 00 R/W
-$24C BCR1 16 Byte Count Register 1 00 R/W
-$250 DSR1 8 Status Register 1 00 R/W
-$254 DIVR1 8 Interrupt Vector Register 1 0F R/W
+$200 DMASAR0 32 Source Address Register 0 00 R/W
+$204 DMADAR0 32 Destination Address Register 0 00 R/W
+$208 DCR0 16 DMA Control Register 0 00 R/W
+$20C BCR0 16 Byte Count Register 0 00 R/W
+$210 DSR0 8 Status Register 0 00 R/W
+$214 DIVR0 8 Interrupt Vector Register 0 0F R/W
+$240 DMASAR1 32 Source Address Register 1 00 R/W
+$244 DMADAR1 32 Destination Address Register 1 00 R/W
+$248 DCR1 16 DMA Control Register 1 00 R/W
+$24C BCR1 16 Byte Count Register 1 00 R/W
+$250 DSR1 8 Status Register 1 00 R/W
+$254 DIVR1 8 Interrupt Vector Register 1 0F R/W
*1 - uninit except BRST=ASET=WRAH=RDAH=WR=RD=0
-*/ \ No newline at end of file
+*/
diff --git a/src/emu/machine/mcf5206e.h b/src/emu/machine/mcf5206e.h
index 161bb0de5ae..9f4e53112fe 100644
--- a/src/emu/machine/mcf5206e.h
+++ b/src/emu/machine/mcf5206e.h
@@ -18,8 +18,7 @@
***************************************************************************/
#define MCFG_MCF5206E_PERIPHERAL_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, MCF5206E_PERIPHERAL, 0) \
-
+ MCFG_DEVICE_ADD(_tag, MCF5206E_PERIPHERAL, 0)
/***************************************************************************
TYPE DEFINITIONS
diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h
index c0855737665..c189d7ec15f 100644
--- a/src/emu/machine/s3c2400.h
+++ b/src/emu/machine/s3c2400.h
@@ -753,7 +753,7 @@ struct s3c24xx_t
devcb_resolved_write8 address_w;
devcb_resolved_read8 nand_data_r;
devcb_resolved_write8 nand_data_w;
-
+
};
#endif
diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h
index a9b2e370909..dfbfe9833f6 100644
--- a/src/emu/machine/s3c2410.h
+++ b/src/emu/machine/s3c2410.h
@@ -900,7 +900,7 @@ struct s3c24xx_t
devcb_resolved_write8 address_w;
devcb_resolved_read8 nand_data_r;
devcb_resolved_write8 nand_data_w;
-
+
};
#endif
diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h
index a5865c91dcf..a88e90b30a0 100644
--- a/src/emu/machine/s3c2440.h
+++ b/src/emu/machine/s3c2440.h
@@ -970,7 +970,7 @@ struct s3c24xx_t
devcb_resolved_write8 command_w;
devcb_resolved_write8 address_w;
devcb_resolved_read8 nand_data_r;
- devcb_resolved_write8 nand_data_w;
+ devcb_resolved_write8 nand_data_w;
};
#endif
diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c
index 5b0e96c4d49..51172cd68b7 100644
--- a/src/emu/sound/spu.c
+++ b/src/emu/sound/spu.c
@@ -2488,7 +2488,7 @@ void spu_device::generate_cdda(void *ptr, const unsigned int sz)
m_cd_out_ptr=(m_cd_out_ptr+2)&0x3ff;
//if((m_cd_out_ptr == ((spureg.irq_addr << 3) & ~0x400)) && (spureg.ctrl & spuctrl_irq_enable))
- // m_irq_handler(1);
+ // m_irq_handler(1);
dp[0]=clamp(dp[0]+vl);
dp[1]=clamp(dp[1]+vr);
diff --git a/src/emu/video/dl1416.c b/src/emu/video/dl1416.c
index 11a672e1298..4584cef0161 100644
--- a/src/emu/video/dl1416.c
+++ b/src/emu/video/dl1416.c
@@ -127,7 +127,7 @@ INLINE dl1416_state *get_safe_token(device_t *device)
static DEVICE_START( dl1416 )
{
dl1416_state *dl1416 = get_safe_token(device);
-
+
/* register for state saving */
state_save_register_item(device->machine(), "dl1416", device->tag(), 0, dl1416->chip_enable);
state_save_register_item(device->machine(), "dl1416", device->tag(), 0, dl1416->cursor_enable);
diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c
index fba7dd1a8a0..eefb06428a5 100644
--- a/src/emu/video/psx.c
+++ b/src/emu/video/psx.c
@@ -1347,8 +1347,7 @@ INLINE int CullVertex( int a, int b )
n_leftpoint = n_point; \
} \
} \
- n_rightpoint = n_leftpoint; \
-
+ n_rightpoint = n_leftpoint;
void psxgpu_device::FlatPolygon( int n_points )
{
INT16 n_y;
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index d3caab4cf58..872caabbb7b 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -1033,7 +1033,7 @@ static TIMER_CALLBACK( vblank_callback )
{
if (LOG_VBLANK_SWAP) logerror("---- vblank flush begin\n");
flush_fifos(v, machine.time());
- if (LOG_VBLANK_SWAP) logerror("---- vblank flush end\n");
+ if (LOG_VBLANK_SWAP) logerror("---- vblank flush end\n");
}
/* increment the count */
diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h
index fed896c0b27..5e8063c35d2 100644
--- a/src/emu/video/voodoo.h
+++ b/src/emu/video/voodoo.h
@@ -74,7 +74,7 @@ struct voodoo_config
UINT8 tmumem1;
const char * screen;
const char * cputag;
- devcb_write_line vblank;
+ devcb_write_line vblank;
devcb_write_line stall;
};
diff --git a/src/lib/util/simple_set.h b/src/lib/util/simple_set.h
index 1a1615f5d4e..b0e2793cd76 100644
--- a/src/lib/util/simple_set.h
+++ b/src/lib/util/simple_set.h
@@ -31,656 +31,656 @@ template <class T> class simple_set_iterator;
// PUBLIC OPERATIONS:
// size, empty, clear, insert, remove, find, contains, merge, & assignment.
//
-
+
template <class T>
class simple_set
{
- friend class simple_set_iterator<T>;
- typedef avl_tree_node<T> tree_node;
+ friend class simple_set_iterator<T>;
+ typedef avl_tree_node<T> tree_node;
public:
- // Construction
- simple_set(resource_pool &pool = global_resource_pool())
- : m_root(NULL),
- m_pool(pool)
- { }
+ // Construction
+ simple_set(resource_pool &pool = global_resource_pool())
+ : m_root(NULL),
+ m_pool(pool)
+ { }
- simple_set(const simple_set& rhs)
- : m_root(NULL)
- {
- *this = rhs;
- }
+ simple_set(const simple_set& rhs)
+ : m_root(NULL)
+ {
+ *this = rhs;
+ }
- ~simple_set()
- {
- clear();
- }
+ ~simple_set()
+ {
+ clear();
+ }
- // A reference to the resource pool
+ // A reference to the resource pool
resource_pool &pool() const { return m_pool; }
- // Returns number of elements in the tree -- O(n)
- int size() const
- {
- if (empty()) return 0;
-
- const tree_node* currentNode = m_root;
- const int nodeCount = sizeRecurse(currentNode);
- return nodeCount;
- }
-
-
- // Test for emptiness -- O(1).
- bool empty() const
- {
- return m_root == NULL;
- }
-
-
- // Empty the tree -- O(n).
- void clear()
- {
- clearRecurse(m_root);
- }
-
-
- // Insert x into the avl tree; duplicates are ignored -- O(log n).
- bool insert(const T& x)
- {
- bool retVal = insert(x, m_root);
-
- // Whether the node was successfully inserted or not (i.e. wasn't a duplicate)
- return retVal;
- }
-
-
- // Remove x from the tree. Nothing is done if x is not found -- O(n).
- bool remove(const T& x)
- {
- // First find the node in the tree
- tree_node* currNode = find(x, m_root);
-
- // Only do this when the current node is valid
- if (currNode)
- {
- // See if it's a leaf
- if (currNode->isLeaf())
- {
- // If we're a leaf and we have no parent, then the tree will be emptied
- if (!currNode->parent)
- {
- m_root = NULL;
- }
-
- // If it's a leaf node, simply remove it
- removeNode(currNode);
- pool_free(m_pool, currNode);
- }
- else
- {
- // Get the parent object
- tree_node* parentNode = currNode->parent;
-
- // Remove the child and reconnect the smallest node in the right sub tree
- // (in order successor)
- tree_node* replaceNode = findMin(currNode->right);
-
- // See if there's even a right-most node
- if (!replaceNode)
- {
- // Get the largest node on the left (because the right doesn't exist)
- replaceNode = findMax(currNode->left);
- }
-
- // Disconnect the replacement node's branch
- removeNode(replaceNode);
-
- // Disconnect the current node
- removeNode(currNode);
-
- // Get the current node's left and right branches
- tree_node* left = currNode->left;
- tree_node* right = currNode->right;
-
- // We no longer need this node
- pool_free(m_pool, currNode);
-
- // Check to see if we removed the root node
- if (!parentNode)
- {
- // Merge the branches into the parent node of what we deleted
- merge(replaceNode, parentNode);
- merge(left, parentNode);
- merge(right, parentNode);
-
- // Now we're the the root
- m_root = parentNode;
- }
- else
- {
- // Merge the branches into the parent node of what we
- // deleted, we let the merge algorithm decide where to
- // put the branches
- merge(replaceNode, parentNode);
- merge(left, parentNode);
- merge(right, parentNode);
- }
- }
-
- // Balance the tree
- balanceTree();
-
- // The node was found and removed successfully
- return true;
- }
- else
- {
- // The node was not found
- return false;
- }
- }
-
-
- // Find item x in the tree. Returns a pointer to the matching item
- // or NULL if not found -- O(log n)
- T* find(const T& x) const
- {
- tree_node* found = find(x, m_root);
- if (found == NULL) return NULL;
- return &found->element;
- }
-
-
- // Is the data present in the set? -- O(log n)
- bool contains(const T& x) const
- {
- if (find(x) != NULL)
- return true;
- else
- return false;
- }
-
-
- // Merge a different tree with ours -- O(n).
- bool merge(const simple_set<T>& b)
- {
- tree_node* c = b->clone();
- bool retVal = merge(c->m_root, m_root);
-
- // Re-balance the tree if the merge was successful
- if (retVal)
- {
- balanceTree();
- }
- else
- {
- pool_free(m_pool, c);
- }
-
- return retVal;
- }
-
-
- // Replace this set with another -- O(n)
- const simple_set& operator=(const simple_set& rhs)
- {
- // Don't clone if it's the same pointer
- if (this != &rhs)
- {
- clear();
-
- m_root = clone(rhs.m_root);
- }
-
- return *this;
- }
+ // Returns number of elements in the tree -- O(n)
+ int size() const
+ {
+ if (empty()) return 0;
+
+ const tree_node* currentNode = m_root;
+ const int nodeCount = sizeRecurse(currentNode);
+ return nodeCount;
+ }
+
+
+ // Test for emptiness -- O(1).
+ bool empty() const
+ {
+ return m_root == NULL;
+ }
+
+
+ // Empty the tree -- O(n).
+ void clear()
+ {
+ clearRecurse(m_root);
+ }
+
+
+ // Insert x into the avl tree; duplicates are ignored -- O(log n).
+ bool insert(const T& x)
+ {
+ bool retVal = insert(x, m_root);
+
+ // Whether the node was successfully inserted or not (i.e. wasn't a duplicate)
+ return retVal;
+ }
+
+
+ // Remove x from the tree. Nothing is done if x is not found -- O(n).
+ bool remove(const T& x)
+ {
+ // First find the node in the tree
+ tree_node* currNode = find(x, m_root);
+
+ // Only do this when the current node is valid
+ if (currNode)
+ {
+ // See if it's a leaf
+ if (currNode->isLeaf())
+ {
+ // If we're a leaf and we have no parent, then the tree will be emptied
+ if (!currNode->parent)
+ {
+ m_root = NULL;
+ }
+
+ // If it's a leaf node, simply remove it
+ removeNode(currNode);
+ pool_free(m_pool, currNode);
+ }
+ else
+ {
+ // Get the parent object
+ tree_node* parentNode = currNode->parent;
+
+ // Remove the child and reconnect the smallest node in the right sub tree
+ // (in order successor)
+ tree_node* replaceNode = findMin(currNode->right);
+
+ // See if there's even a right-most node
+ if (!replaceNode)
+ {
+ // Get the largest node on the left (because the right doesn't exist)
+ replaceNode = findMax(currNode->left);
+ }
+
+ // Disconnect the replacement node's branch
+ removeNode(replaceNode);
+
+ // Disconnect the current node
+ removeNode(currNode);
+
+ // Get the current node's left and right branches
+ tree_node* left = currNode->left;
+ tree_node* right = currNode->right;
+
+ // We no longer need this node
+ pool_free(m_pool, currNode);
+
+ // Check to see if we removed the root node
+ if (!parentNode)
+ {
+ // Merge the branches into the parent node of what we deleted
+ merge(replaceNode, parentNode);
+ merge(left, parentNode);
+ merge(right, parentNode);
+
+ // Now we're the the root
+ m_root = parentNode;
+ }
+ else
+ {
+ // Merge the branches into the parent node of what we
+ // deleted, we let the merge algorithm decide where to
+ // put the branches
+ merge(replaceNode, parentNode);
+ merge(left, parentNode);
+ merge(right, parentNode);
+ }
+ }
+
+ // Balance the tree
+ balanceTree();
+
+ // The node was found and removed successfully
+ return true;
+ }
+ else
+ {
+ // The node was not found
+ return false;
+ }
+ }
+
+
+ // Find item x in the tree. Returns a pointer to the matching item
+ // or NULL if not found -- O(log n)
+ T* find(const T& x) const
+ {
+ tree_node* found = find(x, m_root);
+ if (found == NULL) return NULL;
+ return &found->element;
+ }
+
+
+ // Is the data present in the set? -- O(log n)
+ bool contains(const T& x) const
+ {
+ if (find(x) != NULL)
+ return true;
+ else
+ return false;
+ }
+
+
+ // Merge a different tree with ours -- O(n).
+ bool merge(const simple_set<T>& b)
+ {
+ tree_node* c = b->clone();
+ bool retVal = merge(c->m_root, m_root);
+
+ // Re-balance the tree if the merge was successful
+ if (retVal)
+ {
+ balanceTree();
+ }
+ else
+ {
+ pool_free(m_pool, c);
+ }
+
+ return retVal;
+ }
+
+
+ // Replace this set with another -- O(n)
+ const simple_set& operator=(const simple_set& rhs)
+ {
+ // Don't clone if it's the same pointer
+ if (this != &rhs)
+ {
+ clear();
+
+ m_root = clone(rhs.m_root);
+ }
+
+ return *this;
+ }
#ifdef SIMPLE_SET_DEBUG
- // Debug -- O(n log n)
- void printTree(std::ostream& out = std::cout) const
- {
- if(empty())
- {
- out << "Empty tree" << std::endl;
- }
- else
- {
- printTree(out, m_root);
- }
- }
+ // Debug -- O(n log n)
+ void printTree(std::ostream& out = std::cout) const
+ {
+ if(empty())
+ {
+ out << "Empty tree" << std::endl;
+ }
+ else
+ {
+ printTree(out, m_root);
+ }
+ }
#endif
private:
- // The AVL tree's root
- tree_node* m_root;
-
- // Resource pool where objects are freed
- resource_pool& m_pool;
-
-
- // Find a node in the tree
- tree_node* findNode(const T& x) const
- {
- tree_node* node = find(x, m_root);
- if (node)
- {
- return node;
- }
- else
- {
- return NULL;
- }
- }
-
-
- // Insert item x into a subtree t (root) -- O(log n)
- bool insert(const T& x, tree_node*& t)
- {
- if (t == NULL)
- {
- t = pool_alloc(m_pool, tree_node(x, NULL, NULL, NULL));
-
- // An empty sub-tree here, insertion successful
- return true;
- }
- else if (x < t->element)
- {
- // O(log n)
- bool retVal = insert(x, t->left);
-
- if (retVal)
- {
- t->left->setParent(t);
- if(t->balanceFactor() < -1)
- {
- // See if it went left of the left
- if(x < t->left->element)
- {
- rotateWithLeftChild(t);
- }
- else
- {
- // The element goes on the right of the left
- doubleWithLeftChild(t);
- }
- }
- }
-
- return retVal;
- }
- else if (t->element < x)
- {
- bool retVal = insert(x, t->right);
-
- // Only do this if the insertion was successful
- if (retVal)
- {
- t->right->setParent(t);
-
- if (t->balanceFactor() > 1)
- {
- // See if it went right of the right
- if(t->right->element < x)
- {
- rotateWithRightChild(t);
- }
- else
- {
- // The element goes on the left of the right
- doubleWithRightChild(t);
- }
- }
- }
-
- return retVal;
- }
- else
- {
- return false; // Duplicate
- }
- }
-
-
- // Recursively free all nodes in the tree -- O(n).
- void clearRecurse(tree_node*& t) const
- {
- if(t != NULL)
- {
- clearRecurse(t->left);
- clearRecurse(t->right);
-
- pool_free(m_pool, t);
- }
- t = NULL;
- }
-
-
- // Merge a tree with this one. Private because external care is required.
- bool merge(tree_node* b, tree_node*& t)
- {
- if (!b)
- {
- return false;
- }
- else
- {
- bool retVal = false;
-
- if (t == NULL)
- {
- // Set this element to that subtree
- t = b;
-
- // The parent here should be NULL anyway, but we
- // set it just to be sure. This pointer will be
- // used as a flag to indicate where in the call
- // stack the tree was actually set.
- //
- // The middle layers of this method's call will
- // all have their parent references in tact since
- // no operations took place there.
- //
- //t->parent = NULL;
- t->setParent(NULL);
-
- // We were successful in merging
- retVal = true;
- }
- else if (b->element < t->element)
- {
- retVal = merge(b, t->left);
-
- // Only do this if the insertion actually took place
- if (retVal && !t->left->parent)
- {
- t->left->setParent(t);
- }
- }
- else if (t->element < b->element)
- {
- retVal = merge(b, t->right);
-
- // Only do this if the insertion was successful
- if (retVal && !t->right->parent)
- {
- t->right->setParent(t);
- }
-
- return retVal;
- }
-
- return retVal;
- }
- }
-
-
- // Find the smallest item's node in a subtree t -- O(log n).
- tree_node* findMin(tree_node* t) const
- {
- if(t == NULL)
- {
- return t;
- }
-
- while(t->left != NULL)
- {
- t = t->left;
- }
-
- return t;
- }
-
-
- // Find the smallest item's node in a subtree t -- O(log n).
- tree_node* findMax(tree_node* t) const
- {
- if(t == NULL)
- {
- return t;
- }
-
- while(t->right != NULL)
- {
- t = t->right;
- }
-
- return t;
- }
-
-
- // Find item x's node in subtree t -- O(log n)
- tree_node* find(const T& x, tree_node* t) const
- {
- while(t != NULL)
- {
- if (x < t->element)
- {
- t = t->left;
- }
- else if (t->element < x)
- {
- t = t->right;
- }
- else
- {
- return t; // Match
- }
- }
-
- return NULL; // No match
- }
-
-
- // Clone a subtree -- O(n)
- tree_node* clone(const tree_node* t) const
- {
- if(t == NULL)
- {
- return NULL;
- }
- else
- {
- // Create a node with the left and right nodes and a parent set to NULL
- tree_node* retVal = pool_alloc(m_pool, tree_node(t->element, NULL, clone(t->left), clone(t->right)));
-
- // Now set our children's parent node reference
- if (retVal->left) { retVal->left->setParent(retVal); }
- if (retVal->right) { retVal->right->setParent(retVal); }
-
- return retVal;
- }
- }
-
-
- // Rotate binary tree node with left child.
- // Single rotation for case 1 -- O(1).
- void rotateWithLeftChild(tree_node*& k2) const
- {
- tree_node* k1 = k2->left;
- tree_node* k2Parent = k2->parent;
-
- k2->setLeft(k1->right);
- if (k2->left) { k2->left->setParent(k2); }
-
- k1->setRight(k2);
- if (k1->right) { k1->right->setParent(k1); }
-
- k2 = k1;
- k2->setParent(k2Parent);
- }
-
-
- // Rotate binary tree node with right child.
- // Single rotation for case 4 -- O(1).
- void rotateWithRightChild(tree_node*& k1) const
- {
- tree_node* k2 = k1->right;
- tree_node* k1Parent = k1->parent;
-
- k1->setRight(k2->left);
- if (k1->right) { k1->right->setParent(k1); }
-
- k2->setLeft(k1);
- if (k2->left) { k2->left->setParent(k2); }
-
- k1 = k2;
- k1->setParent(k1Parent);
- }
-
-
- // Double rotate binary tree node: first left child
- // with its right child; then node k3 with new left child.
- // Double rotation for case 2 -- O(1).
- void doubleWithLeftChild(tree_node*& k3) const
- {
- rotateWithRightChild(k3->left);
- rotateWithLeftChild(k3);
- }
-
-
- // Double rotate binary tree node: first right child
- // with its left child; then node k1 with new right child.
- // Double rotation for case 3 -- O(1).
- void doubleWithRightChild(tree_node*& k1) const
- {
- rotateWithLeftChild(k1->right);
- rotateWithRightChild(k1);
- }
-
-
- // Removes a node. Returns true if the node was on the left side of its parent -- O(1).
- void removeNode(tree_node*& node)
- {
- // It is a leaf, simply remove the item and disconnect the parent
- if (node->isLeft())
- {
- node->parent->setLeft(NULL);
- }
- else // (node == node->parent->right)
- {
- if (node->parent) { node->parent->setRight(NULL); }
- }
-
- node->setParent(NULL);
- }
-
-
- // Swap one node with another -- O(1).
- void replaceNode(tree_node*& node1, tree_node*& node2)
- {
- // Save both parent references
- simple_set<T>* node1Parent = node1->parent;
- simple_set<T>* node2Parent = node2->parent;
-
- // First move node2 into node1's place
- if (node1Parent)
- {
- if (isLeft(node1))
- {
- node1Parent->setLeft(node2);
- }
- else // node1 is on the right
- {
- node1Parent->setRight(node2);
- }
- }
- node2->setParent(node1Parent);
-
- // Now move node1 into node2's place
- if (node2Parent)
- {
- if (isLeft(node2))
- {
- node2Parent->setLeft(node1);
- }
- else // node2 is on the right
- {
- node2Parent->setRight(node1);
- }
- }
- node1->setParent(node2Parent);
- }
-
-
- // Balances the tree starting at the root node
- void balanceTree() { balanceTree(m_root); }
-
-
- // Balance the tree starting at the given node -- O(n).
- void balanceTree(tree_node*& node)
- {
- if (node)
- {
- // First see what the balance factor for this node is
- int balFactor = node->balanceFactor();
-
- if (balFactor < -1)
- {
- // See if we're heavy left of the left
- if(node->left->balanceFactor() < 0)
- {
- rotateWithLeftChild(node);
- }
- else // if (node->left->balanceFactor() > 0)
- {
- // We're heavy on the right of the left
- doubleWithLeftChild(node);
- }
- }
- else if (balFactor > 1)
- {
- // See if it we're heavy right of the right
- if(node->right->balanceFactor() > 0)
- {
- rotateWithRightChild(node);
- }
- else // if (node->right->balanceFactor() < 0)
- {
- // The element goes on the left of the right
- doubleWithRightChild(node);
- }
- }
- else // if (balFactor >= -1 && balFactor <= 1)
- {
- // We're balanced here, but are our children balanced?
- balanceTree(node->left);
- balanceTree(node->right);
- }
- }
- }
-
-
- // Recursive helper function for public size()
- int sizeRecurse(const tree_node* currentNode) const
- {
- int nodeCount = 1;
- if (currentNode->left != NULL)
- nodeCount += sizeRecurse(currentNode->left);
- if (currentNode->right != NULL)
- nodeCount += sizeRecurse(currentNode->right);
- return nodeCount;
- }
+ // The AVL tree's root
+ tree_node* m_root;
+
+ // Resource pool where objects are freed
+ resource_pool& m_pool;
+
+
+ // Find a node in the tree
+ tree_node* findNode(const T& x) const
+ {
+ tree_node* node = find(x, m_root);
+ if (node)
+ {
+ return node;
+ }
+ else
+ {
+ return NULL;
+ }
+ }
+
+
+ // Insert item x into a subtree t (root) -- O(log n)
+ bool insert(const T& x, tree_node*& t)
+ {
+ if (t == NULL)
+ {
+ t = pool_alloc(m_pool, tree_node(x, NULL, NULL, NULL));
+
+ // An empty sub-tree here, insertion successful
+ return true;
+ }
+ else if (x < t->element)
+ {
+ // O(log n)
+ bool retVal = insert(x, t->left);
+
+ if (retVal)
+ {
+ t->left->setParent(t);
+ if(t->balanceFactor() < -1)
+ {
+ // See if it went left of the left
+ if(x < t->left->element)
+ {
+ rotateWithLeftChild(t);
+ }
+ else
+ {
+ // The element goes on the right of the left
+ doubleWithLeftChild(t);
+ }
+ }
+ }
+
+ return retVal;
+ }
+ else if (t->element < x)
+ {
+ bool retVal = insert(x, t->right);
+
+ // Only do this if the insertion was successful
+ if (retVal)
+ {
+ t->right->setParent(t);
+
+ if (t->balanceFactor() > 1)
+ {
+ // See if it went right of the right
+ if(t->right->element < x)
+ {
+ rotateWithRightChild(t);
+ }
+ else
+ {
+ // The element goes on the left of the right
+ doubleWithRightChild(t);
+ }
+ }
+ }
+
+ return retVal;
+ }
+ else
+ {
+ return false; // Duplicate
+ }
+ }
+
+
+ // Recursively free all nodes in the tree -- O(n).
+ void clearRecurse(tree_node*& t) const
+ {
+ if(t != NULL)
+ {
+ clearRecurse(t->left);
+ clearRecurse(t->right);
+
+ pool_free(m_pool, t);
+ }
+ t = NULL;
+ }
+
+
+ // Merge a tree with this one. Private because external care is required.
+ bool merge(tree_node* b, tree_node*& t)
+ {
+ if (!b)
+ {
+ return false;
+ }
+ else
+ {
+ bool retVal = false;
+
+ if (t == NULL)
+ {
+ // Set this element to that subtree
+ t = b;
+
+ // The parent here should be NULL anyway, but we
+ // set it just to be sure. This pointer will be
+ // used as a flag to indicate where in the call
+ // stack the tree was actually set.
+ //
+ // The middle layers of this method's call will
+ // all have their parent references in tact since
+ // no operations took place there.
+ //
+ //t->parent = NULL;
+ t->setParent(NULL);
+
+ // We were successful in merging
+ retVal = true;
+ }
+ else if (b->element < t->element)
+ {
+ retVal = merge(b, t->left);
+
+ // Only do this if the insertion actually took place
+ if (retVal && !t->left->parent)
+ {
+ t->left->setParent(t);
+ }
+ }
+ else if (t->element < b->element)
+ {
+ retVal = merge(b, t->right);
+
+ // Only do this if the insertion was successful
+ if (retVal && !t->right->parent)
+ {
+ t->right->setParent(t);
+ }
+
+ return retVal;
+ }
+
+ return retVal;
+ }
+ }
+
+
+ // Find the smallest item's node in a subtree t -- O(log n).
+ tree_node* findMin(tree_node* t) const
+ {
+ if(t == NULL)
+ {
+ return t;
+ }
+
+ while(t->left != NULL)
+ {
+ t = t->left;
+ }
+
+ return t;
+ }
+
+
+ // Find the smallest item's node in a subtree t -- O(log n).
+ tree_node* findMax(tree_node* t) const
+ {
+ if(t == NULL)
+ {
+ return t;
+ }
+
+ while(t->right != NULL)
+ {
+ t = t->right;
+ }
+
+ return t;
+ }
+
+
+ // Find item x's node in subtree t -- O(log n)
+ tree_node* find(const T& x, tree_node* t) const
+ {
+ while(t != NULL)
+ {
+ if (x < t->element)
+ {
+ t = t->left;
+ }
+ else if (t->element < x)
+ {
+ t = t->right;
+ }
+ else
+ {
+ return t; // Match
+ }
+ }
+
+ return NULL; // No match
+ }
+
+
+ // Clone a subtree -- O(n)
+ tree_node* clone(const tree_node* t) const
+ {
+ if(t == NULL)
+ {
+ return NULL;
+ }
+ else
+ {
+ // Create a node with the left and right nodes and a parent set to NULL
+ tree_node* retVal = pool_alloc(m_pool, tree_node(t->element, NULL, clone(t->left), clone(t->right)));
+
+ // Now set our children's parent node reference
+ if (retVal->left) { retVal->left->setParent(retVal); }
+ if (retVal->right) { retVal->right->setParent(retVal); }
+
+ return retVal;
+ }
+ }
+
+
+ // Rotate binary tree node with left child.
+ // Single rotation for case 1 -- O(1).
+ void rotateWithLeftChild(tree_node*& k2) const
+ {
+ tree_node* k1 = k2->left;
+ tree_node* k2Parent = k2->parent;
+
+ k2->setLeft(k1->right);
+ if (k2->left) { k2->left->setParent(k2); }
+
+ k1->setRight(k2);
+ if (k1->right) { k1->right->setParent(k1); }
+
+ k2 = k1;
+ k2->setParent(k2Parent);
+ }
+
+
+ // Rotate binary tree node with right child.
+ // Single rotation for case 4 -- O(1).
+ void rotateWithRightChild(tree_node*& k1) const
+ {
+ tree_node* k2 = k1->right;
+ tree_node* k1Parent = k1->parent;
+
+ k1->setRight(k2->left);
+ if (k1->right) { k1->right->setParent(k1); }
+
+ k2->setLeft(k1);
+ if (k2->left) { k2->left->setParent(k2); }
+
+ k1 = k2;
+ k1->setParent(k1Parent);
+ }
+
+
+ // Double rotate binary tree node: first left child
+ // with its right child; then node k3 with new left child.
+ // Double rotation for case 2 -- O(1).
+ void doubleWithLeftChild(tree_node*& k3) const
+ {
+ rotateWithRightChild(k3->left);
+ rotateWithLeftChild(k3);
+ }
+
+
+ // Double rotate binary tree node: first right child
+ // with its left child; then node k1 with new right child.
+ // Double rotation for case 3 -- O(1).
+ void doubleWithRightChild(tree_node*& k1) const
+ {
+ rotateWithLeftChild(k1->right);
+ rotateWithRightChild(k1);
+ }
+
+
+ // Removes a node. Returns true if the node was on the left side of its parent -- O(1).
+ void removeNode(tree_node*& node)
+ {
+ // It is a leaf, simply remove the item and disconnect the parent
+ if (node->isLeft())
+ {
+ node->parent->setLeft(NULL);
+ }
+ else // (node == node->parent->right)
+ {
+ if (node->parent) { node->parent->setRight(NULL); }
+ }
+
+ node->setParent(NULL);
+ }
+
+
+ // Swap one node with another -- O(1).
+ void replaceNode(tree_node*& node1, tree_node*& node2)
+ {
+ // Save both parent references
+ simple_set<T>* node1Parent = node1->parent;
+ simple_set<T>* node2Parent = node2->parent;
+
+ // First move node2 into node1's place
+ if (node1Parent)
+ {
+ if (isLeft(node1))
+ {
+ node1Parent->setLeft(node2);
+ }
+ else // node1 is on the right
+ {
+ node1Parent->setRight(node2);
+ }
+ }
+ node2->setParent(node1Parent);
+
+ // Now move node1 into node2's place
+ if (node2Parent)
+ {
+ if (isLeft(node2))
+ {
+ node2Parent->setLeft(node1);
+ }
+ else // node2 is on the right
+ {
+ node2Parent->setRight(node1);
+ }
+ }
+ node1->setParent(node2Parent);
+ }
+
+
+ // Balances the tree starting at the root node
+ void balanceTree() { balanceTree(m_root); }
+
+
+ // Balance the tree starting at the given node -- O(n).
+ void balanceTree(tree_node*& node)
+ {
+ if (node)
+ {
+ // First see what the balance factor for this node is
+ int balFactor = node->balanceFactor();
+
+ if (balFactor < -1)
+ {
+ // See if we're heavy left of the left
+ if(node->left->balanceFactor() < 0)
+ {
+ rotateWithLeftChild(node);
+ }
+ else // if (node->left->balanceFactor() > 0)
+ {
+ // We're heavy on the right of the left
+ doubleWithLeftChild(node);
+ }
+ }
+ else if (balFactor > 1)
+ {
+ // See if it we're heavy right of the right
+ if(node->right->balanceFactor() > 0)
+ {
+ rotateWithRightChild(node);
+ }
+ else // if (node->right->balanceFactor() < 0)
+ {
+ // The element goes on the left of the right
+ doubleWithRightChild(node);
+ }
+ }
+ else // if (balFactor >= -1 && balFactor <= 1)
+ {
+ // We're balanced here, but are our children balanced?
+ balanceTree(node->left);
+ balanceTree(node->right);
+ }
+ }
+ }
+
+
+ // Recursive helper function for public size()
+ int sizeRecurse(const tree_node* currentNode) const
+ {
+ int nodeCount = 1;
+ if (currentNode->left != NULL)
+ nodeCount += sizeRecurse(currentNode->left);
+ if (currentNode->right != NULL)
+ nodeCount += sizeRecurse(currentNode->right);
+ return nodeCount;
+ }
#ifdef SIMPLE_SET_DEBUG
- // Debug. Print from the start node, down -- O(n log n).
- void printTree(std::ostream& out, tree_node* t=NULL, int numTabs=0, char lr='_') const
- {
- if(t != NULL)
- {
- for (int i =0; i < numTabs; i++) { out << " "; } out << "|_" << lr << "__ ";
- out << t->element << " {h = " << t->height() << ", b = " << t->balanceFactor() << "} ";
- // TODO: Reinstate out << std::hex << t << " (p = " << t->parent << ")" << std::dec;
- out << std::endl;
-
- printTree(out, t->left, numTabs + 1, '<');
- printTree(out, t->right, numTabs + 1, '>');
- }
- }
+ // Debug. Print from the start node, down -- O(n log n).
+ void printTree(std::ostream& out, tree_node* t=NULL, int numTabs=0, char lr='_') const
+ {
+ if(t != NULL)
+ {
+ for (int i =0; i < numTabs; i++) { out << " "; } out << "|_" << lr << "__ ";
+ out << t->element << " {h = " << t->height() << ", b = " << t->balanceFactor() << "} ";
+ // TODO: Reinstate out << std::hex << t << " (p = " << t->parent << ")" << std::dec;
+ out << std::endl;
+
+ printTree(out, t->left, numTabs + 1, '<');
+ printTree(out, t->right, numTabs + 1, '>');
+ }
+ }
#endif
};
@@ -692,149 +692,149 @@ private:
template <class T> class avl_tree_node
{
- friend class simple_set<T>;
- friend class simple_set_iterator<T>;
- typedef avl_tree_node<T> tree_node;
+ friend class simple_set<T>;
+ friend class simple_set_iterator<T>;
+ typedef avl_tree_node<T> tree_node;
public:
- // Construction
- avl_tree_node(const T& theElement, avl_tree_node* p, avl_tree_node* lt, avl_tree_node* rt)
- : element(theElement),
- parent(p),
- left(lt),
- right(rt),
- m_height(1),
- m_balanceFactor(0)
- { }
-
-
- // Are we to our parent's left?
- bool isLeft()
- {
- if (parent && this == parent->left)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-
-
- // Are we a leaf node?
- bool isLeaf() { return !left && !right; }
-
-
- // Set the parent pointer
- void setParent(tree_node* p)
- {
- // Set our new parent
- parent = p;
-
- // If we have a valid parent, set its height
- if (parent)
- {
- // Set the parent's height to include this tree. If the parent
- // already has a tree that is taller than the one we're attaching
- // then the parent's height remains unchanged
- int rightHeight = (parent->right ? parent->right->m_height : 0);
- int leftHeight = (parent->left ? parent->left->m_height : 0);
-
- // The height of the tallest branch + 1
- parent->m_height = maxInt(rightHeight, leftHeight) + 1;
-
- // Also set the balance factor
- parent->m_balanceFactor = rightHeight - leftHeight;
- }
- }
-
-
- // Set the left child pointer
- void setLeft(tree_node* l)
- {
- // Set our new left node
- left = l;
-
- // Set the height and balance factor
- int rightHeight = (right ? right->m_height : 0);
- int leftHeight = (left ? left->m_height : 0);
-
- m_height = maxInt(rightHeight, leftHeight) + 1;
- m_balanceFactor = (right ? right->m_height : 0) - (left ? left->m_height : 0);
- }
-
-
- // Set the right child pointer
- void setRight(tree_node* r)
- {
- // Set our new right node
- right = r;
-
- // Set the height and balance factor
- int rightHeight = (right ? right->m_height : 0);
- int leftHeight = (left ? left->m_height : 0);
-
- m_height = maxInt(rightHeight, leftHeight) + 1;
- m_balanceFactor = (right ? right->m_height : 0) - (left ? left->m_height : 0);
- }
-
-
- // Recover the height
- int height() const
- {
- // The height is equal to the maximum of the right or left side's height plus 1
- // Trading memory for operation time can be done O(n) like this =>
- // return max(left ? left->height() : 0, right ? right->height() : 0) + 1;
- return m_height;
- }
-
-
- // Recover the balance factor
- int balanceFactor() const
- {
- // The weight of a node is equal to the difference between
- // the weight of the left subtree and the weight of the
- // right subtree
- //
- // O(n) version =>
- // return (right ? right->height() : 0) - (left ? left->height() : 0);
- //
- return m_balanceFactor;
- }
+ // Construction
+ avl_tree_node(const T& theElement, avl_tree_node* p, avl_tree_node* lt, avl_tree_node* rt)
+ : element(theElement),
+ parent(p),
+ left(lt),
+ right(rt),
+ m_height(1),
+ m_balanceFactor(0)
+ { }
+
+
+ // Are we to our parent's left?
+ bool isLeft()
+ {
+ if (parent && this == parent->left)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+
+ // Are we a leaf node?
+ bool isLeaf() { return !left && !right; }
+
+
+ // Set the parent pointer
+ void setParent(tree_node* p)
+ {
+ // Set our new parent
+ parent = p;
+
+ // If we have a valid parent, set its height
+ if (parent)
+ {
+ // Set the parent's height to include this tree. If the parent
+ // already has a tree that is taller than the one we're attaching
+ // then the parent's height remains unchanged
+ int rightHeight = (parent->right ? parent->right->m_height : 0);
+ int leftHeight = (parent->left ? parent->left->m_height : 0);
+
+ // The height of the tallest branch + 1
+ parent->m_height = maxInt(rightHeight, leftHeight) + 1;
+
+ // Also set the balance factor
+ parent->m_balanceFactor = rightHeight - leftHeight;
+ }
+ }
+
+
+ // Set the left child pointer
+ void setLeft(tree_node* l)
+ {
+ // Set our new left node
+ left = l;
+
+ // Set the height and balance factor
+ int rightHeight = (right ? right->m_height : 0);
+ int leftHeight = (left ? left->m_height : 0);
+
+ m_height = maxInt(rightHeight, leftHeight) + 1;
+ m_balanceFactor = (right ? right->m_height : 0) - (left ? left->m_height : 0);
+ }
+
+
+ // Set the right child pointer
+ void setRight(tree_node* r)
+ {
+ // Set our new right node
+ right = r;
+
+ // Set the height and balance factor
+ int rightHeight = (right ? right->m_height : 0);
+ int leftHeight = (left ? left->m_height : 0);
+
+ m_height = maxInt(rightHeight, leftHeight) + 1;
+ m_balanceFactor = (right ? right->m_height : 0) - (left ? left->m_height : 0);
+ }
+
+
+ // Recover the height
+ int height() const
+ {
+ // The height is equal to the maximum of the right or left side's height plus 1
+ // Trading memory for operation time can be done O(n) like this =>
+ // return max(left ? left->height() : 0, right ? right->height() : 0) + 1;
+ return m_height;
+ }
+
+
+ // Recover the balance factor
+ int balanceFactor() const
+ {
+ // The weight of a node is equal to the difference between
+ // the weight of the left subtree and the weight of the
+ // right subtree
+ //
+ // O(n) version =>
+ // return (right ? right->height() : 0) - (left ? left->height() : 0);
+ //
+ return m_balanceFactor;
+ }
private:
- // Calculates all of the heights for this node and its ancestors -- O(log n).
- void calcHeights()
- {
- // Calculate our own height -- O(1)
- m_height = maxInt(left ? left->m_height : 0, right ? right->m_height : 0) + 1;
+ // Calculates all of the heights for this node and its ancestors -- O(log n).
+ void calcHeights()
+ {
+ // Calculate our own height -- O(1)
+ m_height = maxInt(left ? left->m_height : 0, right ? right->m_height : 0) + 1;
- // And our parent's height (and recurse) -- O(log n)
- if (parent)
- {
- parent->calcHeights();
- }
- }
+ // And our parent's height (and recurse) -- O(log n)
+ if (parent)
+ {
+ parent->calcHeights();
+ }
+ }
- // Utility function - TODO replace
- int maxInt(const int& lhs, const int& rhs) const
- {
- return lhs > rhs ? lhs : rhs;
- }
+ // Utility function - TODO replace
+ int maxInt(const int& lhs, const int& rhs) const
+ {
+ return lhs > rhs ? lhs : rhs;
+ }
private:
- T element;
+ T element;
- avl_tree_node* parent;
- avl_tree_node* left;
- avl_tree_node* right;
+ avl_tree_node* parent;
+ avl_tree_node* left;
+ avl_tree_node* right;
- int m_height;
- int m_balanceFactor;
+ int m_height;
+ int m_balanceFactor;
};
@@ -850,146 +850,146 @@ private:
template <class T>
class simple_set_iterator
{
- typedef avl_tree_node<T> tree_node;
+ typedef avl_tree_node<T> tree_node;
public:
- enum TraversalType { PRE_ORDER, IN_ORDER, POST_ORDER, LEVEL_ORDER };
+ enum TraversalType { PRE_ORDER, IN_ORDER, POST_ORDER, LEVEL_ORDER };
public:
- // construction
- simple_set_iterator(simple_set<T>& set, const TraversalType& tt=IN_ORDER)
- : m_set(&set),
- m_traversalType(tt),
- m_currentNode(NULL),
- m_endNode(NULL) { }
-
- ~simple_set_iterator() { }
-
-
- // getters
- T* current() const { return m_currentNode; }
-
-
- // reset and return first item
- T* first()
- {
- m_currentNode = m_set->m_root;
- switch (m_traversalType)
- {
- case IN_ORDER:
- {
- // The current node is the smallest value
- m_currentNode = m_set->findMin(m_set->m_root);
-
- // The end case is the largest value
- m_endNode = m_set->findMax(m_set->m_root);
-
- return &m_currentNode->element;
- }
-
- default:
- {
- // TODO (better error message):
- printf("simple_set_iterator: Traversal type not yet supported.\n");
- return NULL;
- }
- }
- return NULL;
- }
-
-
- T* last()
- {
- return NULL;
- }
-
-
- // advance according to current state and traversal type
- T* next()
- {
- if (m_currentNode == NULL) return NULL;
-
- switch (m_traversalType)
- {
- case IN_ORDER:
- {
- // You are at the end
- if (m_currentNode == m_endNode)
- return NULL;
-
- if (m_currentNode->right != NULL)
- {
- // Gather the furthest left node of right subtree
- m_currentNode = m_currentNode->right;
- while (m_currentNode->left != NULL)
- {
- m_currentNode = m_currentNode->left;
- }
- }
- else
- {
- // No right subtree? Move up the tree, looking for a left child link.
- tree_node* p = m_currentNode->parent;
- while (p != NULL && m_currentNode == p->right)
- {
- m_currentNode = p;
- p = p->parent;
- }
- m_currentNode = p;
- }
-
- return &m_currentNode->element;
- }
-
- default:
- {
- // TODO (better error message):
- printf("simple_set_iterator: Traversal type not yet supported.\n");
- return NULL;
- }
- }
-
- return NULL;
- }
-
-
- // return the number of items available
- int count()
- {
- return m_set->size();
- }
-
-
- // return the index of a given item in the virtual list
- // note: this function is destructive to any in-progress iterations!
- int indexof(T inData)
- {
- int index = 0;
- for (T* data = first(); data != last(); data = next(), index++)
- if (!(*data < inData) && !(inData < *data))
- return index;
- return -1;
- }
-
-
- // return the indexed item in the list
- // note: this function is destructive to any in-progress iterations!
- T* byindex(int index)
- {
- int count = 0;
- for (T* data = first(); data != last(); data = next(), count++)
- if (count == index)
- return data;
- return NULL;
- }
+ // construction
+ simple_set_iterator(simple_set<T>& set, const TraversalType& tt=IN_ORDER)
+ : m_set(&set),
+ m_traversalType(tt),
+ m_currentNode(NULL),
+ m_endNode(NULL) { }
+
+ ~simple_set_iterator() { }
+
+
+ // getters
+ T* current() const { return m_currentNode; }
+
+
+ // reset and return first item
+ T* first()
+ {
+ m_currentNode = m_set->m_root;
+ switch (m_traversalType)
+ {
+ case IN_ORDER:
+ {
+ // The current node is the smallest value
+ m_currentNode = m_set->findMin(m_set->m_root);
+
+ // The end case is the largest value
+ m_endNode = m_set->findMax(m_set->m_root);
+
+ return &m_currentNode->element;
+ }
+
+ default:
+ {
+ // TODO (better error message):
+ printf("simple_set_iterator: Traversal type not yet supported.\n");
+ return NULL;
+ }
+ }
+ return NULL;
+ }
+
+
+ T* last()
+ {
+ return NULL;
+ }
+
+
+ // advance according to current state and traversal type
+ T* next()
+ {
+ if (m_currentNode == NULL) return NULL;
+
+ switch (m_traversalType)
+ {
+ case IN_ORDER:
+ {
+ // You are at the end
+ if (m_currentNode == m_endNode)
+ return NULL;
+
+ if (m_currentNode->right != NULL)
+ {
+ // Gather the furthest left node of right subtree
+ m_currentNode = m_currentNode->right;
+ while (m_currentNode->left != NULL)
+ {
+ m_currentNode = m_currentNode->left;
+ }
+ }
+ else
+ {
+ // No right subtree? Move up the tree, looking for a left child link.
+ tree_node* p = m_currentNode->parent;
+ while (p != NULL && m_currentNode == p->right)
+ {
+ m_currentNode = p;
+ p = p->parent;
+ }
+ m_currentNode = p;
+ }
+
+ return &m_currentNode->element;
+ }
+
+ default:
+ {
+ // TODO (better error message):
+ printf("simple_set_iterator: Traversal type not yet supported.\n");
+ return NULL;
+ }
+ }
+
+ return NULL;
+ }
+
+
+ // return the number of items available
+ int count()
+ {
+ return m_set->size();
+ }
+
+
+ // return the index of a given item in the virtual list
+ // note: this function is destructive to any in-progress iterations!
+ int indexof(T inData)
+ {
+ int index = 0;
+ for (T* data = first(); data != last(); data = next(), index++)
+ if (!(*data < inData) && !(inData < *data))
+ return index;
+ return -1;
+ }
+
+
+ // return the indexed item in the list
+ // note: this function is destructive to any in-progress iterations!
+ T* byindex(int index)
+ {
+ int count = 0;
+ for (T* data = first(); data != last(); data = next(), count++)
+ if (count == index)
+ return data;
+ return NULL;
+ }
private:
- simple_set<T>* m_set;
+ simple_set<T>* m_set;
- TraversalType m_traversalType;
- tree_node* m_currentNode;
- tree_node* m_endNode;
+ TraversalType m_traversalType;
+ tree_node* m_currentNode;
+ tree_node* m_endNode;
};
#endif
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 367a9e216ef..5fc2eb2de41 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -238,7 +238,6 @@ GFXDECODE_END
void _1942_state::machine_start()
{
-
save_item(NAME(m_palette_bank));
save_item(NAME(m_scroll));
}
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 0414ba0b2d0..b997e5705d5 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -423,7 +423,6 @@ static const ym2610_interface ym2610_config =
MACHINE_START_MEMBER(_2mindril_state,drill)
{
-
save_item(NAME(m_defender_sensor));
save_item(NAME(m_shutter_sensor));
}
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index c659f76af05..399cf0e7be7 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -1440,7 +1440,7 @@ DRIVER_INIT_MEMBER(_39in1_state,39in1)
{
m_dmadac[0] = machine().device<dmadac_sound_device>("dac1");
m_dmadac[1] = machine().device<dmadac_sound_device>("dac2");
-
+
address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_read_handler (0xa0151648, 0xa015164b, read32_delegate(FUNC(_39in1_state::prot_cheater_r), this));
}
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 29b3a4db35f..be9c8a1877d 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -968,7 +968,6 @@ static const msm5232_interface msm5232_config =
MACHINE_START_MEMBER(fortyl_state,40love)
{
-
/* video */
save_item(NAME(m_pix1));
save_item(NAME(m_pix2));
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 1ce107a3653..9c65a79a5c4 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1862,7 +1862,6 @@ static const ym3812_interface ym3812_config =
MACHINE_START_MEMBER(alpha68k_state,common)
{
-
save_item(NAME(m_trigstate));
save_item(NAME(m_deposits1));
save_item(NAME(m_deposits2));
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 7a20395a8fa..2ffeb04c663 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -240,7 +240,6 @@ GFXDECODE_END
void amspdwy_state::machine_start()
{
-
save_item(NAME(m_flipscreen));
save_item(NAME(m_wheel_old));
save_item(NAME(m_wheel_return));
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 6ed0bd31ba3..8a74d7724ed 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -569,7 +569,6 @@ GFXDECODE_END
void angelkds_state::machine_start()
{
-
save_item(NAME(m_layer_ctrl));
save_item(NAME(m_txbank));
save_item(NAME(m_bgbotbank));
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index eac32a030f3..ba2a32d80c1 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -287,7 +287,6 @@ GFXDECODE_END
void aquarium_state::machine_start()
{
-
save_item(NAME(m_aquarium_snd_ack));
}
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 654546ee0fc..44753e96ba6 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -326,7 +326,6 @@ static const msm5205_interface msm5205_config =
void ashnojoe_state::machine_start()
{
-
save_item(NAME(m_adpcm_byte));
save_item(NAME(m_soundlatch_status));
save_item(NAME(m_msm5205_vclk_toggle));
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index 3e82b28f43a..403037f58ff 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -506,7 +506,6 @@ GFXDECODE_END
void atarifb_state::machine_start()
{
-
save_item(NAME(m_CTRLD));
save_item(NAME(m_sign_x_1));
save_item(NAME(m_sign_x_2));
diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c
index 5dfbe566a27..bd7030decb4 100644
--- a/src/mame/drivers/atvtrack.c
+++ b/src/mame/drivers/atvtrack.c
@@ -148,7 +148,7 @@ WRITE64_MEMBER(atvtrack_state::area1_w)
// old = m_area1_data[addr];
m_area1_data[addr] = dat;
if (addr == (0x00020000-0x00020000)/4) {
- if (data & 4) {
+ if (data & 4) {
m_subcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
}
}
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 86d6da3f0f4..794588954be 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -266,7 +266,6 @@ static const ym3526_interface ym3526_config =
void battlane_state::machine_start()
{
-
save_item(NAME(m_video_ctrl));
save_item(NAME(m_cpu_control));
}
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 337bf1c4a1a..79635e7bbd7 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()
{
-
/* video */
save_item(NAME(m_pc3259_output));
save_item(NAME(m_pc3259_mask));
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 27cbb527004..f3d53eed7fb 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -271,7 +271,6 @@ WRITE_LINE_MEMBER(blockout_state::irq_handler)
void blockout_state::machine_start()
{
-
save_item(NAME(m_color));
}
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 27cead31786..759e9dddb5c 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -428,7 +428,6 @@ GFXDECODE_END
void boxer_state::machine_start()
{
-
save_item(NAME(m_pot_state));
save_item(NAME(m_pot_latch));
}
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 32ec9b2e80a..355719ae8ca 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -363,7 +363,6 @@ static const ym3526_interface ym3526_config =
void brkthru_state::machine_start()
{
-
save_item(NAME(m_bgscroll));
save_item(NAME(m_bgbasecolor));
save_item(NAME(m_flipscreen));
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index af4e4cc86b9..ae0e240aa05 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1240,7 +1240,6 @@ DISCRETE_SOUND_END
MACHINE_START_MEMBER(btime_state,btime)
{
-
save_item(NAME(m_btime_palette));
save_item(NAME(m_bnj_scroll1));
save_item(NAME(m_bnj_scroll2));
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index de8b54e7e5b..b18709ea772 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -331,7 +331,6 @@ GFXDECODE_END
void bwing_state::machine_start()
{
-
save_item(NAME(m_palatch));
save_item(NAME(m_srbank));
save_item(NAME(m_mapmask));
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index d2f30c9c057..22cbb496efb 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -925,9 +925,9 @@ static MACHINE_CONFIG_START( calchase, calchase_state )
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, NULL, intel82439tx_pci_r, intel82439tx_pci_w)
MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_trident_vga )
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 4a8ef6e1e0b..684287cb387 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -334,7 +334,6 @@ static const ym2203_interface ym2203_config =
void capbowl_state::machine_start()
{
-
save_item(NAME(m_blitter_addr));
save_item(NAME(m_last_trackball_val[0]));
save_item(NAME(m_last_trackball_val[1]));
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 4b687e01715..7f79ff8854b 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -1777,7 +1777,6 @@ GFXDECODE_END
MACHINE_START_MEMBER(cave_state,cave)
{
-
save_item(NAME(m_soundbuf_len));
save_item(NAME(m_soundbuf_data));
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 3186cbb0068..10a3b682f53 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -578,7 +578,6 @@ MACHINE_START_MEMBER(champbas_state,champbas)
MACHINE_START_MEMBER(champbas_state,exctsccr)
{
-
// FIXME
machine().scheduler().timer_pulse(attotime::from_hz(75), timer_expired_delegate(FUNC(champbas_state::exctsccr_fm_callback),this)); /* updates fm */
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 78ddd0358a8..213a1326042 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -385,7 +385,6 @@ static const ym2203_interface ym2203_config =
void chanbara_state::machine_start()
{
-
save_item(NAME(m_scroll));
save_item(NAME(m_scrollhi));
}
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 00b95a3d968..b6be4682ef4 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -239,7 +239,7 @@ WRITE8_MEMBER(chinagat_state::saiyugoub1_adpcm_rom_addr_w )
}
WRITE8_MEMBER(chinagat_state::saiyugoub1_adpcm_control_w )
-{
+{
/* i8748 Port 2 write */
UINT8 *saiyugoub1_adpcm_rom = memregion("adpcm")->base();
@@ -291,7 +291,7 @@ WRITE8_MEMBER(chinagat_state::saiyugoub1_m5205_clk_w )
/* to the xtal pins of the MSM5205 */
/* Actually, T0 output clk mode is not supported by the i8048 core */
-#if 0
+#if 0
m_m5205_clk++;
if (m_m5205_clk == 8)
{
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 86347ac549b..76b13cd6eb0 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()
{
-
save_item(NAME(m_bg_image));
}
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index a8e9161c30c..d8b49caf362 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()
{
-
save_item(NAME(m_scroll_x));
save_item(NAME(m_scroll_y));
}
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 12628c2e2c4..43da3456efe 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -425,7 +425,6 @@ GFXDECODE_END
void cop01_state::machine_start()
{
-
save_item(NAME(m_pulse));
save_item(NAME(m_timer));
save_item(NAME(m_vreg));
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 7838ad5b8c8..5cf5b737405 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1240,7 +1240,6 @@ GFXDECODE_END
MACHINE_START_MEMBER(cps_state,cps2)
{
-
if (m_audiocpu != NULL) // gigaman2 has no audiocpu
membank("bank1")->configure_entries(0, (QSOUND_SIZE - 0x10000) / 0x4000, memregion("audiocpu")->base() + 0x10000, 0x4000);
}
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 9a1badde5e5..5572eaedc24 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()
{
-
/* configure the banking */
membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x2000);
membank("bank1")->set_entry(0);
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index 432c26c9409..80d9b0f300f 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -328,7 +328,6 @@ static const ym3812_interface ym3812_config =
void crospang_state::machine_start()
{
-
save_item(NAME(m_bestri_tilebank));
}
diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c
index 56f1ac6ebf3..ac173ab16c2 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -85,7 +85,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(csplayh5_irq);
DECLARE_WRITE_LINE_MEMBER(csplayh5_vdp0_interrupt);
required_device<dac_device> m_dac1;
- required_device<dac_device> m_dac2;
+ required_device<dac_device> m_dac2;
};
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index b3c8b839507..7abf3702cdd 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -42,7 +42,7 @@ public:
required_device<simutrek_special_device> m_laserdisc;
required_device<cpu_device> m_rotatecpu;
required_device<cpu_device> m_linecpu;
- required_device<cpu_device> m_soundcpu;
+ required_device<cpu_device> m_soundcpu;
rgb_t *m_colormap;
DECLARE_WRITE16_MEMBER(palette_w);
DECLARE_READ16_MEMBER(line_r);
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 582bdf68ee0..f81cfa77196 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -56,7 +56,7 @@ public:
required_shared_ptr<UINT8> m_bgvideoram;
required_shared_ptr<UINT8> m_fgvideoram;
required_shared_ptr<UINT8> m_spriteram;
-
+
optional_device<msm5205_device> m_msm;
/* video-related */
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index ba296226015..ba721fe7c1f 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -450,7 +450,6 @@ INTERRUPT_GEN_MEMBER(ddayjlc_state::ddayjlc_snd_interrupt)
void ddayjlc_state::machine_start()
{
-
save_item(NAME(m_char_bank));
save_item(NAME(m_bgadr));
save_item(NAME(m_sound_nmi_enable));
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 6cc5c603806..8dc7477a181 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -540,7 +540,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon3_state::ddragon3_scanline)
void ddragon3_state::machine_start()
{
-
save_item(NAME(m_vreg));
save_item(NAME(m_bg_scrollx));
save_item(NAME(m_bg_scrolly));
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index ee6779b31bf..63ca3423ab5 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -433,7 +433,6 @@ void destroyr_state::palette_init()
void destroyr_state::machine_start()
{
-
save_item(NAME(m_cursor));
save_item(NAME(m_wavemod));
save_item(NAME(m_attract));
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 7a138d63e94..81377e892cd 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -456,7 +456,6 @@ GFXDECODE_END
void discoboy_state::machine_start()
{
-
save_item(NAME(m_ram_bank));
save_item(NAME(m_port_00));
save_item(NAME(m_gfxbank));
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index c44514c8661..a00f2f314e2 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -55,7 +55,7 @@ public:
m_22vp932(*this, "ld_22vp932") ,
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
- m_beeper(*this, "beeper") { }
+ m_beeper(*this, "beeper") { }
void laserdisc_data_w(UINT8 data)
{
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 96ff2abcf25..3da3d96fd6f 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -207,7 +207,6 @@ GFXDECODE_END
void dogfgt_state::machine_start()
{
-
save_item(NAME(m_bm_plane));
save_item(NAME(m_lastflip));
save_item(NAME(m_pixcolor));
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 905f0c116b0..daaf1acb366 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -394,7 +394,6 @@ GFXDECODE_END
void egghunt_state::machine_start()
{
-
save_item(NAME(m_gfx_banking));
save_item(NAME(m_okibanking));
save_item(NAME(m_vidram_bank));
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index b4190d0d2aa..d3d518b7bea 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -54,7 +54,6 @@ void espial_state::machine_reset()
void espial_state::machine_start()
{
-
//state_save_register_global_array(machine(), mcu_out[1]);
save_item(NAME(m_sound_nmi_enabled));
}
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 3ecc0ee60c4..f62b0e70974 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()
{
-
save_item(NAME(m_porta));
save_item(NAME(m_portb));
save_item(NAME(m_cocktail_flip));
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index abc82df0258..a73b889e8e8 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -257,7 +257,6 @@ GFXDECODE_END
void fcombat_state::machine_start()
{
-
save_item(NAME(m_cocktail_flip));
save_item(NAME(m_char_palette));
save_item(NAME(m_sprite_palette));
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 7793b2ae756..9e7bdcacf14 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -1382,7 +1382,6 @@ MACHINE_START_MEMBER(cps_state,sgyxz)
MACHINE_START_MEMBER(cps_state,kodb)
{
-
m_layer_enable_reg = 0x20;
m_layer_mask_reg[0] = 0x2e;
m_layer_mask_reg[1] = 0x2c;
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 7dee42f3c5e..a01c67741c5 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -375,7 +375,6 @@ void flyball_state::palette_init()
void flyball_state::machine_start()
{
-
save_item(NAME(m_pitcher_vert));
save_item(NAME(m_pitcher_horz));
save_item(NAME(m_pitcher_pic));
diff --git a/src/mame/drivers/fruitpc.c b/src/mame/drivers/fruitpc.c
index 1e878997089..8a8a4bdf3a5 100644
--- a/src/mame/drivers/fruitpc.c
+++ b/src/mame/drivers/fruitpc.c
@@ -3,7 +3,7 @@
"Fruit" (c) ???? (DOSBox runs it with half the screen missing)
preliminary driver by R. Belmont
-
+
Hardware:
- ST STPCD0166BTC3 486/66 + PC + VGA all on one chip
- 4x AS4LC1M16E5-60TC 1M x 16 EDO DRAM
@@ -553,9 +553,9 @@ static MACHINE_CONFIG_START( fruitpc, fruitpc_state )
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
@@ -569,9 +569,9 @@ DRIVER_INIT_MEMBER(fruitpc_state,fruitpc)
ROM_START( fruitpc )
ROM_REGION( 0x20000, "bios", 0 )
- ROM_LOAD( "at-gs001.bin", 0x000000, 0x020000, CRC(7dec34d0) SHA1(81d194d67fef9f6531bd3cd1ee0baacb5c2558bf) )
+ ROM_LOAD( "at-gs001.bin", 0x000000, 0x020000, CRC(7dec34d0) SHA1(81d194d67fef9f6531bd3cd1ee0baacb5c2558bf) )
- DISK_REGION( "drive_0" ) // 8 MB Compact Flash card
+ DISK_REGION( "drive_0" ) // 8 MB Compact Flash card
DISK_IMAGE( "fruit", 0,SHA1(df250ff06a97fa141a4144034f7035ac2947c53c) )
ROM_END
diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c
index cc1d6b33e8e..87eb8b5bb70 100644
--- a/src/mame/drivers/funkball.c
+++ b/src/mame/drivers/funkball.c
@@ -1144,7 +1144,7 @@ static MACHINE_CONFIG_START( funkball, funkball_state )
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_3DFX_VOODOO_1_ADD("voodoo_0", STD_VOODOO_1_CLOCK, voodoo_intf)
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index fd7a75dc2c7..3d28323af66 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -306,7 +306,6 @@ MACHINE_RESET_MEMBER(gaiden_state,raiga)
MACHINE_START_MEMBER(gaiden_state,raiga)
{
-
save_item(NAME(m_prot));
save_item(NAME(m_jumpcode));
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index fdf51a9b995..089fe851e3d 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -730,7 +730,7 @@ static MACHINE_CONFIG_START( gamecstl, gamecstl_state )
MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/gammagic.c b/src/mame/drivers/gammagic.c
index 7ddc19cabe8..9fd0b923815 100644
--- a/src/mame/drivers/gammagic.c
+++ b/src/mame/drivers/gammagic.c
@@ -80,7 +80,7 @@ public:
m_pic8259_1(*this, "pic8259_1" ),
m_pic8259_2(*this, "pic8259_2" ),
m_dma8237_1(*this, "dma8237_1" ),
- m_dma8237_2(*this, "dma8237_2" ),
+ m_dma8237_2(*this, "dma8237_2" ),
m_maincpu(*this, "maincpu") { }
int m_dma_channel;
@@ -120,10 +120,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(pc_dack0_w);
DECLARE_WRITE_LINE_MEMBER(pc_dack1_w);
DECLARE_WRITE_LINE_MEMBER(pc_dack2_w);
- DECLARE_WRITE_LINE_MEMBER(pc_dack3_w);
+ DECLARE_WRITE_LINE_MEMBER(pc_dack3_w);
DECLARE_WRITE_LINE_MEMBER(gammagic_pic8259_1_set_int_line);
DECLARE_READ8_MEMBER(get_slave_ack);
-
+
virtual void machine_start();
virtual void machine_reset();
void atapi_init();
@@ -781,7 +781,7 @@ static MACHINE_CONFIG_START( gammagic, gammagic_state )
// MCFG_PCI_BUS_DEVICE(1, "i82371sb", i82371sb_pci_read, i82371sb_pci_write)
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 3bf3ac2b870..3b087cb2468 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -86,7 +86,7 @@ public:
m_system_memory(*this, "systememory"),
m_i2cmem(*this, "i2cmem"),
m_s3c2410(*this, "s3c2410"),
- m_maincpu(*this, "maincpu") { }
+ m_maincpu(*this, "maincpu") { }
required_shared_ptr<UINT32> m_system_memory;
required_device<i2cmem_device> m_i2cmem;
@@ -599,7 +599,7 @@ void ghosteo_state::machine_start()
void ghosteo_state::machine_reset()
{
- m_maincpu->space(AS_PROGRAM).install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this));
}
static MACHINE_CONFIG_START( ghosteo, ghosteo_state )
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index e91fdad9087..650421ad385 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -228,7 +228,6 @@ GFXDECODE_END
void ginganin_state::machine_start()
{
-
save_item(NAME(m_layers_ctrl));
save_item(NAME(m_flipscreen));
}
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index a4431f6baf5..f2d2ce017c4 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -278,7 +278,7 @@ WRITE_LINE_MEMBER(gladiatr_state::gladiator_ym_irq)
/*Sound Functions*/
WRITE8_MEMBER(gladiatr_state::glad_adpcm_w)
-{
+{
UINT8 *rom = memregion("audiocpu")->base() + 0x10000;
/* bit6 = bank offset */
diff --git a/src/mame/drivers/gluck2.c b/src/mame/drivers/gluck2.c
index c17f9f3b029..cd7a96df9e9 100644
--- a/src/mame/drivers/gluck2.c
+++ b/src/mame/drivers/gluck2.c
@@ -189,7 +189,7 @@
#define MASTER_CLOCK XTAL_10MHz
-#define SND_CLOCK XTAL_3_579545MHz
+#define SND_CLOCK XTAL_3_579545MHz
#include "emu.h"
#include "cpu/m6502/m6502.h"
@@ -250,8 +250,8 @@ TILE_GET_INFO_MEMBER(gluck2_state::get_gluck2_tile_info)
*/
int attr = m_colorram[tile_index];
int code = m_videoram[tile_index];
- int bank = ((attr & 0xc0) >> 5 ) + ((attr & 0x02) >> 1 ); /* bits 1-6-7 handle the gfx banks */
- int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 handle the color */
+ int bank = ((attr & 0xc0) >> 5 ) + ((attr & 0x02) >> 1 ); /* bits 1-6-7 handle the gfx banks */
+ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 handle the color */
SET_TILE_INFO_MEMBER(bank, code, color, 0);
}
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( gluck2_map, AS_PROGRAM, 8, gluck2_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0x0844, 0x084b) AM_NOP /* see below */
+ AM_RANGE(0x0844, 0x084b) AM_NOP /* see below */
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(gluck2_videoram_w) AM_SHARE("videoram") /* 6116 #1 (2K x 8) RAM (only 1st half used) */
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(gluck2_colorram_w) AM_SHARE("colorram") /* 6116 #2 (2K x 8) RAM (only 1st half used) */
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("SW1")
@@ -367,7 +367,7 @@ static INPUT_PORTS_START( gluck2 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_CANCEL )
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note In")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Note In")
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -391,78 +391,78 @@ static INPUT_PORTS_START( gluck2 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_R) PORT_NAME("Reset")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("SW1") // 2000
- PORT_DIPNAME( 0x01, 0x01, "Paytable" ) PORT_DIPLOCATION("SW1:1")
+ PORT_START("SW1") // 2000
+ PORT_DIPNAME( 0x01, 0x01, "Paytable" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, "Strings and Numbers" )
PORT_DIPSETTING( 0x00, "Only Numbers" )
- PORT_DIPNAME( 0x02, 0x02, "SW1:2" ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPNAME( 0x02, 0x02, "SW1:2" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, "SW1:3" ) PORT_DIPLOCATION("SW1:3")
+ PORT_DIPNAME( 0x04, 0x04, "SW1:3" ) PORT_DIPLOCATION("SW1:3")
PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, "SW1:4" ) PORT_DIPLOCATION("SW1:4")
+ PORT_DIPNAME( 0x08, 0x08, "SW1:4" ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "SW1:5" ) PORT_DIPLOCATION("SW1:5")
+ PORT_DIPNAME( 0x10, 0x10, "SW1:5" ) PORT_DIPLOCATION("SW1:5")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, "SW1:6" ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPNAME( 0x20, 0x20, "SW1:6" ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, "SW1:7" ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x40, 0x40, "SW1:7" ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "SW1:8" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x80, "SW1:8" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("SW2") // 3D01: AY8910 port B
- PORT_DIPNAME( 0x01, 0x01, "SW2:8" ) PORT_DIPLOCATION("SW2:8")
+ PORT_START("SW2") // 3D01: AY8910 port B
+ PORT_DIPNAME( 0x01, 0x01, "SW2:8" ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x06, 0x02, "Bet Max" ) PORT_DIPLOCATION("SW2:7, 6")
+ PORT_DIPNAME( 0x06, 0x02, "Bet Max" ) PORT_DIPLOCATION("SW2:7, 6")
PORT_DIPSETTING( 0x00, "10" )
PORT_DIPSETTING( 0x02, "20" )
PORT_DIPSETTING( 0x04, "30" )
PORT_DIPSETTING( 0x06, "40" )
- PORT_DIPNAME( 0x08, 0x08, "SW2:5" ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPNAME( 0x08, 0x08, "SW2:5" ) PORT_DIPLOCATION("SW2:5")
PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "SW2:4" ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPNAME( 0x10, 0x10, "SW2:4" ) PORT_DIPLOCATION("SW2:4")
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, "SW2:3" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPNAME( 0x20, 0x20, "SW2:3" ) PORT_DIPLOCATION("SW2:3")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0xc0, 0xc0, "Note In" ) PORT_DIPLOCATION("SW2:2, 1")
+ PORT_DIPNAME( 0xc0, 0xc0, "Note In" ) PORT_DIPLOCATION("SW2:2, 1")
PORT_DIPSETTING( 0x00, "10" )
PORT_DIPSETTING( 0x40, "20" )
PORT_DIPSETTING( 0x80, "50" )
PORT_DIPSETTING( 0xc0, "100" )
- PORT_START("SW3") // 3D01: AY8910 port A
- PORT_DIPNAME( 0x01, 0x01, "SW3:1" ) PORT_DIPLOCATION("SW3:1")
+ PORT_START("SW3") // 3D01: AY8910 port A
+ PORT_DIPNAME( 0x01, 0x01, "SW3:1" ) PORT_DIPLOCATION("SW3:1")
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "SW3:8" ) PORT_DIPLOCATION("SW3:8")
+ PORT_DIPNAME( 0x02, 0x02, "SW3:8" ) PORT_DIPLOCATION("SW3:8")
PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, "Graphics" ) PORT_DIPLOCATION("SW3:7")
+ PORT_DIPNAME( 0x04, 0x04, "Graphics" ) PORT_DIPLOCATION("SW3:7")
PORT_DIPSETTING( 0x04, "Turtles" )
PORT_DIPSETTING( 0x00, "Cards" )
- PORT_DIPNAME( 0x18, 0x18, "Coin In" ) PORT_DIPLOCATION("SW3:6, 5")
+ PORT_DIPNAME( 0x18, 0x18, "Coin In" ) PORT_DIPLOCATION("SW3:6, 5")
PORT_DIPSETTING( 0x00, "1" )
PORT_DIPSETTING( 0x08, "2" )
PORT_DIPSETTING( 0x10, "5" )
PORT_DIPSETTING( 0x18, "10" )
- PORT_DIPNAME( 0x20, 0x20, "SW3:4" ) PORT_DIPLOCATION("SW3:4")
+ PORT_DIPNAME( 0x20, 0x20, "SW3:4" ) PORT_DIPLOCATION("SW3:4")
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, "SW3:3" ) PORT_DIPLOCATION("SW3:3")
+ PORT_DIPNAME( 0x40, 0x40, "SW3:3" ) PORT_DIPLOCATION("SW3:3")
PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "SW3:2" ) PORT_DIPLOCATION("SW3:2")
+ PORT_DIPNAME( 0x80, 0x80, "SW3:2" ) PORT_DIPLOCATION("SW3:2")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -476,7 +476,7 @@ INPUT_PORTS_END
static const gfx_layout tilelayout =
{
8, 8,
- 256, // 0x100 tiles per bank.
+ 256, // 0x100 tiles per bank.
3,
{ 0, RGN_FRAC(1,3), RGN_FRAC(2,3) },
{ 0, 1, 2, 3, 4, 5, 6, 7 },
@@ -535,7 +535,7 @@ static const ay8910_interface ay8910_intf =
/* Output ports have a minimal activity during init.
They seems unused (at least for Good Luck II)
*/
- DEVCB_NULL,
+ DEVCB_NULL,
DEVCB_NULL
};
@@ -574,7 +574,7 @@ static MACHINE_CONFIG_START( gluck2, gluck2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
MCFG_SOUND_CONFIG(ay8910_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -597,7 +597,7 @@ ROM_START( gluck2 )
ROM_LOAD( "2.u32", 0x08000, 0x8000, CRC(6a621a98) SHA1(9c83eab9f0858735e0176e5335651dd2dc620229) )
ROM_LOAD( "1.u31", 0x10000, 0x8000, CRC(ea33db1a) SHA1(69c67944f5e8bd060335b5e14628c0e0828271a4) )
- ROM_REGION( 0x0300, "proms", 0 ) // RGB
+ ROM_REGION( 0x0300, "proms", 0 ) // RGB
ROM_LOAD( "v1.u27", 0x0000, 0x0100, CRC(1aa5479f) SHA1(246cc99e7b351d5546060807b8a0b8acfe2f8e39) )
ROM_LOAD( "v2.u26", 0x0100, 0x0100, CRC(8da53489) SHA1(b90f5dd4bc5b64009e8bfad8f79f23d4020e537b) )
ROM_LOAD( "v3.u25", 0x0200, 0x0100, CRC(a4d2c9c3) SHA1(a799875b8b92391696419081244da2e56216e024) )
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 19b2064031e..634552ba188 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -236,7 +236,6 @@ GFXDECODE_END
void gotcha_state::machine_start()
{
-
save_item(NAME(m_banksel));
save_item(NAME(m_gfxbank));
save_item(NAME(m_scroll));
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 5c48955e280..6def5e4be35 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -135,7 +135,6 @@ TIMER_CALLBACK_MEMBER(gridlee_state::firq_timer_tick)
void gridlee_state::machine_start()
{
-
/* create the polynomial tables */
poly17_init();
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index c810c5e6c02..d1f8606d840 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -665,7 +665,7 @@ ROM_START( braveff )
ROM_LOAD32_WORD( "epr-21994.ic29", 0x000000, 0x200000, CRC(31b0a754) SHA1(b49c998a15fbc790b780ed6665a56681d4edd369) )
ROM_LOAD32_WORD( "epr-21995.ic30", 0x000002, 0x200000, CRC(bcccb56b) SHA1(6e7a69934e5b47495ae8e90c57759573bc519d24) )
ROM_LOAD32_WORD( "epr-21996.ic31", 0x400000, 0x200000, CRC(a8f88e17) SHA1(dbbd2a73335c740bcf2ff9680c575841af29b340) )
- ROM_LOAD32_WORD( "epr-21997.ic32", 0x400002, 0x200000, CRC(36641a7f) SHA1(37931bde1ddebef61fa6d8caca3cb67328fd0b90) )
+ ROM_LOAD32_WORD( "epr-21997.ic32", 0x400002, 0x200000, CRC(36641a7f) SHA1(37931bde1ddebef61fa6d8caca3cb67328fd0b90) )
ROM_LOAD32_WORD( "epr-21998.ic33", 0x800000, 0x200000, CRC(bd1df696) SHA1(fd937894763fab5cb50f33c40f8047e0d3adc93b) )
ROM_LOAD32_WORD( "epr-21999.ic34", 0x800002, 0x200000, CRC(9425eee0) SHA1(0f6a23163022bbd7ec54dd638094f3e317a87919) )
/* ic35 unpopulated */
@@ -673,30 +673,30 @@ ROM_START( braveff )
/* ROM board using 64M SOP44 MASKROM */
ROM_REGION( 0xc000000, "user2", ROMREGION_ERASE00)
- ROM_LOAD( "mpr-22000.ic37", 0x0000000, 0x800000, CRC(53d641d6) SHA1(f47d7c77d0e36c4ec3b7171fd7a017f9f58ca5a0) )
- ROM_LOAD( "mpr-22001.ic38", 0x0800000, 0x800000, CRC(234bc48f) SHA1(177c46884de0ba4bac1f9b778f99c905410a9345) )
- ROM_LOAD( "mpr-22002.ic39", 0x1000000, 0x800000, CRC(d8f3aa9e) SHA1(f73208034fdd51fed086e912cb8580d2270122b6) )
- ROM_LOAD( "mpr-22003.ic40", 0x1800000, 0x800000, CRC(2560fe98) SHA1(9bb5ffb6212ec6aa3f92e437eb424141f3b15e43) )
- ROM_LOAD( "mpr-22004.ic41", 0x2000000, 0x800000, CRC(4e24d71d) SHA1(503344dd8cdd8e65ec7c801b0efae83b3f1f9ae2) )
- ROM_LOAD( "mpr-22005.ic42", 0x2800000, 0x800000, CRC(2b96c97f) SHA1(707070c85f4b044236694daa13970c241b242d4d) )
- ROM_LOAD( "mpr-22006.ic43", 0x3000000, 0x800000, CRC(f793a3ba) SHA1(80acd1d4f71cafd7328ff9b9ce30e5169b8f4f8c) )
- ROM_LOAD( "mpr-22007.ic44", 0x3800000, 0x800000, CRC(62616e31) SHA1(dbe0d4b8fc085ed97884c105fd527af5cd8fbe79) )
- ROM_LOAD( "mpr-22008.ic45", 0x4000000, 0x800000, CRC(e6905de8) SHA1(6bb4e43b1394788add15f0b78ccd5ab14f86516c) )
- ROM_LOAD( "mpr-22009.ic46", 0x4800000, 0x800000, CRC(c37dfa5c) SHA1(5a3a5f2eb5a13831e36ca215147ec3c9740c50fc) )
- ROM_LOAD( "mpr-22010.ic47", 0x5000000, 0x800000, CRC(b570b46c) SHA1(6e512fd1a2c8835f6aee307865b42d57ddf90ef5) )
- ROM_LOAD( "mpr-22011.ic48", 0x5800000, 0x800000, CRC(d1f5fb58) SHA1(08a1282e00bda52d8d938225c65f67d22abfea05) )
- ROM_LOAD( "mpr-22012.ic49", 0x6000000, 0x800000, CRC(3ab79029) SHA1(d4708446ba700d5f7c89827c80177ad2d1c0b222) )
- ROM_LOAD( "mpr-22013.ic50", 0x6800000, 0x800000, CRC(42d8d00b) SHA1(ddce3c95258d8cf51792f2115f89ca658ffe97b6) )
- ROM_LOAD( "mpr-22014.ic51", 0x7000000, 0x800000, CRC(0f49c00f) SHA1(877c654268edc9526ae3e21e21e3ecca706f300b) )
- ROM_LOAD( "mpr-22015.ic52", 0x7800000, 0x800000, CRC(d3696e61) SHA1(247161c99c7061b8f391543af1812764a82399cb) )
- ROM_LOAD( "mpr-22016.ic53s", 0x8000000, 0x800000, CRC(c1015e00) SHA1(f2ce2009d4f4f0f3cbfcce7a36fab2c54e738b07) )
- ROM_LOAD( "mpr-22017.ic54s", 0x8800000, 0x800000, CRC(222a7cb0) SHA1(9f98ae3f13f85fae4596b671ea508b07c2116ab6) )
- ROM_LOAD( "mpr-22018.ic55s", 0x9000000, 0x800000, CRC(f160e115) SHA1(ecf7f9f58fce6bff220568972ba7763537c9d7d7) )
- ROM_LOAD( "mpr-22019.ic56s", 0x9800000, 0x800000, CRC(468b2f10) SHA1(f3fc0af7d4dd3f30ba84e684f3d9c217730564bb) )
- ROM_LOAD( "mpr-22020.ic57s", 0xa000000, 0x800000, CRC(0c018d8a) SHA1(0447d7ad64061cca4c1231733e660ba51de5a216) )
- ROM_LOAD( "mpr-22021.ic58s", 0xa800000, 0x800000, CRC(43b08604) SHA1(681142d8b95b2f9664d70b23262a64938774d4e3) )
- ROM_LOAD( "mpr-22022.ic59s", 0xb000000, 0x800000, CRC(abd3d888) SHA1(9654c3a38feab46b4983a602831fb29cccdd0526) )
- ROM_LOAD( "mpr-22023.ic60s", 0xb800000, 0x800000, CRC(07f00869) SHA1(92282d09d72d3e65a91128e06bb0d4426bb90be5) )
+ ROM_LOAD( "mpr-22000.ic37", 0x0000000, 0x800000, CRC(53d641d6) SHA1(f47d7c77d0e36c4ec3b7171fd7a017f9f58ca5a0) )
+ ROM_LOAD( "mpr-22001.ic38", 0x0800000, 0x800000, CRC(234bc48f) SHA1(177c46884de0ba4bac1f9b778f99c905410a9345) )
+ ROM_LOAD( "mpr-22002.ic39", 0x1000000, 0x800000, CRC(d8f3aa9e) SHA1(f73208034fdd51fed086e912cb8580d2270122b6) )
+ ROM_LOAD( "mpr-22003.ic40", 0x1800000, 0x800000, CRC(2560fe98) SHA1(9bb5ffb6212ec6aa3f92e437eb424141f3b15e43) )
+ ROM_LOAD( "mpr-22004.ic41", 0x2000000, 0x800000, CRC(4e24d71d) SHA1(503344dd8cdd8e65ec7c801b0efae83b3f1f9ae2) )
+ ROM_LOAD( "mpr-22005.ic42", 0x2800000, 0x800000, CRC(2b96c97f) SHA1(707070c85f4b044236694daa13970c241b242d4d) )
+ ROM_LOAD( "mpr-22006.ic43", 0x3000000, 0x800000, CRC(f793a3ba) SHA1(80acd1d4f71cafd7328ff9b9ce30e5169b8f4f8c) )
+ ROM_LOAD( "mpr-22007.ic44", 0x3800000, 0x800000, CRC(62616e31) SHA1(dbe0d4b8fc085ed97884c105fd527af5cd8fbe79) )
+ ROM_LOAD( "mpr-22008.ic45", 0x4000000, 0x800000, CRC(e6905de8) SHA1(6bb4e43b1394788add15f0b78ccd5ab14f86516c) )
+ ROM_LOAD( "mpr-22009.ic46", 0x4800000, 0x800000, CRC(c37dfa5c) SHA1(5a3a5f2eb5a13831e36ca215147ec3c9740c50fc) )
+ ROM_LOAD( "mpr-22010.ic47", 0x5000000, 0x800000, CRC(b570b46c) SHA1(6e512fd1a2c8835f6aee307865b42d57ddf90ef5) )
+ ROM_LOAD( "mpr-22011.ic48", 0x5800000, 0x800000, CRC(d1f5fb58) SHA1(08a1282e00bda52d8d938225c65f67d22abfea05) )
+ ROM_LOAD( "mpr-22012.ic49", 0x6000000, 0x800000, CRC(3ab79029) SHA1(d4708446ba700d5f7c89827c80177ad2d1c0b222) )
+ ROM_LOAD( "mpr-22013.ic50", 0x6800000, 0x800000, CRC(42d8d00b) SHA1(ddce3c95258d8cf51792f2115f89ca658ffe97b6) )
+ ROM_LOAD( "mpr-22014.ic51", 0x7000000, 0x800000, CRC(0f49c00f) SHA1(877c654268edc9526ae3e21e21e3ecca706f300b) )
+ ROM_LOAD( "mpr-22015.ic52", 0x7800000, 0x800000, CRC(d3696e61) SHA1(247161c99c7061b8f391543af1812764a82399cb) )
+ ROM_LOAD( "mpr-22016.ic53s", 0x8000000, 0x800000, CRC(c1015e00) SHA1(f2ce2009d4f4f0f3cbfcce7a36fab2c54e738b07) )
+ ROM_LOAD( "mpr-22017.ic54s", 0x8800000, 0x800000, CRC(222a7cb0) SHA1(9f98ae3f13f85fae4596b671ea508b07c2116ab6) )
+ ROM_LOAD( "mpr-22018.ic55s", 0x9000000, 0x800000, CRC(f160e115) SHA1(ecf7f9f58fce6bff220568972ba7763537c9d7d7) )
+ ROM_LOAD( "mpr-22019.ic56s", 0x9800000, 0x800000, CRC(468b2f10) SHA1(f3fc0af7d4dd3f30ba84e684f3d9c217730564bb) )
+ ROM_LOAD( "mpr-22020.ic57s", 0xa000000, 0x800000, CRC(0c018d8a) SHA1(0447d7ad64061cca4c1231733e660ba51de5a216) )
+ ROM_LOAD( "mpr-22021.ic58s", 0xa800000, 0x800000, CRC(43b08604) SHA1(681142d8b95b2f9664d70b23262a64938774d4e3) )
+ ROM_LOAD( "mpr-22022.ic59s", 0xb000000, 0x800000, CRC(abd3d888) SHA1(9654c3a38feab46b4983a602831fb29cccdd0526) )
+ ROM_LOAD( "mpr-22023.ic60s", 0xb800000, 0x800000, CRC(07f00869) SHA1(92282d09d72d3e65a91128e06bb0d4426bb90be5) )
ROM_END
ROM_START( sgnascar )
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index 49f681e34a8..6457ec85a83 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -132,7 +132,7 @@ public:
UINT32 screen_update_hvyunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void screen_eof_hvyunit(screen_device &screen, bool state);
TIMER_DEVICE_CALLBACK_MEMBER(hvyunit_scanline);
- required_device<cpu_device> m_soundcpu;
+ required_device<cpu_device> m_soundcpu;
};
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index b909afb302d..876e4dd6f17 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -628,7 +628,6 @@ void hyprduel_state::machine_reset()
MACHINE_START_MEMBER(hyprduel_state,hyprduel)
{
-
save_item(NAME(m_blitter_bit));
save_item(NAME(m_requested_int));
save_item(NAME(m_subcpu_resetline));
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 24673984eca..ffb2eb1743f 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -356,7 +356,6 @@ static const ym2203_interface ym2203_config =
void ironhors_state::machine_start()
{
-
save_item(NAME(m_palettebank));
save_item(NAME(m_charbank));
save_item(NAME(m_spriterambank));
diff --git a/src/mame/drivers/iteagle.c b/src/mame/drivers/iteagle.c
index 06e85fd890e..806d62e5563 100644
--- a/src/mame/drivers/iteagle.c
+++ b/src/mame/drivers/iteagle.c
@@ -5,37 +5,37 @@
skeleton by R. Belmont
Known games on this hardware and their security chip IDs:
- * E2-LED0 (c) 2000 Golden Tee Fore!
- * E2-BBH0 (c) 2000 Big Buck Hunter
- * G42-US-U (c) 2001 Golden Tee Fore! 2002
- * BB15-US (c) 2002 Big Buck Hunter: Shooter's Challenge (AKA Big Buck Hunter v1.5)
- * BBH2-US (c) 2002 Big Buck Hunter II: Sportsman's Paradise
- * CK1-US (C) 2002 Carnival King
- * G43-US-U (c) 2002 Golden Tee Fore! 2003
- * G44-US-U (c) 2003 Golden Tee Fore! 2004
- * G45-US-U (c) 2004 Golden Tee Fore! 2005
- * CW-US-U (c) 2005 Big Buck Hunter: Call of the Wild
- * G4C-US-U (c) 2006 Golden Tee Complete
- * ???????? (c) ???? Virtual Pool (not on IT's website master list but known to exist)
-
- Valid regions: US = USA, CAN = Canada, ENG = England, EUR = Euro, SWD = Sweden, AUS = Australia, NZ = New Zealand, SA = South Africa
-
+ * E2-LED0 (c) 2000 Golden Tee Fore!
+ * E2-BBH0 (c) 2000 Big Buck Hunter
+ * G42-US-U (c) 2001 Golden Tee Fore! 2002
+ * BB15-US (c) 2002 Big Buck Hunter: Shooter's Challenge (AKA Big Buck Hunter v1.5)
+ * BBH2-US (c) 2002 Big Buck Hunter II: Sportsman's Paradise
+ * CK1-US (C) 2002 Carnival King
+ * G43-US-U (c) 2002 Golden Tee Fore! 2003
+ * G44-US-U (c) 2003 Golden Tee Fore! 2004
+ * G45-US-U (c) 2004 Golden Tee Fore! 2005
+ * CW-US-U (c) 2005 Big Buck Hunter: Call of the Wild
+ * G4C-US-U (c) 2006 Golden Tee Complete
+ * ???????? (c) ???? Virtual Pool (not on IT's website master list but known to exist)
+
+ Valid regions: US = USA, CAN = Canada, ENG = England, EUR = Euro, SWD = Sweden, AUS = Australia, NZ = New Zealand, SA = South Africa
+
Hardware overview:
* NEC VR4310 CPU (similar to the N64's VR4300)
* NEC VR4373 "Nile 3" system controller / PCI bridge
- * 3DFX Voodoo Banshee video
- * Creative/Ensoniq AudioPCI ES1373 audio
- * Atmel 90S2313 AVR-based microcontroller for protection
- * STM48T02 NVRAM
- * Conexant CX88168 modem
-
+ * 3DFX Voodoo Banshee video
+ * Creative/Ensoniq AudioPCI ES1373 audio
+ * Atmel 90S2313 AVR-based microcontroller for protection
+ * STM48T02 NVRAM
+ * Conexant CX88168 modem
+
TODO:
- * Everything (need new PCI subsystem to do this right)
-
+ * Everything (need new PCI subsystem to do this right)
+
***************************************************************************/
-/*
-
+/*
+
Big Buck Hunter II
Incredible Technologies 2004
@@ -78,8 +78,8 @@ www.multitech.com
| | | |VRC 4373 | |
| |--------| |REV1.0 | CREATIVE |
|PAL(E2-RE53) |-----------| ES1373 |
-|--------------------------------------------------------------------|
-
+|--------------------------------------------------------------------|
+
*/
#include "emu.h"
@@ -101,7 +101,7 @@ public:
DECLARE_DRIVER_INIT(iteagle);
DECLARE_WRITE_LINE_MEMBER(ide_interrupt);
- DECLARE_WRITE_LINE_MEMBER(vblank_assert);
+ DECLARE_WRITE_LINE_MEMBER(vblank_assert);
UINT32 screen_update_iteagle(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
virtual void machine_start();
};
@@ -151,7 +151,7 @@ WRITE_LINE_MEMBER(iteagle_state::ide_interrupt)
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32, iteagle_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00000000, 0x01ffffff) AM_RAM
+ AM_RANGE(0x00000000, 0x01ffffff) AM_RAM
// Nile 3 northbridge/PCI controller at 0f000000
AM_RANGE(0x1fc00000, 0x1fcfffff) AM_ROM AM_REGION("maincpu", 0) AM_SHARE("rombase")
ADDRESS_MAP_END
@@ -188,8 +188,8 @@ static const voodoo_config iteagle_voodoo_intf =
static const mips3_config r4310_config =
{
- 16384, /* code cache size */
- 16384 /* data cache size */
+ 16384, /* code cache size */
+ 16384 /* data cache size */
};
static MACHINE_CONFIG_START( gtfore, iteagle_state )
@@ -224,52 +224,52 @@ MACHINE_CONFIG_END
*************************************/
#define EAGLE_BIOS \
- ROM_REGION( 0x100000, "maincpu", 0 ) /* MIPS code */ \
+ ROM_REGION( 0x100000, "maincpu", 0 ) /* MIPS code */ \
ROM_SYSTEM_BIOS( 0, "209", "bootrom 2.09" ) \
- ROM_LOAD( "eagle209.u15", 0x000000, 0x100000, CRC(e0fc1a16) SHA1(c9524f7ee6b95bd484a3b75bcbe2243cb273f84c) ) \
+ ROM_LOAD( "eagle209.u15", 0x000000, 0x100000, CRC(e0fc1a16) SHA1(c9524f7ee6b95bd484a3b75bcbe2243cb273f84c) ) \
ROM_SYSTEM_BIOS( 1, "208", "bootrom 2.08" ) \
- ROM_LOAD( "eagle208.u15", 0x000000, 0x100000, CRC(772f2864) SHA1(085063a4e34f29ebe3814823cd2c6323a050da36) ) \
+ ROM_LOAD( "eagle208.u15", 0x000000, 0x100000, CRC(772f2864) SHA1(085063a4e34f29ebe3814823cd2c6323a050da36) ) \
ROM_SYSTEM_BIOS( 2, "204", "bootrom 2.04" ) \
- ROM_LOAD( "eagle204.u15", 0x000000, 0x100000, CRC(f02e5523) SHA1(b979cf72a6992f1ecad9695a08c8d51e315ab537) ) \
+ ROM_LOAD( "eagle204.u15", 0x000000, 0x100000, CRC(f02e5523) SHA1(b979cf72a6992f1ecad9695a08c8d51e315ab537) ) \
ROM_SYSTEM_BIOS( 3, "201", "bootrom 2.01" ) \
- ROM_LOAD( "eagle201.u15", 0x000000, 0x100000, CRC(e180442b) SHA1(4f50821fed5bcd786d989520aa2559d6c416fb1f) ) \
+ ROM_LOAD( "eagle201.u15", 0x000000, 0x100000, CRC(e180442b) SHA1(4f50821fed5bcd786d989520aa2559d6c416fb1f) ) \
ROM_SYSTEM_BIOS( 4, "107", "bootrom 1.07" ) \
- ROM_LOAD( "eagle107.u15", 0x000000, 0x100000, CRC(97a01fc9) SHA1(a421dbf4d097b2f50cc005d3cd0d63e562e03df8) ) \
+ ROM_LOAD( "eagle107.u15", 0x000000, 0x100000, CRC(97a01fc9) SHA1(a421dbf4d097b2f50cc005d3cd0d63e562e03df8) ) \
ROM_SYSTEM_BIOS( 5, "106a", "bootrom 1.06a" ) \
- ROM_LOAD( "eagle106a.u15", 0x000000, 0x100000, CRC(9c79b7ad) SHA1(ccf1c86e79d65bee30f399e0fa33a7839570d93b) ) \
+ ROM_LOAD( "eagle106a.u15", 0x000000, 0x100000, CRC(9c79b7ad) SHA1(ccf1c86e79d65bee30f399e0fa33a7839570d93b) ) \
ROM_SYSTEM_BIOS( 6, "106", "bootrom 1.06" ) \
- ROM_LOAD( "eagle106.u15", 0x000000, 0x100000, CRC(56bc193d) SHA1(e531d208ef27f777d0784414885f390d1be654b9) ) \
+ ROM_LOAD( "eagle106.u15", 0x000000, 0x100000, CRC(56bc193d) SHA1(e531d208ef27f777d0784414885f390d1be654b9) ) \
ROM_SYSTEM_BIOS( 7, "105", "bootrom 1.05" ) \
- ROM_LOAD( "eagle105.u15", 0x000000, 0x100000, CRC(3870dbe0) SHA1(09be2d86c7259cd81d945c757044b167a76f30db) ) \
+ ROM_LOAD( "eagle105.u15", 0x000000, 0x100000, CRC(3870dbe0) SHA1(09be2d86c7259cd81d945c757044b167a76f30db) ) \
ROM_SYSTEM_BIOS( 8, "103", "bootrom 1.03" ) \
- ROM_LOAD( "eagle103.u15", 0x000000, 0x100000, CRC(c35f4cf2) SHA1(45301c18c7f8f78754c8ad60ea4d2da5a7dc55fb) ) \
+ ROM_LOAD( "eagle103.u15", 0x000000, 0x100000, CRC(c35f4cf2) SHA1(45301c18c7f8f78754c8ad60ea4d2da5a7dc55fb) ) \
ROM_SYSTEM_BIOS( 9, "102", "bootrom 1.02" ) \
ROM_LOAD( "eagle102.u15", 0x000000, 0x100000, CRC(1fd39e73) SHA1(d1ac758f94defc5c55c62594b3999a406dd9ef1f) ) \
ROM_SYSTEM_BIOS( 10, "101", "bootrom 1.01" ) \
- ROM_LOAD( "eagle101.u15", 0x000000, 0x100000, CRC(2600bc2b) SHA1(c4b89e69c51e4a3bb1874407c4d30b6caed4f396) ) \
+ ROM_LOAD( "eagle101.u15", 0x000000, 0x100000, CRC(2600bc2b) SHA1(c4b89e69c51e4a3bb1874407c4d30b6caed4f396) ) \
ROM_REGION( 0x30000, "fpga", 0 ) \
ROM_LOAD( "17s20lpc_sb4.u26", 0x000000, 0x008000, CRC(62c4af8a) SHA1(6eca277b9c66a401990599e98fdca64a9e38cc9a) ) \
ROM_LOAD( "17s20lpc_sb5.u26", 0x008000, 0x008000, CRC(c88b9d42) SHA1(b912d0fc50ecdc6a198c626f6e1644e8405fac6e) ) \
ROM_LOAD( "17s50a_red1.u26", 0x010000, 0x020000, CRC(f5cf3187) SHA1(83b4a14de9959e5a776d97d424945d43501bda7f) ) \
ROM_REGION( 0x2000, "pals", 0 ) \
ROM_LOAD( "e2-card1.u22.jed", 0x000000, 0x000bd1, CRC(9d1e1ace) SHA1(287d6a30e9f32137ef4eba54f0effa092c97a6eb) ) \
- ROM_LOAD( "e2-res3.u117.jed", 0x001000, 0x000bd1, CRC(4f1ff45a) SHA1(213cbdd6cd37ad9b5bfc9545084892a68d29f5ff) )
+ ROM_LOAD( "e2-res3.u117.jed", 0x001000, 0x000bd1, CRC(4f1ff45a) SHA1(213cbdd6cd37ad9b5bfc9545084892a68d29f5ff) )
ROM_START( iteagle )
- EAGLE_BIOS
+ EAGLE_BIOS
DISK_REGION( "drive_0" )
ROM_END
ROM_START( gtfore04 )
- EAGLE_BIOS
+ EAGLE_BIOS
DISK_REGION( "drive_0" )
DISK_IMAGE( "gt2004", 0, SHA1(739a52d6ce13bb6ac7a543ee0e8086fb66be19b9) )
ROM_END
ROM_START( gtfore05 )
- EAGLE_BIOS
+ EAGLE_BIOS
DISK_REGION( "drive_0" )
DISK_IMAGE( "gt2005", 0, SHA1(d8de569d8cf97b5aaada10ce896eb3c75f1b37f1) )
@@ -288,4 +288,3 @@ DRIVER_INIT_MEMBER(iteagle_state, iteagle)
GAME( 2000, iteagle, 0, gtfore, gtfore, iteagle_state, iteagle, ROT0, "Incredible Technologies", "Eagle BIOS", GAME_IS_BIOS_ROOT )
GAME( 2003, gtfore04, iteagle, gtfore, gtfore, iteagle_state, iteagle, ROT0, "Incredible Technologies", "Golden Tee Fore! 2004", GAME_NOT_WORKING | GAME_NO_SOUND )
GAME( 2004, gtfore05, iteagle, gtfore, gtfore, iteagle_state, iteagle, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005", GAME_NOT_WORKING | GAME_NO_SOUND )
-
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index eaa8f4e1dcf..bf3dccdc99f 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -94,8 +94,8 @@ class junofrst_state : public tutankhm_state
public:
junofrst_state(const machine_config &mconfig, device_type type, const char *tag)
: tutankhm_state(mconfig, type, tag),
- m_audiocpu(*this, "audiocpu"),
- m_i8039(*this, "mcu") { }
+ m_audiocpu(*this, "audiocpu"),
+ m_i8039(*this, "mcu") { }
UINT8 m_blitterdata[4];
int m_i8039_status;
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 5fe94f8d517..37e9dc19643 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -758,7 +758,6 @@ static const ym3526_interface ym3526_config =
void karnov_state::machine_start()
{
-
save_item(NAME(m_flipscreen));
save_item(NAME(m_scroll));
diff --git a/src/mame/drivers/kas89.c b/src/mame/drivers/kas89.c
index cb8c7537ba3..1463b3b5280 100644
--- a/src/mame/drivers/kas89.c
+++ b/src/mame/drivers/kas89.c
@@ -263,7 +263,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(kas89_state::kas89_interrupt)
void kas89_state::machine_start()
{
-
output_set_lamp_value(37, 0); /* turning off the operator led */
}
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index a7ee38ba82f..876d4daadd6 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -379,7 +379,6 @@ INTERRUPT_GEN_MEMBER(kchamp_state::sound_int)
MACHINE_START_MEMBER(kchamp_state,kchamp)
{
-
save_item(NAME(m_nmi_enable));
save_item(NAME(m_sound_nmi_enable));
}
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 06e3308221f..55e9cadf060 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -263,7 +263,6 @@ INTERRUPT_GEN_MEMBER(kncljoe_state::sound_nmi)
void kncljoe_state::machine_start()
{
-
save_item(NAME(m_port1));
save_item(NAME(m_port2));
save_item(NAME(m_tile_bank));
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 51e5fa9c246..4c4b70f0060 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -169,7 +169,6 @@ GFXDECODE_END
void kopunch_state::machine_start()
{
-
save_item(NAME(m_gfxbank));
}
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index c893bca3881..bc52b107c47 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()
{
-
save_item(NAME(m_scroll_x_lo));
save_item(NAME(m_scroll_x_hi));
save_item(NAME(m_scroll_y));
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 006bdadf45a..ba3e5125039 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -729,7 +729,6 @@ MACHINE_START_MEMBER(ladybug_state,ladybug)
MACHINE_START_MEMBER(ladybug_state,sraider)
{
-
save_item(NAME(m_grid_color));
save_item(NAME(m_sound_low));
save_item(NAME(m_sound_high));
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 0ab6712a241..d7d227ee05c 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -275,7 +275,6 @@ GFXDECODE_END
void ladyfrog_state::machine_start()
{
-
save_item(NAME(m_tilebank));
save_item(NAME(m_palette_bank));
save_item(NAME(m_sound_nmi_enable));
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 1db03e9f168..488252d8f41 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -470,7 +470,6 @@ static const sn76496_config psg_intf =
void lasso_state::machine_start()
{
-
save_item(NAME(m_gfxbank));
}
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 226208c9af8..d0c001f1a63 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -515,7 +515,7 @@ static INPUT_PORTS_START( medlanes )
PORT_DIPSETTING( 0x01, "3 seconds" )
PORT_DIPSETTING( 0x03, "5 seconds" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
-// PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) // dupe
+// PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) // dupe
PORT_BIT( 0x9C, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_DIPNAME( 0x20, 0x00, "Video Invert" )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 076b6dc9444..858df1b6992 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -224,7 +224,7 @@ ADDRESS_MAP_END
WRITE8_MEMBER(legionna_state::okim_rombank_w)
-{
+{
// popmessage("%08x",0x40000 * (data & 0x07));
m_oki->set_bank_base(0x40000 * (data & 0x7));
}
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index ceff77f5084..852526eb6d9 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -580,7 +580,7 @@ void lethal_state::machine_start()
membank("bank1")->set_entry(0);
m_generic_paletteram_8.allocate(0x3800 + 0x02);
-
+
save_item(NAME(m_cur_control2));
save_item(NAME(m_sprite_colorbase));
save_item(NAME(m_layer_colorbase));
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index d670f7f9746..8393c2692b3 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)
{
-
save_item(NAME(m_background_disable));
save_item(NAME(m_background_color));
save_item(NAME(m_gfx_rom_readback));
diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c
index f3200f58358..ee5921bbf26 100644
--- a/src/mame/drivers/m14.c
+++ b/src/mame/drivers/m14.c
@@ -316,7 +316,6 @@ INTERRUPT_GEN_MEMBER(m14_state::m14_irq)
void m14_state::machine_start()
{
-
save_item(NAME(m_hop_mux));
}
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 42172285004..07f5e348182 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -593,7 +593,6 @@ static const es5506_interface es5506_config =
void macrossp_state::machine_start()
{
-
save_item(NAME(m_sndpending));
save_item(NAME(m_snd_toggle));
save_item(NAME(m_fade_effect));
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 42fb6723836..cf7c510b50b 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -220,7 +220,6 @@ GFXDECODE_END
void madmotor_state::machine_start()
{
-
save_item(NAME(m_flipscreen));
}
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index d5c857ab4a5..c509249d273 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -199,7 +199,7 @@ INPUT_PORTS_END
void magtouch_state::machine_start()
{
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(magtouch_state::irq_callback),this));
-
+
membank("rombank")->configure_entries(0, 0x80, memregion("game_prg")->base(), 0x8000 );
membank("rombank")->set_entry(0);
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index eafe75f0db1..812dd3fb826 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1429,7 +1429,6 @@ INTERRUPT_GEN_MEMBER(mazerbla_state::sound_interrupt)
void mazerbla_state::machine_start()
{
-
save_item(NAME(m_vcu_video_reg));
save_item(NAME(m_vcu_gfx_addr));
save_item(NAME(m_vcu_gfx_param_addr));
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 95e0e72582b..645ea6ef026 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1225,7 +1225,7 @@ static MACHINE_CONFIG_START( mediagx, mediagx_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
-
+
void mediagx_state::init_mediagx()
{
m_frame_width = m_frame_height = 1;
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 4b76869f1c3..a89bde7d0ad 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()
{
-
save_item(NAME(m_write_mask));
save_item(NAME(m_gfxbank));
}
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 2d91b84ea3a..d61e87fb43a 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -308,7 +308,6 @@ GFXDECODE_END
void mgolf_state::machine_start()
{
-
save_item(NAME(m_prev));
save_item(NAME(m_mask));
}
diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c
index 7d0b415af47..40aa1ffda32 100644
--- a/src/mame/drivers/midqslvr.c
+++ b/src/mame/drivers/midqslvr.c
@@ -682,7 +682,7 @@ static MACHINE_CONFIG_START( midqslvr, midqslvr_state )
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 0b687bfde04..e7b08f3d04b 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -247,7 +247,6 @@ static const sn76496_config psg_intf =
void mikie_state::machine_start()
{
-
save_item(NAME(m_palettebank));
save_item(NAME(m_last_irq));
}
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index ea21bc08ffc..46e7dae7b51 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -324,9 +324,9 @@ WRITE16_MEMBER(mlanding_state::ml_sub_reset_w)
m_dma_active = 1;
machine().scheduler().timer_set(attotime::from_msec(20), timer_expired_delegate(FUNC(mlanding_state::dma_complete),this));
}
-
+
// 0 (falling edge?) starts cpus in this order:
-
+
if (!(data & 0x40)) // $09b0 d6: sub cpu
m_subcpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
@@ -369,17 +369,17 @@ READ16_MEMBER(mlanding_state::ml_analog1_msb_r)
// d7: ?
UINT8 throttle = ioport("STICK1")->read();
UINT16 x = ioport("STICK2")->read();
-
+
UINT8 res = 0xf0;
if (throttle & 0x80)
res ^= 0x2f;
else if (throttle > 0)
res ^= 0x40;
-
+
if (!(x & 0x800) && x > 0)
res ^= 0x10;
-
+
return res;
}
@@ -399,17 +399,17 @@ READ16_MEMBER(mlanding_state::ml_analog3_msb_r)
// d7: ?
UINT16 x = ioport("STICK2")->read();
UINT16 y = ioport("STICK3")->read();
-
+
UINT8 res = (y >> 8 & 0x0f) | 0xf0;
if (y & 0x800)
res ^= 0x40;
else if (y > 0)
res ^= 0x10;
-
+
if (x & 0x800)
res ^= 0x20;
-
+
return res;
}
@@ -439,7 +439,7 @@ static ADDRESS_MAP_START( mlanding_mem, AS_PROGRAM, 16, mlanding_state )
AM_RANGE(0x1c4000, 0x1cffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(ml_sub_reset_w)
-// AM_RANGE(0x1d0002, 0x1d0003) AM_WRITENOP // ?
+// AM_RANGE(0x1d0002, 0x1d0003) AM_WRITENOP // ?
AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_device, tc0140syt_port_w, 0x00ff)
AM_RANGE(0x2d0002, 0x2d0003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_device, tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 8ba20e4e616..e3ac900178b 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -182,7 +182,6 @@ GFXDECODE_END
void mouser_state::machine_start()
{
-
save_item(NAME(m_sound_byte));
save_item(NAME(m_nmi_enable));
}
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 85c65c506d4..e970c8cba10 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -327,7 +327,6 @@ static const ay8910_interface mrflea_ay8910_interface_1 =
void mrflea_state::machine_start()
{
-
save_item(NAME(m_gfx_bank));
save_item(NAME(m_io));
save_item(NAME(m_main));
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 2a2add14950..505c1f879dc 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -238,7 +238,7 @@ WRITE8_MEMBER(msisaac_state::sound_control_0_w)
{
m_snd_ctrl0 = data & 0xff;
//popmessage("SND0 0=%2x 1=%2x", m_snd_ctrl0, m_snd_ctrl1);
-
+
m_msm->set_output_gain(0, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */
m_msm->set_output_gain(1, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */
m_msm->set_output_gain(2, m_vol_ctrl[m_snd_ctrl0 & 15] / 100.0); /* group1 from msm5232 */
@@ -429,7 +429,6 @@ static const msm5232_interface msm5232_config =
void msisaac_state::machine_start()
{
-
/* video */
save_item(NAME(m_bg2_textbank));
/* sound */
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 45d7fbc1e4b..7af4aa532e3 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -303,7 +303,6 @@ GFXDECODE_END
void munchmo_state::machine_start()
{
-
save_item(NAME(m_palette_bank));
save_item(NAME(m_flipscreen));
save_item(NAME(m_nmi_enable));
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index 9fc50e56de0..88ca2dcb9ab 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -468,7 +468,6 @@ static I8085_CONFIG( n8080_cpu_config )
MACHINE_START_MEMBER(n8080_state,n8080)
{
-
save_item(NAME(m_shift_data));
save_item(NAME(m_shift_bits));
save_item(NAME(m_inte));
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index fe9fc9f4083..bb60a2893cd 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -6751,7 +6751,7 @@ ROM_START( shaktmsp )
DISK_REGION( "gdrom" )
DISK_IMAGE_READONLY( "gds-0013", 0, SHA1(47372ae3bd5ada0981e549f9b4d974f0112ce4c8) )
- ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) // 317-0315-COM
+ ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) // 317-0315-COM
ROM_LOAD( "317-0315-com.pic", 0x000000, 0x004000, CRC(c225b08b) SHA1(37ac664524a9e4e37cc9af1e509759295f659e0d) )
ROM_END
@@ -8207,7 +8207,7 @@ ROM_END
// 0012A Virtua Fighter 4 (Rev A)
/* 0012B */ GAME( 2001, vf4b, vf4, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 (Rev B) (GDS-0012B)", GAME_FLAGS )
/* 0012C */ GAME( 2001, vf4c, vf4, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Virtua Fighter 4 (Rev C) (GDS-0012C)", GAME_FLAGS )
-/* 0013 */ GAME( 2001, shaktmsp, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine 2K1 SPR (GDS-0013)", GAME_FLAGS )
+/* 0013 */ GAME( 2001, shaktmsp, naomigd, naomigd, shaktamb, naomi_state, naomigd, ROT0, "Sega", "Shakatto Tambourine 2K1 SPR (GDS-0013)", GAME_FLAGS )
/* 0014 */ GAME( 2001, beachspi, naomi2, naomi2gd, naomi, naomi_state, naomi2, ROT0, "Sega", "Beach Spikers (GDS-0014)", GAME_FLAGS )
// 0015 Virtua Tennis 2 / Power Smash 2
/* 0015A */ GAME( 2001, vtennis2, naomigd, naomigd, naomi, naomi_state, naomigd, ROT0, "Sega", "Virtua Tennis 2 / Power Smash 2 (Rev A) (GDS-0015A)", GAME_FLAGS )
diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c
index 46dcc8ad8a6..a3645c1e49b 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -876,7 +876,6 @@ static const ay8910_interface ay8910_config =
void nightgal_state::machine_start()
{
-
save_item(NAME(m_nsc_latch));
save_item(NAME(m_z80_latch));
save_item(NAME(m_mux_data));
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 69ef76d50a6..589a71d38b0 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -987,7 +987,6 @@ static const ym3812_interface ym3812_intf =
void nmg5_state::machine_start()
{
-
save_item(NAME(m_gfx_bank));
save_item(NAME(m_priority_reg));
save_item(NAME(m_input_data));
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index a2a6bd35111..2404307d305 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -3458,7 +3458,7 @@ ROM_END
*/
ROM_START( pkii_dm )
- ROM_REGION( 0x10000, "maincpu", 0 ) /* no stack, call's RET go to PC=0 */
+ ROM_REGION( 0x10000, "maincpu", 0 ) /* no stack, call's RET go to PC=0 */
ROM_LOAD( "12.u12", 0x0000, 0x1000, CRC(048e70d8) SHA1(f0eb16ba68455638de2ce68f51f305a13d0df287) )
ROM_LOAD( "13.u18", 0x1000, 0x1000, CRC(06cf6789) SHA1(587d883c399348b518e3be4d1dc2581824055328) )
@@ -3665,4 +3665,3 @@ GAME( 198?, dphlunka, 0, dphl, norautp, driver_device, 0, ROT0, "S
GAME( 198?, dphlunkb, 0, dphl, norautp, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Draw Poker HI-LO (unknown, rev 2)", GAME_NOT_WORKING )
GAME( 198?, pkii_dm, 0, nortest1, norautp, driver_device, 0, ROT0, "<unknown>", "Unknown Poker PKII/DM", GAME_NOT_WORKING )
-
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 1c38a80ba87..182279dd555 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -56,7 +56,7 @@ WRITE8_MEMBER(ojankohs_state::ojankoy_rombank_w)
}
WRITE8_MEMBER(ojankohs_state::ojankohs_adpcm_reset_w)
-{
+{
m_adpcm_reset = BIT(data, 0);
m_vclk_left = 0;
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 512a08c05b7..18fb862672d 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -338,7 +338,6 @@ static const ym3812_interface ym3812_config =
void oneshot_state::machine_start()
{
-
save_item(NAME(m_gun_x_p1));
save_item(NAME(m_gun_y_p1));
save_item(NAME(m_gun_x_p2));
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 903d0caaf68..321636d5b2e 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -478,7 +478,7 @@ WRITE_LINE_MEMBER(opwolf_state::opwolf_msm5205_vck_2)
}
WRITE8_MEMBER(opwolf_state::opwolf_adpcm_b_w)
-{
+{
int start;
int end;
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 5541b450f32..6a9f00e8cfe 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -269,7 +269,6 @@ GFXDECODE_END
void orbit_state::machine_start()
{
-
save_item(NAME(m_misc_flags));
save_item(NAME(m_flip_screen));
}
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 438f0d3647c..7eb31cffb96 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -115,7 +115,7 @@ public:
UINT32 screen_update_pasha2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<okim6295_device> m_oki1;
- required_device<okim6295_device> m_oki2;
+ required_device<okim6295_device> m_oki2;
};
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 867cd74d8da..f51a58aab7f 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -256,7 +256,6 @@ INTERRUPT_GEN_MEMBER(pbaction_state::pbaction_interrupt)
void pbaction_state::machine_start()
{
-
save_item(NAME(m_scroll));
}
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index dfbe7906226..cd038191ca6 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -111,7 +111,7 @@ public:
DECLARE_READ8_MEMBER(pcat_nit_io_r);
DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1);
DECLARE_DRIVER_INIT(pcat_nit);
- virtual void machine_start();
+ virtual void machine_start();
};
WRITE_LINE_MEMBER(pcat_nit_state::microtouch_out)
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 95590247c32..0341106ab24 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -2527,18 +2527,15 @@ Some logic IC's, resistors, caps etc.
#define DDP2_PROGRAM_102 \
ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */ \
PGM_68K_BIOS \
- ROM_LOAD16_WORD_SWAP( "v102.u8", 0x100000, 0x200000, CRC(5a9ea040) SHA1(51eaec46c368f7cfc5245e64896092f52b1193e0) ) \
-
+ ROM_LOAD16_WORD_SWAP( "v102.u8", 0x100000, 0x200000, CRC(5a9ea040) SHA1(51eaec46c368f7cfc5245e64896092f52b1193e0) )
#define DDP2_PROGRAM_101 \
ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */ \
PGM_68K_BIOS \
- ROM_LOAD16_WORD_SWAP( "v101_16m.u8", 0x100000, 0x200000, CRC(5e5786fd) SHA1(c6fc2956b5dc6a97c0d7d808a8c58aa21fa023b9) ) \
-
+ ROM_LOAD16_WORD_SWAP( "v101_16m.u8", 0x100000, 0x200000, CRC(5e5786fd) SHA1(c6fc2956b5dc6a97c0d7d808a8c58aa21fa023b9) )
#define DDP2_PROGRAM_100 \
ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */ \
PGM_68K_BIOS \
- ROM_LOAD16_WORD_SWAP( "v100.u8", 0x100000, 0x200000, CRC(0c8aa8ea) SHA1(57e33224622607a1df8daabf26ba063cf8a6d3fc) ) \
-
+ ROM_LOAD16_WORD_SWAP( "v100.u8", 0x100000, 0x200000, CRC(0c8aa8ea) SHA1(57e33224622607a1df8daabf26ba063cf8a6d3fc) )
ROM_START( ddp2 )
diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c
index 5faddf25863..915cb0aecc1 100644
--- a/src/mame/drivers/photoply.c
+++ b/src/mame/drivers/photoply.c
@@ -398,7 +398,7 @@ static MACHINE_CONFIG_START( photoply, photoply_state )
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_FRAGMENT_ADD( pcvideo_vga )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pinball2k.c b/src/mame/drivers/pinball2k.c
index 6a5824dc293..5706adc9e76 100644
--- a/src/mame/drivers/pinball2k.c
+++ b/src/mame/drivers/pinball2k.c
@@ -1,20 +1,20 @@
-/*
+/*
Pinball 2000
-
+
Skeleton by R. Belmont, based on mediagx.c by Ville Linde
-
+
TODO:
- - Everything!
- - BIOS hangs waiting for port 0400h to return 0x80. If you make that happy it jumps off into the weeds.
- - MediaGX features should be moved out to machine/ and shared with mediagx.c once we know what these games need
-
+ - Everything!
+ - BIOS hangs waiting for port 0400h to return 0x80. If you make that happy it jumps off into the weeds.
+ - MediaGX features should be moved out to machine/ and shared with mediagx.c once we know what these games need
+
Hardware:
- - Cyrix MediaGX processor/VGA
- - Cyrix CX5520 northbridge?
- - VS9824AG SuperI/O standard PC I/O chip
- - 1 ISA, 2 PCI slots, 2 IDE headers
- - "Prism" PCI card with PLX PCI9052 PCI-to-random stuff bridge
- Card also contains DCS2 Stereo sound system with ADSP-2104
+ - Cyrix MediaGX processor/VGA
+ - Cyrix CX5520 northbridge?
+ - VS9824AG SuperI/O standard PC I/O chip
+ - 1 ISA, 2 PCI slots, 2 IDE headers
+ - "Prism" PCI card with PLX PCI9052 PCI-to-random stuff bridge
+ Card also contains DCS2 Stereo sound system with ADSP-2104
*/
#include "emu.h"
@@ -919,7 +919,7 @@ static MACHINE_CONFIG_START( mediagx, pinball2k_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
-
+
void pinball2k_state::init_mediagx()
{
m_frame_width = m_frame_height = 1;
@@ -934,19 +934,19 @@ DRIVER_INIT_MEMBER(pinball2k_state, pinball2k)
ROM_START( swe1pb )
ROM_REGION32_LE(0x40000, "bios", 0)
- ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
+ ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
ROM_REGION(0x4800000, "prism", 0)
- ROM_LOAD( "swe1_u100.rom", 0x0000000, 0x800000, CRC(db2c9709) SHA1(14e8db2c0b09c4da6306a4a1f7fe54b2a334c5ed) )
- ROM_LOAD( "swe1_u101.rom", 0x0800000, 0x800000, CRC(a039e80d) SHA1(8f63e8ab83e043232fc17ed3dff1f251396a178a) )
- ROM_LOAD( "swe1_u102.rom", 0x1000000, 0x800000, CRC(c9feb7bc) SHA1(a34acd34c3f91f082b67e385b1f4da2e5b6e5087) )
- ROM_LOAD( "swe1_u103.rom", 0x1800000, 0x800000, CRC(7a692466) SHA1(9adf5ae9c12bd5b6314913f6c01d4566ee453fe1) )
- ROM_LOAD( "swe1_u104.rom", 0x2000000, 0x800000, CRC(76e2dd7e) SHA1(9bc20a1423b11c46eb2f5a514e985151defb5651) )
- ROM_LOAD( "swe1_u105.rom", 0x2800000, 0x800000, CRC(87f2460c) SHA1(cdc05e017367f61280e3d5682096e67e4c200150) )
- ROM_LOAD( "swe1_u106.rom", 0x3000000, 0x800000, CRC(84877e2f) SHA1(6dd8c761b2e26313ae9e159690b3a4a170cb3bd8) )
- ROM_LOAD( "swe1_u107.rom", 0x3800000, 0x800000, CRC(dc433c89) SHA1(9f1273debc9168c04202078503cfc4f1ca8cb30b) )
- ROM_LOAD( "swe1_u109.rom", 0x4000000, 0x400000, CRC(cc08936b) SHA1(fc428393e8a0cf37b800dd475fd293a1a98c4bcf) )
- ROM_LOAD( "swe1_u110.rom", 0x4400000, 0x400000, CRC(6011ecd9) SHA1(8575958c8942a6cbcb2ac18f291fcada6f8cbc09) )
+ ROM_LOAD( "swe1_u100.rom", 0x0000000, 0x800000, CRC(db2c9709) SHA1(14e8db2c0b09c4da6306a4a1f7fe54b2a334c5ed) )
+ ROM_LOAD( "swe1_u101.rom", 0x0800000, 0x800000, CRC(a039e80d) SHA1(8f63e8ab83e043232fc17ed3dff1f251396a178a) )
+ ROM_LOAD( "swe1_u102.rom", 0x1000000, 0x800000, CRC(c9feb7bc) SHA1(a34acd34c3f91f082b67e385b1f4da2e5b6e5087) )
+ ROM_LOAD( "swe1_u103.rom", 0x1800000, 0x800000, CRC(7a692466) SHA1(9adf5ae9c12bd5b6314913f6c01d4566ee453fe1) )
+ ROM_LOAD( "swe1_u104.rom", 0x2000000, 0x800000, CRC(76e2dd7e) SHA1(9bc20a1423b11c46eb2f5a514e985151defb5651) )
+ ROM_LOAD( "swe1_u105.rom", 0x2800000, 0x800000, CRC(87f2460c) SHA1(cdc05e017367f61280e3d5682096e67e4c200150) )
+ ROM_LOAD( "swe1_u106.rom", 0x3000000, 0x800000, CRC(84877e2f) SHA1(6dd8c761b2e26313ae9e159690b3a4a170cb3bd8) )
+ ROM_LOAD( "swe1_u107.rom", 0x3800000, 0x800000, CRC(dc433c89) SHA1(9f1273debc9168c04202078503cfc4f1ca8cb30b) )
+ ROM_LOAD( "swe1_u109.rom", 0x4000000, 0x400000, CRC(cc08936b) SHA1(fc428393e8a0cf37b800dd475fd293a1a98c4bcf) )
+ ROM_LOAD( "swe1_u110.rom", 0x4400000, 0x400000, CRC(6011ecd9) SHA1(8575958c8942a6cbcb2ac18f291fcada6f8cbc09) )
ROM_REGION(0x08100, "gfx1", 0)
ROM_LOAD("cga.chr", 0x00000, 0x01000, CRC(42009069) SHA1(ed08559ce2d7f97f68b9f540bddad5b6295294dd))
@@ -954,17 +954,17 @@ ROM_END
ROM_START( rfmpb )
ROM_REGION32_LE(0x40000, "bios", 0)
- ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
+ ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
ROM_REGION(0x4000000, "prism", 0)
- ROM_LOAD( "rfm_u100.rom", 0x0000000, 0x800000, CRC(b3548b1b) SHA1(874a16282bb778886cea2567d68ec7024dc5ed22) )
- ROM_LOAD( "rfm_u101.rom", 0x0800000, 0x800000, CRC(8bef301d) SHA1(2eade00b1a4cd3f5e98ebe8ed8f549e328188e77) )
- ROM_LOAD( "rfm_u102.rom", 0x1000000, 0x800000, CRC(749f5c59) SHA1(2d8850e7f8ea3e07e8b444d7dd4dc4195a547ae7) )
- ROM_LOAD( "rfm_u103.rom", 0x1800000, 0x800000, CRC(a9ec5e97) SHA1(ce7c38dcbf34ce10d6e204a3176cd2c7a83b525a) )
- ROM_LOAD( "rfm_u104.rom", 0x2000000, 0x800000, CRC(0a1acd70) SHA1(dcca4de92eadeb82ac776953326410a9687838cb) )
- ROM_LOAD( "rfm_u105.rom", 0x2800000, 0x800000, CRC(1ef31684) SHA1(141900a7426ad483384606cddb018d186952f439) )
- ROM_LOAD( "rfm_u106.rom", 0x3000000, 0x800000, CRC(daf4e1dc) SHA1(0612495468fb962b833057e50f620c5f69cd5840) )
- ROM_LOAD( "rfm_u107.rom", 0x3800000, 0x800000, CRC(e737ab39) SHA1(0e978923db19e2893fdb4aae69d6ed3c3f664a31) )
+ ROM_LOAD( "rfm_u100.rom", 0x0000000, 0x800000, CRC(b3548b1b) SHA1(874a16282bb778886cea2567d68ec7024dc5ed22) )
+ ROM_LOAD( "rfm_u101.rom", 0x0800000, 0x800000, CRC(8bef301d) SHA1(2eade00b1a4cd3f5e98ebe8ed8f549e328188e77) )
+ ROM_LOAD( "rfm_u102.rom", 0x1000000, 0x800000, CRC(749f5c59) SHA1(2d8850e7f8ea3e07e8b444d7dd4dc4195a547ae7) )
+ ROM_LOAD( "rfm_u103.rom", 0x1800000, 0x800000, CRC(a9ec5e97) SHA1(ce7c38dcbf34ce10d6e204a3176cd2c7a83b525a) )
+ ROM_LOAD( "rfm_u104.rom", 0x2000000, 0x800000, CRC(0a1acd70) SHA1(dcca4de92eadeb82ac776953326410a9687838cb) )
+ ROM_LOAD( "rfm_u105.rom", 0x2800000, 0x800000, CRC(1ef31684) SHA1(141900a7426ad483384606cddb018d186952f439) )
+ ROM_LOAD( "rfm_u106.rom", 0x3000000, 0x800000, CRC(daf4e1dc) SHA1(0612495468fb962b833057e50f620c5f69cd5840) )
+ ROM_LOAD( "rfm_u107.rom", 0x3800000, 0x800000, CRC(e737ab39) SHA1(0e978923db19e2893fdb4aae69d6ed3c3f664a31) )
ROM_REGION(0x08100, "gfx1", 0)
ROM_LOAD("cga.chr", 0x00000, 0x01000, CRC(42009069) SHA1(ed08559ce2d7f97f68b9f540bddad5b6295294dd))
@@ -972,19 +972,19 @@ ROM_END
ROM_START( rfmpbr2 )
ROM_REGION32_LE(0x40000, "bios", 0)
- ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
+ ROM_LOAD( "awdbios.bin", 0x000000, 0x040000, CRC(854ce8c6) SHA1(7826de74026e052dacce8516382f664004c327ad) )
ROM_REGION(0x4800000, "prism", 0)
- ROM_LOAD( "rfm_u100r2.rom", 0x0000000, 0x800000, CRC(d4278a9b) SHA1(ec07b97190acb6b34b9ed6cda505ee8fefd66fec) )
- ROM_LOAD( "rfm_u101r2.rom", 0x0800000, 0x800000, CRC(e5d4c0ed) SHA1(cfc7d9d2324cc02c9eaf53fd674f7db24736699c) )
- ROM_LOAD( "rfm_u102.rom", 0x1000000, 0x800000, CRC(749f5c59) SHA1(2d8850e7f8ea3e07e8b444d7dd4dc4195a547ae7) )
- ROM_LOAD( "rfm_u103.rom", 0x1800000, 0x800000, CRC(a9ec5e97) SHA1(ce7c38dcbf34ce10d6e204a3176cd2c7a83b525a) )
- ROM_LOAD( "rfm_u104.rom", 0x2000000, 0x800000, CRC(0a1acd70) SHA1(dcca4de92eadeb82ac776953326410a9687838cb) )
- ROM_LOAD( "rfm_u105.rom", 0x2800000, 0x800000, CRC(1ef31684) SHA1(141900a7426ad483384606cddb018d186952f439) )
- ROM_LOAD( "rfm_u106.rom", 0x3000000, 0x800000, CRC(daf4e1dc) SHA1(0612495468fb962b833057e50f620c5f69cd5840) )
- ROM_LOAD( "rfm_u107.rom", 0x3800000, 0x800000, CRC(e737ab39) SHA1(0e978923db19e2893fdb4aae69d6ed3c3f664a31) )
- ROM_LOAD( "rfm_u109.bin", 0x4000000, 0x400000, CRC(a20b2abb) SHA1(0010d7dbf60b03f50cc1d314fdf786721161b064) )
- ROM_LOAD( "rfm_u110.bin", 0x4400000, 0x400000, CRC(095abec9) SHA1(87ce156bbf673ebd50bbd7dcca4c6924d24fc823) )
+ ROM_LOAD( "rfm_u100r2.rom", 0x0000000, 0x800000, CRC(d4278a9b) SHA1(ec07b97190acb6b34b9ed6cda505ee8fefd66fec) )
+ ROM_LOAD( "rfm_u101r2.rom", 0x0800000, 0x800000, CRC(e5d4c0ed) SHA1(cfc7d9d2324cc02c9eaf53fd674f7db24736699c) )
+ ROM_LOAD( "rfm_u102.rom", 0x1000000, 0x800000, CRC(749f5c59) SHA1(2d8850e7f8ea3e07e8b444d7dd4dc4195a547ae7) )
+ ROM_LOAD( "rfm_u103.rom", 0x1800000, 0x800000, CRC(a9ec5e97) SHA1(ce7c38dcbf34ce10d6e204a3176cd2c7a83b525a) )
+ ROM_LOAD( "rfm_u104.rom", 0x2000000, 0x800000, CRC(0a1acd70) SHA1(dcca4de92eadeb82ac776953326410a9687838cb) )
+ ROM_LOAD( "rfm_u105.rom", 0x2800000, 0x800000, CRC(1ef31684) SHA1(141900a7426ad483384606cddb018d186952f439) )
+ ROM_LOAD( "rfm_u106.rom", 0x3000000, 0x800000, CRC(daf4e1dc) SHA1(0612495468fb962b833057e50f620c5f69cd5840) )
+ ROM_LOAD( "rfm_u107.rom", 0x3800000, 0x800000, CRC(e737ab39) SHA1(0e978923db19e2893fdb4aae69d6ed3c3f664a31) )
+ ROM_LOAD( "rfm_u109.bin", 0x4000000, 0x400000, CRC(a20b2abb) SHA1(0010d7dbf60b03f50cc1d314fdf786721161b064) )
+ ROM_LOAD( "rfm_u110.bin", 0x4400000, 0x400000, CRC(095abec9) SHA1(87ce156bbf673ebd50bbd7dcca4c6924d24fc823) )
ROM_REGION(0x08100, "gfx1", 0)
ROM_LOAD("cga.chr", 0x00000, 0x01000, CRC(42009069) SHA1(ed08559ce2d7f97f68b9f540bddad5b6295294dd))
@@ -995,4 +995,3 @@ ROM_END
GAME( 1999, swe1pb, 0 , mediagx, mediagx, pinball2k_state, pinball2k, ROT0, "Midway", "Pinball 2000: Star Wars Episode 1", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL )
GAME( 1999, rfmpb, 0 , mediagx, mediagx, pinball2k_state, pinball2k, ROT0, "Midway", "Pinball 2000: Revenge From Mars (rev. 1)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL )
GAME( 1999, rfmpbr2, rfmpb , mediagx, mediagx, pinball2k_state, pinball2k, ROT0, "Midway", "Pinball 2000: Revenge From Mars (rev. 2)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL )
-
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index a51ebffa4fb..4dd5e493258 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -607,7 +607,6 @@ static const ym2610_interface ym2610_config =
MACHINE_START_MEMBER(pipedrm_state,pipedrm)
{
-
/* initialize main Z80 bank */
membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x2000);
membank("bank1")->set_entry(0);
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index d5ed38007a1..63a21f3f40c 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -172,7 +172,6 @@ GFXDECODE_END
void pooyan_state::machine_start()
{
-
save_item(NAME(m_irq_enable));
}
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 8ed96edc0d7..1336a485159 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -311,7 +311,6 @@ GFXDECODE_END
void popper_state::machine_start()
{
-
save_item(NAME(m_flipscreen));
save_item(NAME(m_e002));
save_item(NAME(m_gfx_bank));
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 8270d6120e2..3c1cd6b8989 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1010,7 +1010,6 @@ GFXDECODE_END
void psikyo_state::machine_start()
{
-
save_item(NAME(m_soundlatch));
save_item(NAME(m_z80_nmi));
save_item(NAME(m_mcu_status));
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 38e98750ce0..d21b383d7c5 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -656,7 +656,6 @@ static const ymf278b_interface ymf278b_config =
void psikyo4_state::machine_start()
{
-
save_item(NAME(m_oldbrt1));
save_item(NAME(m_oldbrt2));
}
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 91ba34666f2..dc02c528170 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -793,7 +793,6 @@ static const ymf278b_interface ymf278b_config =
void psikyosh_state::machine_start()
{
-
membank("bank2")->configure_entries(0, 0x1000, memregion("gfx1")->base(), 0x20000);
}
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index a5777736ca0..20da4663e32 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -538,7 +538,7 @@ static MACHINE_CONFIG_START( queen, queen_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 8e2ac9057f8..7d17a2201ea 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -325,7 +325,6 @@ GFXDECODE_END
MACHINE_START_MEMBER(ladybug_state,redclash)
{
-
save_item(NAME(m_star_speed));
save_item(NAME(m_gfxbank));
save_item(NAME(m_stars_enable));
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index 61098b0094f..d3abe4531c5 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -641,7 +641,7 @@ static MACHINE_CONFIG_START( savquest, savquest_state )
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 47ee5621f4e..f2e276cadc1 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -482,7 +482,7 @@ public:
DECLARE_READ32_MEMBER(seattle_ide_r);
DECLARE_WRITE_LINE_MEMBER(ide_interrupt);
DECLARE_WRITE_LINE_MEMBER(vblank_assert);
- DECLARE_WRITE_LINE_MEMBER(voodoo_stall);
+ DECLARE_WRITE_LINE_MEMBER(voodoo_stall);
DECLARE_DRIVER_INIT(sfrush);
DECLARE_DRIVER_INIT(blitz2k);
DECLARE_DRIVER_INIT(carnevil);
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 8e23122dcef..8c8f3cbb448 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1315,7 +1315,7 @@ UINT32 segac2_state::screen_update_segac2_new(screen_device &screen, bitmap_rgb3
void genesis_vdp_sndirqline_callback_segac2(running_machine &machine, bool state)
{
segac2_state *drvstate = machine.driver_data<segac2_state>();
-
+
if (state==true)
drvstate->m_maincpu->set_input_line(6, HOLD_LINE);
}
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 20512acb640..8d553b63890 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -219,7 +219,6 @@ INTERRUPT_GEN_MEMBER(skyfox_state::skyfox_interrupt)
void skyfox_state::machine_start()
{
-
save_item(NAME(m_bg_pos));
save_item(NAME(m_bg_ctrl));
}
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 18855b3ac5d..4ad233e1e9c 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -2423,7 +2423,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( fitegolfu )
- PORT_INCLUDE( fitegolf )
+ PORT_INCLUDE( fitegolf )
PORT_MODIFY("DSW2")
PORT_DIPNAME( 0x01, 0x01, "Shot Time" ) PORT_DIPLOCATION("DSW2:1")
@@ -4630,7 +4630,7 @@ ROM_START( fitegolf )
ROM_LOAD( "pal20l8a.6r", 0x0400, 0x0144, CRC(0f011673) SHA1(383e6f6e78daec9c874d5b48378111ca60f5ed64) )
ROM_END
-ROM_START( fitegolfu ) /* Later US version containing enhancements to make the game a little easier */
+ROM_START( fitegolfu ) /* Later US version containing enhancements to make the game a little easier */
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "np45.128", 0x0000, 0x4000, CRC(16e8e763) SHA1(0b5296f2a91a7f3176b7461ca4958865ce998241) )
ROM_LOAD( "mn45.256", 0x4000, 0x8000, CRC(a4fa09d5) SHA1(ae7f0cb47de06006ae71252c4201a93a01a26887) )
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 70fb6690dcb..7e7be2b1e2a 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -227,7 +227,6 @@ GFXDECODE_END
void sonson_state::machine_start()
{
-
save_item(NAME(m_last_irq));
}
diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c
index 5936eb40b78..fcd624a28e2 100644
--- a/src/mame/drivers/su2000.c
+++ b/src/mame/drivers/su2000.c
@@ -258,7 +258,7 @@ static MACHINE_CONFIG_START( su2000, su2000_state )
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // TODO
- MCFG_FRAGMENT_ADD(pcat_common)
+ MCFG_FRAGMENT_ADD(pcat_common)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 5cb3eaac92c..8b2bcd2d3fd 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -446,7 +446,7 @@ static INPUT_PORTS_START( bssoccer )
JOY(4)
PORT_START("DSW1") /* $a00008.w */
- PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 2C_1C ) )
@@ -455,51 +455,51 @@ static INPUT_PORTS_START( bssoccer )
PORT_DIPSETTING( 0x0005, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) )
PORT_DIPSETTING( 0x0003, DEF_STR( 1C_5C ) )
- PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5")
+ PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:4,5")
PORT_DIPSETTING( 0x0010, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0018, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0008, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, "Hardest?" ) // duplicate of "HARD" not shown as supported in manual - but possible to set on PCB
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:6")
+ PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:6")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0020, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
- PORT_DIPNAME( 0x0300, 0x0300, "Play Time P1" ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPNAME( 0x0300, 0x0300, "Play Time P1" ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x0300, "1:30" )
PORT_DIPSETTING( 0x0200, "1:45" )
PORT_DIPSETTING( 0x0100, "2:00" )
PORT_DIPSETTING( 0x0000, "2:15" )
- PORT_DIPNAME( 0x0c00, 0x0c00, "Play Time P2" ) PORT_DIPLOCATION("SW2:3,4")
+ PORT_DIPNAME( 0x0c00, 0x0c00, "Play Time P2" ) PORT_DIPLOCATION("SW2:3,4")
PORT_DIPSETTING( 0x0c00, "1:30" )
PORT_DIPSETTING( 0x0800, "1:45" )
PORT_DIPSETTING( 0x0400, "2:00" )
PORT_DIPSETTING( 0x0000, "2:15" )
- PORT_DIPNAME( 0x3000, 0x3000, "Play Time P3" ) PORT_DIPLOCATION("SW2:5,6")
+ PORT_DIPNAME( 0x3000, 0x3000, "Play Time P3" ) PORT_DIPLOCATION("SW2:5,6")
PORT_DIPSETTING( 0x3000, "1:30" )
PORT_DIPSETTING( 0x2000, "1:45" )
PORT_DIPSETTING( 0x1000, "2:00" )
PORT_DIPSETTING( 0x0000, "2:15" )
- PORT_DIPNAME( 0xc000, 0xc000, "Play Time P4" ) PORT_DIPLOCATION("SW2:7,8")
+ PORT_DIPNAME( 0xc000, 0xc000, "Play Time P4" ) PORT_DIPLOCATION("SW2:7,8")
PORT_DIPSETTING( 0xc000, "1:30" )
PORT_DIPSETTING( 0x8000, "1:45" )
PORT_DIPSETTING( 0x4000, "2:00" )
PORT_DIPSETTING( 0x0000, "2:15" )
PORT_START("DSW2") /* $a0000b.b - JP3, JP6 & JP7 and what else?? */
- PORT_DIPNAME( 0x0001, 0x0001, "Copyright" ) PORT_DIPLOCATION("Jumper:1") // these 4 are shown in test mode
+ PORT_DIPNAME( 0x0001, 0x0001, "Copyright" ) PORT_DIPLOCATION("Jumper:1") // these 4 are shown in test mode
PORT_DIPSETTING( 0x0001, "Distributer Unico" )
PORT_DIPSETTING( 0x0000, "All Rights Reserved" )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:2") // used!
+ PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:2") // used!
PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:3")
+ PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:3")
PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:4")
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) ) PORT_DIPLOCATION("Jumper:4")
PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -554,7 +554,7 @@ static INPUT_PORTS_START( uballoon )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_START("DSW1") /* $600005.b */
- PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
+ PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -563,12 +563,12 @@ static INPUT_PORTS_START( uballoon )
PORT_DIPSETTING( 0x0006, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:4,5")
+ PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:4,5")
PORT_DIPSETTING( 0x0010, "2" )
PORT_DIPSETTING( 0x0018, "3" )
PORT_DIPSETTING( 0x0008, "4" )
PORT_DIPSETTING( 0x0000, "5" )
- PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7")
+ PORT_DIPNAME( 0x0060, 0x0060, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:6,7")
PORT_DIPSETTING( 0x0040, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0060, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0020, DEF_STR( Hard ) )
@@ -576,13 +576,13 @@ static INPUT_PORTS_START( uballoon )
PORT_SERVICE_DIPLOC( 0x0080, IP_ACTIVE_LOW, "SW1:8" )
PORT_START("DSW2") /* $600007.b */
- PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
PORT_DIPSETTING( 0x0002, DEF_STR( Upright ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Cocktail ) )
- PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4,5")
+ PORT_DIPNAME( 0x001c, 0x001c, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4,5")
PORT_DIPSETTING( 0x001c, "200K" )
PORT_DIPSETTING( 0x0010, "300K, 1000K" )
PORT_DIPSETTING( 0x0018, "400K" )
@@ -591,13 +591,13 @@ static INPUT_PORTS_START( uballoon )
PORT_DIPSETTING( 0x0004, "500K, 3000K" )
PORT_DIPSETTING( 0x0014, "600K" )
PORT_DIPSETTING( 0x0000, DEF_STR( None ) )
- PORT_DIPNAME( 0x0020, 0x0020, "Unknown DSW2-6*" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPNAME( 0x0020, 0x0020, "Unknown DSW2-6*" ) PORT_DIPLOCATION("SW2:6")
PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, "Unknown DSW2-7*" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPNAME( 0x0040, 0x0040, "Unknown DSW2-7*" ) PORT_DIPLOCATION("SW2:7")
PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
+ PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
INPUT_PORTS_END
@@ -698,7 +698,7 @@ static INPUT_PORTS_START( bestbest )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_START("DSW") /* 500004.w */
- PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:1,2,3")
+ PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SWA:1,2,3")
PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x0001, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x0002, DEF_STR( 3C_1C ) )
@@ -707,23 +707,23 @@ static INPUT_PORTS_START( bestbest )
PORT_DIPSETTING( 0x0006, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0005, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0004, DEF_STR( 1C_4C ) )
- PORT_DIPNAME( 0x0018, 0x0010, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWA:4,5")
+ PORT_DIPNAME( 0x0018, 0x0010, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SWA:4,5")
PORT_DIPSETTING( 0x0018, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x0010, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x0008, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) )
- PORT_DIPNAME( 0x0020, 0x0020, "Display Combos" ) PORT_DIPLOCATION("SWA:6")
+ PORT_DIPNAME( 0x0020, 0x0020, "Display Combos" ) PORT_DIPLOCATION("SWA:6")
PORT_DIPSETTING( 0x0000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0020, DEF_STR( On ) )
PORT_SERVICE_DIPLOC( 0x0040, IP_ACTIVE_LOW, "SWA:7" )
- PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWA:8")
+ PORT_DIPNAME( 0x0080, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SWA:8")
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWB:1")
+ PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SWB:1")
PORT_DIPSETTING( 0x0100, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0600, 0x0400, "Play Time" ) PORT_DIPLOCATION("SWB:2,3")
+ PORT_DIPNAME( 0x0600, 0x0400, "Play Time" ) PORT_DIPLOCATION("SWB:2,3")
PORT_DIPSETTING( 0x0600, "1:10" )
PORT_DIPSETTING( 0x0400, "1:20" )
PORT_DIPSETTING( 0x0200, "1:30" )
@@ -853,14 +853,14 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( uballoon, suna16_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_32MHz/6) /* Z80B at 5MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL_32MHz/6) /* Z80B at 5MHz */
MCFG_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
MCFG_CPU_IO_MAP(uballoon_pcm_1_io_map)
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( uballoon, suna16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -903,14 +903,14 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( sunaq, suna16_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(sunaq_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* Z80B at 3.579545MHz */
MCFG_CPU_PROGRAM_MAP(sunaq_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* Z80B at 6MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* Z80B at 6MHz */
MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
@@ -933,7 +933,7 @@ static MACHINE_CONFIG_START( sunaq, suna16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
+ MCFG_YM2151_ADD("ymsnd", XTAL_14_31818MHz/4) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -969,14 +969,14 @@ static const ay8910_interface bestbest_ay8910_interface =
static MACHINE_CONFIG_START( bestbest, suna16_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna16_state, bssoccer_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* 6MHz */
+ MCFG_CPU_ADD("pcm1", Z80, XTAL_24MHz/4) /* 6MHz */
MCFG_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
MCFG_CPU_IO_MAP(bestbest_pcm_1_iomap)
@@ -999,12 +999,12 @@ static MACHINE_CONFIG_START( bestbest, suna16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/16) /* 1.5MHz */
+ MCFG_SOUND_ADD("aysnd", AY8910, XTAL_24MHz/16) /* 1.5MHz */
MCFG_SOUND_CONFIG(bestbest_ay8910_interface)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_24MHz/8) /* 3MHz */
+ MCFG_SOUND_ADD("ymsnd", YM3526, XTAL_24MHz/8) /* 3MHz */
MCFG_SOUND_CONFIG(bestbest_ym3526_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 66e2d05875f..8a3ebadecf9 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -139,7 +139,6 @@ void taitol_state::state_register( )
MACHINE_START_MEMBER(taitol_state,taito_l)
{
-
save_item(NAME(m_rambanks));
save_item(NAME(m_palette_ram));
save_item(NAME(m_empty_ram));
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index fc5add65608..ae001df9523 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -391,18 +391,18 @@ Notes:
// lookup tables for densha de go analog controls/meters
static const int dendego_odometer_table[0x100] =
{
- 0, 3, 7, 10, 14, 17, 21, 24, 28, 31, 34, 38, 41, 45, 48, 52,
- 55, 59, 62, 66, 69, 72, 76, 79, 83, 86, 90, 93, 97, 100, 105, 111,
- 116, 121, 126, 132, 137, 142, 147, 153, 158, 163, 168, 174, 179, 184, 189, 195,
- 200, 206, 211, 217, 222, 228, 233, 239, 244, 250, 256, 261, 267, 272, 278, 283,
- 289, 294, 300, 306, 311, 317, 322, 328, 333, 339, 344, 350, 356, 361, 367, 372,
- 378, 383, 389, 394, 400, 406, 412, 418, 424, 429, 435, 441, 447, 453, 459, 465,
- 471, 476, 482, 488, 494, 500, 505, 511, 516, 521, 526, 532, 537, 542, 547, 553,
- 558, 563, 568, 574, 579, 584, 589, 595, 600, 607, 613, 620, 627, 633, 640, 647,
- 653, 660, 667, 673, 680, 687, 693, 700, 705, 711, 716, 721, 726, 732, 737, 742,
- 747, 753, 758, 763, 768, 774, 779, 784, 789, 795, 800, 806, 812, 818, 824, 829,
- 835, 841, 847, 853, 859, 865, 871, 876, 882, 888, 894, 900, 906, 911, 917, 922,
- 928, 933, 939, 944, 950, 956, 961, 967, 972, 978, 983, 989, 994, 1000, 1005, 1011,
+ 0, 3, 7, 10, 14, 17, 21, 24, 28, 31, 34, 38, 41, 45, 48, 52,
+ 55, 59, 62, 66, 69, 72, 76, 79, 83, 86, 90, 93, 97, 100, 105, 111,
+ 116, 121, 126, 132, 137, 142, 147, 153, 158, 163, 168, 174, 179, 184, 189, 195,
+ 200, 206, 211, 217, 222, 228, 233, 239, 244, 250, 256, 261, 267, 272, 278, 283,
+ 289, 294, 300, 306, 311, 317, 322, 328, 333, 339, 344, 350, 356, 361, 367, 372,
+ 378, 383, 389, 394, 400, 406, 412, 418, 424, 429, 435, 441, 447, 453, 459, 465,
+ 471, 476, 482, 488, 494, 500, 505, 511, 516, 521, 526, 532, 537, 542, 547, 553,
+ 558, 563, 568, 574, 579, 584, 589, 595, 600, 607, 613, 620, 627, 633, 640, 647,
+ 653, 660, 667, 673, 680, 687, 693, 700, 705, 711, 716, 721, 726, 732, 737, 742,
+ 747, 753, 758, 763, 768, 774, 779, 784, 789, 795, 800, 806, 812, 818, 824, 829,
+ 835, 841, 847, 853, 859, 865, 871, 876, 882, 888, 894, 900, 906, 911, 917, 922,
+ 928, 933, 939, 944, 950, 956, 961, 967, 972, 978, 983, 989, 994, 1000, 1005, 1011,
1016, 1021, 1026, 1032, 1037, 1042, 1047, 1053, 1058, 1063, 1068, 1074, 1079, 1084, 1089, 1095,
1100, 1107, 1113, 1120, 1127, 1133, 1140, 1147, 1153, 1160, 1167, 1173, 1180, 1187, 1193, 1200,
1203, 1206, 1209, 1212, 1216, 1219, 1222, 1225, 1228, 1231, 1234, 1238, 1241, 1244, 1247, 1250,
@@ -411,16 +411,16 @@ static const int dendego_odometer_table[0x100] =
static const int dendego_pressure_table[0x100] =
{
- 0, 0, 0, 0, 5, 10, 14, 19, 24, 29, 33, 38, 43, 48, 52, 57,
- 62, 67, 71, 76, 81, 86, 90, 95, 100, 106, 112, 119, 125, 131, 138, 144,
- 150, 156, 162, 169, 175, 181, 188, 194, 200, 206, 212, 219, 225, 231, 238, 244,
- 250, 256, 262, 269, 275, 281, 288, 294, 300, 306, 312, 318, 324, 329, 335, 341,
- 347, 353, 359, 365, 371, 376, 382, 388, 394, 400, 407, 413, 420, 427, 433, 440,
- 447, 453, 460, 467, 473, 480, 487, 493, 500, 507, 514, 521, 529, 536, 543, 550,
- 557, 564, 571, 579, 586, 593, 600, 607, 614, 621, 629, 636, 643, 650, 657, 664,
- 671, 679, 686, 693, 700, 706, 712, 719, 725, 731, 738, 744, 750, 756, 762, 769,
- 775, 781, 788, 794, 800, 807, 814, 821, 829, 836, 843, 850, 857, 864, 871, 879,
- 886, 893, 900, 907, 914, 921, 929, 936, 943, 950, 957, 964, 971, 979, 986, 993,
+ 0, 0, 0, 0, 5, 10, 14, 19, 24, 29, 33, 38, 43, 48, 52, 57,
+ 62, 67, 71, 76, 81, 86, 90, 95, 100, 106, 112, 119, 125, 131, 138, 144,
+ 150, 156, 162, 169, 175, 181, 188, 194, 200, 206, 212, 219, 225, 231, 238, 244,
+ 250, 256, 262, 269, 275, 281, 288, 294, 300, 306, 312, 318, 324, 329, 335, 341,
+ 347, 353, 359, 365, 371, 376, 382, 388, 394, 400, 407, 413, 420, 427, 433, 440,
+ 447, 453, 460, 467, 473, 480, 487, 493, 500, 507, 514, 521, 529, 536, 543, 550,
+ 557, 564, 571, 579, 586, 593, 600, 607, 614, 621, 629, 636, 643, 650, 657, 664,
+ 671, 679, 686, 693, 700, 706, 712, 719, 725, 731, 738, 744, 750, 756, 762, 769,
+ 775, 781, 788, 794, 800, 807, 814, 821, 829, 836, 843, 850, 857, 864, 871, 879,
+ 886, 893, 900, 907, 914, 921, 929, 936, 943, 950, 957, 964, 971, 979, 986, 993,
1000, 1008, 1015, 1023, 1031, 1038, 1046, 1054, 1062, 1069, 1077, 1085, 1092, 1100, 1108, 1115,
1123, 1131, 1138, 1146, 1154, 1162, 1169, 1177, 1185, 1192, 1200, 1207, 1214, 1221, 1229, 1236,
1243, 1250, 1257, 1264, 1271, 1279, 1286, 1293, 1300, 1307, 1314, 1321, 1329, 1336, 1343, 1350,
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 104ebe7a186..d2673602cf2 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -673,7 +673,7 @@ static MACHINE_CONFIG_START( taitowlf, taitowlf_state )
MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
#if ENABLE_VGA
MCFG_FRAGMENT_ADD( pcvideo_vga )
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index eac10d475e5..6000a761883 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -671,7 +671,7 @@ void topspeed_state::topspeed_postload()
void topspeed_state::machine_start()
{
membank("bank10")->configure_entries(0, 4, memregion("audiocpu")->base() + 0xc000, 0x4000);
-
+
m_msm_chip[0] = m_msm1;
m_msm_chip[1] = m_msm2;
m_msm_rom[0] = memregion("adpcm")->base();
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index fa0e7da5cc1..a173a30be4b 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -166,7 +166,6 @@ static const via6522_interface via_2_interface =
MACHINE_START_MEMBER(gameplan_state,trvquest)
{
-
/* register for save states */
save_item(NAME(m_video_x));
save_item(NAME(m_video_y));
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index c7795bd359a..76c95b79a3b 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -49,7 +49,7 @@ Year + Game PCB Notes
***************************************************************************/
WRITE16_MEMBER(unico_state::burglarx_sound_bank_w)
-{
+{
if (ACCESSING_BITS_8_15)
{
int bank = (data >> 8 ) & 1;
diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c
index 947fdd5623e..b71b08d8990 100644
--- a/src/mame/drivers/vlc.c
+++ b/src/mame/drivers/vlc.c
@@ -696,7 +696,7 @@ static const duart68681_config nevada_duart40_68681_config =
* Machine Reset *
*************************/
- void nevada_state::machine_reset()
+ void nevada_state::machine_reset()
{
m_duart18_68681 = machine().device( "duart18_68681" );
m_duart39_68681 = machine().device( "duart39_68681" );
diff --git a/src/mame/drivers/voyager.c b/src/mame/drivers/voyager.c
index a3ef8ea93df..7797f8f1f38 100644
--- a/src/mame/drivers/voyager.c
+++ b/src/mame/drivers/voyager.c
@@ -763,10 +763,10 @@ static MACHINE_CONFIG_START( voyager, voyager_state )
MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_trident_vga )
-
+
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c
index 90f67b031d0..998c9f328df 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -673,7 +673,7 @@ static MACHINE_CONFIG_START( xtom3d, xtom3d_state )
MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_KBDC8042_ADD("kbdc", at8042)
-
+
/* video hardware */
MCFG_FRAGMENT_ADD( pcvideo_vga )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 7bbb4ec23f0..0d81899bb0a 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -556,7 +556,6 @@ GFXDECODE_END
void yunsun16_state::machine_start()
{
-
save_item(NAME(m_sprites_scrolldx));
save_item(NAME(m_sprites_scrolldy));
}
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 604a528bce5..f2abc218c10 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1387,7 +1387,7 @@ void zn_state::atpsx_dma_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_siz
{
device_t *ide = machine().device("ide");
-// logerror("DMA read: %d bytes (%d words) to %08x\n", n_size<<2, n_size, n_address);
+// logerror("DMA read: %d bytes (%d words) to %08x\n", n_size<<2, n_size, n_address);
if (n_address < 0x10000)
{
diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h
index 3452b9cd3c6..a5d86230f58 100644
--- a/src/mame/includes/asuka.h
+++ b/src/mame/includes/asuka.h
@@ -42,7 +42,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
- optional_device<msm5205_device> m_msm;
+ optional_device<msm5205_device> m_msm;
required_device<pc090oj_device> m_pc090oj;
required_device<tc0100scn_device> m_tc0100scn;
DECLARE_WRITE8_MEMBER(sound_bankswitch_w);
diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h
index 03718a2003e..eac29c9aed5 100644
--- a/src/mame/includes/bublbobl.h
+++ b/src/mame/includes/bublbobl.h
@@ -9,7 +9,7 @@ public:
m_mcu_sharedram(*this, "mcu_sharedram"),
m_maincpu(*this, "maincpu"),
m_mcu(*this, "mcu"),
- m_audiocpu(*this, "audiocpu"),
+ m_audiocpu(*this, "audiocpu"),
m_slave(*this, "slave"){ }
/* memory pointers */
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index 311191b4647..193defdb8fa 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -25,7 +25,7 @@ public:
/* memory pointers */
required_shared_ptr<UINT8> m_videoram;
optional_shared_ptr<UINT8> m_bg_data;
-
+
optional_device<msm5205_device> m_msm;
UINT8 * m_pf1_data;
UINT8 * m_row;
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 55d30214bb1..3843e2c9fdd 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -45,7 +45,7 @@ public:
optional_device<decospr_device> m_sprgen;
optional_device<decospr_device> m_sprgen1;
optional_device<decospr_device> m_sprgen2;
-
+
optional_device<eeprom_device> m_eeprom;
optional_device<okim6295_device> m_oki1;
optional_device<okim6295_device> m_oki2;
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index 96eb96e843b..244f969dc92 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -32,7 +32,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_slave;
optional_device<msm5205_device> m_msm;
-
+
DECLARE_READ8_MEMBER(docastle_shared0_r);
DECLARE_READ8_MEMBER(docastle_shared1_r);
DECLARE_WRITE8_MEMBER(docastle_shared0_w);
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index d2b1687c18b..f8640cadf4b 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -13,7 +13,7 @@ public:
: driver_device(mconfig, type, tag),
m_dsw_sel16(*this, "dsw_sel16"),
m_protection1(*this, "protection1"),
- m_protection2(*this, "protection2"),
+ m_protection2(*this, "protection2"),
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
m_oki(*this, "oki"),
diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h
index 21a9e214fe9..9c803138b77 100644
--- a/src/mame/includes/eprom.h
+++ b/src/mame/includes/eprom.h
@@ -11,7 +11,7 @@ class eprom_state : public atarigen_state
public:
eprom_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
- m_extra(*this, "extra") { }
+ m_extra(*this, "extra") { }
int m_screen_intensity;
int m_video_disable;
diff --git a/src/mame/includes/exzisus.h b/src/mame/includes/exzisus.h
index 9d10924d30b..64324068840 100644
--- a/src/mame/includes/exzisus.h
+++ b/src/mame/includes/exzisus.h
@@ -18,7 +18,7 @@ public:
required_shared_ptr<UINT8> m_objectram0;
required_shared_ptr<UINT8> m_videoram0;
required_device<cpu_device> m_cpuc;
-
+
int m_cpua_bank;
int m_cpub_bank;
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 21953f61b1c..2c835da95ec 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -148,7 +148,7 @@ public:
char m_battles_customio_command_count;
char m_battles_customio_data;
char m_battles_sound_played;
-
+
optional_device<cpu_device> m_subcpu3;
};
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 78240e9bd0d..505eb805c38 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -53,7 +53,7 @@ public:
m_main_gpu_wait(NULL),
m_joystick_data(0),
m_eeprom_bit_count(0),
- m_protection_check(0) ,
+ m_protection_check(0) ,
m_eeprom(*this, "eeprom") { }
// devices
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index 6f11a81f330..3d09266be75 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -31,7 +31,7 @@ public:
required_device<cpu_device> m_master;
required_device<cpu_device> m_slave;
required_device<eeprom_device> m_eeprom;
-
+
UINT8 m_dac_control;
UINT8 *m_alleymas_kludge_mem;
UINT8 *m_ataxx_qram;
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 669ce1ef15d..5e7db47e580 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -93,7 +93,7 @@ public:
DECLARE_WRITE8_MEMBER(mario_sh1_w);
DECLARE_WRITE8_MEMBER(mario_sh2_w);
DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
+ DECLARE_WRITE8_MEMBER(memory_write_byte);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 40125d2c09f..1979193b452 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -15,7 +15,7 @@ public:
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
m_dac(*this, "dac"),
- m_samples(*this, "samples") { }
+ m_samples(*this, "samples") { }
optional_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_videoram;
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index 5d5b9634303..deafe94e537 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -62,7 +62,7 @@ public:
optional_shared_ptr<UINT16> m_screenctrl;
optional_shared_ptr<UINT16> m_input_sel;
optional_shared_ptr<UINT16> m_k053936_ram;
-
+
optional_device<eeprom_device> m_eeprom;
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 97a9620263a..9439fc41617 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -31,7 +31,7 @@ public:
/* memory pointers */
required_shared_ptr<UINT8> m_colorram;
required_shared_ptr<UINT8> m_videoram;
-
+
optional_device<eeprom_device> m_eeprom;
optional_device<msm5205_device> m_msm;
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index bdda65963da..de7cd56ab6c 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -46,7 +46,7 @@ public:
required_shared_ptr<UINT16> m_mpSharedRAM1;
required_shared_ptr<UINT8> m_mpDualPortRAM;
optional_shared_ptr<UINT16> m_master_dsp_code;
-
+
optional_device<cpu_device> m_dsp;
UINT8 *m_videoram;
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index 57f513a13e6..ba733971cbe 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -89,7 +89,7 @@ public:
DECLARE_VIDEO_START(mbmj8688_hybrid_12bit);
DECLARE_VIDEO_START(mbmj8688_pure_16bit);
DECLARE_READ8_MEMBER(dipsw1_r);
- DECLARE_READ8_MEMBER(dipsw2_r);
+ DECLARE_READ8_MEMBER(dipsw2_r);
UINT32 screen_update_mbmj8688(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_mbmj8688_lcd0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_mbmj8688_lcd1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 099996445b7..cdf4b7bdbe3 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -132,5 +132,5 @@ public:
void mscoutm_inputportsel_w(int data);
required_device<cpu_device> m_maincpu;
required_device<dac_device> m_dac1;
- required_device<dac_device> m_dac2;
+ required_device<dac_device> m_dac2;
};
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 2ed83cfd6bc..8138b980ce4 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -96,5 +96,5 @@ public:
void niyanpai_soundbank_w(int data);
required_device<cpu_device> m_maincpu;
required_device<dac_device> m_dac1;
- required_device<dac_device> m_dac2;
+ required_device<dac_device> m_dac2;
};
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 5abcc021dd2..a30a980a356 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -182,5 +182,5 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<okim6295_device> m_oki1;
- optional_device<okim6295_device> m_oki2;
+ optional_device<okim6295_device> m_oki2;
};
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index 7216678b581..637f90b4f3d 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -38,7 +38,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<eeprom_device> m_eeprom;
-
+
DECLARE_WRITE32_MEMBER(ps4_paletteram32_RRRRRRRRGGGGGGGGBBBBBBBBxxxxxxxx_dword_w);
DECLARE_WRITE32_MEMBER(ps4_bgpen_1_dword_w);
DECLARE_WRITE32_MEMBER(ps4_bgpen_2_dword_w);
diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h
index 21f0f631305..ed971389641 100644
--- a/src/mame/includes/rainbow.h
+++ b/src/mame/includes/rainbow.h
@@ -14,7 +14,7 @@ public:
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_pc080sn(*this, "pc080sn"),
- m_pc090oj(*this, "pc090oj") { }
+ m_pc090oj(*this, "pc090oj") { }
/* memory pointers */
optional_shared_ptr<UINT16> m_spriteram;
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h
index 771ff12f030..6330ce4d78d 100644
--- a/src/mame/includes/scramble.h
+++ b/src/mame/includes/scramble.h
@@ -8,7 +8,7 @@ public:
: galaxold_state(mconfig, type, tag),
m_ppi8255_0(*this, "ppi8255_0"),
m_ppi8255_1(*this, "ppi8255_1"),
- m_soundram(*this, "soundram")
+ m_soundram(*this, "soundram")
{ }
optional_device<i8255_device> m_ppi8255_0;
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index bb12e920a6c..9d3bd71813d 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -58,7 +58,7 @@ public:
/* devices */
required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_audiocpu;
+ required_device<cpu_device> m_audiocpu;
required_device<tc0140syt_device> m_tc0140syt;
required_device<tc0480scp_device> m_tc0480scp;
required_device<tc0360pri_device> m_tc0360pri;
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 67ecc0bd5a8..def37d925d4 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -61,5 +61,5 @@ public:
DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_2);
required_device<cpu_device> m_audiocpu;
required_device<msm5205_device> m_msm1;
- required_device<msm5205_device> m_msm2;
+ required_device<msm5205_device> m_msm2;
};
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index b21359f10a8..955e5a10ee2 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -18,9 +18,9 @@ public:
required_shared_ptr<UINT16> m_spriteram;
optional_shared_ptr<UINT16> m_spriteram2;
required_device<dac_device> m_dac1;
- required_device<dac_device> m_dac2;
+ required_device<dac_device> m_dac2;
optional_device<dac_device> m_dac3;
- optional_device<dac_device> m_dac4;
+ optional_device<dac_device> m_dac4;
UINT8 m_prot;
UINT16 *m_paletteram;
int m_color_bank;
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index 6eff1a8858e..6d1ecc9d8b6 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -168,4 +168,3 @@ public:
void taitojc_clear_frame();
void debug_dsp_command();
};
-
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index 4c658bcef26..ba136cd60ea 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -66,5 +66,5 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<msm5205_device> m_msm1;
- required_device<msm5205_device> m_msm2;
+ required_device<msm5205_device> m_msm2;
};
diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h
index d3c1a4b6d2c..4915b7bfd10 100644
--- a/src/mame/includes/thunderj.h
+++ b/src/mame/includes/thunderj.h
@@ -11,7 +11,7 @@ class thunderj_state : public atarigen_state
public:
thunderj_state(const machine_config &mconfig, device_type type, const char *tag)
: atarigen_state(mconfig, type, tag),
- m_extra(*this, "extra") { }
+ m_extra(*this, "extra") { }
UINT8 m_alpha_tile_bank;
virtual void update_interrupts();
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index 0dbf48fded6..327ad9db859 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -15,7 +15,7 @@ public:
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
- m_dsp(*this, "dsp") { }
+ m_dsp(*this, "dsp") { }
int m_unk_reset_port;
required_shared_ptr<UINT16> m_colorram1;
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index b7b8e2f5a49..58711b4a15c 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -44,7 +44,7 @@ public:
required_shared_ptr<UINT8> m_videoram;
required_shared_ptr<UINT8> m_spriteram;
required_shared_ptr<UINT8> m_sprite_position;
-
+
required_device<samples_device> m_samples;
UINT8 * m_buckrog_bitmap_ram;
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 33a2120391f..ae1af78f905 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -17,7 +17,7 @@ public:
m_workram(*this, "workram"),
m_spriteram(*this, "spriteram"),
m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu"),
+ m_audiocpu(*this, "audiocpu"),
m_k054539(*this, "k054539"),
m_filter1l(*this, "filter1l"),
m_filter1r(*this, "filter1r"),
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index c2b5e4aae6b..2b5d59e8d72 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -272,7 +272,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(nitedrvr_state::nitedrvr_crash_toggle_callback)
void nitedrvr_state::machine_start()
{
-
save_item(NAME(m_gear));
save_item(NAME(m_track));
save_item(NAME(m_steering_buf));
diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h
index c7c0a7e2cec..3f616ba7eea 100644
--- a/src/mame/machine/pcecommn.h
+++ b/src/mame/machine/pcecommn.h
@@ -24,7 +24,7 @@ public:
DECLARE_DRIVER_INIT(pce_common);
required_device<cpu_device> m_maincpu;
-
+
virtual UINT8 joy_read();
private:
UINT8 m_io_port_options; /*driver-specific options for the PCE*/
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 1c983e908b8..83e0bea079d 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -45,7 +45,7 @@ WRITE_LINE_MEMBER( pcat_base_state::pc_dma_hrq_changed )
READ8_MEMBER(pcat_base_state::pc_dma_read_byte)
{
address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space
-
+
offs_t page_offset = (((offs_t) m_dma_offset[0][m_dma_channel]) << 16)
& 0xFF0000;
@@ -246,6 +246,6 @@ MACHINE_CONFIG_FRAGMENT(pcat_common)
MCFG_I8237_ADD( "dma8237_2", XTAL_14_31818MHz/3, dma8237_2_config )
MCFG_PIT8254_ADD( "pit8254", at_pit8254_config )
// MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pcshare.h b/src/mame/machine/pcshare.h
index 8f136031a2e..7d12c8727fa 100644
--- a/src/mame/machine/pcshare.h
+++ b/src/mame/machine/pcshare.h
@@ -11,7 +11,7 @@ public:
m_dma8237_1(*this, "dma8237_1"),
m_pic8259_1(*this, "pic8259_1"),
m_pic8259_2(*this, "pic8259_2"),
- m_pit8254(*this, "pit8254") { }
+ m_pit8254(*this, "pit8254") { }
IRQ_CALLBACK_MEMBER(irq_callback);
@@ -20,7 +20,7 @@ public:
required_device<pic8259_device> m_pic8259_1;
required_device<pic8259_device> m_pic8259_2;
required_device<pit8254_device> m_pit8254;
-
+
DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed);
DECLARE_READ8_MEMBER(pc_dma_read_byte);
DECLARE_WRITE8_MEMBER(pc_dma_write_byte);
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 1a1324b0b67..10f14ab2a17 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -2510,7 +2510,7 @@ honeydol // (c) 1995 Barko Corp
twinadv // (c) 1995 Barko Corp
twinadvk // (c) 1995 Barko Corp
snowbro3 // (c) 2002 Syrmex
-ballboy // bootleg
+ballboy // bootleg
// SemiCom games on "SnowBros"-like hardware
finalttr // (c) 1993 Jeil Computer System
hyperpac // (c) 1995 SemiCom
@@ -5083,7 +5083,7 @@ drbyocwc // 2001.?? Derby Owners Club World Edition (Rev. C)
derbyocw // 2001.?? Derby Owners Club World Edition (Rev. D)
shootplm // 2001.?? Shootout Pool Medal
// 2001.?? Star Horse 2001
-shaktmsp // 2001.?? Shakatto Tambourine 2K1 SPR
+shaktmsp // 2001.?? Shakatto Tambourine 2K1 SPR
vathlete // 2002.03 Virtua Athletics / Virtua Athlete
luptype // 2002.04 Lupin The Third - The Typing (Rev A)
cleoftp // 2002.05 Cleopatra Fortune Plus
@@ -8741,7 +8741,7 @@ brickznv4 // (c) 1992 SunA
bestbest // (c) 1994 SunA
sunaq // (c) 1994 SunA
bssoccer // (c) 1996 SunA
-bssoccera // (c) 1996 SunA
+bssoccera // (c) 1996 SunA
uballoon // (c) 1996 SunA
go2000 // (c) 2000 SA
@@ -9279,7 +9279,7 @@ puzlstar // (c) 1999 Puzzle Star
olds // (c) 1999 Oriental Legend Super / Special
olds100 //
olds100a //
-olds103t //
+olds103t //
kov2 // (c) 2000 Knights of Valor 2
kov2106 //
kov2103 //
@@ -9291,21 +9291,21 @@ kov2p205 //
ddp2 // (c) 2001 DoDonPachi 2 - Bee Storm
ddp2101 //
ddp2100 //
-ddp2hk //
-ddp2101hk //
-ddp2100hk //
-ddp2k //
-ddp2101k //
-ddp2100k //
-ddp2j //
-ddp2101j //
-ddp2100j //
-ddp2t //
-ddp2101t //
-ddp2100t //
-ddp2c //
-ddp2101c //
-ddp2100c //
+ddp2hk //
+ddp2101hk //
+ddp2100hk //
+ddp2k //
+ddp2101k //
+ddp2100k //
+ddp2j //
+ddp2101j //
+ddp2100j //
+ddp2t //
+ddp2101t //
+ddp2100t //
+ddp2c //
+ddp2101c //
+ddp2100c //
puzzli2 // (c) 1999 Puzzli 2
puzzli2s // (c) 2001 Puzzli 2 Super
martmast // (c) 2001 Martial Masters
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 8d6e76b6f4c..bb7c770fc88 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -787,7 +787,7 @@ $(MAMEOBJ)/gottlieb.a: \
$(MAMEOBJ)/ibmpc.a: \
$(DRIVERS)/calchase.o \
- $(DRIVERS)/fruitpc.o \
+ $(DRIVERS)/fruitpc.o \
$(DRIVERS)/pangofun.o \
$(DRIVERS)/pcat_dyn.o \
$(DRIVERS)/pcat_nit.o \
@@ -846,7 +846,7 @@ $(MAMEOBJ)/itech.a: \
$(DRIVERS)/capbowl.o $(VIDEO)/capbowl.o \
$(DRIVERS)/itech8.o $(MACHINE)/slikshot.o $(VIDEO)/itech8.o \
$(DRIVERS)/itech32.o $(VIDEO)/itech32.o \
- $(DRIVERS)/iteagle.o \
+ $(DRIVERS)/iteagle.o \
$(MAMEOBJ)/jaleco.a: \
$(DRIVERS)/aeroboto.o $(VIDEO)/aeroboto.o \
@@ -1055,7 +1055,7 @@ $(MAMEOBJ)/midway.a: \
$(DRIVERS)/midyunit.o $(MACHINE)/midyunit.o $(VIDEO)/midyunit.o \
$(DRIVERS)/midzeus.o $(VIDEO)/midzeus.o $(VIDEO)/midzeus2.o \
$(DRIVERS)/omegrace.o \
- $(DRIVERS)/pinball2k.o \
+ $(DRIVERS)/pinball2k.o \
$(DRIVERS)/seattle.o \
$(DRIVERS)/tmaster.o \
$(DRIVERS)/vegas.o $(DRIVERS)/wmg.o \
diff --git a/src/mame/video/taitoic.h b/src/mame/video/taitoic.h
index 711405313f7..ad88f303f62 100644
--- a/src/mame/video/taitoic.h
+++ b/src/mame/video/taitoic.h
@@ -527,4 +527,4 @@ DECLARE_WRITE16_DEVICE_HANDLER( tc0180vcu_scroll_w );
DECLARE_READ16_DEVICE_HANDLER( tc0180vcu_word_r );
DECLARE_WRITE16_DEVICE_HANDLER( tc0180vcu_word_w );
void tc0180vcu_tilemap_draw(device_t *device, bitmap_ind16 &bitmap, const rectangle &cliprect, int tmap_num, int plane);
-#endif \ No newline at end of file
+#endif
diff --git a/src/mess/audio/vrc6.c b/src/mess/audio/vrc6.c
index 48864dc3ebc..4553dd118da 100644
--- a/src/mess/audio/vrc6.c
+++ b/src/mess/audio/vrc6.c
@@ -4,17 +4,17 @@
Konami VRC6 additional sound channels
Emulation by R. Belmont
-
+
References:
http://wiki.nesdev.com/w/index.php/VRC6_audio
- http://nesdev.com/vrcvi.txt
-
+ http://nesdev.com/vrcvi.txt
+
***************************************************************************/
#include "emu.h"
#include "vrc6.h"
-#define DISABLE_VRC6_SOUND // not ready yet
+#define DISABLE_VRC6_SOUND // not ready yet
// device type definition
const device_type VRC6 = &device_creator<vrc6snd_device>;
@@ -29,7 +29,7 @@ const device_type VRC6 = &device_creator<vrc6snd_device>;
vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VRC6, "VRC6 sound", tag, owner, clock),
- device_sound_interface(mconfig, *this)
+ device_sound_interface(mconfig, *this)
{
}
@@ -175,7 +175,7 @@ void vrc6snd_device::sound_stream_update(sound_stream &stream, stream_sample_t *
{
m_ticks[2]--;
if (m_ticks[2] == 0)
- {
+ {
m_ticks[2] = m_sawfrql | (m_sawfrqh & 0xf)<<4;
// only update on even steps
@@ -199,7 +199,7 @@ void vrc6snd_device::sound_stream_update(sound_stream &stream, stream_sample_t *
}
// sum 2 4-bit pulses, 1 5-bit saw = unsigned 6 bit output
- tmp = (INT16)(UINT8)(m_output[0] + m_output[1] + m_output[2]);
+ tmp = (INT16)(UINT8)(m_output[0] + m_output[1] + m_output[2]);
tmp <<= 8;
out[i] = tmp;
@@ -316,5 +316,3 @@ WRITE8_MEMBER( vrc6snd_device::write )
}
}
-
-
diff --git a/src/mess/audio/vrc6.h b/src/mess/audio/vrc6.h
index bef5383b5b2..f1d2b1192fa 100644
--- a/src/mess/audio/vrc6.h
+++ b/src/mess/audio/vrc6.h
@@ -57,5 +57,3 @@ extern const device_type VRC6;
#endif /* __VRC6_H__ */
-
-
diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c
index b961fe61f1a..d0f369d83d3 100644
--- a/src/mess/drivers/bebox.c
+++ b/src/mess/drivers/bebox.c
@@ -159,7 +159,7 @@ WRITE_LINE_MEMBER(bebox_state::bebox_keyboard_interrupt)
}
}
-READ8_MEMBER(bebox_state::bebox_get_out2)
+READ8_MEMBER(bebox_state::bebox_get_out2)
{
return pit8253_get_output(machine().device("pit8254"), 2 );
}
@@ -171,7 +171,7 @@ static const struct kbdc8042_interface bebox_8042_interface =
DEVCB_NULL,
DEVCB_DRIVER_LINE_MEMBER(bebox_state,bebox_keyboard_interrupt),
DEVCB_NULL,
-
+
DEVCB_NULL,
DEVCB_DRIVER_MEMBER(bebox_state,bebox_get_out2)
};
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index b8fc75aabb9..743daab7190 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -150,7 +150,7 @@ public:
DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte);
DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
};
/* Status port
diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c
index a36aff8b9ed..b6bb8288f79 100644
--- a/src/mess/drivers/coco3.c
+++ b/src/mess/drivers/coco3.c
@@ -40,7 +40,7 @@ static ADDRESS_MAP_START( coco3_mem, AS_PROGRAM, 8, coco3_state )
AM_RANGE(0xFF40, 0xFF5F) AM_READWRITE(ff40_read, ff40_write)
AM_RANGE(0xFF60, 0xFF8F) AM_READWRITE(ff60_read, ff60_write)
AM_RANGE(0xFF90, 0xFFDF) AM_DEVREADWRITE(GIME_TAG, gime_base_device, read, write)
-
+
// While Tepolt and other sources say that the interrupt vectors are mapped to
// the same memory accessed at $BFFx, William Astle offered evidence that this
// memory on a CoCo 3 is not the same.
diff --git a/src/mess/drivers/dmv.c b/src/mess/drivers/dmv.c
index 1ed626ae089..5bc04533327 100644
--- a/src/mess/drivers/dmv.c
+++ b/src/mess/drivers/dmv.c
@@ -49,7 +49,7 @@ public:
DECLARE_READ8_MEMBER(fdc_dma_r);
DECLARE_WRITE8_MEMBER(fdc_dma_w);
DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
+ DECLARE_WRITE8_MEMBER(memory_write_byte);
void fdc_irq(bool state);
void fdc_drq(bool state);
diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c
index c553738000f..f181c76c2f1 100644
--- a/src/mess/drivers/fk1.c
+++ b/src/mess/drivers/fk1.c
@@ -25,7 +25,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
-
+
DECLARE_WRITE8_MEMBER(fk1_ppi_1_a_w);
DECLARE_WRITE8_MEMBER(fk1_ppi_1_b_w);
DECLARE_WRITE8_MEMBER(fk1_ppi_1_c_w);
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index 8da8cac8a0f..7e9f30b6bdf 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -1930,7 +1930,6 @@ WRITE8_MEMBER(towns_state::towns_rtc_select_w)
void towns_state::rtc_hour()
{
-
m_towns_rtc_reg[4]++;
if(m_towns_rtc_reg[4] > 4 && m_towns_rtc_reg[5] == 2)
{
@@ -1946,7 +1945,6 @@ void towns_state::rtc_hour()
void towns_state::rtc_minute()
{
-
m_towns_rtc_reg[2]++;
if(m_towns_rtc_reg[2] > 9)
{
diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c
index 22bb8d9716b..47cd8e729c1 100644
--- a/src/mess/drivers/ip22.c
+++ b/src/mess/drivers/ip22.c
@@ -1498,9 +1498,9 @@ static const struct kbdc8042_interface at8042 =
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
-
+
DEVCB_NULL,
- DEVCB_DRIVER_MEMBER(ip22_state,ip22_get_out2)
+ DEVCB_DRIVER_MEMBER(ip22_state,ip22_get_out2)
};
DRIVER_INIT_MEMBER(ip22_state,ip225015)
@@ -1642,7 +1642,7 @@ static MACHINE_CONFIG_START( ip225015, ip22_state )
MCFG_SOUND_MODIFY( "scsi:cdrom:cdda" )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^rspeaker", 1.0)
-
+
MCFG_KBDC8042_ADD("kbdc", at8042)
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c
index 4098df19107..9022af56acf 100644
--- a/src/mess/drivers/kyocera.c
+++ b/src/mess/drivers/kyocera.c
@@ -42,9 +42,9 @@
- tandy200 TCM5089 DTMF sound
- international keyboard option ROMs
- 10 FOR A=0 TO 255
- 20 PRINT CHR$(A);
- 30 NEXT A
+ 10 FOR A=0 TO 255
+ 20 PRINT CHR$(A);
+ 30 NEXT A
*/
diff --git a/src/mess/drivers/merlin.c b/src/mess/drivers/merlin.c
index 6b38a0752c9..92835fa1a88 100644
--- a/src/mess/drivers/merlin.c
+++ b/src/mess/drivers/merlin.c
@@ -17,7 +17,7 @@ class merlin_state : public driver_device
public:
merlin_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_speaker(*this, "speaker") ,
+ m_speaker(*this, "speaker") ,
m_maincpu(*this, "maincpu") { }
virtual void machine_start();
diff --git a/src/mess/drivers/mini2440.c b/src/mess/drivers/mini2440.c
index 7515830b241..7e30ed5983f 100644
--- a/src/mess/drivers/mini2440.c
+++ b/src/mess/drivers/mini2440.c
@@ -49,7 +49,7 @@ public:
DECLARE_WRITE8_MEMBER(s3c2440_nand_data_w );
DECLARE_WRITE16_MEMBER(s3c2440_i2s_data_w );
DECLARE_READ32_MEMBER(s3c2440_adc_data_r );
-
+
};
inline void ATTR_PRINTF(3,4) mini2440_state::verboselog( int n_level, const char *s_fmt, ...)
diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c
index ed501728952..07b46c69a6c 100644
--- a/src/mess/drivers/mz3500.c
+++ b/src/mess/drivers/mz3500.c
@@ -58,7 +58,7 @@ public:
required_device<upd765a_device> m_fdc;
required_shared_ptr<UINT8> m_video_ram;
required_device<beep_device> m_beeper;
-
+
UINT8 *m_ipl_rom;
UINT8 *m_basic_rom;
UINT8 *m_work_ram;
diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c
index 65184af235b..037b011d6b1 100644
--- a/src/mess/drivers/p8k.c
+++ b/src/mess/drivers/p8k.c
@@ -110,7 +110,7 @@ public:
DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte);
DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
};
/***************************************************************************
diff --git a/src/mess/drivers/palmz22.c b/src/mess/drivers/palmz22.c
index 5aba8f4b73a..afdd9aa59ef 100644
--- a/src/mess/drivers/palmz22.c
+++ b/src/mess/drivers/palmz22.c
@@ -149,9 +149,9 @@ WRITE8_MEMBER( palmz22_state::s3c2410_nand_data_w )
/*
READ8_MEMBER( palmz22_state::s3c2410_nand_busy_r )
{
- UINT8 data = m_nand->is_busy();
- verboselog(9, "s3c2410_nand_busy_r %02X\n", data);
- return data;
+ UINT8 data = m_nand->is_busy();
+ verboselog(9, "s3c2410_nand_busy_r %02X\n", data);
+ return data;
}
*/
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index 34b00673653..231f83f136c 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -382,7 +382,7 @@ public:
required_shared_ptr<UINT8> m_video_ram_1;
required_shared_ptr<UINT8> m_video_ram_2;
required_device<beep_device> m_beeper;
- optional_device<ram_device> m_ram;
+ optional_device<ram_device> m_ram;
virtual void video_start();
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
diff --git a/src/mess/drivers/tsispch.c b/src/mess/drivers/tsispch.c
index 4a4e9918be0..3da04d51a5d 100644
--- a/src/mess/drivers/tsispch.c
+++ b/src/mess/drivers/tsispch.c
@@ -207,7 +207,7 @@ WRITE8_MEMBER( tsispch_state::peripheral_w )
and (probably) the p0-to-ir0 masking of the upd77p20; there are two
unknown and seemingly unused bits as well.
see the top of the file for more info.
- */
+ */
m_paramReg = data;
m_dsp->set_input_line(INPUT_LINE_RESET, BIT(data,6)?CLEAR_LINE:ASSERT_LINE);
#ifdef DEBUG_PARAM
diff --git a/src/mess/includes/aim65.h b/src/mess/includes/aim65.h
index 11949515d87..37237085385 100644
--- a/src/mess/includes/aim65.h
+++ b/src/mess/includes/aim65.h
@@ -61,7 +61,7 @@ public:
virtual void machine_start();
TIMER_CALLBACK_MEMBER(aim65_printer_timer);
void aim65_pia();
-
+
DECLARE_WRITE16_MEMBER(aim65_update_ds1);
DECLARE_WRITE16_MEMBER(aim65_update_ds2);
DECLARE_WRITE16_MEMBER(aim65_update_ds3);
diff --git a/src/mess/includes/amstr_pc.h b/src/mess/includes/amstr_pc.h
index 20de12892dc..90b70b1e43c 100644
--- a/src/mess/includes/amstr_pc.h
+++ b/src/mess/includes/amstr_pc.h
@@ -14,7 +14,7 @@ class amstrad_pc_state : public pc_state
public:
amstrad_pc_state(const machine_config &mconfig, device_type type, const char *tag)
: pc_state(mconfig, type, tag)
- { m_mouse.x =0; m_mouse.y=0;}
+ { m_mouse.x =0; m_mouse.y=0;}
DECLARE_READ8_MEMBER( pc1640_port60_r );
DECLARE_WRITE8_MEMBER( pc1640_port60_w );
@@ -30,12 +30,12 @@ public:
DECLARE_READ8_MEMBER( pc1640_port3d0_r );
DECLARE_READ8_MEMBER( pc1640_port4278_r );
DECLARE_READ8_MEMBER( pc1640_port278_r );
-
+
DECLARE_DRIVER_INIT(pc1512);
- DECLARE_DRIVER_INIT(pc1640);
+ DECLARE_DRIVER_INIT(pc1640);
DECLARE_DRIVER_INIT(ppc512);
DECLARE_DRIVER_INIT(pc200);
-
+
private:
struct {
UINT8 x,y; //byte clipping needed
@@ -47,7 +47,7 @@ private:
UINT8 m_port62;
UINT8 m_port65;
- int m_dipstate;
+ int m_dipstate;
};
INPUT_PORTS_EXTERN( amstrad_keyboard );
diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h
index efad208eb0d..dac1eaa8988 100644
--- a/src/mess/includes/apple2gs.h
+++ b/src/mess/includes/apple2gs.h
@@ -238,24 +238,24 @@ public:
UINT8 apple2gs_xxCxxx_r(address_space &space, offs_t address);
void apple2gs_xxCxxx_w(address_space &space, offs_t address, UINT8 data);
void apple2gs_setup_memory();
-
+
DECLARE_READ8_MEMBER( gssnd_r );
DECLARE_WRITE8_MEMBER( gssnd_w );
DECLARE_READ8_MEMBER( apple2gs_00Cxxx_r );
DECLARE_READ8_MEMBER( apple2gs_01Cxxx_r );
DECLARE_READ8_MEMBER( apple2gs_E0Cxxx_r );
DECLARE_READ8_MEMBER( apple2gs_E1Cxxx_r );
- DECLARE_WRITE8_MEMBER( apple2gs_00Cxxx_w );
- DECLARE_WRITE8_MEMBER( apple2gs_01Cxxx_w );
- DECLARE_WRITE8_MEMBER( apple2gs_E0Cxxx_w );
- DECLARE_WRITE8_MEMBER( apple2gs_E1Cxxx_w );
+ DECLARE_WRITE8_MEMBER( apple2gs_00Cxxx_w );
+ DECLARE_WRITE8_MEMBER( apple2gs_01Cxxx_w );
+ DECLARE_WRITE8_MEMBER( apple2gs_E0Cxxx_w );
+ DECLARE_WRITE8_MEMBER( apple2gs_E1Cxxx_w );
DECLARE_WRITE8_MEMBER( apple2gs_Exxxxx_w );
DECLARE_WRITE8_MEMBER( apple2gs_E004xx_w );
DECLARE_WRITE8_MEMBER( apple2gs_E02xxx_w );
DECLARE_WRITE8_MEMBER( apple2gs_E104xx_w );
DECLARE_WRITE8_MEMBER( apple2gs_E12xxx_w );
DECLARE_WRITE8_MEMBER( apple2gs_slowmem_w );
- DECLARE_READ8_MEMBER(apple2gs_bank_echo_r);
+ DECLARE_READ8_MEMBER(apple2gs_bank_echo_r);
};
diff --git a/src/mess/includes/avigo.h b/src/mess/includes/avigo.h
index 1f2e41f368e..bdbea2a00dd 100644
--- a/src/mess/includes/avigo.h
+++ b/src/mess/includes/avigo.h
@@ -107,7 +107,7 @@ public:
virtual void palette_init();
TIMER_DEVICE_CALLBACK_MEMBER(avigo_scan_timer);
TIMER_DEVICE_CALLBACK_MEMBER(avigo_1hz_timer);
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( avigo);
};
#endif /* AVIGO_H_ */
diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h
index 43e4196ebc1..63a8ffb2fcb 100644
--- a/src/mess/includes/bbc.h
+++ b/src/mess/includes/bbc.h
@@ -32,7 +32,7 @@ public:
m_trom(*this, "saa505x"),
m_cassette(*this, "cassette"),
m_acia(*this, "acia6850"),
- m_ACCCON_IRR(CLEAR_LINE),
+ m_ACCCON_IRR(CLEAR_LINE),
m_via_system_irq(CLEAR_LINE),
m_via_user_irq(CLEAR_LINE),
m_acia_irq(CLEAR_LINE),
@@ -374,7 +374,7 @@ protected:
void MC6850_Receive_Clock(int new_clock);
void BBC_Cassette_motor(unsigned char status);
void bbc_update_fdq_int(int state);
-public:
+public:
unsigned int calculate_video_address(int ma,int ra);
};
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h
index 9b9dd03fc51..1089afc0dd3 100644
--- a/src/mess/includes/c128.h
+++ b/src/mess/includes/c128.h
@@ -193,7 +193,7 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( restore );
DECLARE_INPUT_CHANGED_MEMBER( caps_lock );
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c64 );
// memory state
int m_z80en;
diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h
index 042bb1a980e..6cf0b902556 100644
--- a/src/mess/includes/c64.h
+++ b/src/mess/includes/c64.h
@@ -138,7 +138,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( exp_reset_w );
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c64 );
-
+
// memory state
int m_loram;
int m_hiram;
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h
index b87d8e12338..f003c0432fb 100644
--- a/src/mess/includes/c65.h
+++ b/src/mess/includes/c65.h
@@ -162,7 +162,7 @@ public:
DECLARE_READ8_MEMBER( c65_read_io );
DECLARE_READ8_MEMBER( c65_read_io_dc00 );
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c65 );
-
+
int c64_paddle_read( device_t *device, address_space &space, int which );
void c65_nmi( );
void c65_irq( int level );
diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h
index 3aa7d6c1cf2..ab06d1a4856 100644
--- a/src/mess/includes/cgenie.h
+++ b/src/mess/includes/cgenie.h
@@ -85,7 +85,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
-
+
void cgenie_offset_xy();
int cgenie_get_register(int indx);
void cgenie_mode_select(int mode);
@@ -131,7 +131,7 @@ public:
DECLARE_WRITE8_MEMBER( cgenie_index_w );
DECLARE_WRITE8_MEMBER( cgenie_register_w );
-
+
};
diff --git a/src/mess/includes/cosmicos.h b/src/mess/includes/cosmicos.h
index 5ec6b9892ee..f631f2425d3 100644
--- a/src/mess/includes/cosmicos.h
+++ b/src/mess/includes/cosmicos.h
@@ -110,7 +110,7 @@ public:
DECLARE_DIRECT_UPDATE_MEMBER(cosmicos_direct_update_handler);
DECLARE_QUICKLOAD_LOAD_MEMBER( cosmicos );
-
+
void set_cdp1802_mode(int mode);
void clear_input_data();
void set_ram_mode();
diff --git a/src/mess/includes/electron.h b/src/mess/includes/electron.h
index cc817b31dd1..2fbdb5acea9 100644
--- a/src/mess/includes/electron.h
+++ b/src/mess/includes/electron.h
@@ -60,7 +60,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_cassette(*this, "cassette"),
- m_beeper(*this, "beeper") { }
+ m_beeper(*this, "beeper") { }
ULA m_ula;
emu_timer *m_tape_timer;
diff --git a/src/mess/includes/enterp.h b/src/mess/includes/enterp.h
index 860cf5bf5ea..7d88614233c 100644
--- a/src/mess/includes/enterp.h
+++ b/src/mess/includes/enterp.h
@@ -64,7 +64,7 @@ public:
void Nick_UpdateLPT();
void Nick_ReloadLPT();
void Nick_DoLine();
- void Nick_DoScreen(bitmap_ind16 &bm);
+ void Nick_DoScreen(bitmap_ind16 &bm);
};
diff --git a/src/mess/includes/europc.h b/src/mess/includes/europc.h
index 0eb62f77f93..8e9f71f5ea7 100644
--- a/src/mess/includes/europc.h
+++ b/src/mess/includes/europc.h
@@ -15,8 +15,8 @@ class europc_pc_state : public pc_state
public:
europc_pc_state(const machine_config &mconfig, device_type type, const char *tag)
: pc_state(mconfig, type, tag),
- m_jim_state(0),
- m_port61(0) { }
+ m_jim_state(0),
+ m_port61(0) { }
DECLARE_WRITE8_MEMBER( europc_pio_w );
DECLARE_READ8_MEMBER( europc_pio_r );
@@ -27,9 +27,9 @@ public:
DECLARE_READ8_MEMBER( europc_rtc_r );
DECLARE_WRITE8_MEMBER( europc_rtc_w );
-
+
TIMER_CALLBACK_MEMBER(europc_rtc_timer);
-
+
DECLARE_DRIVER_INIT(europc);
void europc_rtc_set_time();
diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h
index f1b1d604dd9..3656e23bea6 100644
--- a/src/mess/includes/gb.h
+++ b/src/mess/includes/gb.h
@@ -214,7 +214,7 @@ protected:
required_memory_region m_region_maincpu;
optional_memory_bank m_rambank; // cgb
required_ioport m_inputs;
- optional_device<ram_device> m_ram;
+ optional_device<ram_device> m_ram;
void gb_timer_increment();
void gb_timer_check_irq();
diff --git a/src/mess/includes/gp32.h b/src/mess/includes/gp32.h
index f84e685da49..ee0e0cf1195 100644
--- a/src/mess/includes/gp32.h
+++ b/src/mess/includes/gp32.h
@@ -229,7 +229,7 @@ protected:
void iic_resume();
void s3c240x_machine_start();
void s3c240x_machine_reset();
- inline rgb_t s3c240x_get_color_5551( UINT16 data);
+ inline rgb_t s3c240x_get_color_5551( UINT16 data);
UINT32 s3c240x_lcd_dma_read( );
void s3c240x_lcd_render_01( );
void s3c240x_lcd_render_02( );
diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h
index fe9e72b6d2d..fd09d04deb9 100644
--- a/src/mess/includes/hp48.h
+++ b/src/mess/includes/hp48.h
@@ -110,7 +110,7 @@ public:
#define HP48_IO_8(x) (m_io[(x)] | (m_io[(x)+1] << 4))
#define HP48_IO_12(x) (m_io[(x)] | (m_io[(x)+1] << 4) | (m_io[(x)+2] << 8))
#define HP48_IO_20(x) (m_io[(x)] | (m_io[(x)+1] << 4) | (m_io[(x)+2] << 8) | \
- (m_io[(x)+3] << 12) | (m_io[(x)+4] << 16))
+ (m_io[(x)+3] << 12) | (m_io[(x)+4] << 16))
/*----------- defined in machine/hp48.c -----------*/
diff --git a/src/mess/includes/kc.h b/src/mess/includes/kc.h
index 7b4ce9eb3d5..9f90f5cfcf2 100644
--- a/src/mess/includes/kc.h
+++ b/src/mess/includes/kc.h
@@ -149,7 +149,7 @@ public:
TIMER_CALLBACK_MEMBER(kc_cassette_oneshot_timer);
TIMER_CALLBACK_MEMBER(kc_cassette_timer_callback);
TIMER_DEVICE_CALLBACK_MEMBER(kc_scanline);
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( kc );
};
diff --git a/src/mess/includes/lviv.h b/src/mess/includes/lviv.h
index 7e792a6194c..fe72bb22e10 100644
--- a/src/mess/includes/lviv.h
+++ b/src/mess/includes/lviv.h
@@ -56,7 +56,7 @@ public:
void lviv_setup_snapshot (UINT8 * data);
void dump_registers();
int lviv_verify_snapshot (UINT8 * data, UINT32 size);
- DECLARE_SNAPSHOT_LOAD_MEMBER( lviv );
+ DECLARE_SNAPSHOT_LOAD_MEMBER( lviv );
};
diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h
index 33a1d726f53..aad7792af8f 100644
--- a/src/mess/includes/mac.h
+++ b/src/mess/includes/mac.h
@@ -398,7 +398,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(cuda_reset_w);
DECLARE_WRITE_LINE_MEMBER(adb_linechange_w);
-
+
DECLARE_WRITE_LINE_MEMBER(mac_scsi_irq);
DECLARE_DIRECT_UPDATE_MEMBER(overlay_opbaseoverride);
diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h
index 18dfee41fe3..4f35b2cb3e1 100644
--- a/src/mess/includes/nascom1.h
+++ b/src/mess/includes/nascom1.h
@@ -63,7 +63,7 @@ public:
DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette );
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
- required_device<ram_device> m_ram;
+ required_device<ram_device> m_ram;
DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 );
};
diff --git a/src/mess/includes/nc.h b/src/mess/includes/nc.h
index 0e63cf18d15..94ca1749fbd 100644
--- a/src/mess/includes/nc.h
+++ b/src/mess/includes/nc.h
@@ -110,7 +110,7 @@ public:
required_device<ram_device> m_ram;
required_device<beep_device> m_beeper1;
required_device<beep_device> m_beeper2;
-
+
void nc200_video_set_backlight(int state);
void nc_card_save(device_image_interface &image);
int nc_card_calculate_mask(int size);
diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h
index d673c09b77e..102d96f7202 100644
--- a/src/mess/includes/nes.h
+++ b/src/mess/includes/nes.h
@@ -249,7 +249,7 @@ static SLOT_INTERFACE_START(nes_cart)
SLOT_INTERFACE_INTERNAL("gs2004", NES_GS2004)
SLOT_INTERFACE_INTERNAL("gs2013", NES_GS2013)
SLOT_INTERFACE_INTERNAL("tf9in1", NES_TF9IN1)
- SLOT_INTERFACE_INTERNAL("3dblock", NES_3DBLOCK) // NROM + IRQ?
+ SLOT_INTERFACE_INTERNAL("3dblock", NES_3DBLOCK) // NROM + IRQ?
SLOT_INTERFACE_INTERNAL("racermate", NES_RACERMATE) // mapper 168
SLOT_INTERFACE_INTERNAL("agci_50282", NES_AGCI_50282)
SLOT_INTERFACE_INTERNAL("dreamtech01", NES_DREAMTECH01)
@@ -283,7 +283,7 @@ static SLOT_INTERFACE_START(nes_cart)
SLOT_INTERFACE_INTERNAL("tobidase", NES_TOBIDASE) // mapper 120
SLOT_INTERFACE_INTERNAL("mmalee2", NES_MMALEE) // mapper 55?
SLOT_INTERFACE_INTERNAL("unl_2708", NES_2708) // mapper 103
- SLOT_INTERFACE_INTERNAL("unl_lh32", NES_LH32) // used by Monty no Doki Doki Daidassou FDS conversion
+ SLOT_INTERFACE_INTERNAL("unl_lh32", NES_LH32) // used by Monty no Doki Doki Daidassou FDS conversion
SLOT_INTERFACE_INTERNAL("unl_lh10", NES_LH10) // used in Fuuun Shaolin Kyo (FDS Conversion)
SLOT_INTERFACE_INTERNAL("unl_ac08", NES_AC08) // used by Green Beret FDS conversion
SLOT_INTERFACE_INTERNAL("unl_bb", NES_UNL_BB) // used by a few FDS conversions
diff --git a/src/mess/includes/partner.h b/src/mess/includes/partner.h
index 453ff22117b..a518f8bb013 100644
--- a/src/mess/includes/partner.h
+++ b/src/mess/includes/partner.h
@@ -34,7 +34,7 @@ public:
void partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom);
void partner_iomap_bank(UINT8 *rom);
void partner_bank_switch();
- required_device<ram_device> m_ram;
+ required_device<ram_device> m_ram;
};
diff --git a/src/mess/includes/pc.h b/src/mess/includes/pc.h
index 36b9e111c23..b992d20cb80 100644
--- a/src/mess/includes/pc.h
+++ b/src/mess/includes/pc.h
@@ -166,14 +166,14 @@ public:
int m_turbo_cur_val;
double m_turbo_off_speed;
double m_turbo_on_speed;
-
+
// keyboard
void init_pc_common(void (*set_keyb_int_func)(running_machine &, int));
TIMER_CALLBACK_MEMBER( pc_keyb_timer );
void pc_keyboard();
UINT8 pc_keyb_read();
void pc_keyb_set_clock(int on);
- void pc_keyb_clear();
+ void pc_keyb_clear();
void (*m_pc_keyb_int_cb)(running_machine &, int);
emu_timer *m_pc_keyb_timer;
UINT8 m_pc_keyb_data;
diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h
index b64ade497fc..a1b449994ca 100644
--- a/src/mess/includes/pcw.h
+++ b/src/mess/includes/pcw.h
@@ -28,11 +28,11 @@ class pcw_state : public driver_device
public:
pcw_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_screen(*this, "screen"),
- m_fdc(*this, "upd765"),
- m_ram(*this, RAM_TAG),
- m_beeper(*this, "beeper")
+ m_maincpu(*this, "maincpu"),
+ m_screen(*this, "screen"),
+ m_fdc(*this, "upd765"),
+ m_ram(*this, RAM_TAG),
+ m_beeper(*this, "beeper")
{ }
int m_boot;
@@ -122,7 +122,7 @@ public:
required_device<upd765a_device> m_fdc;
required_device<ram_device> m_ram;
required_device<beep_device> m_beeper;
-
+
inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
void pcw_update_interrupt_counter();
void pcw_update_irqs();
diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h
index 97f268f0c39..2881e73c6c2 100644
--- a/src/mess/includes/pet.h
+++ b/src/mess/includes/pet.h
@@ -128,9 +128,9 @@ public:
DECLARE_WRITE_LINE_MEMBER( pia2_irqb_w );
TIMER_DEVICE_CALLBACK_MEMBER( sync_tick );
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_pet );
-
+
enum
{
SEL0 = 0,
diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h
index 92618223736..12f51fbf372 100644
--- a/src/mess/includes/plus4.h
+++ b/src/mess/includes/plus4.h
@@ -120,7 +120,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( acia_irq_w );
DECLARE_WRITE_LINE_MEMBER( exp_irq_w );
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( cbm_c16 );
enum
diff --git a/src/mess/includes/tandy1t.h b/src/mess/includes/tandy1t.h
index d0751786485..4b4d83b3d93 100644
--- a/src/mess/includes/tandy1t.h
+++ b/src/mess/includes/tandy1t.h
@@ -23,18 +23,18 @@ public:
DECLARE_READ8_MEMBER( tandy1000_bank_r );
DECLARE_WRITE8_MEMBER( tandy1000_bank_w );
- int tandy1000_read_eeprom();
+ int tandy1000_read_eeprom();
void tandy1000_write_eeprom(UINT8 data);
void tandy1000_set_bios_bank();
-
- DECLARE_MACHINE_RESET(tandy1000rl);
-
+
+ DECLARE_MACHINE_RESET(tandy1000rl);
+
struct
{
UINT8 low, high;
- } m_eeprom_ee[0x40]; /* only 0 to 4 used in hx, addressing seems to allow this */
-
-private:
+ } m_eeprom_ee[0x40]; /* only 0 to 4 used in hx, addressing seems to allow this */
+
+private:
int m_eeprom_state;
int m_eeprom_clock;
UINT8 m_eeprom_oper;
diff --git a/src/mess/includes/tmc1800.h b/src/mess/includes/tmc1800.h
index 52a768dbbaa..cf7550e7066 100644
--- a/src/mess/includes/tmc1800.h
+++ b/src/mess/includes/tmc1800.h
@@ -29,7 +29,7 @@ public:
m_maincpu(*this, CDP1802_TAG),
m_cassette(*this, "cassette"),
m_rom(*this, CDP1802_TAG),
- m_run(*this, "RUN"),
+ m_run(*this, "RUN"),
m_ram(*this, RAM_TAG),
m_beeper(*this, "beeper")
{ }
diff --git a/src/mess/includes/trs80m2.h b/src/mess/includes/trs80m2.h
index 615274c8d12..a27c0e25a41 100644
--- a/src/mess/includes/trs80m2.h
+++ b/src/mess/includes/trs80m2.h
@@ -127,7 +127,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
};
class trs80m16_state : public trs80m2_state
diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h
index 67ff580b283..2d6b324778f 100644
--- a/src/mess/includes/tvc.h
+++ b/src/mess/includes/tvc.h
@@ -116,7 +116,7 @@ public:
DECLARE_READ8_MEMBER(tvc_expansion_r);
DECLARE_READ8_MEMBER(tvc_exp_id_r);
DECLARE_WRITE8_MEMBER(tvc_expint_ack_w);
-
+
DECLARE_QUICKLOAD_LOAD_MEMBER( tvc64);
tvcexp_slot_device * m_expansions[4];
diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h
index 40163a5f60d..c13ea301e06 100644
--- a/src/mess/includes/vc4000.h
+++ b/src/mess/includes/vc4000.h
@@ -90,7 +90,7 @@ public:
#else
m_joys(*this, "JOYS"),
m_config(*this, "CONFIG") { }
-#endif
+#endif
DECLARE_WRITE8_MEMBER(vc4000_sound_ctl);
DECLARE_READ8_MEMBER(vc4000_key_r);
diff --git a/src/mess/includes/vidbrain.h b/src/mess/includes/vidbrain.h
index 3c5ee381e9e..358bd6e7fd0 100644
--- a/src/mess/includes/vidbrain.h
+++ b/src/mess/includes/vidbrain.h
@@ -97,7 +97,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( ext_int_w );
DECLARE_WRITE_LINE_MEMBER( hblank_w );
DECLARE_READ8_MEMBER(memory_read_byte);
-
+
IRQ_CALLBACK_MEMBER(vidbrain_int_ack);
diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h
index b1cdd0663bc..43cc3314fd3 100644
--- a/src/mess/includes/x1.h
+++ b/src/mess/includes/x1.h
@@ -223,7 +223,7 @@ public:
int priority_mixer_pri(int color);
void cmt_command( UINT8 cmd );
UINT16 jis_convert(int kanji_addr);
-
+
DECLARE_READ8_MEMBER(memory_read_byte);
DECLARE_WRITE8_MEMBER(memory_write_byte);
DECLARE_READ8_MEMBER(io_read_byte);
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index 7e8b87bf6d7..eca1787935a 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -382,7 +382,7 @@ private:
void x68k_draw_gfx_scanline(bitmap_ind16 &bitmap, rectangle cliprect, UINT8 priority);
void x68k_draw_gfx(bitmap_ind16 &bitmap,rectangle cliprect);
void x68k_draw_sprites(bitmap_ind16 &bitmap, int priority, rectangle cliprect);
-public:
+public:
required_device<cpu_device> m_maincpu;
required_device<okim6258_device> m_okim6258;
required_device<ram_device> m_ram;
diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c
index d0d86a6baf8..c0150a1ac3f 100644
--- a/src/mess/machine/apple2gs.c
+++ b/src/mess/machine/apple2gs.c
@@ -1793,7 +1793,7 @@ WRITE8_MEMBER( apple2gs_state::apple2gs_E104xx_w ) { apple2gs_Exxxxx_w(space, of
WRITE8_MEMBER( apple2gs_state::apple2gs_E12xxx_w ) { apple2gs_Exxxxx_w(space, offset + 0x12000, data, mem_mask); }
WRITE8_MEMBER( apple2gs_state::apple2gs_slowmem_w )
-{
+{
m_slowmem[offset] = data;
if ((offset >= 0x19e00) && (offset < 0x19fff))
@@ -1810,7 +1810,7 @@ WRITE8_MEMBER( apple2gs_state::apple2gs_slowmem_w )
// Because the bank address multiplexes on the 65816 data bus, reading a memory area
// which doesn't drive the bus results in reading back the bank number.
READ8_MEMBER(apple2gs_state::apple2gs_bank_echo_r)
-{
+{
return m_echo_bank + (offset>>16);
}
diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c
index f472a09d845..9551ec5ab84 100644
--- a/src/mess/machine/bebox.c
+++ b/src/mess/machine/bebox.c
@@ -1016,7 +1016,7 @@ DRIVER_INIT_MEMBER(bebox_state,bebox)
space_0.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
space_1.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
membank("bank3")->set_base(m_ram->pointer());
-
+
/* The following is a verrrry ugly hack put in to support NetBSD for
* NetBSD. When NetBSD/bebox it does most of its work on CPU #0 and then
* lets CPU #1 go. However, it seems that CPU #1 jumps into never-never
diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c
index 89995f1a9e9..893be029851 100644
--- a/src/mess/machine/cgenie.c
+++ b/src/mess/machine/cgenie.c
@@ -171,7 +171,7 @@ void cgenie_state::machine_start()
#define FF_BGD (FF_BGD0 | FF_BGD1 | FF_BGD2)
WRITE8_MEMBER( cgenie_state::cgenie_port_ff_w )
-{
+{
int port_ff_changed = m_port_ff ^ data;
m_cassette->output(data & 0x01 ? -1.0 : 1.0 );
@@ -243,7 +243,7 @@ WRITE8_MEMBER( cgenie_state::cgenie_port_ff_w )
READ8_MEMBER( cgenie_state::cgenie_port_ff_r )
-{
+{
UINT8 data = m_port_ff & ~0x01;
data |= m_cass_bit;
@@ -264,12 +264,12 @@ int cgenie_state::cgenie_port_xx_r( int offset )
READ8_MEMBER( cgenie_state::cgenie_psg_port_a_r )
-{
+{
return m_psg_a_inp;
}
READ8_MEMBER( cgenie_state::cgenie_psg_port_b_r )
-{
+{
if( m_psg_a_out < 0xd0 )
{
/* comparator value */
@@ -314,7 +314,7 @@ READ8_MEMBER( cgenie_state::cgenie_psg_port_b_r )
}
WRITE8_MEMBER( cgenie_state::cgenie_psg_port_a_w )
-{
+{
m_psg_a_out = data;
}
@@ -396,7 +396,7 @@ WRITE8_MEMBER( cgenie_state::cgenie_data_w )
}
READ8_MEMBER( cgenie_state::cgenie_irq_status_r )
-{
+{
int result = m_irq_status;
m_irq_status &= ~(IRQ_TIMER | IRQ_FDC);
@@ -441,7 +441,7 @@ const wd17xx_interface cgenie_wd17xx_interface =
};
WRITE8_MEMBER( cgenie_state::cgenie_motor_w )
-{
+{
device_t *fdc = machine().device("wd179x");
UINT8 drive = 255;
@@ -514,7 +514,7 @@ int cgenie_state::cgenie_videoram_r( int offset )
}
WRITE8_MEMBER( cgenie_state::cgenie_videoram_w )
-{
+{
UINT8 *videoram = m_videoram;
/* write to video RAM */
if( data == videoram[offset] )
@@ -528,7 +528,7 @@ READ8_MEMBER( cgenie_state::cgenie_colorram_r )
}
WRITE8_MEMBER( cgenie_state::cgenie_colorram_w )
-{
+{
/* only bits 0 to 3 */
data &= 15;
/* nothing changed ? */
@@ -542,12 +542,12 @@ WRITE8_MEMBER( cgenie_state::cgenie_colorram_w )
}
READ8_MEMBER( cgenie_state::cgenie_fontram_r )
-{
+{
return m_fontram[offset];
}
WRITE8_MEMBER( cgenie_state::cgenie_fontram_w )
-{
+{
UINT8 *dp;
if( data == m_fontram[offset] )
diff --git a/src/mess/machine/dragon.c b/src/mess/machine/dragon.c
index c8ccf4bfa9d..2c2c900dd81 100644
--- a/src/mess/machine/dragon.c
+++ b/src/mess/machine/dragon.c
@@ -146,6 +146,6 @@ void dragon64_state::page_rom(bool romswitch)
offs_t offset = romswitch
? 0x0000 // This is the 32k mode basic(64)/boot rom(alpha)
: 0x8000; // This is the 64k mode basic(64)/basic rom(alpha)
- m_sam->set_bank_offset(1, offset); // 0x8000-0x9FFF
- m_sam->set_bank_offset(2, offset); // 0xA000-0xBFFF
+ m_sam->set_bank_offset(1, offset); // 0x8000-0x9FFF
+ m_sam->set_bank_offset(2, offset); // 0xA000-0xBFFF
}
diff --git a/src/mess/machine/europc.c b/src/mess/machine/europc.c
index 7fed6adae0c..17ccc741cd4 100644
--- a/src/mess/machine/europc.c
+++ b/src/mess/machine/europc.c
@@ -212,12 +212,12 @@ READ8_MEMBER( europc_pc_state::europc_pio_r )
reg 9:
reg a:
reg b: 0x10 written
- bit 0,1: 0 video startup mode: 0=specialadapter, 1=color40, 2=color80, 3=monochrom
- bit 2: internal video on
- bit 4: color
- bit 6,7: clock
+ bit 0,1: 0 video startup mode: 0=specialadapter, 1=color40, 2=color80, 3=monochrom
+ bit 2: internal video on
+ bit 4: color
+ bit 6,7: clock
reg c:
- bit 0,1: language/country
+ bit 0,1: language/country
reg d: xor checksum
reg e:
reg 0f: 01 status ok, when not 01 written
diff --git a/src/mess/machine/galaxy.c b/src/mess/machine/galaxy.c
index faf840d1a4b..7df71e318ab 100644
--- a/src/mess/machine/galaxy.c
+++ b/src/mess/machine/galaxy.c
@@ -62,7 +62,6 @@ IRQ_CALLBACK_MEMBER(galaxy_state::galaxy_irq_callback)
void galaxy_state::galaxy_setup_snapshot (const UINT8 * data, UINT32 size)
{
-
switch (size)
{
case GALAXY_SNAPSHOT_V1_SIZE:
diff --git a/src/mess/machine/isa_ide8.c b/src/mess/machine/isa_ide8.c
index 3cb53b9cab3..e56cc00fa2d 100644
--- a/src/mess/machine/isa_ide8.c
+++ b/src/mess/machine/isa_ide8.c
@@ -4,44 +4,44 @@
As implemented by the Vintage computer forums XT-IDE controller.
-Card has jumpers for I/O base address, and ROM base address, for the time
+Card has jumpers for I/O base address, and ROM base address, for the time
being we'll emulate an I/O base of 0x300 and a ROM base of 0xC8000.
-If the I/O address is changed then the ROM will need to be patched.
+If the I/O address is changed then the ROM will need to be patched.
The opensource bios is available from :
http://code.google.com/p/xtideuniversalbios/
The data high register is connected to a pair of latches that have the MSB of
-the 16 bit data word latched into so that 16 bit IO may be performmed, this
+the 16 bit data word latched into so that 16 bit IO may be performmed, this
involves the following :
A Data read will read the data register first, and obtain the bottom 8 bits
-of the data word, the top 8 bits will be latched at the same time these are
+of the data word, the top 8 bits will be latched at the same time these are
then read from the latch to the processor.
-A data write will first write the top 8 bits to the latch, and then the bottom
-8 bits to the normal data register, this will also transfer the top 8 bits to
+A data write will first write the top 8 bits to the latch, and then the bottom
+8 bits to the normal data register, this will also transfer the top 8 bits to
the drive.
-IDE Register XTIDE rev 1 rev 2 or modded rev 1
-Data (XTIDE Data Low) 0 0
-Error (in), Features (out) 1 8
-Sector Count 2 2
-Sector Number,
-LBA bits 0...7,
-LBA48 bits 24...31 3 10
-Low Cylinder,
-LBA bits 8...15,
-LBA48 bits 32...39 4 4
-High Cylinder,
-LBA bits 16...23,
-LBA48 bits 40...47 5 12
+IDE Register XTIDE rev 1 rev 2 or modded rev 1
+Data (XTIDE Data Low) 0 0
+Error (in), Features (out) 1 8
+Sector Count 2 2
+Sector Number,
+LBA bits 0...7,
+LBA48 bits 24...31 3 10
+Low Cylinder,
+LBA bits 8...15,
+LBA48 bits 32...39 4 4
+High Cylinder,
+LBA bits 16...23,
+LBA48 bits 40...47 5 12
Drive and Head Select,
-LBA28 bits 24...27 6 6
-Status (in), Command (out) 7 14
-XTIDE Data High 8 1
-Alternative Status (in),
-Device Control (out) 14 7
+LBA28 bits 24...27 6 6
+Status (in), Command (out) 7 14
+XTIDE Data High 8 1
+Alternative Status (in),
+Device Control (out) 14 7
***************************************************************************/
@@ -55,10 +55,10 @@ Device Control (out) 14 7
static READ8_DEVICE_HANDLER( ide8_r )
{
- ide_controller_device *ide = (ide_controller_device *) device;
- isa8_ide_device *ide8_d = downcast<isa8_ide_device *>(device->owner());
- UINT8 result = 0;
-
+ ide_controller_device *ide = (ide_controller_device *) device;
+ isa8_ide_device *ide8_d = downcast<isa8_ide_device *>(device->owner());
+ UINT8 result = 0;
+
if(offset == 0)
{
// Data register transfer low byte and latch high
@@ -72,17 +72,17 @@ static READ8_DEVICE_HANDLER( ide8_r )
else if(offset == 14)
result=ide->ide_controller_read(1, (offset & 0x07), 1);
-// logerror("%s ide8_r: offset=%d, result=%2X\n",device->machine().describe_context(),offset,result);
+// logerror("%s ide8_r: offset=%d, result=%2X\n",device->machine().describe_context(),offset,result);
return result;
}
static WRITE8_DEVICE_HANDLER( ide8_w )
{
- ide_controller_device *ide = (ide_controller_device *) device;
- isa8_ide_device *ide8_d = downcast<isa8_ide_device *>(device->owner());
-
-// logerror("%s ide8_w: offset=%d, data=%2X\n",device->machine().describe_context(),offset,data);
+ ide_controller_device *ide = (ide_controller_device *) device;
+ isa8_ide_device *ide8_d = downcast<isa8_ide_device *>(device->owner());
+
+// logerror("%s ide8_w: offset=%d, data=%2X\n",device->machine().describe_context(),offset,data);
if(offset == 0)
{
@@ -168,7 +168,7 @@ INPUT_PORTS_END
ROM_START( ide8 )
ROM_REGION(0x04000,"ide8", 0)
// XT-IDE universal bios from : http://code.google.com/p/xtideuniversalbios/
- ROM_LOAD("ide_xtl.bin", 0x00000, 0x03800, CRC(68801d16) SHA1(f3f5bed385d00ac444d85f492c879aa68a864160))
+ ROM_LOAD("ide_xtl.bin", 0x00000, 0x03800, CRC(68801d16) SHA1(f3f5bed385d00ac444d85f492c879aa68a864160))
ROM_END
//**************************************************************************
@@ -234,10 +234,10 @@ void isa8_ide_device::device_start()
void isa8_ide_device::device_reset()
{
- int base_address = ((ioport("BIOS_BASE")->read() & 0x0F) * 16 * 1024) + 0xC0000;
- int io_address = ((ioport("IO_ADDRESS")->read() & 0x0F) * 0x20) + 0x200;
- irq = (ioport("IRQ")->read() & 0x07);
-
+ int base_address = ((ioport("BIOS_BASE")->read() & 0x0F) * 16 * 1024) + 0xC0000;
+ int io_address = ((ioport("IO_ADDRESS")->read() & 0x0F) * 0x20) + 0x200;
+ irq = (ioport("IRQ")->read() & 0x07);
+
m_isa->install_rom(this, base_address, base_address + (16*1024) -1 , 0, 0, "ide8", "ide8");
m_isa->install_device(subdevice("ide"), io_address, io_address+15, 0, 0, FUNC(ide8_r), FUNC(ide8_w) );
diff --git a/src/mess/machine/isa_ide8.h b/src/mess/machine/isa_ide8.h
index c22d33e4537..67062024fc5 100644
--- a/src/mess/machine/isa_ide8.h
+++ b/src/mess/machine/isa_ide8.h
@@ -31,7 +31,7 @@ public:
void set_latch_in(UINT8 new_latch) { data_high_in=new_latch; }
UINT8 get_latch_out() { return data_high_out; }
void set_latch_out(UINT8 new_latch) { data_high_out=new_latch; }
-
+
protected:
// device-level overrides
@@ -41,11 +41,11 @@ protected:
private:
// internal state
-// bool m_is_primary;
-
+// bool m_is_primary;
+
// Interupt request
- UINT8 irq;
-
+ UINT8 irq;
+
// Data latch for high byte in and out
UINT8 data_high_in;
UINT8 data_high_out;
diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c
index dca53b8110b..09a0ee71199 100644
--- a/src/mess/machine/mac.c
+++ b/src/mess/machine/mac.c
@@ -707,7 +707,6 @@ TIMER_CALLBACK_MEMBER(mac_state::kbd_clock)
void mac_state::kbd_shift_out(int data)
{
-
if (m_kbd_comm == TRUE)
{
m_kbd_shift_reg = data;
@@ -746,7 +745,6 @@ TIMER_CALLBACK_MEMBER(mac_state::inquiry_timeout_func)
*/
void mac_state::keyboard_receive(int val)
{
-
switch (val)
{
case 0x10:
@@ -2025,7 +2023,6 @@ READ32_MEMBER(mac_state::mac_read_id)
void mac_state::mac_driver_init(model_t model)
{
-
m_overlay = 1;
m_scsi_interrupt = 0;
m_model = model;
diff --git a/src/mess/machine/md_rom.c b/src/mess/machine/md_rom.c
index 742c50f6c2f..4df8b83e3ff 100644
--- a/src/mess/machine/md_rom.c
+++ b/src/mess/machine/md_rom.c
@@ -619,7 +619,7 @@ READ16_MEMBER(md_rom_chinf3_device::read)
}
return 0;
}
-
+
// non-protection accesses
if (offset < 0x400000/2)
return m_rom[MD_ADDR(offset)];
diff --git a/src/mess/machine/nes_ave.c b/src/mess/machine/nes_ave.c
index 170a1a03938..90784e1cbe0 100644
--- a/src/mess/machine/nes_ave.c
+++ b/src/mess/machine/nes_ave.c
@@ -115,11 +115,11 @@ void nes_maxi15_device::pcb_reset()
iNES: mapper 34
- Notice that in this board the bankswitch regs
+ Notice that in this board the bankswitch regs
overlaps WRAM, so that writes to the regs are
then readable back in WRAM (WRAM is tested by
Impossible Mission II at start)
-
+
In MESS: Supported.
-------------------------------------------------*/
@@ -127,7 +127,7 @@ void nes_maxi15_device::pcb_reset()
WRITE8_MEMBER(nes_nina001_device::write_m)
{
LOG_MMC(("nina-001 write_m, offset: %04x, data: %02x\n", offset, data));
-
+
switch (offset)
{
case 0x1ffd:
diff --git a/src/mess/machine/nes_bandai.c b/src/mess/machine/nes_bandai.c
index 92ad8e81a4e..d47f45a552d 100644
--- a/src/mess/machine/nes_bandai.c
+++ b/src/mess/machine/nes_bandai.c
@@ -146,7 +146,7 @@ void nes_lz93d50_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
}
@@ -167,7 +167,7 @@ void nes_lz93d50_24c01_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_i2c_mem));
@@ -192,7 +192,7 @@ void nes_fjump2_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_reg));
}
@@ -256,14 +256,14 @@ WRITE8_MEMBER(nes_oekakids_device::nt_w)
update_chr();
}
#endif
-
+
m_nt_access[page][offset & 0x3ff] = data;
}
READ8_MEMBER(nes_oekakids_device::nt_r)
{
int page = ((offset & 0xc00) >> 10);
-
+
#if 0
if (offset < 0x1000 && (m_latch != (offset & 0x300) >> 8))
{
@@ -271,12 +271,12 @@ READ8_MEMBER(nes_oekakids_device::nt_r)
update_chr();
}
#endif
-
+
return m_nt_access[page][offset & 0x3ff];
}
void nes_oekakids_device::update_chr()
-{
+{
chr4_0(m_reg | m_latch, CHRRAM);
chr4_4(m_reg | 0x03, CHRRAM);
}
@@ -332,13 +332,13 @@ void nes_lz93d50_device::device_timer(emu_timer &timer, device_timer_id id, int
if (m_irq_enable)
{
// 16bit counter, IRQ fired when the counter goes from 1 to 0
- // after firing, the counter is *not* reloaded, but next clock
- // counter wraps around from 0 to 0xffff
+ // after firing, the counter is *not* reloaded, but next clock
+ // counter wraps around from 0 to 0xffff
if (!m_irq_count)
m_irq_count = 0xffff;
else
m_irq_count--;
-
+
if (!m_irq_count)
{
machine().device("maincpu")->execute().set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
@@ -487,14 +487,14 @@ void nes_fjump2_device::set_prg()
prg16_cdef(prg_base | 0x0f);
}
-READ8_MEMBER(nes_fjump2_device::read_m)
-{
+READ8_MEMBER(nes_fjump2_device::read_m)
+{
LOG_MMC(("fjump2 read_m, offset: %04x\n", offset));
return m_battery[offset & (m_battery_size - 1)];
}
-WRITE8_MEMBER(nes_fjump2_device::write_m)
-{
+WRITE8_MEMBER(nes_fjump2_device::write_m)
+{
LOG_MMC(("fjump2 write_m, offset: %04x, data: %02x\n", offset, data));
m_battery[offset & (m_battery_size - 1)] = data;
}
diff --git a/src/mess/machine/nes_bandai.h b/src/mess/machine/nes_bandai.h
index 73c9bf96f03..4c596843815 100644
--- a/src/mess/machine/nes_bandai.h
+++ b/src/mess/machine/nes_bandai.h
@@ -69,7 +69,7 @@ public:
protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
diff --git a/src/mess/machine/nes_bootleg.c b/src/mess/machine/nes_bootleg.c
index 4cb89629923..aeb51c9167e 100644
--- a/src/mess/machine/nes_bootleg.c
+++ b/src/mess/machine/nes_bootleg.c
@@ -238,7 +238,7 @@ void nes_smb3p_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
}
@@ -292,7 +292,7 @@ void nes_smb2j_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
}
@@ -305,7 +305,7 @@ void nes_smb2j_device::pcb_reset()
prg8_ab(0);
prg8_cd(0);
prg8_ef(9);
-
+
m_irq_enable = 0;
m_irq_count = 0;
}
@@ -315,7 +315,7 @@ void nes_smb2ja_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
}
@@ -338,7 +338,7 @@ void nes_smb2jb_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
}
@@ -903,7 +903,7 @@ READ8_MEMBER(nes_whirl2706_device::read_m)
Games: Super Mario Bros. 2 Pirate (LF36)
iNES: mapper 43
-
+
In MESS: Supported.
-------------------------------------------------*/
@@ -930,33 +930,33 @@ WRITE8_MEMBER(nes_smb2j_device::write_l)
{
LOG_MMC(("smb2j write_l, offset: %04x, data: %02x\n", offset, data));
offset += 0x100;
-
- if (offset == 0x122) // $4122
- m_irq_enable = data & 3; // maybe also m_irq_count = 0?!?
+
+ if (offset == 0x122) // $4122
+ m_irq_enable = data & 3; // maybe also m_irq_count = 0?!?
}
WRITE8_MEMBER(nes_smb2j_device::write_h)
{
LOG_MMC(("smb2j write_h, offset: %04x, data: %02x\n", offset, data));
-
- if (offset == 0x122) // $8122 too?
+
+ if (offset == 0x122) // $8122 too?
m_irq_enable = data & 3;
}
WRITE8_MEMBER(nes_smb2j_device::write_ex)
{
LOG_MMC(("smb2j write_ex, offset: %04x, data: %02x\n", offset, data));
-
+
if (offset == 2)
{
int temp = 0;
-
+
// According to hardware tests
if (data & 1)
temp = 3;
else
temp = 4 + ((data & 7) >> 1);
-
+
prg8_cd(temp);
}
}
@@ -965,11 +965,11 @@ READ8_MEMBER(nes_smb2j_device::read_l)
{
LOG_MMC(("smb2j read_l, offset: %04x\n", offset));
offset += 0x100;
-
+
if (offset >= 0x1000)
return m_prg[0x10000 + (offset & 0x0fff)];
-
- return ((offset + 0x4000) & 0xff00) >> 8; // open bus
+
+ return ((offset + 0x4000) & 0xff00) >> 8; // open bus
}
READ8_MEMBER(nes_smb2j_device::read_m)
@@ -1105,25 +1105,25 @@ WRITE8_MEMBER(nes_smb2jb_device::write_ex)
}
/*-------------------------------------------------
-
+
(UNL-)09-034A
-
+
Games: Zanac FDS conversion with two PRG chips and
- no CHRROM and Volleyball FDS conversion with two PRG
+ no CHRROM and Volleyball FDS conversion with two PRG
chips and CHRROM.
Originally dumps were marked as UNL-SMB2J pcb
-
- iNES:
-
+
+ iNES:
+
In MESS: Supported.
-
+
-------------------------------------------------*/
WRITE8_MEMBER(nes_09034a_device::write_ex)
{
LOG_MMC(("09-034a write_ex, offset: %04x, data: %02x\n", offset, data));
-
- if (offset == 7) // $4027
+
+ if (offset == 7) // $4027
m_reg = data & 1;
}
diff --git a/src/mess/machine/nes_bootleg.h b/src/mess/machine/nes_bootleg.h
index 72876f4fdcd..6f7311b8c70 100644
--- a/src/mess/machine/nes_bootleg.h
+++ b/src/mess/machine/nes_bootleg.h
@@ -110,7 +110,7 @@ public:
private:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -163,7 +163,7 @@ class nes_smb2j_device : public nes_nrom_device
public:
// construction/destruction
nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
@@ -172,13 +172,13 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ex);
virtual DECLARE_WRITE8_MEMBER(write_l);
virtual DECLARE_WRITE8_MEMBER(write_h);
-
+
virtual void pcb_reset();
-
+
private:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -203,7 +203,7 @@ public:
private:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -229,7 +229,7 @@ public:
private:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -242,14 +242,14 @@ class nes_09034a_device : public nes_nrom_device
public:
// construction/destruction
nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// device-level overrides
virtual void device_start();
virtual DECLARE_WRITE8_MEMBER(write_ex);
virtual DECLARE_READ8_MEMBER(read_m);
-
+
virtual void pcb_reset();
-
+
private:
UINT8 m_reg;
};
diff --git a/src/mess/machine/nes_camerica.c b/src/mess/machine/nes_camerica.c
index 1e7b7af7c07..cb5bc520c16 100644
--- a/src/mess/machine/nes_camerica.c
+++ b/src/mess/machine/nes_camerica.c
@@ -15,7 +15,7 @@
TODO:
- - check what causes flickering from PPU in Fire Hawk, Poogie and Big Nose (same PPU issue as Back to
+ - check what causes flickering from PPU in Fire Hawk, Poogie and Big Nose (same PPU issue as Back to
Future 2&3?)
- not all the Golden Five games work. investigate!
diff --git a/src/mess/machine/nes_cony.c b/src/mess/machine/nes_cony.c
index 40977783b4a..38bfa73ef5e 100644
--- a/src/mess/machine/nes_cony.c
+++ b/src/mess/machine/nes_cony.c
@@ -13,7 +13,7 @@
* UNL-YOKO
TODO: fix glitches and emulate properly the variants
-
+
***********************************************************************************************************/
@@ -63,7 +63,7 @@ void nes_cony_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
@@ -99,7 +99,7 @@ void nes_yoko_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
diff --git a/src/mess/machine/nes_cony.h b/src/mess/machine/nes_cony.h
index b733b09f1d5..1737f610a86 100644
--- a/src/mess/machine/nes_cony.h
+++ b/src/mess/machine/nes_cony.h
@@ -28,10 +28,10 @@ protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
UINT8 m_latch1, m_latch2;
UINT8 m_low_reg[4];
UINT8 m_reg[10];
diff --git a/src/mess/machine/nes_discrete.c b/src/mess/machine/nes_discrete.c
index fe4cab27de5..704e647b8df 100644
--- a/src/mess/machine/nes_discrete.c
+++ b/src/mess/machine/nes_discrete.c
@@ -7,15 +7,15 @@
Visit http://mamedev.org for licensing and usage restrictions.
Here we emulate the following PCBs
-
+
* PCB with IC 74x161x161x32 [mapper 70 & 152]
- * PCB with IC 74x139x74 [mapper 87]
+ * PCB with IC 74x139x74 [mapper 87]
* PCB with IC 74x377 [mapper 11]
* PCB with IC 74x161x138 [mapper 38]
-
+
TODO:
- Investigating missing inputs in Crime Busters
-
+
***********************************************************************************************************/
diff --git a/src/mess/machine/nes_irem.c b/src/mess/machine/nes_irem.c
index cf76583ebad..d00d0bd97b2 100644
--- a/src/mess/machine/nes_irem.c
+++ b/src/mess/machine/nes_irem.c
@@ -132,7 +132,7 @@ void nes_h3001_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_irq_count_latch));
@@ -162,9 +162,9 @@ void nes_h3001_device::pcb_reset()
Games: Napoleon Senki
iNES: mapper 77
-
+
This board should use 2KB of CHRRAM as NTRAM, instead
- of using directly 4-screen mirroring, but for the
+ of using directly 4-screen mirroring, but for the
moment we cheat in this way...
-------------------------------------------------*/
@@ -185,7 +185,7 @@ WRITE8_MEMBER(nes_lrog017_device::write_h)
Irem Holy Diver board emulation
iNES: mapper 78 (shared with JF-16)
-
+
-------------------------------------------------*/
WRITE8_MEMBER(nes_holydivr_device::write_h)
@@ -284,7 +284,7 @@ void nes_h3001_device::device_timer(emu_timer &timer, device_timer_id id, int pa
// after firing, the counter is *not* reloaded and does not wrap
if (m_irq_count > 0)
m_irq_count--;
-
+
if (!m_irq_count)
{
machine().device("maincpu")->execute().set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
diff --git a/src/mess/machine/nes_irem.h b/src/mess/machine/nes_irem.h
index dde443d8015..0380448092d 100644
--- a/src/mess/machine/nes_irem.h
+++ b/src/mess/machine/nes_irem.h
@@ -89,7 +89,7 @@ public:
protected:
UINT16 m_irq_count, m_irq_count_latch;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
diff --git a/src/mess/machine/nes_jaleco.c b/src/mess/machine/nes_jaleco.c
index 1b333afaee2..86b5a21ae55 100644
--- a/src/mess/machine/nes_jaleco.c
+++ b/src/mess/machine/nes_jaleco.c
@@ -210,7 +210,7 @@ void nes_ss88006_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_mmc_prg_bank));
save_item(NAME(m_mmc_vrom_bank));
save_item(NAME(m_irq_enable));
@@ -430,7 +430,7 @@ void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int
{
if (m_irq_enable)
{
- if (m_irq_mode & 0x08) // 4bits counter
+ if (m_irq_mode & 0x08) // 4bits counter
{
if (!(m_irq_count & 0x000f))
{
@@ -440,7 +440,7 @@ void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int
else
m_irq_count = (m_irq_count & 0xfff0) | ((m_irq_count & 0x000f) - 1);
}
- else if (m_irq_mode & 0x04) // 8bits counter
+ else if (m_irq_mode & 0x04) // 8bits counter
{
if (!(m_irq_count & 0x00ff))
{
@@ -450,7 +450,7 @@ void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int
else
m_irq_count = (m_irq_count & 0xff00) | ((m_irq_count & 0x00ff) - 1);
}
- else if (m_irq_mode & 0x02) // 12bits counter
+ else if (m_irq_mode & 0x02) // 12bits counter
{
if (!(m_irq_count & 0x0fff))
{
@@ -460,7 +460,7 @@ void nes_ss88006_device::device_timer(emu_timer &timer, device_timer_id id, int
else
m_irq_count = (m_irq_count & 0xf000) | ((m_irq_count & 0x0fff) - 1);
}
- else // 16bits counter
+ else // 16bits counter
{
if (!m_irq_count)
{
diff --git a/src/mess/machine/nes_jaleco.h b/src/mess/machine/nes_jaleco.h
index fd9971d324f..b621c38c2f8 100644
--- a/src/mess/machine/nes_jaleco.h
+++ b/src/mess/machine/nes_jaleco.h
@@ -147,10 +147,10 @@ protected:
UINT16 m_irq_count, m_irq_count_latch;
UINT8 m_irq_mode;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
UINT8 m_mmc_prg_bank[3];
UINT8 m_mmc_vrom_bank[8];
diff --git a/src/mess/machine/nes_kaiser.c b/src/mess/machine/nes_kaiser.c
index d1309c120ac..9194a5147a3 100644
--- a/src/mess/machine/nes_kaiser.c
+++ b/src/mess/machine/nes_kaiser.c
@@ -19,12 +19,12 @@
The Kaiser KS7057 bootleg board is emulated in nes_mmc3_clones.c
-
+
TODO:
- - FCEUmm lists more Kaiser PCBs:
- * KS7030 (for Yume Koujou Doki Doki Panic by Kaiser?)
+ - FCEUmm lists more Kaiser PCBs:
+ * KS7030 (for Yume Koujou Doki Doki Panic by Kaiser?)
* KS7031 (for Dracula II?)
- * KS7037
+ * KS7037
but there seem to be no available dumps...
***********************************************************************************************************/
@@ -134,7 +134,7 @@ void nes_ks7032_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_latch));
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
@@ -160,7 +160,7 @@ void nes_ks7017_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_latch));
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
diff --git a/src/mess/machine/nes_kaiser.h b/src/mess/machine/nes_kaiser.h
index 6df5cc27a8e..ea42f3d5a58 100644
--- a/src/mess/machine/nes_kaiser.h
+++ b/src/mess/machine/nes_kaiser.h
@@ -66,7 +66,7 @@ protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -109,7 +109,7 @@ private:
UINT16 m_irq_count;
UINT8 m_irq_status;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
diff --git a/src/mess/machine/nes_konami.c b/src/mess/machine/nes_konami.c
index 2b528600705..af98dcdb5b5 100644
--- a/src/mess/machine/nes_konami.c
+++ b/src/mess/machine/nes_konami.c
@@ -158,7 +158,7 @@ void nes_konami_vrc4_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_mode));
save_item(NAME(m_irq_prescale));
save_item(NAME(m_irq_enable));
@@ -201,7 +201,7 @@ void nes_konami_vrc7_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_mode));
save_item(NAME(m_irq_prescale));
save_item(NAME(m_irq_enable));
@@ -367,7 +367,7 @@ void nes_konami_vrc3_device::device_timer(emu_timer &timer, device_timer_id id,
{
if (m_irq_enable)
{
- if (m_irq_mode) // 8bits mode
+ if (m_irq_mode) // 8bits mode
{
if ((m_irq_count & 0x00ff) == 0xff)
{
@@ -377,7 +377,7 @@ void nes_konami_vrc3_device::device_timer(emu_timer &timer, device_timer_id id,
else
m_irq_count = (m_irq_count & 0xff00) | ((m_irq_count & 0x00ff) + 1);
}
- else // 16bits mode
+ else // 16bits mode
{
if (m_irq_count == 0xffff)
{
@@ -455,11 +455,11 @@ void nes_konami_vrc4_device::device_timer(emu_timer &timer, device_timer_id id,
{
if (m_irq_enable)
{
- if (m_irq_mode) // cycle mode
+ if (m_irq_mode) // cycle mode
irq_tick();
- else // scanline mode
+ else // scanline mode
{
- // A prescaler divides the passing CPU cycles by 114, 114, then 113 (and repeats that order).
+ // A prescaler divides the passing CPU cycles by 114, 114, then 113 (and repeats that order).
// This approximates 113+2/3 CPU cycles, which is one NTSC scanline.
// Since this is a CPU-based IRQ, though, it is triggered also during non visible scanlines...
if (m_irq_prescale < 3)
@@ -584,10 +584,10 @@ WRITE8_MEMBER(nes_konami_vrc6_device::write_h)
case 0x4000:
prg8_cd(data);
break;
- case 0x1000: // pulse 1 & global control
+ case 0x1000: // pulse 1 & global control
m_vrc6snd->write(space, add_lines>>8, data);
break;
- case 0x2000: // pulse 2
+ case 0x2000: // pulse 2
m_vrc6snd->write(space, (add_lines>>8) | 0x100, data);
break;
case 0x3000:
@@ -601,7 +601,7 @@ WRITE8_MEMBER(nes_konami_vrc6_device::write_h)
case 0x0c: set_nt_mirroring(PPU_MIRROR_HIGH); break;
}
}
- else // saw
+ else // saw
{
m_vrc6snd->write(space, (add_lines>>8) | 0x200, data);
}
diff --git a/src/mess/machine/nes_konami.h b/src/mess/machine/nes_konami.h
index 4ffee71959c..a0f3dd59afa 100644
--- a/src/mess/machine/nes_konami.h
+++ b/src/mess/machine/nes_konami.h
@@ -65,7 +65,7 @@ private:
UINT16 m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
int m_irq_mode;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -95,9 +95,9 @@ protected:
void irq_tick();
UINT16 m_irq_count, m_irq_count_latch;
int m_irq_enable, m_irq_enable_latch;
- int m_irq_mode;
+ int m_irq_mode;
int m_irq_prescale;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
diff --git a/src/mess/machine/nes_legacy.h b/src/mess/machine/nes_legacy.h
index d1265e8a26a..b4f18943a6d 100644
--- a/src/mess/machine/nes_legacy.h
+++ b/src/mess/machine/nes_legacy.h
@@ -42,10 +42,10 @@ public:
protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
UINT8 m_latch;
UINT8 *m_exram;
int m_exram_enabled;
diff --git a/src/mess/machine/nes_mmc1.c b/src/mess/machine/nes_mmc1.c
index 3f64dc8da69..4d6ddd2914c 100644
--- a/src/mess/machine/nes_mmc1.c
+++ b/src/mess/machine/nes_mmc1.c
@@ -10,10 +10,10 @@
Here we emulate the Nintendo SxROM / MMC-1 PCBs + older variants without WRAM protect bit
Known issues on specific mappers:
-
- * 001 Yoshi flashes in-game.
+
+ * 001 Yoshi flashes in-game.
* 001 Back to the Future have heavily corrupted graphics (since forever).
-
+
***********************************************************************************************************/
diff --git a/src/mess/machine/nes_mmc3.c b/src/mess/machine/nes_mmc3.c
index b5bb7b66ec8..6205f7c01b1 100644
--- a/src/mess/machine/nes_mmc3.c
+++ b/src/mess/machine/nes_mmc3.c
@@ -18,11 +18,11 @@
Known issues on specific mappers:
-
+
* 004 Mendel Palace has never worked properly
* 004 Ninja Gaiden 2 has flashing bg graphics in the second level
* 119 Pin Bot has glitches when the ball is in the upper half of the screen
-
+
***********************************************************************************************************/
diff --git a/src/mess/machine/nes_namcot.c b/src/mess/machine/nes_namcot.c
index 0c037ce7c5f..5931d6b87b8 100644
--- a/src/mess/machine/nes_namcot.c
+++ b/src/mess/machine/nes_namcot.c
@@ -147,7 +147,7 @@ void nes_namcot340_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
@@ -175,7 +175,7 @@ void nes_namcot175_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_wram_enable));
@@ -205,7 +205,7 @@ void nes_namcot163_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_count));
save_item(NAME(m_wram_protect));
@@ -408,7 +408,7 @@ void nes_namcot340_device::device_timer(emu_timer &timer, device_timer_id id, in
{
if (m_irq_enable)
{
- if (m_irq_count == 0x7fff) // counter does not wrap to 0!
+ if (m_irq_count == 0x7fff) // counter does not wrap to 0!
machine().device("maincpu")->execute().set_input_line(M6502_IRQ_LINE, ASSERT_LINE);
else
m_irq_count++;
diff --git a/src/mess/machine/nes_namcot.h b/src/mess/machine/nes_namcot.h
index cbe788322f4..fb75d59086a 100644
--- a/src/mess/machine/nes_namcot.h
+++ b/src/mess/machine/nes_namcot.h
@@ -88,10 +88,10 @@ public:
protected:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
// Namcot-163 chip contains 8K of internal ram, possibly battery backed up (not emulated yet)
// was it also present in 175 & 340 chips?
UINT8 *m_n163_ram;
diff --git a/src/mess/machine/nes_nxrom.c b/src/mess/machine/nes_nxrom.c
index 78ceee67022..c3012cb4e98 100644
--- a/src/mess/machine/nes_nxrom.c
+++ b/src/mess/machine/nes_nxrom.c
@@ -19,12 +19,12 @@
* Nintendo UN1ROM [mapper 94]
Known issues on specific mappers:
-
+
* 000 F1 Race requires more precise PPU timing. It currently has plenty of 1-line glitches.
* 003 Firehouse Rescue has flashing graphics (same PPU issue as Back to the Future 2 & 3?)
* 007 Marble Madness has small graphics corruptions
* 034 Titanic 1912 (pirate BxROM) has missing gfx (same PPU issue of many Waixing titles almost for sure)
-
+
***********************************************************************************************************/
diff --git a/src/mess/machine/nes_pirate.c b/src/mess/machine/nes_pirate.c
index fe9e5397e9e..5540f84f833 100644
--- a/src/mess/machine/nes_pirate.c
+++ b/src/mess/machine/nes_pirate.c
@@ -11,7 +11,7 @@
TODO:
- Are the scrolling glitches (check status bar) in Magic Dragon correct? FWIW, NEStopia behaves similarly
-
+
***********************************************************************************************************/
@@ -429,7 +429,7 @@ void nes_cityfight_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_prg_reg));
save_item(NAME(m_prg_mode));
save_item(NAME(m_irq_enable));
diff --git a/src/mess/machine/nes_pirate.h b/src/mess/machine/nes_pirate.h
index ad0c2b78698..c8236bdb047 100644
--- a/src/mess/machine/nes_pirate.h
+++ b/src/mess/machine/nes_pirate.h
@@ -343,10 +343,10 @@ private:
UINT8 m_prg_reg, m_prg_mode;
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
UINT8 m_mmc_vrom_bank[8];
};
diff --git a/src/mess/machine/nes_sachen.c b/src/mess/machine/nes_sachen.c
index f1739f834e0..fe0ca5b2c62 100644
--- a/src/mess/machine/nes_sachen.c
+++ b/src/mess/machine/nes_sachen.c
@@ -21,7 +21,7 @@
* Sachen 8259 [mapper 141 (A), 138 (B), 139 (C), 137 (D)]
Known issues on specific mappers:
-
+
* 133 Qi Wang starts with corrupted graphics (ingame seems better)
diff --git a/src/mess/machine/nes_slot.c b/src/mess/machine/nes_slot.c
index 9f97ab76245..781c1b76e43 100644
--- a/src/mess/machine/nes_slot.c
+++ b/src/mess/machine/nes_slot.c
@@ -1,6 +1,6 @@
/***********************************************************************************************************
-
-
+
+
Nintendo NES/FC cart emulation
(through slot devices)
@@ -9,7 +9,7 @@
0x6000-0x7fff to read_m/write_m (here are *usually* installed NVRAM & WRAM, if any)
0x8000-0xffff to write_h (reads are directed to 4 x 8K PRG banks)
Default implementations of these handlers are available here, to be rewritten by PCB-specific ones when needed.
-
+
Additional handlers are available, but have to be manually installed at machine_start
* read_ex/write_ex for address range 0x4020-0x40ff
* read_h for address range 0x8000-0xffff when a cart does some protection or address scramble before reading ROM
@@ -21,22 +21,22 @@
Plus a few of latch functions are available: ppu_latch (see MMC2), hblank_irq and scanline_irq (see e.g. MMC3),
but these might be subject to future changes when the PPU is revisited.
-
+
Notes:
- - Differently from later systems (like SNES or MD), it is uncommon to find PRG ROMs of NES games which are not a
+ - Differently from later systems (like SNES or MD), it is uncommon to find PRG ROMs of NES games which are not a
power of 2K, so we do not perform any mirroring by default.
- A bunch of pcb types, though, come with 1.5MB of PRG (some Waixing translations) or with multiple PRG chips
- having peculiar size (32K + 16K, 32K + 8K, 32K + 2K). Hence, if such a configuration is detected, we provide
- a m_prg_bank_map array to handle internally PRG mirroring up to the next power of 2K, as long as the size is
- a multiple of 8K (i.e. the unit chunk for standard PRG).
- For the case of PRG chips which are not-multiple of 8K (e.g. UNL-MARIO2-MALEE pcb), the handling has to be
+ A bunch of pcb types, though, come with 1.5MB of PRG (some Waixing translations) or with multiple PRG chips
+ having peculiar size (32K + 16K, 32K + 8K, 32K + 2K). Hence, if such a configuration is detected, we provide
+ a m_prg_bank_map array to handle internally PRG mirroring up to the next power of 2K, as long as the size is
+ a multiple of 8K (i.e. the unit chunk for standard PRG).
+ For the case of PRG chips which are not-multiple of 8K (e.g. UNL-MARIO2-MALEE pcb), the handling has to be
handled in the pcb-specific code!
- Our open bus emulation is very sketchy, by simply returning the higher 8bits of the accessed address. This seems
enough for most games (only two sets have issues with this). A slightly better implementation is almost ready
to fix these two remaining cases, but I plan to revisit the whole implementation in an accurate way at a later
stage
- Bus conflict is implemented based on latest tests by Blargg. There is some uncertainty about AxROM behavior
- (some AOROM pcbs suffers from bus conflict, some do not... since no AOROM game is known to glitch due to lack
+ (some AOROM pcbs suffers from bus conflict, some do not... since no AOROM game is known to glitch due to lack
of bus conflict it seems safe to emulate the board without bus conflict, but eventually it would be good to
differentiate the real variants)
@@ -44,20 +44,20 @@
Many information about the mappers/pcbs come from the wonderful doc written by Disch.
Current info (when used) are based on v0.6.1 of his docs.
You can find the latest version of the doc at http://www.romhacking.net/docs/362/
-
- A lot of details have been based on the researches carried on at NesDev forums (by Blargg, Quietust and many more)
+
+ A lot of details have been based on the researches carried on at NesDev forums (by Blargg, Quietust and many more)
and collected on the NesDev Wiki http://wiki.nesdev.com/
-
+
Particular thanks go to
- Martin Freij for his work on NEStopia
- Cah4e3 for his efforts on FCEUMM and the reverse engineering of pirate boards
- BootGod, lidnariq and naruko for the PCB tests which made possible
-
+
***********************************************************************************************************/
/*****************************************************************************************
-
+
A few Mappers suffer of hardware conflict: original dumpers have used the same mapper number for more than
a kind of boards. In these cases (and only in these cases) we exploit nes.hsi to set up accordingly
emulation. Games which requires this hack are the following:
@@ -69,14 +69,14 @@
* 113 - HES 6-in-1 requires mirroring (check Bookyman playfield), while other games break with this (check AV Soccer)
* 153 - Famicom Jump II uses a different board (or the same in a very different way)
* 242 - DQ8 has no mirroring (missing graphics is due to other reasons though)
-
+
crc_hacks have been added also to handle a few wiring settings which would require submappers:
* CHR protection pins for mapper 185
* VRC-2, VRC-4 and VRC-6 line wiring
-
+
Remember that the MMC # does not equal the mapper #. In particular, Mapper 4 is
in fact MMC3, Mapper 9 is MMC2 and Mapper 10 is MMC4. Makes perfect sense, right?
-
+
****************************************************************************************/
@@ -170,14 +170,14 @@ void device_nes_cart_interface::prg_alloc(running_machine &machine, size_t size)
m_prg_mask = ((m_prg_chunks << 1) - 1);
-// printf("first mask %x!\n", m_prg_mask);
+// printf("first mask %x!\n", m_prg_mask);
if ((m_prg_chunks << 1) & m_prg_mask)
{
int mask_bits = 0, temp = (m_prg_chunks << 1), mapsize;
// contrary to what happens with later systems, like e.g. SNES or MD,
// only half a dozen of NES carts have PRG which is not a power of 2
// so we use this bank_map only as an exception
-// printf("uneven rom!\n");
+// printf("uneven rom!\n");
// 1. redefine mask as (next power of 2)-1
for (; temp; )
@@ -186,7 +186,7 @@ void device_nes_cart_interface::prg_alloc(running_machine &machine, size_t size)
temp >>= 1;
}
m_prg_mask = (1 << mask_bits) - 1;
-// printf("new mask %x!\n", m_prg_mask);
+// printf("new mask %x!\n", m_prg_mask);
mapsize = (1 << mask_bits)/2;
// 2. create a bank_map for banks in the range mask/2 -> mask
@@ -196,7 +196,7 @@ void device_nes_cart_interface::prg_alloc(running_machine &machine, size_t size)
int j;
for (j = mapsize; j < (m_prg_chunks << 1); j++)
m_prg_bank_map[j - mapsize] = j;
-
+
while (j % mapsize)
{
int k = 0, repeat_banks;
@@ -207,14 +207,14 @@ void device_nes_cart_interface::prg_alloc(running_machine &machine, size_t size)
m_prg_bank_map[(j - mapsize) + l] = m_prg_bank_map[(j - mapsize) + l - repeat_banks];
j += repeat_banks;
}
-
+
// check bank map!
-// for (int i = 0; i < mapsize; i++)
-// {
-// printf("bank %3d = %3d\t", i, m_prg_bank_map[i]);
-// if ((i%8) == 7)
-// printf("\n");
-// }
+// for (int i = 0; i < mapsize; i++)
+// {
+// printf("bank %3d = %3d\t", i, m_prg_bank_map[i]);
+// if ((i%8) == 7)
+// printf("\n");
+// }
}
}
}
@@ -275,10 +275,10 @@ inline int device_nes_cart_interface::prg_8k_bank_num(int bank_8k)
return bank_8k;
// case 2: otherwise return a mirror using the bank_map!
-// UINT8 temp = bank_8k;
+// UINT8 temp = bank_8k;
bank_8k &= m_prg_mask;
bank_8k -= (m_prg_mask/2 + 1);
-// printf("bank: accessed %x (top: %x), returned %x\n", temp, (m_prg_chunks << 1) - 1, m_prg_bank_map[bank_8k]);
+// printf("bank: accessed %x (top: %x), returned %x\n", temp, (m_prg_chunks << 1) - 1, m_prg_bank_map[bank_8k]);
return m_prg_bank_map[bank_8k];
}
@@ -289,7 +289,7 @@ inline void device_nes_cart_interface::update_prg_banks(int prg_bank_start, int
assert(prg_bank >= 0);
assert(prg_bank < ARRAY_LENGTH(m_prg_bank));
assert(prg_bank < ARRAY_LENGTH(m_prg_bank_mem));
-
+
m_prg_bank_mem[prg_bank]->set_entry(m_prg_bank[prg_bank]);
}
}
@@ -299,7 +299,7 @@ void device_nes_cart_interface::prg32(int bank)
/* if there is only 16k PRG, return */
if (!(m_prg_chunks >> 1))
return;
-
+
/* assumes that bank references a 32k chunk */
bank = prg_8k_bank_num(bank * 4);
@@ -314,7 +314,7 @@ void device_nes_cart_interface::prg16_89ab(int bank)
{
/* assumes that bank references a 16k chunk */
bank = prg_8k_bank_num(bank * 2);
-
+
m_prg_bank[0] = bank + 0;
m_prg_bank[1] = bank + 1;
update_prg_banks(0, 1);
@@ -324,7 +324,7 @@ void device_nes_cart_interface::prg16_cdef(int bank)
{
/* assumes that bank references a 16k chunk */
bank = prg_8k_bank_num(bank * 2);
-
+
m_prg_bank[2] = bank + 0;
m_prg_bank[3] = bank + 1;
update_prg_banks(2, 3);
@@ -334,7 +334,7 @@ void device_nes_cart_interface::prg8_89(int bank)
{
/* assumes that bank references an 8k chunk */
bank = prg_8k_bank_num(bank);
-
+
m_prg_bank[0] = bank;
update_prg_banks(0, 0);
}
@@ -343,7 +343,7 @@ void device_nes_cart_interface::prg8_ab(int bank)
{
/* assumes that bank references an 8k chunk */
bank = prg_8k_bank_num(bank);
-
+
m_prg_bank[1] = bank;
update_prg_banks(1, 1);
}
@@ -352,7 +352,7 @@ void device_nes_cart_interface::prg8_cd(int bank)
{
/* assumes that bank references an 8k chunk */
bank = prg_8k_bank_num(bank);
-
+
m_prg_bank[2] = bank;
update_prg_banks(2, 2);
}
@@ -361,7 +361,7 @@ void device_nes_cart_interface::prg8_ef(int bank)
{
/* assumes that bank references an 8k chunk */
bank = prg_8k_bank_num(bank);
-
+
m_prg_bank[3] = bank;
update_prg_banks(3, 3);
}
@@ -370,10 +370,10 @@ void device_nes_cart_interface::prg8_ef(int bank)
void device_nes_cart_interface::prg8_x(int start, int bank)
{
assert(start < 4);
-
+
/* assumes that bank references an 8k chunk */
bank = prg_8k_bank_num(bank);
-
+
m_prg_bank[start] = bank;
update_prg_banks(start, start);
}
@@ -386,7 +386,7 @@ inline void device_nes_cart_interface::chr_sanity_check( int source )
{
if (source == CHRRAM && m_vram == NULL)
fatalerror("CHRRAM bankswitch with no VRAM\n");
-
+
if (source == CHRROM && m_vrom == NULL)
fatalerror("CHRROM bankswitch with no VROM\n");
}
@@ -394,7 +394,7 @@ inline void device_nes_cart_interface::chr_sanity_check( int source )
void device_nes_cart_interface::chr8(int bank, int source)
{
chr_sanity_check(source);
-
+
if (source == CHRRAM)
{
bank &= (m_vram_chunks - 1);
@@ -420,7 +420,7 @@ void device_nes_cart_interface::chr8(int bank, int source)
void device_nes_cart_interface::chr4_x(int start, int bank, int source)
{
chr_sanity_check(source);
-
+
if (source == CHRRAM)
{
bank &= ((m_vram_chunks << 1) - 1);
@@ -446,7 +446,7 @@ void device_nes_cart_interface::chr4_x(int start, int bank, int source)
void device_nes_cart_interface::chr2_x(int start, int bank, int source)
{
chr_sanity_check(source);
-
+
if (source == CHRRAM)
{
bank &= ((m_vram_chunks << 2) - 1);
@@ -472,7 +472,7 @@ void device_nes_cart_interface::chr2_x(int start, int bank, int source)
void device_nes_cart_interface::chr1_x(int start, int bank, int source)
{
chr_sanity_check(source);
-
+
if (source == CHRRAM)
{
bank &= ((m_vram_chunks << 3) - 1);
@@ -517,16 +517,16 @@ void device_nes_cart_interface::set_nt_page(int page, int source, int bank, int
base_ptr = m_ciram;
break;
}
-
+
page &= 3; /* mask down to the 4 logical pages */
m_nt_src[page] = source;
-
+
if (base_ptr != NULL)
{
m_nt_orig[page] = bank * 0x400;
m_nt_access[page] = base_ptr + m_nt_orig[page];
}
-
+
m_nt_writable[page] = writable;
}
@@ -541,21 +541,21 @@ void device_nes_cart_interface::set_nt_mirroring(int mirroring)
set_nt_page(2, CIRAM, 0, 1);
set_nt_page(3, CIRAM, 1, 1);
break;
-
+
case PPU_MIRROR_HORZ:
set_nt_page(0, CIRAM, 0, 1);
set_nt_page(1, CIRAM, 0, 1);
set_nt_page(2, CIRAM, 1, 1);
set_nt_page(3, CIRAM, 1, 1);
break;
-
+
case PPU_MIRROR_HIGH:
set_nt_page(0, CIRAM, 1, 1);
set_nt_page(1, CIRAM, 1, 1);
set_nt_page(2, CIRAM, 1, 1);
set_nt_page(3, CIRAM, 1, 1);
break;
-
+
case PPU_MIRROR_LOW:
set_nt_page(0, CIRAM, 0, 1);
set_nt_page(1, CIRAM, 0, 1);
@@ -570,7 +570,7 @@ void device_nes_cart_interface::set_nt_mirroring(int mirroring)
set_nt_page(2, CART_NTRAM, 2, 1);
set_nt_page(3, CART_NTRAM, 3, 1);
break;
-
+
case PPU_MIRROR_NONE:
default:
set_nt_page(0, CIRAM, 0, 1);
@@ -596,7 +596,7 @@ UINT8 device_nes_cart_interface::hi_access_rom(UINT32 offset)
// Helper function for the few mappers subject to bus conflict at write.
// Tests by blargg showed that in many of the boards suffering of CPU/ROM
-// conflicts the behaviour can be accurately emulated by writing not the
+// conflicts the behaviour can be accurately emulated by writing not the
// original data, but data & rom[offset]
UINT8 device_nes_cart_interface::account_bus_conflict(UINT32 offset, UINT8 data)
{
@@ -604,7 +604,7 @@ UINT8 device_nes_cart_interface::account_bus_conflict(UINT32 offset, UINT8 data)
// so we allow to set m_bus_conflict to FALSE at loading time when necessary
if (m_bus_conflict)
return data & hi_access_rom(offset);
- else
+ else
return data;
}
@@ -616,7 +616,7 @@ UINT8 device_nes_cart_interface::account_bus_conflict(UINT32 offset, UINT8 data)
WRITE8_MEMBER(device_nes_cart_interface::chr_w)
{
int bank = offset >> 10;
-
+
if (m_chr_src[bank] == CHRRAM)
m_chr_access[bank][offset & 0x3ff] = data;
}
@@ -631,10 +631,10 @@ READ8_MEMBER(device_nes_cart_interface::chr_r)
WRITE8_MEMBER(device_nes_cart_interface::nt_w)
{
int page = ((offset & 0xc00) >> 10);
-
+
if (!m_nt_writable[page])
return;
-
+
m_nt_access[page][offset & 0x3ff] = data;
}
@@ -649,40 +649,40 @@ READ8_MEMBER(device_nes_cart_interface::nt_r)
// Base memory accessors (emulating open bus
// behaviour and/or WRAM accesses)
// Open bus emulation is defective, but it should
-// be enough for the few cases known to rely on
+// be enough for the few cases known to rely on
// this (more in the comments at the top of the
// source)
//-------------------------------------------------
-READ8_MEMBER(device_nes_cart_interface::read_l)
-{
- return ((offset + 0x4100) & 0xff00) >> 8; // open bus
+READ8_MEMBER(device_nes_cart_interface::read_l)
+{
+ return ((offset + 0x4100) & 0xff00) >> 8; // open bus
}
-READ8_MEMBER(device_nes_cart_interface::read_m)
-{
+READ8_MEMBER(device_nes_cart_interface::read_m)
+{
if (m_battery)
return m_battery[offset & (m_battery_size - 1)];
if (m_prgram)
return m_prgram[offset & (m_prgram_size - 1)];
-
- return ((offset + 0x6000) & 0xff00) >> 8; // open bus
+
+ return ((offset + 0x6000) & 0xff00) >> 8; // open bus
}
-WRITE8_MEMBER(device_nes_cart_interface::write_l)
-{
+WRITE8_MEMBER(device_nes_cart_interface::write_l)
+{
}
-WRITE8_MEMBER(device_nes_cart_interface::write_m)
-{
+WRITE8_MEMBER(device_nes_cart_interface::write_m)
+{
if (m_battery)
m_battery[offset & (m_battery_size - 1)] = data;
if (m_prgram)
m_prgram[offset & (m_prgram_size - 1)] = data;
}
-WRITE8_MEMBER(device_nes_cart_interface::write_h)
-{
+WRITE8_MEMBER(device_nes_cart_interface::write_h)
+{
}
@@ -743,11 +743,11 @@ void device_nes_cart_interface::pcb_start(running_machine &machine, UINT8 *ciram
m_prg_bank_mem[i]->set_entry(i);
m_prg_bank[i] = i;
}
-
+
// Setup CHR
m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM;
chr8(0, m_chr_source);
-
+
// Setup NT
m_ciram = ciram_ptr;
@@ -846,9 +846,9 @@ void nes_cart_slot_device::pcb_reset()
/*-------------------------------------------------
-
+
Load from xml list and identify the required slot device
-
+
-------------------------------------------------*/
/* Include emulation of NES PCBs for softlist */
@@ -856,9 +856,9 @@ void nes_cart_slot_device::pcb_reset()
/*-------------------------------------------------
-
+
Load .unf files (UNIF boards) and identify the required slot device
-
+
-------------------------------------------------*/
/* Include emulation of UNIF Boards for .unf files */
@@ -866,9 +866,9 @@ void nes_cart_slot_device::pcb_reset()
/*-------------------------------------------------
-
+
Load .nes files (iNES mappers) and identify the required slot devices
-
+
-------------------------------------------------*/
/* Include emulation of iNES Mappers for .nes files */
@@ -975,10 +975,10 @@ const char * nes_cart_slot_device::get_default_card_software(const machine_confi
if ((ROM[0] == 'U') && (ROM[1] == 'N') && (ROM[2] == 'I') && (ROM[3] == 'F'))
slot_string = get_default_card_unif(ROM, len);
-
+
global_free(ROM);
clear();
-
+
return slot_string;
}
else
@@ -1058,10 +1058,9 @@ WRITE8_MEMBER(nes_cart_slot_device::write_ex)
//-------------------------------------------------
void nes_partialhash(hash_collection &dest, const unsigned char *data,
- unsigned long length, const char *functions)
+ unsigned long length, const char *functions)
{
if (length <= 16)
return;
dest.compute(&data[16], length - 16, functions);
}
-
diff --git a/src/mess/machine/nes_slot.h b/src/mess/machine/nes_slot.h
index 83e0353f7c1..ae052789887 100644
--- a/src/mess/machine/nes_slot.h
+++ b/src/mess/machine/nes_slot.h
@@ -12,14 +12,14 @@
enum
{
STD_NROM = 0,
- STD_AXROM, STD_AMROM, STD_BXROM,
+ STD_AXROM, STD_AMROM, STD_BXROM,
STD_CNROM, STD_CPROM,
STD_EXROM, STD_FXROM, STD_GXROM,
STD_HKROM, STD_PXROM,
STD_SXROM, STD_TXROM, STD_TXSROM,
- STD_TKROM, STD_TQROM,
+ STD_TKROM, STD_TQROM,
STD_UXROM, STD_UN1ROM, UXROM_CC,
- HVC_FAMBASIC, NES_QJ, PAL_ZZ, STD_EVENT,
+ HVC_FAMBASIC, NES_QJ, PAL_ZZ, STD_EVENT,
STD_SXROM_A, STD_SOROM, STD_SOROM_A,
/* Discrete components boards (by various manufacturer) */
DIS_74X161X138, DIS_74X139X74,
@@ -77,7 +77,7 @@ enum
TXC_22211, TXC_DUMARACING, TXC_MJBLOCK,
TXC_COMMANDOS, TXC_TW, TXC_STRIKEW,
/* Multigame Carts */
- BMC_64IN1NR, BMC_190IN1, BMC_A65AS,
+ BMC_64IN1NR, BMC_190IN1, BMC_A65AS,
BMC_HIK8IN1, BMC_NOVEL1, BMC_NOVEL2, BMC_S24IN1SC03, BMC_T262,
BMC_WS, BMC_SUPERBIG_7IN1, BMC_SUPERHIK_4IN1, BMC_BALLGAMES_11IN1,
BMC_MARIOPARTY_7IN1, BMC_GOLD_7IN1, BMC_SUPER_700IN1, BMC_FAMILY_4646,
@@ -85,10 +85,10 @@ enum
BMC_15IN1, BMC_SUPERHIK_300IN1, BMC_SUPERGUN_20IN1,
BMC_GOLDENCARD_6IN1, BMC_72IN1, BMC_SUPER_42IN1, BMC_76IN1,
BMC_31IN1, BMC_22GAMES, BMC_20IN1, BMC_110IN1,
- BMC_70IN1, BMC_800IN1, BMC_1200IN1,
+ BMC_70IN1, BMC_800IN1, BMC_1200IN1,
BMC_GKA, BMC_GKB, BMC_VT5201, BMC_BENSHIENG, BMC_810544,
BMC_NTD_03, BMC_G63IN1, BMC_FK23C, BMC_FK23CA, BMC_PJOY84,
- BMC_POWERFUL_255, BMC_11160, BMC_G146, BMC_8157, BMC_830118C,
+ BMC_POWERFUL_255, BMC_11160, BMC_G146, BMC_8157, BMC_830118C,
BMC_411120C, BMC_GOLD150, BMC_GOLD260, BMC_CH001, BMC_SUPER22,
BMC_12IN1, BMC_4IN1RESET, BMC_42IN1RESET,
/* Unlicensed */
@@ -97,7 +97,7 @@ enum
UNL_UXROM, UNL_MK2, UNL_XIAOZY, UNL_KOF96,
UNL_SF3, UNL_RACERMATE, UNL_EDU2K, UNL_LH32, UNL_LH10,
UNL_STUDYNGAME, UNL_603_5052, UNL_H2288, UNL_2708,
- UNL_MALISB, UNL_BB, UNL_AC08, UNL_A9746, UNL_WORLDHERO,
+ UNL_MALISB, UNL_BB, UNL_AC08, UNL_A9746, UNL_WORLDHERO,
UNL_43272, UNL_TF1201, UNL_CITYFIGHT,
/* Bootleg boards */
BTL_SMB2JA, BTL_MARIOBABY, BTL_AISENSHINICOL, BTL_TOBIDASE,
@@ -108,7 +108,7 @@ enum
MAGICSERIES_MD, KASING_BOARD, FUTUREMEDIA_BOARD, FUKUTAKE_BOARD, SOMARI_SL12,
HENGG_SRICH, HENGG_XHZS, HENGG_SHJY3, SUBOR_TYPE0, SUBOR_TYPE1,
KAISER_KS7058, KAISER_KS7032, KAISER_KS7022, KAISER_KS7017, KAISER_KS7012, KAISER_KS7013B, KAISER_KS202,
- CNE_DECATHLON, CNE_FSB, CNE_SHLZ, CONY_BOARD, YOKO_BOARD,
+ CNE_DECATHLON, CNE_FSB, CNE_SHLZ, CONY_BOARD, YOKO_BOARD,
RCM_GS2015, RCM_GS2004, RCM_GS2013, RCM_TF9IN1, RCM_3DBLOCK,
WAIXING_TYPE_A, WAIXING_TYPE_A1, WAIXING_TYPE_B, WAIXING_TYPE_C, WAIXING_TYPE_D,
WAIXING_TYPE_E, WAIXING_TYPE_F, WAIXING_TYPE_G, WAIXING_TYPE_H, WAIXING_TYPE_H1,
@@ -164,7 +164,7 @@ public:
virtual DECLARE_READ8_MEMBER(read_h) { return 0xff; }
virtual DECLARE_READ8_MEMBER(read_ex) { return 0xff; }
virtual DECLARE_WRITE8_MEMBER(write_l);
- virtual DECLARE_WRITE8_MEMBER(write_m);
+ virtual DECLARE_WRITE8_MEMBER(write_m);
virtual DECLARE_WRITE8_MEMBER(write_h);
virtual DECLARE_WRITE8_MEMBER(write_ex) { }
@@ -188,7 +188,7 @@ public:
bool get_trainer() { return m_has_trainer; }
void set_trainer(bool val) { m_has_trainer = val; }
- void set_ce(int mask, int state) { m_ce_mask = mask; m_ce_state = state; }
+ void set_ce(int mask, int state) { m_ce_mask = mask; m_ce_state = state; }
void set_vrc_lines(int PRG_A, int PRG_B, int CHR) { m_vrc_ls_prg_a = PRG_A; m_vrc_ls_prg_b = PRG_B; m_vrc_ls_chr = CHR; }
void set_x1_005_alt(bool val) { m_x1_005_alt_mirroring = val; }
void set_bus_conflict(bool val) { m_bus_conflict = val; }
@@ -211,12 +211,12 @@ public:
virtual void hblank_irq(int scanline, int vblank, int blanked) {}
virtual void scanline_irq(int scanline, int vblank, int blanked) {}
- virtual void pcb_reset() {} // many pcb expect specific PRG/CHR banking at start
+ virtual void pcb_reset() {} // many pcb expect specific PRG/CHR banking at start
void pcb_start(running_machine &machine, UINT8 *ciram_ptr);
void pcb_reg_postload(running_machine &machine);
void nes_banks_restore();
- UINT8 hi_access_rom(UINT32 offset); // helper ROM access for a bunch of PCB reading 0x8000-0xffff for protection too
+ UINT8 hi_access_rom(UINT32 offset); // helper ROM access for a bunch of PCB reading 0x8000-0xffff for protection too
UINT8 account_bus_conflict(UINT32 offset, UINT8 data);
protected:
@@ -228,13 +228,13 @@ protected:
UINT8 *m_vram;
UINT8 *m_battery;
UINT8 *m_ciram;
-
+
UINT32 m_prg_size;
UINT32 m_prgram_size;
UINT32 m_vrom_size;
UINT32 m_vram_size;
UINT32 m_battery_size;
-
+
// these are specific of some boards but must be accessible from the driver
// E.g. additional save ram for HKROM, X1-005 & X1-017 boards, or ExRAM for MMC5
UINT8 *m_mapper_sram;
@@ -247,10 +247,10 @@ protected:
int m_vrc_ls_prg_a;
int m_vrc_ls_prg_b;
int m_vrc_ls_chr;
-
+
int m_mirroring;
bool m_pcb_ctrl_mirror, m_four_screen_vram, m_has_trainer;
- bool m_x1_005_alt_mirroring; // temp hack for two kind of mirroring in Taito X1-005 boards (to be replaced with pin checking)
+ bool m_x1_005_alt_mirroring; // temp hack for two kind of mirroring in Taito X1-005 boards (to be replaced with pin checking)
bool m_bus_conflict;
// PRG
@@ -271,12 +271,12 @@ protected:
void prg8_ef(int bank);
void prg8_x(int start, int bank);
-
+
// CHR
- int m_chr_source; // global source for the 8 VROM banks
+ int m_chr_source; // global source for the 8 VROM banks
inline void chr_sanity_check(int source);
- //these were previously called chr_map. they are a quick banking structure,
+ //these were previously called chr_map. they are a quick banking structure,
//because some of these change multiple times per scanline!
int m_chr_src[8]; //defines source of base pointer
int m_chr_orig[8]; //defines offset of 0x400 byte segment at base pointer
@@ -305,7 +305,7 @@ protected:
void chr1_6(int bank, int source) { chr1_x(6, bank, source); };
void chr1_7(int bank, int source) { chr1_x(7, bank, source); };
-
+
// NameTable & Mirroring
//these were previously called nt_page. they are a quick banking structure for a maximum of 4K of RAM/ROM/ExRAM
int m_nt_src[4];
@@ -375,7 +375,7 @@ public:
virtual DECLARE_WRITE8_MEMBER(write_ex);
int get_pcb_id() { return m_pcb_id; };
-
+
void pcb_start(UINT8 *ciram_ptr);
void pcb_reset();
diff --git a/src/mess/machine/nes_somari.c b/src/mess/machine/nes_somari.c
index aa7e6d54b3a..65c8dc1a9fe 100644
--- a/src/mess/machine/nes_somari.c
+++ b/src/mess/machine/nes_somari.c
@@ -181,7 +181,7 @@ WRITE8_MEMBER(nes_somari_device::mmc1_w)
update_mirror();
update_prg();
update_chr();
-
+
m_count = 0;
}
}
@@ -287,7 +287,7 @@ void nes_somari_device::update_prg()
break;
case SOMARI_MMC3_MODE:
{
- UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
+ UINT8 prg_flip = (m_latch & 0x40) ? 2 : 0;
prg8_x(0, m_mmc_prg_bank[0 ^ prg_flip]);
prg8_x(1, m_mmc_prg_bank[1]);
prg8_x(2, m_mmc_prg_bank[2 ^ prg_flip]);
@@ -295,7 +295,7 @@ void nes_somari_device::update_prg()
}
break;
case SOMARI_MMC1_MODE:
-// case SOMARI_MMC1_MODE_AGAIN:
+// case SOMARI_MMC1_MODE_AGAIN:
{
UINT8 prg_offset = m_mmc1_reg[1] & 0x10;
@@ -341,7 +341,7 @@ void nes_somari_device::update_chr()
}
break;
case SOMARI_MMC1_MODE:
-// case SOMARI_MMC1_MODE_AGAIN:
+// case SOMARI_MMC1_MODE_AGAIN:
if (BIT(m_mmc1_reg[0], 4))
{
chr4_0(m_mmc1_reg[1] & 0x1f, CHRROM);
@@ -364,7 +364,7 @@ void nes_somari_device::update_mirror()
set_nt_mirroring(m_mmc3_mirror_reg ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
break;
case SOMARI_MMC1_MODE:
-// case SOMARI_MMC1_MODE_AGAIN:
+// case SOMARI_MMC1_MODE_AGAIN:
switch (m_mmc1_reg[0] & 0x03)
{
case 0x00: set_nt_mirroring(PPU_MIRROR_LOW); break;
diff --git a/src/mess/machine/nes_sunsoft.c b/src/mess/machine/nes_sunsoft.c
index f86d1c71a9b..561cc50a392 100644
--- a/src/mess/machine/nes_sunsoft.c
+++ b/src/mess/machine/nes_sunsoft.c
@@ -18,7 +18,7 @@
TODO:
- check 1-line glitches due to IRQ in Sunsoft-3
-
+
***********************************************************************************************************/
@@ -124,7 +124,7 @@ void nes_sunsoft_3_device::device_start()
common_start();
irq_timer = timer_alloc(TIMER_IRQ);
irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+
save_item(NAME(m_irq_enable));
save_item(NAME(m_irq_toggle));
save_item(NAME(m_irq_count));
@@ -169,8 +169,8 @@ void nes_sunsoft_fme7_device::device_start()
irq_timer = timer_alloc(TIMER_IRQ);
// this has to be hardcoded because some some scanline code only suits NTSC... it will be fixed with PPU rewrite
irq_timer->adjust(attotime::zero, 0, attotime::from_hz((21477272.724 / 12)));
-// irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
-
+// irq_timer->adjust(attotime::zero, 0, machine().device<cpu_device>("maincpu")->cycles_to_attotime(1));
+
save_item(NAME(m_wram_bank));
save_item(NAME(m_latch));
save_item(NAME(m_irq_enable));
diff --git a/src/mess/machine/nes_sunsoft.h b/src/mess/machine/nes_sunsoft.h
index 5219e866cdd..1bc5f007cb0 100644
--- a/src/mess/machine/nes_sunsoft.h
+++ b/src/mess/machine/nes_sunsoft.h
@@ -55,7 +55,7 @@ public:
private:
UINT16 m_irq_count;
int m_irq_enable, m_irq_toggle;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
};
@@ -106,10 +106,10 @@ public:
private:
UINT16 m_irq_count;
int m_irq_enable;
-
+
static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
-
+
UINT8 m_latch;
UINT8 m_wram_bank;
};
diff --git a/src/mess/machine/nes_taito.c b/src/mess/machine/nes_taito.c
index 6b00eba446c..600d039095a 100644
--- a/src/mess/machine/nes_taito.c
+++ b/src/mess/machine/nes_taito.c
@@ -13,11 +13,11 @@
* Taito TC0190FMC+PAL16R4 [mapper 48]
* Taito X1-005 [mapper 80, 207]
* Taito X1-017 [mapper 82]
-
+
TODO:
- Akira does not work. Investigate why!
- Don Doko Don 2 freezes when you get to the first boss
-
+
***********************************************************************************************************/
diff --git a/src/mess/machine/nes_txc.c b/src/mess/machine/nes_txc.c
index aef62df61e7..e0c501fc4de 100644
--- a/src/mess/machine/nes_txc.c
+++ b/src/mess/machine/nes_txc.c
@@ -14,8 +14,8 @@
* TXC Mahjong Block [mapper 172]
* TXC Strike Wolf [mapper 36]
* TXC Commandos (and many more) [mapper 241]
-
- TODO:
+
+ TODO:
- Does Commandos indeed use this board?
diff --git a/src/mess/machine/nes_waixing.c b/src/mess/machine/nes_waixing.c
index 0d44ab924ae..0b73da9b8c7 100644
--- a/src/mess/machine/nes_waixing.c
+++ b/src/mess/machine/nes_waixing.c
@@ -10,7 +10,7 @@
Here we emulate the various PCBs used by Waixing for its games
TODO:
- - investigate the PPU issues causing some games not to have sprites (e.g. some games using mappers 15, 164,
+ - investigate the PPU issues causing some games not to have sprites (e.g. some games using mappers 15, 164,
242, 249)
***********************************************************************************************************/
diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c
index d6c6a5f9d90..6f2ac3ed030 100644
--- a/src/mess/machine/pc.c
+++ b/src/mess/machine/pc.c
@@ -1407,7 +1407,7 @@ void pc_state::init_pc_common(void (*set_keyb_int_func)(running_machine &, int))
m_pc_keyb_int_cb = set_keyb_int_func;
m_pc_keyb_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pc_state::pc_keyb_timer),this));
}
-
+
void pc_state::mess_init_pc_common(void (*set_keyb_int_func)(running_machine &, int))
{
if ( set_keyb_int_func != NULL )
@@ -1530,7 +1530,7 @@ MACHINE_START_MEMBER(pc_state,pcjr)
{
pc_int_delay_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pc_state::pcjr_delayed_pic8259_irq),this));
m_pcjr_watchdog = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pc_state::pcjr_fdc_watchdog),this));
- pcjr_keyb.keyb_signal_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pc_state::pcjr_keyb_signal_callback),this));
+ pcjr_keyb.keyb_signal_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pc_state::pcjr_keyb_signal_callback),this));
m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(pc_state::pc_irq_callback),this));
machine().device<upd765a_device>("upd765")->set_ready_line_connected(false);
@@ -1838,5 +1838,5 @@ void pc_state::pc_turbo_setup(double off_speed, double on_speed)
m_turbo_cur_val = -1;
m_turbo_off_speed = off_speed;
m_turbo_on_speed = on_speed;
- machine().scheduler().timer_pulse(attotime::from_msec(100), timer_expired_delegate(FUNC(pc_state::pc_turbo_callback),this));
+ machine().scheduler().timer_pulse(attotime::from_msec(100), timer_expired_delegate(FUNC(pc_state::pc_turbo_callback),this));
}
diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c
index 03e27549fd3..f8bce0f2d3c 100644
--- a/src/mess/machine/primo.c
+++ b/src/mess/machine/primo.c
@@ -333,7 +333,7 @@ void primo_state::primo_setup_pp (UINT8* quickload_data, UINT32 quickload_size)
{
int i;
-
+
UINT16 load_addr;
UINT16 start_addr;
diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c
index 050d30c652d..ab7b3b07218 100644
--- a/src/mess/machine/psxcd.c
+++ b/src/mess/machine/psxcd.c
@@ -1084,7 +1084,7 @@ void psxcd_device::start_read()
return;
}
send_result(intr_complete);
- status |= status_reading;
+ status |= status_reading;
m_cursec=sectail=0;
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index 8a1b74cb789..15754a62fb4 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -2373,7 +2373,6 @@ WRITE8_MEMBER(rmnimbus_state::nimbus_disk_w)
void rmnimbus_state::hdc_reset()
{
-
m_nimbus_drives.reg410_in=0;
m_nimbus_drives.reg410_in |= (m_scsibus->scsi_req_r() ? 0 : HDC_REQ_MASK);
m_nimbus_drives.reg410_in |= (m_scsibus->scsi_cd_r() ? 0 : HDC_CD_MASK);
@@ -2386,7 +2385,6 @@ void rmnimbus_state::hdc_reset()
void rmnimbus_state::hdc_ctrl_write(UINT8 data)
{
-
// If we enable the HDC interupt, and an interrupt is pending, go deal with it.
if(((data & HDC_IRQ_MASK) && (~m_nimbus_drives.reg410_out & HDC_IRQ_MASK)) &&
((~m_nimbus_drives.reg410_in & HDC_INT_TRIGGER)==HDC_INT_TRIGGER))
@@ -2400,7 +2398,6 @@ void rmnimbus_state::hdc_ctrl_write(UINT8 data)
void rmnimbus_state::hdc_post_rw()
{
-
if((m_nimbus_drives.reg410_in & HDC_REQ_MASK)==0)
m_scsibus->scsi_ack_w(1);
diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c
index 24dd3c64434..d5f4d744700 100644
--- a/src/mess/machine/s3c44b0.c
+++ b/src/mess/machine/s3c44b0.c
@@ -2011,8 +2011,8 @@ DEVICE_START( s3c44b0 )
s3c44b0->sda_w.resolve(s3c44b0->iface->i2c.sda_w, *device);
s3c44b0->adc_data_r.resolve(s3c44b0->iface->adc.data_r, *device);
s3c44b0->i2s_data_w.resolve(s3c44b0->iface->i2s.data_w, *device);
-
-
+
+
s3c44b0->space = &space;
s3c44b0->cpu = downcast<cpu_device *>(device->machine().device( "maincpu"));
for (int i = 0; i < 6; i++) s3c44b0->pwm.timer[i] = machine.scheduler().timer_alloc(FUNC(s3c44b0_pwm_timer_exp), (void*)device);
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index f941bc534db..daea1de0fa3 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -1512,7 +1512,6 @@ int sms_state::detect_tvdraw( UINT8 *rom )
int sms_state::detect_lphaser_xoffset( UINT8 *rom )
{
-
static const UINT8 signatures[6][16] =
{
/* Spacegun */
diff --git a/src/mess/machine/upd71071.c b/src/mess/machine/upd71071.c
index ca7be166cfd..9b6228f588b 100644
--- a/src/mess/machine/upd71071.c
+++ b/src/mess/machine/upd71071.c
@@ -110,8 +110,8 @@ struct upd71071_t
const upd71071_intf* intf;
devcb_resolved_write_line m_out_hreq_func;
devcb_resolved_write_line m_out_eop_func;
- devcb_resolved_read16 m_dma_read[4];
- devcb_resolved_write16 m_dma_write[4];
+ devcb_resolved_read16 m_dma_read[4];
+ devcb_resolved_write16 m_dma_write[4];
devcb_resolved_write_line m_out_dack_func[4];
int m_hreq;
int m_eop;
diff --git a/src/mess/machine/upd71071.h b/src/mess/machine/upd71071.h
index 1e87a41fcac..9a815d8819e 100644
--- a/src/mess/machine/upd71071.h
+++ b/src/mess/machine/upd71071.h
@@ -9,8 +9,8 @@ struct upd71071_intf
int clock;
devcb_write_line m_out_hreq_cb;
devcb_write_line m_out_eop_cb;
- devcb_read16 m_dma_read[4];
- devcb_write16 m_dma_write[4];
+ devcb_read16 m_dma_read[4];
+ devcb_write16 m_dma_write[4];
devcb_write_line m_out_dack_cb[4];
};
diff --git a/src/mess/machine/vtech2.c b/src/mess/machine/vtech2.c
index 62a90d126b3..a56a2f9e78e 100644
--- a/src/mess/machine/vtech2.c
+++ b/src/mess/machine/vtech2.c
@@ -332,7 +332,7 @@ DEVICE_IMAGE_UNLOAD_MEMBER( vtech2_state, laser_cart )
}
device_t *vtech2_state::laser_file()
-{
+{
return machine().device(m_laser_drive ? FLOPPY_1 : FLOPPY_0);
}
diff --git a/src/mess/video/cgenie.c b/src/mess/video/cgenie.c
index ca6f6cfa42f..bc8231d0d0e 100644
--- a/src/mess/video/cgenie.c
+++ b/src/mess/video/cgenie.c
@@ -57,7 +57,7 @@ void cgenie_state::cgenie_offset_xy()
Write to an indexed register of the 6845 CRTC
***************************************************************************/
WRITE8_MEMBER( cgenie_state::cgenie_register_w )
-{
+{
//int addr;
switch (m_crt.idx)
@@ -166,7 +166,7 @@ WRITE8_MEMBER( cgenie_state::cgenie_index_w )
Read from an indexed register of the 6845 CRTC
***************************************************************************/
READ8_MEMBER( cgenie_state::cgenie_register_r )
-{
+{
return cgenie_get_register(m_crt.idx);
}
@@ -217,7 +217,7 @@ int cgenie_state::cgenie_get_register(int indx)
Read the index register of the 6845 CRTC
***************************************************************************/
READ8_MEMBER( cgenie_state::cgenie_index_r )
-{
+{
return m_crt.idx;
}
diff --git a/src/mess/video/fm7.c b/src/mess/video/fm7.c
index 126623ecb53..a4d0a3817b9 100644
--- a/src/mess/video/fm7.c
+++ b/src/mess/video/fm7.c
@@ -645,7 +645,7 @@ READ8_MEMBER(fm7_state::fm7_vram_r)
return 0xff;
if(m_alu.command & 0x80) // ALU active, writes to VRAM even when reading it (go figure)
- {
+ {
fm7_alu_function(offset+page);
}
diff --git a/src/mess/video/pc_aga.h b/src/mess/video/pc_aga.h
index 971fd5ea018..acf3414cf75 100644
--- a/src/mess/video/pc_aga.h
+++ b/src/mess/video/pc_aga.h
@@ -44,4 +44,4 @@ DECLARE_WRITE8_HANDLER( pc200_cga_w );
DECLARE_READ16_HANDLER( pc200_cga16le_r );
DECLARE_WRITE16_HANDLER( pc200_cga16le_w );
-#endif \ No newline at end of file
+#endif
diff --git a/src/mess/video/rmnimbus.c b/src/mess/video/rmnimbus.c
index efb9c4d6302..86055d6a9b5 100644
--- a/src/mess/video/rmnimbus.c
+++ b/src/mess/video/rmnimbus.c
@@ -82,7 +82,7 @@ static void video_regdump(running_machine &machine, int ref, int params, const c
*/
READ16_MEMBER(rmnimbus_state::nimbus_video_io_r)
-{
+{
int pc=space.device().safe_pc();
UINT16 result;
@@ -242,7 +242,7 @@ UINT16 rmnimbus_state::read_reg_00A()
*/
WRITE16_MEMBER(rmnimbus_state::nimbus_video_io_w)
-{
+{
int pc=space.device().safe_pc();
if(offset<reg028)
diff --git a/src/mess/video/tx0.c b/src/mess/video/tx0.c
index 31b495d8313..cb760ba5317 100644
--- a/src/mess/video/tx0.c
+++ b/src/mess/video/tx0.c
@@ -54,7 +54,6 @@ void tx0_state::screen_eof_tx0(screen_device &screen, bool state)
*/
void tx0_state::tx0_plot(int x, int y)
{
-
/* compute pixel coordinates and plot */
x = x*crt_window_width/0777;
y = y*crt_window_height/0777;
diff --git a/src/mess/video/vic4567.h b/src/mess/video/vic4567.h
index 1aca87cab0c..664ea89d01c 100644
--- a/src/mess/video/vic4567.h
+++ b/src/mess/video/vic4567.h
@@ -25,14 +25,14 @@ struct vic3_interface
const char *screen;
const char *cpu;
- vic3_type type;
+ vic3_type type;
devcb_read8 x_cb;
devcb_read8 y_cb;
- devcb_read8 button_cb;
+ devcb_read8 button_cb;
devcb_read8 dma_read;
- devcb_read8 dma_read_color;
+ devcb_read8 dma_read_color;
devcb_write_line irq;
devcb_write8 port_changed;
diff --git a/src/osd/sdl/debugqtdasmwindow.h b/src/osd/sdl/debugqtdasmwindow.h
index 633a6029b74..f723fad55dc 100644
--- a/src/osd/sdl/debugqtdasmwindow.h
+++ b/src/osd/sdl/debugqtdasmwindow.h
@@ -52,13 +52,13 @@ public:
m_rightBar(0)
{
}
-
+
~DasmWindowQtConfig() {}
-
+
// Settings
int m_cpu;
int m_rightBar;
-
+
void buildFromQWidget(QWidget* widget);
void applyToQWidget(QWidget* widget);
void addToXmlDataNode(xml_data_node* node) const;
diff --git a/src/osd/sdl/debugqtlogwindow.h b/src/osd/sdl/debugqtlogwindow.h
index 18fce1ea760..812da3715ad 100644
--- a/src/osd/sdl/debugqtlogwindow.h
+++ b/src/osd/sdl/debugqtlogwindow.h
@@ -35,9 +35,9 @@ public:
WindowQtConfig(WIN_TYPE_LOG)
{
}
-
+
~LogWindowQtConfig() {}
-
+
void buildFromQWidget(QWidget* widget);
void applyToQWidget(QWidget* widget);
void addToXmlDataNode(xml_data_node* node) const;
diff --git a/src/osd/sdl/debugqtmainwindow.c b/src/osd/sdl/debugqtmainwindow.c
index cc4223a3e23..fab7fddc440 100644
--- a/src/osd/sdl/debugqtmainwindow.c
+++ b/src/osd/sdl/debugqtmainwindow.c
@@ -125,7 +125,7 @@ void MainWindow::setProcessor(device_t* processor)
void MainWindow::closeEvent(QCloseEvent* event)
{
debugActQuit();
-
+
// Insure the window doesn't disappear before we get a chance to save its parameters
event->ignore();
}
diff --git a/src/osd/sdl/debugqtmainwindow.h b/src/osd/sdl/debugqtmainwindow.h
index f01ea0bb716..8d25bf60a2a 100644
--- a/src/osd/sdl/debugqtmainwindow.h
+++ b/src/osd/sdl/debugqtmainwindow.h
@@ -171,13 +171,13 @@ public:
m_rightBar(0),
m_windowState()
{}
-
+
~MainWindowQtConfig() {}
-
+
// Settings
int m_rightBar;
QByteArray m_windowState;
-
+
void buildFromQWidget(QWidget* widget);
void applyToQWidget(QWidget* widget);
void addToXmlDataNode(xml_data_node* node) const;
diff --git a/src/osd/sdl/debugqtmemorywindow.h b/src/osd/sdl/debugqtmemorywindow.h
index f76658055ce..8abc2ce4721 100644
--- a/src/osd/sdl/debugqtmemorywindow.h
+++ b/src/osd/sdl/debugqtmemorywindow.h
@@ -59,13 +59,13 @@ public:
}
~MemoryWindowQtConfig() {}
-
+
// Settings
int m_reverse;
int m_addressMode;
int m_chunkSize;
int m_memoryRegion;
-
+
void buildFromQWidget(QWidget* widget);
void applyToQWidget(QWidget* widget);
void addToXmlDataNode(xml_data_node* node) const;
diff --git a/src/osd/sdl/debugqtwindow.h b/src/osd/sdl/debugqtwindow.h
index 63dddc6ea42..9ae0852d3a3 100644
--- a/src/osd/sdl/debugqtwindow.h
+++ b/src/osd/sdl/debugqtwindow.h
@@ -77,17 +77,17 @@ public:
m_next(NULL)
{}
virtual ~WindowQtConfig() {}
-
+
// Settings
WindowType m_type;
QPoint m_size;
QPoint m_position;
-
+
// Dues for becoming a member of a simple_list
WindowQtConfig* m_next;
WindowQtConfig* next() const { return m_next; }
-
-
+
+
virtual void buildFromQWidget(QWidget* widget);
virtual void applyToQWidget(QWidget* widget);
virtual void addToXmlDataNode(xml_data_node* node) const;
diff --git a/src/osd/sdl/sdldir.c b/src/osd/sdl/sdldir.c
index 7cbc571b3d3..5df2e0cd22d 100644
--- a/src/osd/sdl/sdldir.c
+++ b/src/osd/sdl/sdldir.c
@@ -89,7 +89,7 @@ static osd_dir_entry_type get_attributes_enttype(int attributes, char *path)
case DT_REG:
return ENTTYPE_FILE;
- case DT_LNK:
+ case DT_LNK:
{
struct stat s;
diff --git a/src/version.c b/src/version.c
index 61bfad493c1..2a70206f176 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.148u3 ("__DATE__")";
+const char build_version[] = "0.148u4 ("__DATE__")";